Merge lp:~bregma/unity-lens-friends/lp-1056204 into lp:unity-lens-friends

[Stephen M. Webb]

change hint text (lp: #1056204)

Changes the hint text (lp: #1056204).

The hint text was too long to fit on most screens and was inconsistent with other hint texts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/unity-lens-friends-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-friends-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-friends-raring-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-friends-raring-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-friends-ci/1/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Great, thanks.

review: Approve

=== modified file 'data/social.scope.in.in'
--- data/social.scope.in.in	2013-05-01 17:45:49 +0000
+++ data/social.scope.in.in	2013-05-28 13:54:24 +0000
@@ -4,7 +4,7 @@
 Icon=@prefix@/share/unity/icons/lens-nav-gwibber.svg
 _Name=Social
 _Description=This is an Ubuntu search plugin that enables information from Online accounts to be searched and displayed in the Dash underneath the Social header. If you do not wish to search this content source, you can disable this search plugin.
-_SearchHint=Enter name or content you would like to search for
+_SearchHint=Search social network messages
 Shortcut=g
 Type=social
 
 
=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-04-22 11:04:16 +0000
+++ src/daemon.vala	2013-05-28 13:54:24 +0000
@@ -59,7 +59,7 @@
             empty_asv = new Variant.array (VariantType.VARDICT.element (), {});
             scope = new Unity.DeprecatedScope("/com/canonical/unity/scope/friends", "friends.scope");
             scope.search_in_global = false;
-            scope.search_hint = _("Enter name or content you would like to search for");
+            scope.search_hint = _("Search social network messages");
             scope.visible = false;
             try
             {