Merge lp:~therve/landscape-client/i18n-settings into lp:~landscape/landscape-client/trunk
- i18n-settings
- Merge into trunk
Proposed by
Thomas Herve
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alberto Donato | ||||
Approved revision: | 548 | ||||
Merged at revision: | 543 | ||||
Proposed branch: | lp:~therve/landscape-client/i18n-settings | ||||
Merge into: | lp:~landscape/landscape-client/trunk | ||||
Diff against target: |
580 lines (+295/-39) 12 files modified
applications/landscape-client-settings.desktop.in (+3/-3) debian/rules (+0/-1) landscape/ui/controller/app.py (+7/-5) landscape/ui/controller/configuration.py (+12/-9) landscape/ui/view/configuration.py (+24/-6) po/POTFILES.in (+6/-0) po/fr.po (+116/-8) po/landscape-client.pot (+116/-1) polkit-1/com.canonical.LandscapeClientSettings.policy.in (+2/-2) scripts/landscape-client-settings-ui (+4/-0) setup.cfg (+5/-0) setup.py (+0/-4) |
||||
To merge this branch: | bzr merge lp:~therve/landscape-client/i18n-settings | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alberto Donato (community) | Approve | ||
Mike Milner (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
This adds i18n to the settings UI itself, including policy file, glade file, and desktop file. Most of the infrastructure being in place it was easier than the previous ones.
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 | === renamed file 'applications/landscape-client-settings.desktop' => 'applications/landscape-client-settings.desktop.in' | |||
2 | --- applications/landscape-client-settings.desktop 2012-03-09 14:49:04 +0000 | |||
3 | +++ applications/landscape-client-settings.desktop.in 2012-03-23 14:26:24 +0000 | |||
4 | @@ -1,6 +1,6 @@ | |||
5 | 1 | [Desktop Entry] | 1 | [Desktop Entry] |
8 | 2 | Name=Management Service | 2 | _Name=Management Service |
9 | 3 | Comment=Management Service Preferences | 3 | _Comment=Management Service Preferences |
10 | 4 | Exec=landscape-client-ui-install | 4 | Exec=landscape-client-ui-install |
11 | 5 | Icon=preferences-management-service | 5 | Icon=preferences-management-service |
12 | 6 | Terminal=False | 6 | Terminal=False |
13 | @@ -13,5 +13,5 @@ | |||
14 | 13 | X-GNOME-Bugzilla-Component=sample | 13 | X-GNOME-Bugzilla-Component=sample |
15 | 14 | X-GNOME-Bugzilla-Version=1.0.0 | 14 | X-GNOME-Bugzilla-Version=1.0.0 |
16 | 15 | X-GNOME-Settings-Panel=sample | 15 | X-GNOME-Settings-Panel=sample |
17 | 16 | X-Ubuntu-Gettext-Domain=gnome-control-center-2.0 | ||
18 | 17 | X-GNOME-Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred; | 16 | X-GNOME-Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred; |
19 | 17 | X-Ubuntu-Gettext-Domain=landscape-client | ||
20 | 18 | 18 | ||
21 | === modified file 'debian/rules' | |||
22 | --- debian/rules 2012-03-22 09:35:43 +0000 | |||
23 | +++ debian/rules 2012-03-23 14:26:24 +0000 | |||
24 | @@ -35,7 +35,6 @@ | |||
25 | 35 | dh_testdir | 35 | dh_testdir |
26 | 36 | sed -i -e "s/^DEBIAN_REVISION = \"\"/DEBIAN_REVISION = \"-$(revision)\"/g" landscape/__init__.py | 36 | sed -i -e "s/^DEBIAN_REVISION = \"\"/DEBIAN_REVISION = \"-$(revision)\"/g" landscape/__init__.py |
27 | 37 | python setup.py build | 37 | python setup.py build |
28 | 38 | python setup.py build_i18n | ||
29 | 39 | make -C apt-update | 38 | make -C apt-update |
30 | 40 | touch build-stamp | 39 | touch build-stamp |
31 | 41 | 40 | ||
32 | 42 | 41 | ||
33 | === modified file 'landscape/ui/controller/app.py' | |||
34 | --- landscape/ui/controller/app.py 2012-03-14 12:05:30 +0000 | |||
35 | +++ landscape/ui/controller/app.py 2012-03-23 14:26:24 +0000 | |||
36 | @@ -1,5 +1,7 @@ | |||
37 | 1 | import sys | 1 | import sys |
38 | 2 | 2 | ||
39 | 3 | from gettext import gettext as _ | ||
40 | 4 | |||
41 | 3 | from gi.repository import Gio, Gtk, Notify | 5 | from gi.repository import Gio, Gtk, Notify |
42 | 4 | 6 | ||
43 | 5 | from landscape.ui.model.configuration.proxy import ConfigurationProxy | 7 | from landscape.ui.model.configuration.proxy import ConfigurationProxy |
44 | @@ -42,18 +44,18 @@ | |||
45 | 42 | 44 | ||
46 | 43 | def on_succeed(self, action=None): | 45 | def on_succeed(self, action=None): |
47 | 44 | if action: | 46 | if action: |
49 | 45 | message = "%s was successful." % action | 47 | message = action |
50 | 46 | else: | 48 | else: |
52 | 47 | message = "Success" | 49 | message = _("Success.") |
53 | 48 | notification = Notify.Notification.new(NOTIFY_ID, message, | 50 | notification = Notify.Notification.new(NOTIFY_ID, message, |
54 | 49 | "dialog-information") | 51 | "dialog-information") |
55 | 50 | notification.show() | 52 | notification.show() |
56 | 51 | 53 | ||
57 | 52 | def on_fail(self, action=None): | 54 | def on_fail(self, action=None): |
58 | 53 | if action: | 55 | if action: |
60 | 54 | message = "%s failed." % action | 56 | message = action |
61 | 55 | else: | 57 | else: |
63 | 56 | message = "Failure." | 58 | message = _("Failure.") |
64 | 57 | notification = Notify.Notification.new(NOTIFY_ID, message, | 59 | notification = Notify.Notification.new(NOTIFY_ID, message, |
65 | 58 | "dialog-information") | 60 | "dialog-information") |
66 | 59 | notification.show() | 61 | notification.show() |
67 | @@ -85,5 +87,5 @@ | |||
68 | 85 | controller.exit(asynchronous=asynchronous) | 87 | controller.exit(asynchronous=asynchronous) |
69 | 86 | self.settings_dialog.destroy() | 88 | self.settings_dialog.destroy() |
70 | 87 | else: | 89 | else: |
72 | 88 | self.on_fail(action="Authentication") | 90 | self.on_fail(action=_("Authentication failed")) |
73 | 89 | sys.stderr.write("Authentication failed.\n") | 91 | sys.stderr.write("Authentication failed.\n") |
74 | 90 | 92 | ||
75 | === modified file 'landscape/ui/controller/configuration.py' | |||
76 | --- landscape/ui/controller/configuration.py 2012-03-14 13:48:18 +0000 | |||
77 | +++ landscape/ui/controller/configuration.py 2012-03-23 14:26:24 +0000 | |||
78 | @@ -1,5 +1,8 @@ | |||
79 | 1 | import logging | ||
80 | 2 | |||
81 | 3 | from gettext import gettext as _ | ||
82 | 4 | |||
83 | 1 | from landscape.ui.constants import NOT_MANAGED, CANONICAL_MANAGED | 5 | from landscape.ui.constants import NOT_MANAGED, CANONICAL_MANAGED |
84 | 2 | import logging | ||
85 | 3 | 6 | ||
86 | 4 | from landscape.ui.model.registration.proxy import RegistrationProxy | 7 | from landscape.ui.model.registration.proxy import RegistrationProxy |
87 | 5 | from landscape.ui.model.configuration.state import StateError | 8 | from landscape.ui.model.configuration.state import StateError |
88 | @@ -62,7 +65,7 @@ | |||
89 | 62 | "changes to revert.") | 65 | "changes to revert.") |
90 | 63 | 66 | ||
91 | 64 | def persist(self, on_notify, on_error, on_succeed, on_fail): | 67 | def persist(self, on_notify, on_error, on_succeed, on_fail): |
93 | 65 | "Persist settings via the configuration object." | 68 | """Persist settings via the configuration object.""" |
94 | 66 | try: | 69 | try: |
95 | 67 | self._configuration.persist() | 70 | self._configuration.persist() |
96 | 68 | except StateError: | 71 | except StateError: |
97 | @@ -81,10 +84,10 @@ | |||
98 | 81 | """ | 84 | """ |
99 | 82 | 85 | ||
100 | 83 | def registration_fail_wrapper(): | 86 | def registration_fail_wrapper(): |
102 | 84 | fail_method(action="Registering client") | 87 | fail_method(action=_("Registering client failed")) |
103 | 85 | 88 | ||
104 | 86 | def registration_succeed_wrapper(): | 89 | def registration_succeed_wrapper(): |
106 | 87 | succeed_method(action="Registering client") | 90 | succeed_method(action=_("Registering client was successful")) |
107 | 88 | 91 | ||
108 | 89 | registration = RegistrationProxy( | 92 | registration = RegistrationProxy( |
109 | 90 | on_register_notify=notify_method, | 93 | on_register_notify=notify_method, |
110 | @@ -92,10 +95,10 @@ | |||
111 | 92 | on_register_succeed=registration_succeed_wrapper, | 95 | on_register_succeed=registration_succeed_wrapper, |
112 | 93 | on_register_fail=registration_fail_wrapper) | 96 | on_register_fail=registration_fail_wrapper) |
113 | 94 | if self._configuration.management_type == CANONICAL_MANAGED: | 97 | if self._configuration.management_type == CANONICAL_MANAGED: |
115 | 95 | notify_method("Attempting to register at %s" % | 98 | notify_method(_("Attempting to register at %s") % |
116 | 96 | self._configuration.hosted_landscape_host) | 99 | self._configuration.hosted_landscape_host) |
117 | 97 | else: | 100 | else: |
119 | 98 | notify_method("Attempting to register at %s" % | 101 | notify_method(_("Attempting to register at %s") % |
120 | 99 | self._configuration.local_landscape_host) | 102 | self._configuration.local_landscape_host) |
121 | 100 | registration.register(self._configuration.get_config_filename()) | 103 | registration.register(self._configuration.get_config_filename()) |
122 | 101 | registration.exit() | 104 | registration.exit() |
123 | @@ -106,14 +109,14 @@ | |||
124 | 106 | """ | 109 | """ |
125 | 107 | 110 | ||
126 | 108 | def disabling_fail_wrapper(): | 111 | def disabling_fail_wrapper(): |
128 | 109 | fail_method(action="Disabling client") | 112 | fail_method(action=_("Disabling client failed")) |
129 | 110 | 113 | ||
130 | 111 | def disabling_succeed_wrapper(): | 114 | def disabling_succeed_wrapper(): |
132 | 112 | succeed_method(action="Disabling client") | 115 | succeed_method(action=_("Disabling client was successful")) |
133 | 113 | 116 | ||
134 | 114 | registration = RegistrationProxy( | 117 | registration = RegistrationProxy( |
135 | 115 | on_disable_succeed=disabling_succeed_wrapper, | 118 | on_disable_succeed=disabling_succeed_wrapper, |
136 | 116 | on_disable_fail=disabling_fail_wrapper) | 119 | on_disable_fail=disabling_fail_wrapper) |
138 | 117 | notify_method("Attempting to disable landscape client.") | 120 | notify_method(_("Attempting to disable landscape client.")) |
139 | 118 | registration.disable() | 121 | registration.disable() |
140 | 119 | registration.exit() | 122 | registration.exit() |
141 | 120 | 123 | ||
142 | === modified file 'landscape/ui/view/configuration.py' | |||
143 | --- landscape/ui/view/configuration.py 2012-03-16 14:57:32 +0000 | |||
144 | +++ landscape/ui/view/configuration.py 2012-03-23 14:26:24 +0000 | |||
145 | @@ -1,5 +1,7 @@ | |||
146 | 1 | import os | 1 | import os |
147 | 2 | 2 | ||
148 | 3 | from gettext import gettext as _ | ||
149 | 4 | |||
150 | 3 | from gi.repository import GObject, Gtk | 5 | from gi.repository import GObject, Gtk |
151 | 4 | 6 | ||
152 | 5 | from landscape.ui.constants import ( | 7 | from landscape.ui.constants import ( |
153 | @@ -14,15 +16,10 @@ | |||
154 | 14 | """ | 16 | """ |
155 | 15 | 17 | ||
156 | 16 | GLADE_FILE = "landscape-client-settings.glade" | 18 | GLADE_FILE = "landscape-client-settings.glade" |
157 | 17 | NO_SERVICE_TEXT = "None" | ||
158 | 18 | HOSTED_SERVICE_TEXT = "Landscape - hosted by Canonical" | ||
159 | 19 | LOCAL_SERVICE_TEXT = "Landscape - dedicated server" | ||
160 | 20 | REGISTER_BUTTON_TEXT = "Register" | ||
161 | 21 | DISABLE_BUTTON_TEXT = "Disable" | ||
162 | 22 | 19 | ||
163 | 23 | def __init__(self, controller): | 20 | def __init__(self, controller): |
164 | 24 | super(ClientSettingsDialog, self).__init__( | 21 | super(ClientSettingsDialog, self).__init__( |
166 | 25 | title="Management Service", | 22 | title=_("Management Service"), |
167 | 26 | flags=Gtk.DialogFlags.MODAL) | 23 | flags=Gtk.DialogFlags.MODAL) |
168 | 27 | self.set_default_icon_name("preferences-management-service") | 24 | self.set_default_icon_name("preferences-management-service") |
169 | 28 | self.set_resizable(False) | 25 | self.set_resizable(False) |
170 | @@ -33,6 +30,26 @@ | |||
171 | 33 | # One extra revert to reset after loading data | 30 | # One extra revert to reset after loading data |
172 | 34 | self.controller.revert() | 31 | self.controller.revert() |
173 | 35 | 32 | ||
174 | 33 | @property | ||
175 | 34 | def NO_SERVICE_TEXT(self): | ||
176 | 35 | return _("None") | ||
177 | 36 | |||
178 | 37 | @property | ||
179 | 38 | def HOSTED_SERVICE_TEXT(self): | ||
180 | 39 | return _("Landscape - hosted by Canonical") | ||
181 | 40 | |||
182 | 41 | @property | ||
183 | 42 | def LOCAL_SERVICE_TEXT(self): | ||
184 | 43 | return _("Landscape - dedicated server") | ||
185 | 44 | |||
186 | 45 | @property | ||
187 | 46 | def REGISTER_BUTTON_TEXT(self): | ||
188 | 47 | return _("Register") | ||
189 | 48 | |||
190 | 49 | @property | ||
191 | 50 | def DISABLE_BUTTON_TEXT(self): | ||
192 | 51 | return _("Disable") | ||
193 | 52 | |||
194 | 36 | def _set_use_type_combobox_from_controller(self): | 53 | def _set_use_type_combobox_from_controller(self): |
195 | 37 | """ | 54 | """ |
196 | 38 | Load the persisted L{management_type} from the controller and set the | 55 | Load the persisted L{management_type} from the controller and set the |
197 | @@ -150,6 +167,7 @@ | |||
198 | 150 | 167 | ||
199 | 151 | def setup_ui(self): | 168 | def setup_ui(self): |
200 | 152 | self._builder = Gtk.Builder() | 169 | self._builder = Gtk.Builder() |
201 | 170 | self._builder.set_translation_domain("landscape-client") | ||
202 | 153 | self._builder.add_from_file( | 171 | self._builder.add_from_file( |
203 | 154 | os.path.join( | 172 | os.path.join( |
204 | 155 | os.path.dirname(__file__), "ui", self.GLADE_FILE)) | 173 | os.path.dirname(__file__), "ui", self.GLADE_FILE)) |
205 | 156 | 174 | ||
206 | === modified file 'po/POTFILES.in' | |||
207 | --- po/POTFILES.in 2012-03-22 09:11:31 +0000 | |||
208 | +++ po/POTFILES.in 2012-03-23 14:26:24 +0000 | |||
209 | @@ -1,2 +1,8 @@ | |||
210 | 1 | [encoding: UTF-8] | 1 | [encoding: UTF-8] |
211 | 2 | landscape/ui/controller/app.py | ||
212 | 3 | landscape/ui/controller/configuration.py | ||
213 | 4 | landscape/ui/view/configuration.py | ||
214 | 5 | landscape/ui/view/ui/landscape-client-settings.glade | ||
215 | 6 | applications/landscape-client-settings.desktop.in | ||
216 | 7 | polkit-1/com.canonical.LandscapeClientSettings.policy.in | ||
217 | 2 | scripts/landscape-client-ui-install | 8 | scripts/landscape-client-ui-install |
218 | 3 | 9 | ||
219 | === modified file 'po/fr.po' | |||
220 | --- po/fr.po 2012-03-22 15:11:27 +0000 | |||
221 | +++ po/fr.po 2012-03-23 14:26:24 +0000 | |||
222 | @@ -8,8 +8,8 @@ | |||
223 | 8 | msgstr "" | 8 | msgstr "" |
224 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
225 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
228 | 11 | "POT-Creation-Date: 2012-03-22 10:33+0100\n" | 11 | "POT-Creation-Date: 2012-03-23 11:12+0100\n" |
229 | 12 | "PO-Revision-Date: 2012-03-22 15:32+0100\n" | 12 | "PO-Revision-Date: 2012-03-23 11:25+0100\n" |
230 | 13 | "Last-Translator: Thomas Hervé <thomas.herve@canonical.com>\n" | 13 | "Last-Translator: Thomas Hervé <thomas.herve@canonical.com>\n" |
231 | 14 | "Language-Team: français <>\n" | 14 | "Language-Team: français <>\n" |
232 | 15 | "Language: \n" | 15 | "Language: \n" |
233 | @@ -18,27 +18,135 @@ | |||
234 | 18 | "Content-Transfer-Encoding: 8bit\n" | 18 | "Content-Transfer-Encoding: 8bit\n" |
235 | 19 | "Plural-Forms: nplurals=2; plural=(n!=1);\n" | 19 | "Plural-Forms: nplurals=2; plural=(n!=1);\n" |
236 | 20 | 20 | ||
238 | 21 | #: ../scripts/landscape-client-ui-install:49 | 21 | #: ../landscape/ui/controller/app.py:49 |
239 | 22 | msgid "Success." | ||
240 | 23 | msgstr "Réussi." | ||
241 | 24 | |||
242 | 25 | #: ../landscape/ui/controller/app.py:58 | ||
243 | 26 | msgid "Failure." | ||
244 | 27 | msgstr "Echoué." | ||
245 | 28 | |||
246 | 29 | #: ../landscape/ui/controller/app.py:90 | ||
247 | 30 | msgid "Authentication failed" | ||
248 | 31 | msgstr "L'authentification a échoué" | ||
249 | 32 | |||
250 | 33 | #: ../landscape/ui/controller/configuration.py:87 | ||
251 | 34 | msgid "Registering client failed" | ||
252 | 35 | msgstr "L'enregistrement du client a échoué" | ||
253 | 36 | |||
254 | 37 | #: ../landscape/ui/controller/configuration.py:90 | ||
255 | 38 | msgid "Registering client was successful" | ||
256 | 39 | msgstr "L'enregistrement du client a réussi" | ||
257 | 40 | |||
258 | 41 | #: ../landscape/ui/controller/configuration.py:98 | ||
259 | 42 | #: ../landscape/ui/controller/configuration.py:101 | ||
260 | 43 | #, python-format | ||
261 | 44 | msgid "Attempting to register at %s" | ||
262 | 45 | msgstr "Tentative d'enregistrement sur %s" | ||
263 | 46 | |||
264 | 47 | #: ../landscape/ui/controller/configuration.py:112 | ||
265 | 48 | msgid "Disabling client failed" | ||
266 | 49 | msgstr "Le client n'a pas pu être désactivé" | ||
267 | 50 | |||
268 | 51 | #: ../landscape/ui/controller/configuration.py:115 | ||
269 | 52 | msgid "Disabling client was successful" | ||
270 | 53 | msgstr "Le client a été désactivé avec succès" | ||
271 | 54 | |||
272 | 55 | #: ../landscape/ui/controller/configuration.py:120 | ||
273 | 56 | msgid "Attempting to disable landscape client." | ||
274 | 57 | msgstr "Tentative de désactivation du client Landscape." | ||
275 | 58 | |||
276 | 59 | #: ../landscape/ui/view/configuration.py:19 | ||
277 | 60 | msgid "None" | ||
278 | 61 | msgstr "Aucun" | ||
279 | 62 | |||
280 | 63 | #: ../landscape/ui/view/configuration.py:20 | ||
281 | 64 | msgid "Landscape - hosted by Canonical" | ||
282 | 65 | msgstr "Landscape - hébergé par Canonical" | ||
283 | 66 | |||
284 | 67 | #: ../landscape/ui/view/configuration.py:21 | ||
285 | 68 | msgid "Landscape - dedicated server" | ||
286 | 69 | msgstr "Landscape - serveur dédié" | ||
287 | 70 | |||
288 | 71 | #: ../landscape/ui/view/configuration.py:22 | ||
289 | 72 | msgid "Register" | ||
290 | 73 | msgstr "S'enregistrer" | ||
291 | 74 | |||
292 | 75 | #: ../landscape/ui/view/configuration.py:23 | ||
293 | 76 | msgid "Disable" | ||
294 | 77 | msgstr "Désactiver" | ||
295 | 78 | |||
296 | 79 | #: ../landscape/ui/view/configuration.py:27 | ||
297 | 80 | #: ../applications/landscape-client-settings.desktop.in.h:1 | ||
298 | 81 | msgid "Management Service" | ||
299 | 82 | msgstr "Service de gestion" | ||
300 | 83 | |||
301 | 84 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:1 | ||
302 | 85 | msgid "Account name:" | ||
303 | 86 | msgstr "Nom du compte:" | ||
304 | 87 | |||
305 | 88 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:2 | ||
306 | 89 | msgid "Don't have an account?" | ||
307 | 90 | msgstr "Vous n'avez pas de compte?" | ||
308 | 91 | |||
309 | 92 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:3 | ||
310 | 93 | #: ../scripts/landscape-client-ui-install:52 | ||
311 | 22 | msgid "Find out more..." | 94 | msgid "Find out more..." |
312 | 23 | msgstr "En apprendre plus..." | 95 | msgstr "En apprendre plus..." |
313 | 24 | 96 | ||
315 | 25 | #: ../scripts/landscape-client-ui-install:52 | 97 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:4 |
316 | 98 | msgid "If you click \"Disable\" the Landscape client on this machine will be disabled. You can reenable it later by revisiting this dialog." | ||
317 | 99 | msgstr "Si vous cliquez sur \"Désactiver\" le client Landscape sera désactivé sur cette machine. Vous pouvez le réactiver plus tard en rouvrant cette fenêtre de dialogue." | ||
318 | 100 | |||
319 | 101 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:5 | ||
320 | 102 | msgid "Landscape is a remote administration service from Canonical. If you allow it, a Landcape server can monitor this computer's performance and send administration commands." | ||
321 | 103 | msgstr "Landscape est un service de gestion à distance de Canonical. Si vous l'autorisez, un serveur Landscape peut surveiller les performance de cette machine et envoyer des commandes administratives." | ||
322 | 104 | |||
323 | 105 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:6 | ||
324 | 106 | msgid "Landscape server hostname:" | ||
325 | 107 | msgstr "Nom d'hôte du serveur Landscape:" | ||
326 | 108 | |||
327 | 109 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:7 | ||
328 | 110 | msgid "Management service:" | ||
329 | 111 | msgstr "Service de gestion:" | ||
330 | 112 | |||
331 | 113 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:8 | ||
332 | 114 | msgid "Password:" | ||
333 | 115 | msgstr "Mot de passe:" | ||
334 | 116 | |||
335 | 117 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:9 | ||
336 | 118 | msgid "Sign up..." | ||
337 | 119 | msgstr "S'inscrire..." | ||
338 | 120 | |||
339 | 121 | #: ../applications/landscape-client-settings.desktop.in.h:2 | ||
340 | 122 | msgid "Management Service Preferences" | ||
341 | 123 | msgstr "Préférences du service de gestion" | ||
342 | 124 | |||
343 | 125 | #: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:1 | ||
344 | 126 | msgid "Allow the user to read and write Landscape Client settings." | ||
345 | 127 | msgstr "Autorise l'utilisateur à lire et écrire la configuration du client Landscape." | ||
346 | 128 | |||
347 | 129 | #: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:2 | ||
348 | 130 | msgid "System policy prevents you from reading and writing Landscape Client Settings." | ||
349 | 131 | msgstr "Politique système vous empêchant de lire et d'écrire la configuration du client Landscape." | ||
350 | 132 | |||
351 | 133 | #: ../scripts/landscape-client-ui-install:55 | ||
352 | 26 | msgid "Landscape client" | 134 | msgid "Landscape client" |
353 | 27 | msgstr "Client Landscape" | 135 | msgstr "Client Landscape" |
354 | 28 | 136 | ||
356 | 29 | #: ../scripts/landscape-client-ui-install:53 | 137 | #: ../scripts/landscape-client-ui-install:56 |
357 | 30 | msgid "Landscape is an easy to use systems management and monitoring service offered by Canonical that helps administrators manage multiple machines efficiently." | 138 | msgid "Landscape is an easy to use systems management and monitoring service offered by Canonical that helps administrators manage multiple machines efficiently." |
358 | 31 | msgstr "Landscape est un système de gestion et de surveillance proposé en tant que service par Canonical, qui aide les administrateurs à gérer plusieurs machine efficacement." | 139 | msgstr "Landscape est un système de gestion et de surveillance proposé en tant que service par Canonical, qui aide les administrateurs à gérer plusieurs machine efficacement." |
359 | 32 | 140 | ||
361 | 33 | #: ../scripts/landscape-client-ui-install:56 | 141 | #: ../scripts/landscape-client-ui-install:59 |
362 | 34 | msgid "You need to install Landscape client to be able to configure it. Do you want to install it now?" | 142 | msgid "You need to install Landscape client to be able to configure it. Do you want to install it now?" |
363 | 35 | msgstr "Il faut installer le client Landscape pour le configurer. Voulez-vous l'installer maintenant?" | 143 | msgstr "Il faut installer le client Landscape pour le configurer. Voulez-vous l'installer maintenant?" |
364 | 36 | 144 | ||
366 | 37 | #: ../scripts/landscape-client-ui-install:58 | 145 | #: ../scripts/landscape-client-ui-install:61 |
367 | 38 | msgid "Install Landscape client?" | 146 | msgid "Install Landscape client?" |
368 | 39 | msgstr "Installer le client Landscape?" | 147 | msgstr "Installer le client Landscape?" |
369 | 40 | 148 | ||
371 | 41 | #: ../scripts/landscape-client-ui-install:59 | 149 | #: ../scripts/landscape-client-ui-install:62 |
372 | 42 | msgid "Install" | 150 | msgid "Install" |
373 | 43 | msgstr "Installer" | 151 | msgstr "Installer" |
374 | 44 | 152 | ||
375 | 45 | 153 | ||
376 | === modified file 'po/landscape-client.pot' | |||
377 | --- po/landscape-client.pot 2012-03-22 15:11:27 +0000 | |||
378 | +++ po/landscape-client.pot 2012-03-23 14:26:24 +0000 | |||
379 | @@ -8,7 +8,7 @@ | |||
380 | 8 | msgstr "" | 8 | msgstr "" |
381 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
382 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
384 | 11 | "POT-Creation-Date: 2012-03-22 16:08+0100\n" | 11 | "POT-Creation-Date: 2012-03-23 11:12+0100\n" |
385 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
386 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
387 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
388 | @@ -17,10 +17,125 @@ | |||
389 | 17 | "Content-Type: text/plain; charset=CHARSET\n" | 17 | "Content-Type: text/plain; charset=CHARSET\n" |
390 | 18 | "Content-Transfer-Encoding: 8bit\n" | 18 | "Content-Transfer-Encoding: 8bit\n" |
391 | 19 | 19 | ||
392 | 20 | #: ../landscape/ui/controller/app.py:49 | ||
393 | 21 | msgid "Success." | ||
394 | 22 | msgstr "" | ||
395 | 23 | |||
396 | 24 | #: ../landscape/ui/controller/app.py:58 | ||
397 | 25 | msgid "Failure." | ||
398 | 26 | msgstr "" | ||
399 | 27 | |||
400 | 28 | #: ../landscape/ui/controller/app.py:90 | ||
401 | 29 | msgid "Authentication failed" | ||
402 | 30 | msgstr "" | ||
403 | 31 | |||
404 | 32 | #: ../landscape/ui/controller/configuration.py:87 | ||
405 | 33 | msgid "Registering client failed" | ||
406 | 34 | msgstr "" | ||
407 | 35 | |||
408 | 36 | #: ../landscape/ui/controller/configuration.py:90 | ||
409 | 37 | msgid "Registering client was successful" | ||
410 | 38 | msgstr "" | ||
411 | 39 | |||
412 | 40 | #: ../landscape/ui/controller/configuration.py:98 | ||
413 | 41 | #: ../landscape/ui/controller/configuration.py:101 | ||
414 | 42 | #, python-format | ||
415 | 43 | msgid "Attempting to register at %s" | ||
416 | 44 | msgstr "" | ||
417 | 45 | |||
418 | 46 | #: ../landscape/ui/controller/configuration.py:112 | ||
419 | 47 | msgid "Disabling client failed" | ||
420 | 48 | msgstr "" | ||
421 | 49 | |||
422 | 50 | #: ../landscape/ui/controller/configuration.py:115 | ||
423 | 51 | msgid "Disabling client was successful" | ||
424 | 52 | msgstr "" | ||
425 | 53 | |||
426 | 54 | #: ../landscape/ui/controller/configuration.py:120 | ||
427 | 55 | msgid "Attempting to disable landscape client." | ||
428 | 56 | msgstr "" | ||
429 | 57 | |||
430 | 58 | #: ../landscape/ui/view/configuration.py:19 | ||
431 | 59 | msgid "None" | ||
432 | 60 | msgstr "" | ||
433 | 61 | |||
434 | 62 | #: ../landscape/ui/view/configuration.py:20 | ||
435 | 63 | msgid "Landscape - hosted by Canonical" | ||
436 | 64 | msgstr "" | ||
437 | 65 | |||
438 | 66 | #: ../landscape/ui/view/configuration.py:21 | ||
439 | 67 | msgid "Landscape - dedicated server" | ||
440 | 68 | msgstr "" | ||
441 | 69 | |||
442 | 70 | #: ../landscape/ui/view/configuration.py:22 | ||
443 | 71 | msgid "Register" | ||
444 | 72 | msgstr "" | ||
445 | 73 | |||
446 | 74 | #: ../landscape/ui/view/configuration.py:23 | ||
447 | 75 | msgid "Disable" | ||
448 | 76 | msgstr "" | ||
449 | 77 | |||
450 | 78 | #: ../landscape/ui/view/configuration.py:27 | ||
451 | 79 | #: ../applications/landscape-client-settings.desktop.in.h:1 | ||
452 | 80 | msgid "Management Service" | ||
453 | 81 | msgstr "" | ||
454 | 82 | |||
455 | 83 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:1 | ||
456 | 84 | msgid "Account name:" | ||
457 | 85 | msgstr "" | ||
458 | 86 | |||
459 | 87 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:2 | ||
460 | 88 | msgid "Don't have an account?" | ||
461 | 89 | msgstr "" | ||
462 | 90 | |||
463 | 91 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:3 | ||
464 | 20 | #: ../scripts/landscape-client-ui-install:52 | 92 | #: ../scripts/landscape-client-ui-install:52 |
465 | 21 | msgid "Find out more..." | 93 | msgid "Find out more..." |
466 | 22 | msgstr "" | 94 | msgstr "" |
467 | 23 | 95 | ||
468 | 96 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:4 | ||
469 | 97 | msgid "" | ||
470 | 98 | "If you click \"Disable\" the Landscape client on this machine will be " | ||
471 | 99 | "disabled. You can reenable it later by revisiting this dialog." | ||
472 | 100 | msgstr "" | ||
473 | 101 | |||
474 | 102 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:5 | ||
475 | 103 | msgid "" | ||
476 | 104 | "Landscape is a remote administration service from Canonical. If you allow " | ||
477 | 105 | "it, a Landcape server can monitor this computer's performance and send " | ||
478 | 106 | "administration commands." | ||
479 | 107 | msgstr "" | ||
480 | 108 | |||
481 | 109 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:6 | ||
482 | 110 | msgid "Landscape server hostname:" | ||
483 | 111 | msgstr "" | ||
484 | 112 | |||
485 | 113 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:7 | ||
486 | 114 | msgid "Management service:" | ||
487 | 115 | msgstr "" | ||
488 | 116 | |||
489 | 117 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:8 | ||
490 | 118 | msgid "Password:" | ||
491 | 119 | msgstr "" | ||
492 | 120 | |||
493 | 121 | #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:9 | ||
494 | 122 | msgid "Sign up..." | ||
495 | 123 | msgstr "" | ||
496 | 124 | |||
497 | 125 | #: ../applications/landscape-client-settings.desktop.in.h:2 | ||
498 | 126 | msgid "Management Service Preferences" | ||
499 | 127 | msgstr "" | ||
500 | 128 | |||
501 | 129 | #: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:1 | ||
502 | 130 | msgid "Allow the user to read and write Landscape Client settings." | ||
503 | 131 | msgstr "" | ||
504 | 132 | |||
505 | 133 | #: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:2 | ||
506 | 134 | msgid "" | ||
507 | 135 | "System policy prevents you from reading and writing Landscape Client " | ||
508 | 136 | "Settings." | ||
509 | 137 | msgstr "" | ||
510 | 138 | |||
511 | 24 | #: ../scripts/landscape-client-ui-install:55 | 139 | #: ../scripts/landscape-client-ui-install:55 |
512 | 25 | msgid "Landscape client" | 140 | msgid "Landscape client" |
513 | 26 | msgstr "" | 141 | msgstr "" |
514 | 27 | 142 | ||
515 | === renamed file 'polkit-1/com.canonical.LandscapeClientSettings.policy' => 'polkit-1/com.canonical.LandscapeClientSettings.policy.in' | |||
516 | --- polkit-1/com.canonical.LandscapeClientSettings.policy 2012-01-19 14:06:45 +0000 | |||
517 | +++ polkit-1/com.canonical.LandscapeClientSettings.policy.in 2012-03-23 14:26:24 +0000 | |||
518 | @@ -9,8 +9,8 @@ | |||
519 | 9 | <icon_name>preferences-management-service</icon_name> | 9 | <icon_name>preferences-management-service</icon_name> |
520 | 10 | 10 | ||
521 | 11 | <action id="com.canonical.LandscapeClientSettings.configure"> | 11 | <action id="com.canonical.LandscapeClientSettings.configure"> |
524 | 12 | <description>Allow the user to read and write Landscape Client settings.</description> | 12 | <_description>Allow the user to read and write Landscape Client settings.</_description> |
525 | 13 | <message>System policy prevents you from reading and writing Landscape Client Settings.</message> | 13 | <_message>System policy prevents you from reading and writing Landscape Client Settings.</_message> |
526 | 14 | <defaults> | 14 | <defaults> |
527 | 15 | <allow_any>auth_admin_keep</allow_any> | 15 | <allow_any>auth_admin_keep</allow_any> |
528 | 16 | <allow_inactive>auth_admin_keep</allow_inactive> | 16 | <allow_inactive>auth_admin_keep</allow_inactive> |
529 | 17 | 17 | ||
530 | === modified file 'scripts/landscape-client-settings-ui' | |||
531 | --- scripts/landscape-client-settings-ui 2012-03-21 14:14:06 +0000 | |||
532 | +++ scripts/landscape-client-settings-ui 2012-03-23 14:26:24 +0000 | |||
533 | @@ -2,6 +2,8 @@ | |||
534 | 2 | import os | 2 | import os |
535 | 3 | import sys | 3 | import sys |
536 | 4 | 4 | ||
537 | 5 | from gettext import bindtextdomain, textdomain | ||
538 | 6 | |||
539 | 5 | script_dir = os.path.abspath("scripts") | 7 | script_dir = os.path.abspath("scripts") |
540 | 6 | if os.path.dirname(os.path.abspath(sys.argv[0])) == script_dir: | 8 | if os.path.dirname(os.path.abspath(sys.argv[0])) == script_dir: |
541 | 7 | sys.path.insert(0, "./") | 9 | sys.path.insert(0, "./") |
542 | @@ -22,6 +24,8 @@ | |||
543 | 22 | "running.\n") | 24 | "running.\n") |
544 | 23 | sys.exit(1) | 25 | sys.exit(1) |
545 | 24 | else: | 26 | else: |
546 | 27 | bindtextdomain("landscape-client", "/usr/share/locale") | ||
547 | 28 | textdomain("landscape-client") | ||
548 | 25 | app = SettingsApplicationController(args=sys.argv[1:]) | 29 | app = SettingsApplicationController(args=sys.argv[1:]) |
549 | 26 | try: | 30 | try: |
550 | 27 | app.run(None) | 31 | app.run(None) |
551 | 28 | 32 | ||
552 | === modified file 'setup.cfg' | |||
553 | --- setup.cfg 2012-03-22 09:11:31 +0000 | |||
554 | +++ setup.cfg 2012-03-23 14:26:24 +0000 | |||
555 | @@ -1,2 +1,7 @@ | |||
556 | 1 | [build] | ||
557 | 2 | i18n=True | ||
558 | 3 | |||
559 | 1 | [build_i18n] | 4 | [build_i18n] |
560 | 2 | domain=landscape-client | 5 | domain=landscape-client |
561 | 6 | xml_files=[("share/polkit-1/actions/", ["polkit-1/com.canonical.LandscapeClientSettings.policy.in"])] | ||
562 | 7 | desktop_files=[("share/applications", ["applications/landscape-client-settings.desktop.in"])] | ||
563 | 3 | 8 | ||
564 | === modified file 'setup.py' | |||
565 | --- setup.py 2012-03-22 15:11:27 +0000 | |||
566 | +++ setup.py 2012-03-23 14:26:24 +0000 | |||
567 | @@ -36,13 +36,9 @@ | |||
568 | 36 | ("/usr/share/dbus-1/system-services/", | 36 | ("/usr/share/dbus-1/system-services/", |
569 | 37 | ["dbus-1/com.canonical.LandscapeClientSettings.service", | 37 | ["dbus-1/com.canonical.LandscapeClientSettings.service", |
570 | 38 | "dbus-1/com.canonical.LandscapeClientRegistration.service"]), | 38 | "dbus-1/com.canonical.LandscapeClientRegistration.service"]), |
571 | 39 | ("/usr/share/polkit-1/actions", | ||
572 | 40 | ["polkit-1/com.canonical.LandscapeClientSettings.policy"]), | ||
573 | 41 | ("/etc/dbus-1/system.d/", | 39 | ("/etc/dbus-1/system.d/", |
574 | 42 | ["dbus-1/com.canonical.LandscapeClientSettings.conf", | 40 | ["dbus-1/com.canonical.LandscapeClientSettings.conf", |
575 | 43 | "dbus-1/com.canonical.LandscapeClientRegistration.conf"]), | 41 | "dbus-1/com.canonical.LandscapeClientRegistration.conf"]), |
576 | 44 | ("/usr/share/applications/", | ||
577 | 45 | ["applications/landscape-client-settings.desktop"]), | ||
578 | 46 | ("/usr/share/icons/hicolor/scalable/apps/", | 42 | ("/usr/share/icons/hicolor/scalable/apps/", |
579 | 47 | ["icons/preferences-management-service.svg"]), | 43 | ["icons/preferences-management-service.svg"]), |
580 | 48 | ("/usr/share/glib-2.0/schemas/", | 44 | ("/usr/share/glib-2.0/schemas/", |
Looks good! Can't make sense of your Parisian French though :) +1