Unity

Merge lp:~didrocks/unity/fix-697166 into lp:unity

  1. fix-697166
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 792
Proposed branch: lp:~didrocks/unity/fix-697166
Merge into: lp:unity
Diff against target: 126 lines (+21/-12)
5 files modified
po/POTFILES.in (+6/-7)
src/BamfLauncherIcon.cpp (+4/-3)
src/LauncherController.cpp (+2/-1)
src/TrashLauncherIcon.cpp (+2/-1)
src/unityshell.cpp (+7/-0)
To merge this branch: bzr merge lp:~didrocks/unity/fix-697166
Reviewer Review Type Date Requested Status
Gord Allott Pending
Review via email: mp+47565@code.launchpad.net

Description of the change

make unity able to speak sane languages… like French
This is the second part to fix LP: #697166

Also remerged against latest trunk to have all the love localized

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 'po/POTFILES.in'
2--- po/POTFILES.in 2010-11-03 00:01:02 +0000
3+++ po/POTFILES.in 2011-01-26 17:54:52 +0000
4@@ -1,7 +1,6 @@
5-unity-private/launcher/application-controller.vala
6-unity-private/places/places-default-renderer-group.vala
7-unity-private/places/places-place-home-renderer.vala
8-unity-private/places/places-place-search-entry.vala
9-unity-private/places/places-trash-controller.vala
10-unity-private/places/places-volume-child-controller.vala
11-
12+src/BamfLauncherIcon.cpp
13+src/DeviceLauncherIcon.cpp
14+src/LauncherController.cpp
15+src/PlaceLauncherIcon.cpp
16+src/PlacesHomeView.cpp
17+src/TrashLauncherIcon.cpp
18
19=== modified file 'src/BamfLauncherIcon.cpp'
20--- src/BamfLauncherIcon.cpp 2011-01-14 18:17:34 +0000
21+++ src/BamfLauncherIcon.cpp 2011-01-26 17:54:52 +0000
22@@ -25,6 +25,7 @@
23 #include "PluginAdapter.h"
24 #include "FavoriteStore.h"
25
26+#include <glib/gi18n-lib.h>
27 #include <gio/gdesktopappinfo.h>
28 #include <libindicator/indicator-desktop-shortcuts.h>
29 #include <core/core.h>
30@@ -645,7 +646,7 @@
31 menu_item = dbusmenu_menuitem_new ();
32 g_object_ref (menu_item);
33
34- dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, "Open New Window");
35+ dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Open New Window"));
36 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
37 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
38
39@@ -661,7 +662,7 @@
40 g_object_ref (menu_item);
41
42 dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, DBUSMENU_MENUITEM_TOGGLE_CHECK);
43- dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, "Keep In Launcher");
44+ dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Keep In Launcher"));
45 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
46 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
47
48@@ -683,7 +684,7 @@
49 menu_item = dbusmenu_menuitem_new ();
50 g_object_ref (menu_item);
51
52- dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, "Quit");
53+ dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Quit"));
54 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
55 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
56
57
58=== modified file 'src/LauncherController.cpp'
59--- src/LauncherController.cpp 2011-01-24 23:05:38 +0000
60+++ src/LauncherController.cpp 2011-01-26 17:54:52 +0000
61@@ -24,6 +24,7 @@
62 #include "PluginAdapter.h"
63 #include "TrashLauncherIcon.h"
64
65+#include <glib/gi18n-lib.h>
66
67 #include <Nux/Nux.h>
68 #include <Nux/BaseWindow.h>
69@@ -207,7 +208,7 @@
70 SimpleLauncherIcon *expoIcon;
71 expoIcon = new SimpleLauncherIcon (_launcher);
72
73- expoIcon->SetTooltipText ("Workspace Switcher");
74+ expoIcon->SetTooltipText (_("Workspace Switcher"));
75 expoIcon->SetIconName ("workspace-switcher");
76 expoIcon->SetQuirk (LauncherIcon::QUIRK_VISIBLE, true);
77 expoIcon->SetQuirk (LauncherIcon::QUIRK_RUNNING, false);
78
79=== modified file 'src/TrashLauncherIcon.cpp'
80--- src/TrashLauncherIcon.cpp 2011-01-07 16:37:51 +0000
81+++ src/TrashLauncherIcon.cpp 2011-01-26 17:54:52 +0000
82@@ -20,11 +20,12 @@
83 #include "TrashLauncherIcon.h"
84
85 #include <gio/gio.h>
86+#include <glib/gi18n-lib.h>
87
88 TrashLauncherIcon::TrashLauncherIcon (Launcher* IconManager)
89 : SimpleLauncherIcon(IconManager)
90 {
91- SetTooltipText ("Trash");
92+ SetTooltipText (_("Trash"));
93 SetIconName ("user-trash");
94 SetQuirk (QUIRK_VISIBLE, true);
95 SetQuirk (QUIRK_RUNNING, false);
96
97=== modified file 'src/unityshell.cpp'
98--- src/unityshell.cpp 2011-01-24 10:44:25 +0000
99+++ src/unityshell.cpp 2011-01-26 17:54:52 +0000
100@@ -36,6 +36,7 @@
101
102 #include <dbus/dbus.h>
103 #include <dbus/dbus-glib.h>
104+#include <glib/gi18n-lib.h>
105 #include <gtk/gtk.h>
106
107 #include <core/atoms.h>
108@@ -43,6 +44,8 @@
109 #include "perf-logger-utility.h"
110 #include "unitya11y.h"
111
112+#include "config.h"
113+
114 /* FIXME: once we get a better method to add the toplevel windows to
115 the accessible root object, this include would not be required */
116 #include "unity-util-accessible.h"
117@@ -476,6 +479,10 @@
118
119 unity_a11y_init ();
120
121+ /* i18n init */
122+ bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
123+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
124+
125 wt->Run (NULL);
126 uScreen = this;
127