unity-scope-click

Merge lp:~alecu/unity-scope-click/fix-search-hint into lp:unity-scope-click/devel

  1. fix-search-hint
  2. Merge into devel
Proposed by Alejandro J. Cura
Status: Merged
Approved by: dobey
Approved revision: 364
Merged at revision: 365
Proposed branch: lp:~alecu/unity-scope-click/fix-search-hint
Merge into: lp:unity-scope-click/devel
Diff against target: 21 lines (+2/-4)
2 files modified
data/clickscope.ini.in.in (+1/-2)
data/com.canonical.scopes.clickstore.ini.in.in (+1/-2)
To merge this branch: bzr merge lp:~alecu/unity-scope-click/fix-search-hint
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Diego Sarmentero (community) Approve
dobey (community) Approve
Review via email: mp+228305@code.launchpad.net

This proposal supersedes a proposal from 2014-07-25.

Commit message

Put the right text in the SearchHint, and make it translatable.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:364
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/235/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/210/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/209/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/209/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/235/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:364
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/236/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/211/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/210/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/210/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/236/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/clickscope.ini.in.in'
--- data/clickscope.ini.in.in 2014-05-27 13:15:52 +0000
+++ data/clickscope.ini.in.in 2014-07-25 13:21:30 +0000
@@ -4,5 +4,4 @@
4Author=Canonical Ltd.4Author=Canonical Ltd.
5Art=@APPS_DATA_DIR@/clickscope-screenshot.jpg5Art=@APPS_DATA_DIR@/clickscope-screenshot.jpg
6Icon=@APPS_DATA_DIR@/apps-scope.svg6Icon=@APPS_DATA_DIR@/apps-scope.svg
7SearchHint=clickscope.SearchHint7_SearchHint=Search apps
8HotKey=clickscope.HotKey
98
=== modified file 'data/com.canonical.scopes.clickstore.ini.in.in'
--- data/com.canonical.scopes.clickstore.ini.in.in 2014-05-27 08:12:53 +0000
+++ data/com.canonical.scopes.clickstore.ini.in.in 2014-07-25 13:21:30 +0000
@@ -4,5 +4,4 @@
4Author=Canonical Ltd.4Author=Canonical Ltd.
5Art=@STORE_DATA_DIR@/clickscope-screenshot.jpg5Art=@STORE_DATA_DIR@/clickscope-screenshot.jpg
6Icon=@STORE_DATA_DIR@/apps-scope.svg6Icon=@STORE_DATA_DIR@/apps-scope.svg
7SearchHint=clickscope.SearchHint7_SearchHint=Search store
8HotKey=clickscope.HotKey

Subscribers

People subscribed via source and target branches

to all changes: