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
=== modified file 'po/ar.po'
--- po/ar.po 2011-06-01 23:46:41 +0000
+++ po/ar.po 2011-06-10 18:55:54 +0000
@@ -52,7 +52,7 @@
52msgstr ""52msgstr ""
5353
54#, fuzzy54#, fuzzy
55msgid "Keep In Launcher"55msgid "Keep in launcher"
56msgstr "إبقاء في برنامج Launcher"56msgstr "إبقاء في برنامج Launcher"
5757
58msgid "Launcher & Menus"58msgid "Launcher & Menus"
5959
=== modified file 'po/bg.po'
--- po/bg.po 2011-06-01 23:46:41 +0000
+++ po/bg.po 2011-06-10 18:55:54 +0000
@@ -52,7 +52,7 @@
52msgstr ""52msgstr ""
5353
54#, fuzzy54#, fuzzy
55msgid "Keep In Launcher"55msgid "Keep in launcher"
56msgstr "Остави в програмата за стартиране"56msgstr "Остави в програмата за стартиране"
5757
58msgid "Launcher & Menus"58msgid "Launcher & Menus"
5959
=== modified file 'po/cs.po'
--- po/cs.po 2011-06-01 23:46:41 +0000
+++ po/cs.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Ponechat ve Spouštěči"57msgstr "Ponechat ve Spouštěči"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/da.po'
--- po/da.po 2011-06-01 23:46:41 +0000
+++ po/da.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Behold i Launcher"57msgstr "Behold i Launcher"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/de.po'
--- po/de.po 2011-06-01 23:46:41 +0000
+++ po/de.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Im Startprogramm behalten"57msgstr "Im Startprogramm behalten"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/el.po'
--- po/el.po 2011-06-01 23:46:41 +0000
+++ po/el.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Διατήρηση στο πρόγραμμα εκκίνησης"57msgstr "Διατήρηση στο πρόγραμμα εκκίνησης"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/es.po'
--- po/es.po 2011-06-01 23:46:41 +0000
+++ po/es.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Conservar en el iniciador"57msgstr "Conservar en el iniciador"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/fi.po'
--- po/fi.po 2011-06-01 23:46:41 +0000
+++ po/fi.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Pidä Launcherissa"57msgstr "Pidä Launcherissa"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/fr.po'
--- po/fr.po 2011-06-01 23:46:41 +0000
+++ po/fr.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Conserver dans le lanceur"57msgstr "Conserver dans le lanceur"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/he.po'
--- po/he.po 2011-06-01 23:46:41 +0000
+++ po/he.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "שמור ב- Launcher"57msgstr "שמור ב- Launcher"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/hi.po'
--- po/hi.po 2011-06-01 23:46:41 +0000
+++ po/hi.po 2011-06-10 18:55:54 +0000
@@ -52,7 +52,7 @@
52msgstr ""52msgstr ""
5353
54#, fuzzy54#, fuzzy
55msgid "Keep In Launcher"55msgid "Keep in launcher"
56msgstr "लॉन्चर में रखें"56msgstr "लॉन्चर में रखें"
5757
58msgid "Launcher & Menus"58msgid "Launcher & Menus"
5959
=== modified file 'po/hr.po'
--- po/hr.po 2011-06-01 23:46:41 +0000
+++ po/hr.po 2011-06-10 18:55:54 +0000
@@ -54,7 +54,7 @@
54msgstr ""54msgstr ""
5555
56#, fuzzy56#, fuzzy
57msgid "Keep In Launcher"57msgid "Keep in launcher"
58msgstr "Zadrži u programu za pokretanje"58msgstr "Zadrži u programu za pokretanje"
5959
60msgid "Launcher & Menus"60msgid "Launcher & Menus"
6161
=== modified file 'po/hu.po'
--- po/hu.po 2011-06-01 23:46:41 +0000
+++ po/hu.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Megtartás a Launcherben"57msgstr "Megtartás a Launcherben"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/it.po'
--- po/it.po 2011-06-01 23:46:41 +0000
+++ po/it.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Mantieni in Launcher"57msgstr "Mantieni in Launcher"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/ja.po'
--- po/ja.po 2011-06-01 23:46:41 +0000
+++ po/ja.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Launcher に残す"57msgstr "Launcher に残す"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/ko.po'
--- po/ko.po 2011-06-01 23:46:41 +0000
+++ po/ko.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "시작 관리자에 유지"57msgstr "시작 관리자에 유지"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/nb.po'
--- po/nb.po 2011-06-01 23:46:41 +0000
+++ po/nb.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Behold i oppstartsprogram"57msgstr "Behold i oppstartsprogram"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/nl.po'
--- po/nl.po 2011-06-01 23:46:41 +0000
+++ po/nl.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Bewaren in starter"57msgstr "Bewaren in starter"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/pl.po'
--- po/pl.po 2011-06-01 23:46:41 +0000
+++ po/pl.po 2011-06-10 18:55:54 +0000
@@ -54,7 +54,7 @@
54msgstr ""54msgstr ""
5555
56#, fuzzy56#, fuzzy
57msgid "Keep In Launcher"57msgid "Keep in launcher"
58msgstr "Pozostaw w obszarze uruchamiania"58msgstr "Pozostaw w obszarze uruchamiania"
5959
60msgid "Launcher & Menus"60msgid "Launcher & Menus"
6161
=== modified file 'po/pt.po'
--- po/pt.po 2011-06-01 23:46:41 +0000
+++ po/pt.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Manter no Launcher"57msgstr "Manter no Launcher"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/pt_BR.po'
--- po/pt_BR.po 2011-06-01 23:46:41 +0000
+++ po/pt_BR.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Manter no Inicializador"57msgstr "Manter no Inicializador"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/ro.po'
--- po/ro.po 2011-06-01 23:46:41 +0000
+++ po/ro.po 2011-06-10 18:55:54 +0000
@@ -54,7 +54,7 @@
54msgstr ""54msgstr ""
5555
56#, fuzzy56#, fuzzy
57msgid "Keep In Launcher"57msgid "Keep in launcher"
58msgstr "Păstrează în programul de lansare"58msgstr "Păstrează în programul de lansare"
5959
60msgid "Launcher & Menus"60msgid "Launcher & Menus"
6161
=== modified file 'po/ru.po'
--- po/ru.po 2011-06-01 23:46:41 +0000
+++ po/ru.po 2011-06-10 18:55:54 +0000
@@ -54,7 +54,7 @@
54msgstr ""54msgstr ""
5555
56#, fuzzy56#, fuzzy
57msgid "Keep In Launcher"57msgid "Keep in launcher"
58msgstr "Оставить в модуле запуска"58msgstr "Оставить в модуле запуска"
5959
60msgid "Launcher & Menus"60msgid "Launcher & Menus"
6161
=== modified file 'po/sk.po'
--- po/sk.po 2011-06-01 23:46:41 +0000
+++ po/sk.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Ponechať v aplikácii Launcher"57msgstr "Ponechať v aplikácii Launcher"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/sl.po'
--- po/sl.po 2011-06-01 23:46:41 +0000
+++ po/sl.po 2011-06-10 18:55:54 +0000
@@ -54,7 +54,7 @@
54msgstr ""54msgstr ""
5555
56#, fuzzy56#, fuzzy
57msgid "Keep In Launcher"57msgid "Keep in launcher"
58msgstr "Obdrži v zaganjalniku"58msgstr "Obdrži v zaganjalniku"
5959
60msgid "Launcher & Menus"60msgid "Launcher & Menus"
6161
=== modified file 'po/sr.po'
--- po/sr.po 2011-06-01 23:46:41 +0000
+++ po/sr.po 2011-06-10 18:55:54 +0000
@@ -54,7 +54,7 @@
54msgstr ""54msgstr ""
5555
56#, fuzzy56#, fuzzy
57msgid "Keep In Launcher"57msgid "Keep in launcher"
58msgstr "Zadrži u pokretaču"58msgstr "Zadrži u pokretaču"
5959
60msgid "Launcher & Menus"60msgid "Launcher & Menus"
6161
=== modified file 'po/sv.po'
--- po/sv.po 2011-06-01 23:46:41 +0000
+++ po/sv.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Behåll i startprogram"57msgstr "Behåll i startprogram"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/th.po'
--- po/th.po 2011-06-01 23:46:41 +0000
+++ po/th.po 2011-06-10 18:55:54 +0000
@@ -52,7 +52,7 @@
52msgstr ""52msgstr ""
5353
54#, fuzzy54#, fuzzy
55msgid "Keep In Launcher"55msgid "Keep in launcher"
56msgstr "อยู่ในโปรแกรมเรียกทำงาน"56msgstr "อยู่ในโปรแกรมเรียกทำงาน"
5757
58msgid "Launcher & Menus"58msgid "Launcher & Menus"
5959
=== modified file 'po/tr.po'
--- po/tr.po 2011-06-01 23:46:41 +0000
+++ po/tr.po 2011-06-10 18:55:54 +0000
@@ -53,7 +53,7 @@
53msgstr ""53msgstr ""
5454
55#, fuzzy55#, fuzzy
56msgid "Keep In Launcher"56msgid "Keep in launcher"
57msgstr "Başlatıcıda Tut"57msgstr "Başlatıcıda Tut"
5858
59msgid "Launcher & Menus"59msgid "Launcher & Menus"
6060
=== modified file 'po/unity.pot'
--- po/unity.pot 2011-06-01 23:46:41 +0000
+++ po/unity.pot 2011-06-10 18:55:54 +0000
@@ -17,7 +17,7 @@
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
20msgid "Keep In Launcher"20msgid "Keep in launcher"
21msgstr ""21msgstr ""
2222
23msgid "Quit"23msgid "Quit"
2424
=== modified file 'po/zh_CN.po'
--- po/zh_CN.po 2011-06-01 23:46:41 +0000
+++ po/zh_CN.po 2011-06-10 18:55:54 +0000
@@ -52,7 +52,7 @@
52msgstr ""52msgstr ""
5353
54#, fuzzy54#, fuzzy
55msgid "Keep In Launcher"55msgid "Keep in launcher"
56msgstr "保留在启动程序中"56msgstr "保留在启动程序中"
5757
58msgid "Launcher & Menus"58msgid "Launcher & Menus"
5959
=== modified file 'po/zh_TW.po'
--- po/zh_TW.po 2011-06-01 23:46:41 +0000
+++ po/zh_TW.po 2011-06-10 18:55:54 +0000
@@ -52,7 +52,7 @@
52msgstr ""52msgstr ""
5353
54#, fuzzy54#, fuzzy
55msgid "Keep In Launcher"55msgid "Keep in launcher"
56msgstr "保留在啟動程式中"56msgstr "保留在啟動程式中"
5757
58msgid "Launcher & Menus"58msgid "Launcher & Menus"
5959
=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp 2011-06-02 15:14:17 +0000
+++ src/BamfLauncherIcon.cpp 2011-06-10 18:55:54 +0000
@@ -775,7 +775,7 @@
775 g_object_ref (menu_item);775 g_object_ref (menu_item);
776776
777 dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, DBUSMENU_MENUITEM_TOGGLE_CHECK);777 dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, DBUSMENU_MENUITEM_TOGGLE_CHECK);
778 dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Keep In Launcher"));778 dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Keep in launcher"));
779 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);779 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
780 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);780 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
781781