Merge lp:~ttosttos/eidete/fix-1004294 into lp:eidete

Proposed by ttosttos on 2012-06-07
Status: Merged
Merged at revision: 73
Proposed branch: lp:~ttosttos/eidete/fix-1004294
Merge into: lp:eidete
Diff against target: 231 lines (+54/-37)
4 files modified
CMakeLists.txt (+1/-0)
data/eidete.desktop (+1/-1)
po/eidete.pot (+44/-36)
src/desktop_launcher.vala (+8/-0)
To merge this branch: bzr merge lp:~ttosttos/eidete/fix-1004294
Reviewer Review Type Date Requested Status
Victor Martinez 2012-06-07 Approve on 2012-06-23
Review via email: mp+109065@code.launchpad.net

Description of the change

- Added gettext domain key to eidete.desktop
- created desktop_launcher.vala to have xgettext automatically add launcher strings to translation template

To post a comment you must log in.
ttosttos (ttosttos) wrote :

Earlier merge requests has been sitting for some time. I'd appreciate if someone can review and comment or otherwise merge. Thanks.

Victor Martinez (victored) wrote :

Eidete dev(s) seem to be busy. This looks fine to me.

review: Approve
ttosttos (ttosttos) wrote :

@victored, thanks for approving. Is merge still pending? Status is marked as "needs review". Thanks again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-04-28 16:44:17 +0000
3+++ CMakeLists.txt 2012-06-07 05:12:20 +0000
4@@ -46,6 +46,7 @@
5 src/Widgets/keyview.vala
6 src/Widgets/selectionarea.vala
7 src/Widgets/end_dialog.vala
8+ src/desktop_launcher.vala
9 ${CMAKE_BINARY_DIR}/src/Config.vala
10 PACKAGES
11 granite
12
13=== modified file 'data/eidete.desktop'
14--- data/eidete.desktop 2012-01-20 21:04:36 +0000
15+++ data/eidete.desktop 2012-06-07 05:12:20 +0000
16@@ -1,4 +1,3 @@
17-
18 [Desktop Entry]
19 Type=Application
20 Name=Eidete
21@@ -8,6 +7,7 @@
22 Icon=eidete
23 Terminal=false
24 Categories=GNOME;GTK;Utility;
25+X-GNOME-Gettext-Domain=eidete
26
27 X-Ayatana-Desktop-Shortcuts=Pause;Finish
28
29
30=== modified file 'po/eidete.pot'
31--- po/eidete.pot 2012-06-05 06:14:12 +0000
32+++ po/eidete.pot 2012-06-07 05:12:20 +0000
33@@ -8,7 +8,7 @@
34 msgstr ""
35 "Project-Id-Version: PACKAGE VERSION\n"
36 "Report-Msgid-Bugs-To: \n"
37-"POT-Creation-Date: 2012-06-04 22:56-0700\n"
38+"POT-Creation-Date: 2012-06-06 20:56-0700\n"
39 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
40 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
41 "Language-Team: LANGUAGE <LL@li.org>\n"
42@@ -17,133 +17,141 @@
43 "Content-Type: text/plain; charset=CHARSET\n"
44 "Content-Transfer-Encoding: 8bit\n"
45
46-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/countdown.vala:27
47+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/countdown.vala:27
48 msgid "Recording starts in"
49 msgstr ""
50
51-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/countdown.vala:33
52+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/countdown.vala:33
53 msgid "Focus Eidete to stop recording"
54 msgstr ""
55
56-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:24
57+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:24
58 msgid "Recording done"
59 msgstr ""
60
61-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:27
62+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:27
63 msgid "And now?"
64 msgstr ""
65
66-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:27
67+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:27
68 msgid "</span>"
69 msgstr ""
70
71-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:31
72+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:31
73 msgid "Go"
74 msgstr ""
75
76-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:64
77+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:64
78 msgid "Could not contact Contractor. Click Save to save the file"
79 msgstr ""
80
81-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:66
82-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:103
83-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/savedialog.vala:8
84+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:66
85+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:103
86+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/savedialog.vala:8
87 msgid "Save"
88 msgstr ""
89
90-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:139
91+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:139
92 msgid "Monitor"
93 msgstr ""
94
95-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:154
96+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:154
97 msgid "Fullscreen"
98 msgstr ""
99
100-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:155
101+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:155
102 msgid "Custom"
103 msgstr ""
104
105-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:175
106+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:175
107 msgid "Record"
108 msgstr ""
109
110-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:187
111+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:187
112 msgid "Sound"
113 msgstr ""
114
115-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:188
116+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:188
117 msgid "Record Computer Sounds"
118 msgstr ""
119
120-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:190
121+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:190
122 msgid "Record from Microphone"
123 msgstr ""
124
125-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:192
126+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:192
127 msgid "Video"
128 msgstr ""
129
130-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:193
131+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:193
132 msgid "Record from Monitor"
133 msgstr ""
134
135-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:195
136+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:195
137 msgid "Recording Area"
138 msgstr ""
139
140-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:197
141+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:197
142 msgid "Width"
143 msgstr ""
144
145-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:199
146+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:199
147 msgid "Height"
148 msgstr ""
149
150-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:218
151+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:218
152 msgid "Show pressed keys on screen"
153 msgstr ""
154
155-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:220
156+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:220
157 msgid "Show clicks on screen"
158 msgstr ""
159
160-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:222
161+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:222
162 msgid "Show circle behind mouse"
163 msgstr ""
164
165-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:228
166+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:228
167 msgid "Behaviour"
168 msgstr ""
169
170-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:229
171+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:229
172 msgid "Appearance"
173 msgstr ""
174
175-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:424
176+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:424
177 msgid "Finish"
178 msgstr ""
179
180-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:425
181+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:425
182 msgid "Finish recording"
183 msgstr ""
184
185-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:427
186+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:427
187 msgid "Record more"
188 msgstr ""
189
190-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:441
191-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:588
192+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:441
193+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:588
194 msgid "Recording paused"
195 msgstr ""
196
197-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:442
198+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:442
199 msgid "You can continue or finish the recording now."
200 msgstr ""
201
202-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:598
203+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:598
204 msgid "Pause recording"
205 msgstr ""
206
207-#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/videobin_uploader.vala:45
208+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/videobin_uploader.vala:45
209 msgid "Upload"
210 msgstr ""
211+
212+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/desktop_launcher.vala:5
213+msgid "Record screencasts"
214+msgstr ""
215+
216+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/desktop_launcher.vala:6
217+msgid "Screencaster"
218+msgstr ""
219
220=== added file 'src/desktop_launcher.vala'
221--- src/desktop_launcher.vala 1970-01-01 00:00:00 +0000
222+++ src/desktop_launcher.vala 2012-06-07 05:12:20 +0000
223@@ -0,0 +1,8 @@
224+namespace DesktopLauncher {
225+ /* Translatable launcher (.desktop) strings to be added to */
226+ /* template (.pot) file. These strings MUST reflect any */
227+ /* changes in these launcher keys in .desktop file. */
228+ public const string COMMENT = N_("Record screencasts");
229+ public const string GENERIC_NAME = N_("Screencaster");
230+
231+}

Subscribers

People subscribed via source and target branches

to all changes: