Unity

Merge lp:~fougner/unity/fix-for-bug-795422 into lp:unity

  1. fix-for-bug-795422
  2. Merge into trunk
Proposed by Alexander Fougner
Status: Merged
Merged at revision: 1260
Proposed branch: lp:~fougner/unity/fix-for-bug-795422
Merge into: lp:unity
Diff against target: 427 lines (+33/-33)
33 files modified
po/ar.po (+1/-1)
po/bg.po (+1/-1)
po/cs.po (+1/-1)
po/da.po (+1/-1)
po/de.po (+1/-1)
po/el.po (+1/-1)
po/es.po (+1/-1)
po/fi.po (+1/-1)
po/fr.po (+1/-1)
po/he.po (+1/-1)
po/hi.po (+1/-1)
po/hr.po (+1/-1)
po/hu.po (+1/-1)
po/it.po (+1/-1)
po/ja.po (+1/-1)
po/ko.po (+1/-1)
po/nb.po (+1/-1)
po/nl.po (+1/-1)
po/pl.po (+1/-1)
po/pt.po (+1/-1)
po/pt_BR.po (+1/-1)
po/ro.po (+1/-1)
po/ru.po (+1/-1)
po/sk.po (+1/-1)
po/sl.po (+1/-1)
po/sr.po (+1/-1)
po/sv.po (+1/-1)
po/th.po (+1/-1)
po/tr.po (+1/-1)
po/unity.pot (+1/-1)
po/zh_CN.po (+1/-1)
po/zh_TW.po (+1/-1)
src/BamfLauncherIcon.cpp (+1/-1)
To merge this branch: bzr merge lp:~fougner/unity/fix-for-bug-795422
Reviewer Review Type Date Requested Status
Alex Launi (community) Approve
Tim Penhey (community) Approve
Review via email: mp+64235@code.launchpad.net

Description of the change

Fix for bug 795422. My first fix ever, please do tell if I did something wrong.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

The changes looks good to me.

review: Approve
Revision history for this message
Alex Launi (alexlauni) wrote :

Looks good, but before it can be merged we need you to sign the Canonical Contributor Agreement. Details and instructions for signing the document can be found at http://www.canonical.com/contributors.

review: Approve
Revision history for this message
Alexander Fougner (fougner) wrote :

Alex Launi,

