Merge lp:~stolowski/unity-lens-video/merge-trunk into lp:~unity-team/unity-lens-video/libunity7-compatible

[Paweł Stołowski]

Merged trunk.

Merged trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:130
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-raring-amd64-ci/15

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-video-libunity7-compatible-ci/14/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-lens-video/merge-trunk]

131. By Paweł Stołowski on 2013-05-09

Set RemoteContent flag.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:131
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-raring-amd64-ci/16

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-video-libunity7-compatible-ci/15/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

review: Approve

=== modified file 'data/remote.scope.in.in'
--- data/remote.scope.in.in	2013-04-29 19:07:42 +0000
+++ data/remote.scope.in.in	2013-05-09 14:55:31 +0000
@@ -6,6 +6,7 @@
 Icon=@prefix@/share/unity/icons/lens-nav-video.svg
 _Description=This is an Ubuntu search plugin that enables information from various video providers to be searched and displayed in the Dash underneath the Video header. If you do not wish to search these content sources, you can disable this search plugin.
 GlobalSearches=false
+RemoteContent=true
 
 [Desktop Entry]
 X-Ubuntu-Gettext-Domain=unity-lens-video

=== modified file 'debian/control'
--- debian/control	2013-04-24 11:30:58 +0000
+++ debian/control	2013-05-09 14:55:31 +0000
@@ -19,7 +19,7 @@
 Homepage: https://launchpad.net/unity-lens-video
 # If you aren't a member of ~unity-team but need to upload packaging changes,
 # just go ahead.  ~unity-team will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-video/trunk
+Vcs-Bzr: https://code.launchpad.net/~unity-lens-videos/unity-lens-video/trunk
 
 Package: unity-lens-video
 Architecture: any

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-04-23 08:47:54 +0000
+++ po/POTFILES.in	2013-05-09 14:55:31 +0000
@@ -1,7 +1,10 @@
 [encoding: UTF-8]
+src/daemon.vala
 src/main.vala
+src/remote-scope.vala
 src/remote-video-main.vala
+src/scope.vala
 src/ubuntu-video-search.vala
 tests/unit/test-ubuntu-video-search.vala
-[type: gettext/ini]data/local.scope.in
-[type: gettext/ini]data/remote.scope.in
+[type: gettext/ini]data/local.scope.in.in
+[type: gettext/ini]data/remote.scope.in.in

=== modified file 'src/scope.vala'
--- src/scope.vala	2013-05-09 09:03:36 +0000
+++ src/scope.vala	2013-05-09 14:55:31 +0000
@@ -64,7 +64,7 @@
       locate = new Locate (cache_directory, videos_folder);
 
       search_in_global = true;
-      search_hint = _("Search videos");
+      search_hint = _("Search Videos");
       visible = true;
       sources.add_option ("local", _("My Videos"), null);
       populate_categories ();