Merge lp:~kelemeng/unity-lens-video/bug938576 into lp:unity-lens-video

Proposed by Gabor Kelemen
Status: Merged
Approved by: David Callé
Approved revision: 43
Merged at revision: 37
Proposed branch: lp:~kelemeng/unity-lens-video/bug938576
Merge into: lp:unity-lens-video
Diff against target: 122 lines (+32/-12)
7 files modified
debian/control (+1/-0)
debian/rules (+1/-1)
po/POTFILES.in (+1/-0)
po/unity-lens-video.pot (+15/-7)
setup.cfg (+10/-0)
setup.py (+2/-2)
video.lens.in (+2/-2)
To merge this branch: bzr merge lp:~kelemeng/unity-lens-video/bug938576
Reviewer Review Type Date Requested Status
Unity Videos lens Pending
Review via email: mp+94129@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2012-02-15 17:07:08 +0000
+++ debian/control 2012-02-22 11:42:20 +0000
@@ -12,6 +12,7 @@
12 ${python:Depends},12 ${python:Depends},
13 gir1.2-unity-5.0,13 gir1.2-unity-5.0,
14 gir1.2-dee-1.0,14 gir1.2-dee-1.0,
15 dh-translations,
15Recommends: unity-scope-video-remote16Recommends: unity-scope-video-remote
16Description: Unity Video lens17Description: Unity Video lens
17 A plugin to search videos in the Dash.18 A plugin to search videos in the Dash.
1819
=== modified file 'debian/rules'
--- debian/rules 2012-02-02 19:43:07 +0000
+++ debian/rules 2012-02-22 11:42:20 +0000
@@ -3,4 +3,4 @@
33
44
5%:5%:
6 dh $@ --with python26 dh $@ --with python2,translations
77
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2012-02-04 17:48:53 +0000
+++ po/POTFILES.in 2012-02-22 11:42:20 +0000
@@ -1,2 +1,3 @@
1[encoding: UTF-8]1[encoding: UTF-8]
2src/unity-lens-video2src/unity-lens-video
3[type: gettext/ini]video.lens.in
34
=== modified file 'po/unity-lens-video.pot'
--- po/unity-lens-video.pot 2012-02-06 10:29:16 +0000
+++ po/unity-lens-video.pot 2012-02-22 11:42:20 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2012-02-06 11:27+0100\n"11"POT-Creation-Date: 2012-02-22 11:42+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,30 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: ../src/unity-lens-video:6520#: ../src/unity-lens-video:78 ../src/unity-lens-video:84
21msgid "On this computer"21msgid "My Videos"
22msgstr ""22msgstr ""
2323
24#: ../src/unity-lens-video:6624#: ../src/unity-lens-video:79
25msgid "Online"25msgid "Online"
26msgstr ""26msgstr ""
2727
28#: ../src/unity-lens-video:6728#: ../src/unity-lens-video:80 ../video.lens.in.h:2
29msgid "Videos"29msgid "Videos"
30msgstr ""30msgstr ""
3131
32#: ../src/unity-lens-video:6832#: ../src/unity-lens-video:81
33msgid "Recently Watched"
34msgstr ""
35
36#: ../src/unity-lens-video:82
33msgid "Search Videos"37msgid "Search Videos"
34msgstr ""38msgstr ""
3539
36#: ../src/unity-lens-video:6940#: ../src/unity-lens-video:83
37msgid "Sources"41msgid "Sources"
38msgstr ""42msgstr ""
43
44#: ../video.lens.in.h:1
45msgid "Search local videos"
46msgstr ""
3947
=== added file 'setup.cfg'
--- setup.cfg 1970-01-01 00:00:00 +0000
+++ setup.cfg 2012-02-22 11:42:20 +0000
@@ -0,0 +1,10 @@
1[build]
2i18n=True
3
4[build_i18n]
5domain=unity-lens-video
6desktop_files=[ ("share/unity/lenses/video",
7 ("video.lens.in",)
8 )
9 ]
10
011
=== modified file 'setup.py'
--- setup.py 2012-02-02 19:43:07 +0000
+++ setup.py 2012-02-22 11:42:20 +0000
@@ -12,5 +12,5 @@
12 data_files=[12 data_files=[
13 ('lib/unity-lens-video', ['src/unity-lens-video']),13 ('lib/unity-lens-video', ['src/unity-lens-video']),
14 ('share/dbus-1/services', ['unity-lens-video.service']),14 ('share/dbus-1/services', ['unity-lens-video.service']),
15 ('share/unity/lenses/video', ['video.lens']),15 ], cmdclass={"build": build_extra.build_extra,
16 ], cmdclass={"build": build_extra.build_extra, })16 "build_i18n": build_i18n.build_i18n,})
1717
=== renamed file 'video.lens' => 'video.lens.in'
--- video.lens 2012-02-02 19:43:07 +0000
+++ video.lens.in 2012-02-22 11:42:20 +0000
@@ -1,9 +1,9 @@
1[Lens]1[Lens]
2DBusName=net.launchpad.lens.video2DBusName=net.launchpad.lens.video
3DBusPath=/net/launchpad/lens/video3DBusPath=/net/launchpad/lens/video
4Name=Videos4_Name=Videos
5Icon=/usr/share/unity/5/lens-nav-video.svg5Icon=/usr/share/unity/5/lens-nav-video.svg
6Description=Search local videos6_Description=Search local videos
7Shortcut=v7Shortcut=v
88
9[Desktop Entry]9[Desktop Entry]

Subscribers

People subscribed via source and target branches