done!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/ar.po'
2--- po/ar.po 2011-06-01 23:46:41 +0000
3+++ po/ar.po 2011-06-10 18:55:54 +0000
4@@ -52,7 +52,7 @@
5 msgstr ""
6
7 #, fuzzy
8-msgid "Keep In Launcher"
9+msgid "Keep in launcher"
10 msgstr "إبقاء في برنامج Launcher"
11
12 msgid "Launcher & Menus"
13
14=== modified file 'po/bg.po'
15--- po/bg.po 2011-06-01 23:46:41 +0000
16+++ po/bg.po 2011-06-10 18:55:54 +0000
17@@ -52,7 +52,7 @@
18 msgstr ""
19
20 #, fuzzy
21-msgid "Keep In Launcher"
22+msgid "Keep in launcher"
23 msgstr "Остави в програмата за стартиране"
24
25 msgid "Launcher & Menus"
26
27=== modified file 'po/cs.po'
28--- po/cs.po 2011-06-01 23:46:41 +0000
29+++ po/cs.po 2011-06-10 18:55:54 +0000
30@@ -53,7 +53,7 @@
31 msgstr ""
32
33 #, fuzzy
34-msgid "Keep In Launcher"
35+msgid "Keep in launcher"
36 msgstr "Ponechat ve Spouštěči"
37
38 msgid "Launcher & Menus"
39
40=== modified file 'po/da.po'
41--- po/da.po 2011-06-01 23:46:41 +0000
42+++ po/da.po 2011-06-10 18:55:54 +0000
43@@ -53,7 +53,7 @@
44 msgstr ""
45
46 #, fuzzy
47-msgid "Keep In Launcher"
48+msgid "Keep in launcher"
49 msgstr "Behold i Launcher"
50
51 msgid "Launcher & Menus"
52
53=== modified file 'po/de.po'
54--- po/de.po 2011-06-01 23:46:41 +0000
55+++ po/de.po 2011-06-10 18:55:54 +0000
56@@ -53,7 +53,7 @@
57 msgstr ""
58
59 #, fuzzy
60-msgid "Keep In Launcher"
61+msgid "Keep in launcher"
62 msgstr "Im Startprogramm behalten"
63
64 msgid "Launcher & Menus"
65
66=== modified file 'po/el.po'
67--- po/el.po 2011-06-01 23:46:41 +0000
68+++ po/el.po 2011-06-10 18:55:54 +0000
69@@ -53,7 +53,7 @@
70 msgstr ""
71
72 #, fuzzy
73-msgid "Keep In Launcher"
74+msgid "Keep in launcher"
75 msgstr "Διατήρηση στο πρόγραμμα εκκίνησης"
76
77 msgid "Launcher & Menus"
78
79=== modified file 'po/es.po'
80--- po/es.po 2011-06-01 23:46:41 +0000
81+++ po/es.po 2011-06-10 18:55:54 +0000
82@@ -53,7 +53,7 @@
83 msgstr ""
84
85 #, fuzzy
86-msgid "Keep In Launcher"
87+msgid "Keep in launcher"
88 msgstr "Conservar en el iniciador"
89
90 msgid "Launcher & Menus"
91
92=== modified file 'po/fi.po'
93--- po/fi.po 2011-06-01 23:46:41 +0000
94+++ po/fi.po 2011-06-10 18:55:54 +0000
95@@ -53,7 +53,7 @@
96 msgstr ""
97
98 #, fuzzy
99-msgid "Keep In Launcher"
100+msgid "Keep in launcher"
101 msgstr "Pidä Launcherissa"
102
103 msgid "Launcher & Menus"
104
105=== modified file 'po/fr.po'
106--- po/fr.po 2011-06-01 23:46:41 +0000
107+++ po/fr.po 2011-06-10 18:55:54 +0000
108@@ -53,7 +53,7 @@
109 msgstr ""
110
111 #, fuzzy
112-msgid "Keep In Launcher"
113+msgid "Keep in launcher"
114 msgstr "Conserver dans le lanceur"
115
116 msgid "Launcher & Menus"
117
118=== modified file 'po/he.po'
119--- po/he.po 2011-06-01 23:46:41 +0000
120+++ po/he.po 2011-06-10 18:55:54 +0000
121@@ -53,7 +53,7 @@
122 msgstr ""
123
124 #, fuzzy
125-msgid "Keep In Launcher"
126+msgid "Keep in launcher"
127 msgstr "שמור ב- Launcher"
128
129 msgid "Launcher & Menus"
130
131=== modified file 'po/hi.po'
132--- po/hi.po 2011-06-01 23:46:41 +0000
133+++ po/hi.po 2011-06-10 18:55:54 +0000
134@@ -52,7 +52,7 @@
135 msgstr ""
136
137 #, fuzzy
138-msgid "Keep In Launcher"
139+msgid "Keep in launcher"
140 msgstr "लॉन्चर में रखें"
141
142 msgid "Launcher & Menus"
143
144=== modified file 'po/hr.po'
145--- po/hr.po 2011-06-01 23:46:41 +0000
146+++ po/hr.po 2011-06-10 18:55:54 +0000
147@@ -54,7 +54,7 @@
148 msgstr ""
149
150 #, fuzzy
151-msgid "Keep In Launcher"
152+msgid "Keep in launcher"
153 msgstr "Zadrži u programu za pokretanje"
154
155 msgid "Launcher & Menus"
156
157=== modified file 'po/hu.po'
158--- po/hu.po 2011-06-01 23:46:41 +0000
159+++ po/hu.po 2011-06-10 18:55:54 +0000
160@@ -53,7 +53,7 @@
161 msgstr ""
162
163 #, fuzzy
164-msgid "Keep In Launcher"
165+msgid "Keep in launcher"
166 msgstr "Megtartás a Launcherben"
167
168 msgid "Launcher & Menus"
169
170=== modified file 'po/it.po'
171--- po/it.po 2011-06-01 23:46:41 +0000
172+++ po/it.po 2011-06-10 18:55:54 +0000
173@@ -53,7 +53,7 @@
174 msgstr ""
175
176 #, fuzzy
177-msgid "Keep In Launcher"
178+msgid "Keep in launcher"
179 msgstr "Mantieni in Launcher"
180
181 msgid "Launcher & Menus"
182
183=== modified file 'po/ja.po'
184--- po/ja.po 2011-06-01 23:46:41 +0000
185+++ po/ja.po 2011-06-10 18:55:54 +0000
186@@ -53,7 +53,7 @@
187 msgstr ""
188
189 #, fuzzy
190-msgid "Keep In Launcher"
191+msgid "Keep in launcher"
192 msgstr "Launcher に残す"
193
194 msgid "Launcher & Menus"
195
196=== modified file 'po/ko.po'
197--- po/ko.po 2011-06-01 23:46:41 +0000
198+++ po/ko.po 2011-06-10 18:55:54 +0000
199@@ -53,7 +53,7 @@
200 msgstr ""
201
202 #, fuzzy
203-msgid "Keep In Launcher"
204+msgid "Keep in launcher"
205 msgstr "시작 관리자에 유지"
206
207 msgid "Launcher & Menus"
208
209=== modified file 'po/nb.po'
210--- po/nb.po 2011-06-01 23:46:41 +0000
211+++ po/nb.po 2011-06-10 18:55:54 +0000
212@@ -53,7 +53,7 @@
213 msgstr ""
214
215 #, fuzzy
216-msgid "Keep In Launcher"
217+msgid "Keep in launcher"
218 msgstr "Behold i oppstartsprogram"
219
220 msgid "Launcher & Menus"
221
222=== modified file 'po/nl.po'
223--- po/nl.po 2011-06-01 23:46:41 +0000
224+++ po/nl.po 2011-06-10 18:55:54 +0000
225@@ -53,7 +53,7 @@
226 msgstr ""
227
228 #, fuzzy
229-msgid "Keep In Launcher"
230+msgid "Keep in launcher"
231 msgstr "Bewaren in starter"
232
233 msgid "Launcher & Menus"
234
235=== modified file 'po/pl.po'
236--- po/pl.po 2011-06-01 23:46:41 +0000
237+++ po/pl.po 2011-06-10 18:55:54 +0000
238@@ -54,7 +54,7 @@
239 msgstr ""
240
241 #, fuzzy
242-msgid "Keep In Launcher"
243+msgid "Keep in launcher"
244 msgstr "Pozostaw w obszarze uruchamiania"
245
246 msgid "Launcher & Menus"
247
248=== modified file 'po/pt.po'
249--- po/pt.po 2011-06-01 23:46:41 +0000
250+++ po/pt.po 2011-06-10 18:55:54 +0000
251@@ -53,7 +53,7 @@
252 msgstr ""
253
254 #, fuzzy
255-msgid "Keep In Launcher"
256+msgid "Keep in launcher"
257 msgstr "Manter no Launcher"
258
259 msgid "Launcher & Menus"
260
261=== modified file 'po/pt_BR.po'
262--- po/pt_BR.po 2011-06-01 23:46:41 +0000
263+++ po/pt_BR.po 2011-06-10 18:55:54 +0000
264@@ -53,7 +53,7 @@
265 msgstr ""
266
267 #, fuzzy
268-msgid "Keep In Launcher"
269+msgid "Keep in launcher"
270 msgstr "Manter no Inicializador"
271
272 msgid "Launcher & Menus"
273
274=== modified file 'po/ro.po'
275--- po/ro.po 2011-06-01 23:46:41 +0000
276+++ po/ro.po 2011-06-10 18:55:54 +0000
277@@ -54,7 +54,7 @@
278 msgstr ""
279
280 #, fuzzy
281-msgid "Keep In Launcher"
282+msgid "Keep in launcher"
283 msgstr "Păstrează în programul de lansare"
284
285 msgid "Launcher & Menus"
286
287=== modified file 'po/ru.po'
288--- po/ru.po 2011-06-01 23:46:41 +0000
289+++ po/ru.po 2011-06-10 18:55:54 +0000
290@@ -54,7 +54,7 @@
291 msgstr ""
292
293 #, fuzzy
294-msgid "Keep In Launcher"
295+msgid "Keep in launcher"
296 msgstr "Оставить в модуле запуска"
297
298 msgid "Launcher & Menus"
299
300=== modified file 'po/sk.po'
301--- po/sk.po 2011-06-01 23:46:41 +0000
302+++ po/sk.po 2011-06-10 18:55:54 +0000
303@@ -53,7 +53,7 @@
304 msgstr ""
305
306 #, fuzzy
307-msgid "Keep In Launcher"
308+msgid "Keep in launcher"
309 msgstr "Ponechať v aplikácii Launcher"
310
311 msgid "Launcher & Menus"
312
313=== modified file 'po/sl.po'
314--- po/sl.po 2011-06-01 23:46:41 +0000
315+++ po/sl.po 2011-06-10 18:55:54 +0000
316@@ -54,7 +54,7 @@
317 msgstr ""
318
319 #, fuzzy
320-msgid "Keep In Launcher"
321+msgid "Keep in launcher"
322 msgstr "Obdrži v zaganjalniku"
323
324 msgid "Launcher & Menus"
325
326=== modified file 'po/sr.po'
327--- po/sr.po 2011-06-01 23:46:41 +0000
328+++ po/sr.po 2011-06-10 18:55:54 +0000
329@@ -54,7 +54,7 @@
330 msgstr ""
331
332 #, fuzzy
333-msgid "Keep In Launcher"
334+msgid "Keep in launcher"
335 msgstr "Zadrži u pokretaču"
336
337 msgid "Launcher & Menus"
338
339=== modified file 'po/sv.po'
340--- po/sv.po 2011-06-01 23:46:41 +0000
341+++ po/sv.po 2011-06-10 18:55:54 +0000
342@@ -53,7 +53,7 @@
343 msgstr ""
344
345 #, fuzzy
346-msgid "Keep In Launcher"
347+msgid "Keep in launcher"
348 msgstr "Behåll i startprogram"
349
350 msgid "Launcher & Menus"
351
352=== modified file 'po/th.po'
353--- po/th.po 2011-06-01 23:46:41 +0000
354+++ po/th.po 2011-06-10 18:55:54 +0000
355@@ -52,7 +52,7 @@
356 msgstr ""
357
358 #, fuzzy
359-msgid "Keep In Launcher"
360+msgid "Keep in launcher"
361 msgstr "อยู่ในโปรแกรมเรียกทำงาน"
362
363 msgid "Launcher & Menus"
364
365=== modified file 'po/tr.po'
366--- po/tr.po 2011-06-01 23:46:41 +0000
367+++ po/tr.po 2011-06-10 18:55:54 +0000
368@@ -53,7 +53,7 @@
369 msgstr ""
370
371 #, fuzzy
372-msgid "Keep In Launcher"
373+msgid "Keep in launcher"
374 msgstr "Başlatıcıda Tut"
375
376 msgid "Launcher & Menus"
377
378=== modified file 'po/unity.pot'
379--- po/unity.pot 2011-06-01 23:46:41 +0000
380+++ po/unity.pot 2011-06-10 18:55:54 +0000
381@@ -17,7 +17,7 @@
382 "Content-Type: text/plain; charset=CHARSET\n"
383 "Content-Transfer-Encoding: 8bit\n"
384
385-msgid "Keep In Launcher"
386+msgid "Keep in launcher"
387 msgstr ""
388
389 msgid "Quit"
390
391=== modified file 'po/zh_CN.po'
392--- po/zh_CN.po 2011-06-01 23:46:41 +0000
393+++ po/zh_CN.po 2011-06-10 18:55:54 +0000
394@@ -52,7 +52,7 @@
395 msgstr ""
396
397 #, fuzzy
398-msgid "Keep In Launcher"
399+msgid "Keep in launcher"
400 msgstr "保留在启动程序中"
401
402 msgid "Launcher & Menus"
403
404=== modified file 'po/zh_TW.po'
405--- po/zh_TW.po 2011-06-01 23:46:41 +0000
406+++ po/zh_TW.po 2011-06-10 18:55:54 +0000
407@@ -52,7 +52,7 @@
408 msgstr ""
409
410 #, fuzzy
411-msgid "Keep In Launcher"
412+msgid "Keep in launcher"
413 msgstr "保留在啟動程式中"
414
415 msgid "Launcher & Menus"
416
417=== modified file 'src/BamfLauncherIcon.cpp'
418--- src/BamfLauncherIcon.cpp 2011-06-02 15:14:17 +0000
419+++ src/BamfLauncherIcon.cpp 2011-06-10 18:55:54 +0000
420@@ -775,7 +775,7 @@
421 g_object_ref (menu_item);
422
423 dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, DBUSMENU_MENUITEM_TOGGLE_CHECK);
424- dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Keep In Launcher"));
425+ dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Keep in launcher"));
426 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
427 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
428