Unity Videos Lens

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

  1. bug938576
  2. Merge into trunk
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
1=== modified file 'debian/control'
2--- debian/control 2012-02-15 17:07:08 +0000
3+++ debian/control 2012-02-22 11:42:20 +0000
4@@ -12,6 +12,7 @@
5 ${python:Depends},
6 gir1.2-unity-5.0,
7 gir1.2-dee-1.0,
8+ dh-translations,
9 Recommends: unity-scope-video-remote
10 Description: Unity Video lens
11 A plugin to search videos in the Dash.
12
13=== modified file 'debian/rules'
14--- debian/rules 2012-02-02 19:43:07 +0000
15+++ debian/rules 2012-02-22 11:42:20 +0000
16@@ -3,4 +3,4 @@
17
18
19 %:
20- dh $@ --with python2
21+ dh $@ --with python2,translations
22
23=== modified file 'po/POTFILES.in'
24--- po/POTFILES.in 2012-02-04 17:48:53 +0000
25+++ po/POTFILES.in 2012-02-22 11:42:20 +0000
26@@ -1,2 +1,3 @@
27 [encoding: UTF-8]
28 src/unity-lens-video
29+[type: gettext/ini]video.lens.in
30
31=== modified file 'po/unity-lens-video.pot'
32--- po/unity-lens-video.pot 2012-02-06 10:29:16 +0000
33+++ po/unity-lens-video.pot 2012-02-22 11:42:20 +0000
34@@ -8,7 +8,7 @@
35 msgstr ""
36 "Project-Id-Version: PACKAGE VERSION\n"
37 "Report-Msgid-Bugs-To: \n"
38-"POT-Creation-Date: 2012-02-06 11:27+0100\n"
39+"POT-Creation-Date: 2012-02-22 11:42+0100\n"
40 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
41 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
42 "Language-Team: LANGUAGE <LL@li.org>\n"
43@@ -17,22 +17,30 @@
44 "Content-Type: text/plain; charset=CHARSET\n"
45 "Content-Transfer-Encoding: 8bit\n"
46
47-#: ../src/unity-lens-video:65
48-msgid "On this computer"
49+#: ../src/unity-lens-video:78 ../src/unity-lens-video:84
50+msgid "My Videos"
51 msgstr ""
52
53-#: ../src/unity-lens-video:66
54+#: ../src/unity-lens-video:79
55 msgid "Online"
56 msgstr ""
57
58-#: ../src/unity-lens-video:67
59+#: ../src/unity-lens-video:80 ../video.lens.in.h:2
60 msgid "Videos"
61 msgstr ""
62
63-#: ../src/unity-lens-video:68
64+#: ../src/unity-lens-video:81
65+msgid "Recently Watched"
66+msgstr ""
67+
68+#: ../src/unity-lens-video:82
69 msgid "Search Videos"
70 msgstr ""
71
72-#: ../src/unity-lens-video:69
73+#: ../src/unity-lens-video:83
74 msgid "Sources"
75 msgstr ""
76+
77+#: ../video.lens.in.h:1
78+msgid "Search local videos"
79+msgstr ""
80
81=== added file 'setup.cfg'
82--- setup.cfg 1970-01-01 00:00:00 +0000
83+++ setup.cfg 2012-02-22 11:42:20 +0000
84@@ -0,0 +1,10 @@
85+[build]
86+i18n=True
87+
88+[build_i18n]
89+domain=unity-lens-video
90+desktop_files=[ ("share/unity/lenses/video",
91+ ("video.lens.in",)
92+ )
93+ ]
94+
95
96=== modified file 'setup.py'
97--- setup.py 2012-02-02 19:43:07 +0000
98+++ setup.py 2012-02-22 11:42:20 +0000
99@@ -12,5 +12,5 @@
100 data_files=[
101 ('lib/unity-lens-video', ['src/unity-lens-video']),
102 ('share/dbus-1/services', ['unity-lens-video.service']),
103- ('share/unity/lenses/video', ['video.lens']),
104- ], cmdclass={"build": build_extra.build_extra, })
105+ ], cmdclass={"build": build_extra.build_extra,
106+ "build_i18n": build_i18n.build_i18n,})
107
108=== renamed file 'video.lens' => 'video.lens.in'
109--- video.lens 2012-02-02 19:43:07 +0000
110+++ video.lens.in 2012-02-22 11:42:20 +0000
111@@ -1,9 +1,9 @@
112 [Lens]
113 DBusName=net.launchpad.lens.video
114 DBusPath=/net/launchpad/lens/video
115-Name=Videos
116+_Name=Videos
117 Icon=/usr/share/unity/5/lens-nav-video.svg
118-Description=Search local videos
119+_Description=Search local videos
120 Shortcut=v
121
122 [Desktop Entry]

Subscribers

People subscribed via source and target branches