Merge lp:~barry/computer-janitor/ppa into lp:computer-janitor
- ppa
- Merge into trunk
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merge reported by: | Barry Warsaw | ||||||||
Merged at revision: | not available | ||||||||
Proposed branch: | lp:~barry/computer-janitor/ppa | ||||||||
Merge into: | lp:computer-janitor | ||||||||
Diff against target: |
1273 lines (+514/-383) 16 files modified
.bzrignore (+1/-0) computer-janitor (+15/-1) computer-janitor-gtk (+4/-0) computerjanitorapp/gtk/areyousure.py (+19/-5) computerjanitorapp/gtk/ui.py (+12/-2) computerjanitord/application.py (+7/-26) computerjanitord/errors.py (+35/-7) data/ComputerJanitor.ui (+1/-9) debian/changelog (+33/-0) po/POTFILES.in (+11/-11) po/computerjanitor.pot (+61/-52) po/es.po (+63/-54) po/fi.po (+63/-54) po/fr.po (+63/-54) po/ja.po (+63/-54) po/pl.po (+63/-54) |
||||||||
To merge this branch: | bzr merge lp:~barry/computer-janitor/ppa | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Michael Vogt | Pending | ||
computer-janitor-hackers | Pending | ||
Review via email: mp+22482@code.launchpad.net |
Commit message
Description of the change
This cleans up a few things noticed during visual inspection while responding
to FFe for C-J 2.0 in Lucid 10.04 beta 2. This merges two branches I'd done
separately, but are now combined into this branch, which I'm building in my
PPA.
From the changelog:
computer-janitor (2.0-0ubuntu3) lucid; urgency=low
* Some cleanup indicated by visual inspection.
- Move more exception classes to the error.py module.
- Update docstring.
- Do not translate logged error messages (can make log analysis
scripts more difficult).
- Update copyright years in About dialog.
-- Barry Warsaw <email address hidden> Tue, 30 Mar 2010 15:18:03 -0400
computer-janitor (2.0-0ubuntu2) lucid; urgency=low
* Disable the Do... button when there is no cruft to clean up.
-- Barry Warsaw <email address hidden> Tue, 30 Mar 2010 15:22:23 -0400
- 233. By Barry Warsaw
-
* FFe review resolution (LP: #541990)
- Reverted some strings back to Karmic versions to satisfy FFe for C-J
2.0 in Lucid. Strings marked with FIXME for updating in Lucid+1.
- Catch DBusExceptions in both cli and gtk front-ends and print a
better error message.
Martin Pitt (pitti) wrote : | # |
Martin Pitt (pitti) : | # |
- 234. By Barry Warsaw
-
Move some FIXME comments around for less gettext confusion.
Also, update i18n
Preview Diff
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2010-03-22 18:35:56 +0000 |
3 | +++ .bzrignore 2010-04-01 17:35:45 +0000 |
4 | @@ -5,3 +5,4 @@ |
5 | computerjanitord/tests/data/var/lib/apt/lists/partial |
6 | debian/computer-janitor.debhelper.log |
7 | debian/computer-janitor-gtk.debhelper.log |
8 | +data/computer-janitor-gtk.desktop |
9 | |
10 | === modified file 'computer-janitor' |
11 | --- computer-janitor 2010-03-18 13:04:58 +0000 |
12 | +++ computer-janitor 2010-04-01 17:35:45 +0000 |
13 | @@ -23,5 +23,19 @@ |
14 | ] |
15 | |
16 | |
17 | +import sys |
18 | + |
19 | +from computerjanitorapp import setup_gettext |
20 | from computerjanitorapp.cli.main import main |
21 | -main() |
22 | +from dbus.exceptions import DBusException |
23 | +_ = setup_gettext() |
24 | + |
25 | + |
26 | +try: |
27 | + main() |
28 | +except KeyboardInterrupt: |
29 | + pass |
30 | +except DBusException as error: |
31 | + print >> sys.stderr, _( |
32 | + 'Cannot contact Computer Janitor dbus service; try again.') |
33 | + sys.exit(1) |
34 | |
35 | === modified file 'computer-janitor-gtk' |
36 | --- computer-janitor-gtk 2010-03-18 13:04:58 +0000 |
37 | +++ computer-janitor-gtk 2010-04-01 17:35:45 +0000 |
38 | @@ -31,6 +31,7 @@ |
39 | import computerjanitor |
40 | |
41 | from computerjanitorapp.gtk.main import main |
42 | +from dbus.exceptions import DBusException |
43 | |
44 | |
45 | try: |
46 | @@ -39,6 +40,9 @@ |
47 | main() |
48 | except KeyboardInterrupt: |
49 | pass |
50 | +except DBusException as error: |
51 | + log.exception('Cannot contact Computer Janitor dbus service; try again.') |
52 | + sys.exit(1) |
53 | except: |
54 | log.exception('computer-janitor-gtk uncaught exception') |
55 | sys.exit(1) |
56 | |
57 | === modified file 'computerjanitorapp/gtk/areyousure.py' |
58 | --- computerjanitorapp/gtk/areyousure.py 2010-03-18 13:04:58 +0000 |
59 | +++ computerjanitorapp/gtk/areyousure.py 2010-04-01 17:35:45 +0000 |
60 | @@ -45,7 +45,10 @@ |
61 | # It would be nice if we could produce better messages than these, but |
62 | # that would require a richer interface to the dbus service, and |
63 | # probably to the cruft plugin architecture underneath that. |
64 | - message = _('Are you sure you want to clean your system?') |
65 | + # |
66 | + message = _('Are you sure you want to clean up?') |
67 | + # FIXME: For lucid+1 use this message. (LP: #552777) |
68 | + #message = _('Are you sure you want to clean your system?') |
69 | dialog = gtk.MessageDialog( |
70 | parent=self._ui.widgets['window'], |
71 | type=gtk.MESSAGE_WARNING, |
72 | @@ -57,12 +60,23 @@ |
73 | other_cruft_count = len(cleanable_cruft) - package_cruft_count |
74 | messages = [] |
75 | if package_cruft_count > 0: |
76 | - messages = [_('<b>Software packages to remove: {packages}</b>.'), |
77 | - _('\nRemoving packages that are still in use can ' |
78 | - 'cause errors.')] |
79 | + messages = [ |
80 | + _('You have chosen to <b>remove %d software packages.</b> ' |
81 | + 'Removing packages that are still needed can cause ' |
82 | + 'errors.') % package_cruft_count, |
83 | + ] |
84 | + # FIXME: For lucid+1 use this. (LP: #552777) |
85 | + ## messages = [ |
86 | + ## _('<b>Software packages to remove: {packages}</b>.'), |
87 | + ## _('\nRemoving packages that are still in use can ' |
88 | + ## 'cause errors.'), |
89 | + ## ] |
90 | + ## |
91 | ok_button = _('Remove packages') |
92 | if other_cruft_count > 0: |
93 | - messages.insert(1, _('Non-package items to remove: {others}.')) |
94 | + # FIXME: For lucid+1 use this message. (LP: #552777) |
95 | + #messages.insert(1, _('Non-package items to remove: {others}.')) |
96 | + # |
97 | ok_button = _('Clean up') |
98 | message = NL.join(messages).format(packages=package_cruft_count, |
99 | others=other_cruft_count) |
100 | |
101 | === modified file 'computerjanitorapp/gtk/ui.py' |
102 | --- computerjanitorapp/gtk/ui.py 2010-03-22 18:21:39 +0000 |
103 | +++ computerjanitorapp/gtk/ui.py 2010-04-01 17:35:45 +0000 |
104 | @@ -89,8 +89,12 @@ |
105 | # for testing purposes. |
106 | glade_file = os.environ.get('COMPUTER_JANITOR_GLADE', GLADE) |
107 | builder.add_from_file(glade_file) |
108 | - # Bind widgets to callbacks. |
109 | + # Bind widgets to callbacks. Initialize the Do... button to |
110 | + # insensitive, but possibly toggle it back to sensitive if we find |
111 | + # cruft. |
112 | self.find_and_bind_widgets(builder) |
113 | + self.widgets['do_button'].set_sensitive(False) |
114 | + self.janitord.connect_to_signal('find_finished', self._find_finished) |
115 | # Do the initial search for cruft and set up the TreeView model. |
116 | self.store.find_cruft() |
117 | self.sort_cruft() |
118 | @@ -257,7 +261,9 @@ |
119 | action = ACTIONS.get(cruft_type.lower()) |
120 | if action is not None: |
121 | lines.append(action) |
122 | - lines.append('Size: {0}'.format(format_size(size))) |
123 | + lines.append(_('Size: %s.') % format_size(size)) |
124 | + # FIXME: For lucid+1, use this message. (LP: #552777) |
125 | + #lines.append(_('Size: {0}').format(format_size(size))) |
126 | lines.append('') |
127 | description = self.janitord.get_description(cruft_name) |
128 | lines.append(gobject.markup_escape_text(description)) |
129 | @@ -275,6 +281,10 @@ |
130 | for widget in SENSITIVE_WIDGETS: |
131 | self.widgets[widget].set_sensitive(True) |
132 | |
133 | + def _find_finished(self, all_cruft_names): |
134 | + """dbus signal handler.""" |
135 | + self.widgets['do_button'].set_sensitive(len(all_cruft_names) > 0) |
136 | + |
137 | # Popup menu support. |
138 | |
139 | def popup_menu_foreach_set_state(self, treeview, enabled): |
140 | |
141 | === modified file 'computerjanitord/application.py' |
142 | --- computerjanitord/application.py 2010-02-06 01:28:35 +0000 |
143 | +++ computerjanitord/application.py 2010-04-01 17:35:45 +0000 |
144 | @@ -31,6 +31,10 @@ |
145 | import computerjanitor |
146 | import computerjanitorapp |
147 | |
148 | +from computerjanitord.errors import ( |
149 | + MissingLandmarkError, NonDownloadableError) |
150 | + |
151 | + |
152 | _ = computerjanitorapp.setup_gettext() |
153 | |
154 | SYNTAPTIC_PREFERENCES_FILE = '/var/lib/synaptic/preferences' |
155 | @@ -44,31 +48,6 @@ |
156 | ] |
157 | |
158 | |
159 | -class LandmarkPackageError(computerjanitor.Exception): |
160 | - """Base class for problems with the landmark packages.""" |
161 | - |
162 | - _errmsg = None |
163 | - |
164 | - def __init__(self, package): |
165 | - self.package = package |
166 | - |
167 | - def __str__(self): |
168 | - # gettext translation needs to be called at run time. |
169 | - return _(self._errmsg).format(self) |
170 | - |
171 | - |
172 | -class MissingLandmarkError(LandmarkPackageError): |
173 | - """A landmark package could not be found.""" |
174 | - |
175 | - _errmsg = _('Landmark package {0.package} is missing') |
176 | - |
177 | - |
178 | -class NonDownloadableError(LandmarkPackageError): |
179 | - """A landmark package is not downloadable.""" |
180 | - |
181 | - _errmsg = _('Landmark package {0.package} is not downloadable') |
182 | - |
183 | - |
184 | class Application: |
185 | """Interface for plugins requesting apt actions.""" |
186 | |
187 | @@ -101,8 +80,10 @@ |
188 | |
189 | This API is used by plugins. |
190 | |
191 | - :raises SourcesListProblem: when an essential package is not |
192 | + :raises MissingLandmarkError: When an essential package is not |
193 | available. |
194 | + :raises NonDownloadableError: When an essential package cannot be |
195 | + downloaded. |
196 | """ |
197 | for name in LANDMARK_PACKAGES: |
198 | if name not in self.apt_cache: |
199 | |
200 | === modified file 'computerjanitord/errors.py' |
201 | --- computerjanitord/errors.py 2010-02-08 23:06:04 +0000 |
202 | +++ computerjanitord/errors.py 2010-04-01 17:35:45 +0000 |
203 | @@ -20,15 +20,16 @@ |
204 | __metaclass__ = type |
205 | __all__ = [ |
206 | 'DuplicateCruftError', |
207 | + 'LandmarkPackageError', |
208 | + 'MissingLandmarkError', |
209 | 'NoSuchCruftError', |
210 | + 'NonDownloadableError', |
211 | 'PermissionDeniedError', |
212 | ] |
213 | |
214 | |
215 | import dbus |
216 | - |
217 | -from computerjanitorapp import setup_gettext |
218 | -_ = setup_gettext() |
219 | +import computerjanitor |
220 | |
221 | |
222 | class PermissionDeniedError(dbus.DBusException): |
223 | @@ -36,22 +37,49 @@ |
224 | |
225 | |
226 | class CruftError(dbus.DBusException): |
227 | - MSG = None |
228 | + """Cruft exceptions passed back to dbus client.""" |
229 | + |
230 | + _errmsg = None |
231 | |
232 | def __init__(self, cruft_name): |
233 | self.cruft_name = cruft_name |
234 | |
235 | def __str__(self): |
236 | - return _(self.MSG).format(self) |
237 | + return self._errmsg.format(self) |
238 | |
239 | |
240 | class DuplicateCruftError(CruftError): |
241 | """Duplicate cruft name with different cleanup.""" |
242 | |
243 | - MSG = _('Duplicate cruft with different cleanup: {0.cruft_name}') |
244 | + _errmsg = 'Duplicate cruft with different cleanup: {0.cruft_name}' |
245 | |
246 | |
247 | class NoSuchCruftError(CruftError): |
248 | """There is no cruft by the given name.""" |
249 | |
250 | - MSG = _('No such cruft: {0.cruft_name}') |
251 | + _errmsg = 'No such cruft: {0.cruft_name}' |
252 | + |
253 | + |
254 | +class LandmarkPackageError(computerjanitor.Exception): |
255 | + """Base class for problems with the landmark packages.""" |
256 | + |
257 | + _errmsg = None |
258 | + |
259 | + def __init__(self, package): |
260 | + self.package = package |
261 | + |
262 | + def __str__(self): |
263 | + # gettext translation needs to be called at run time. |
264 | + return self._errmsg.format(self) |
265 | + |
266 | + |
267 | +class MissingLandmarkError(LandmarkPackageError): |
268 | + """A landmark package could not be found.""" |
269 | + |
270 | + _errmsg = 'Landmark package {0.package} is missing' |
271 | + |
272 | + |
273 | +class NonDownloadableError(LandmarkPackageError): |
274 | + """A landmark package is not downloadable.""" |
275 | + |
276 | + _errmsg = 'Landmark package {0.package} is not downloadable' |
277 | |
278 | === modified file 'data/ComputerJanitor.ui' |
279 | --- data/ComputerJanitor.ui 2010-03-17 17:01:20 +0000 |
280 | +++ data/ComputerJanitor.ui 2010-04-01 17:35:45 +0000 |
281 | @@ -10,7 +10,6 @@ |
282 | <child> |
283 | <object class="GtkVBox" id="vbox1"> |
284 | <property name="visible">True</property> |
285 | - <property name="orientation">vertical</property> |
286 | <child> |
287 | <object class="GtkMenuBar" id="menubar1"> |
288 | <property name="visible">True</property> |
289 | @@ -108,7 +107,6 @@ |
290 | <child> |
291 | <object class="GtkVBox" id="vbox2"> |
292 | <property name="visible">True</property> |
293 | - <property name="orientation">vertical</property> |
294 | <child> |
295 | <object class="GtkHBox" id="hbox2"> |
296 | <property name="visible">True</property> |
297 | @@ -117,7 +115,6 @@ |
298 | <child> |
299 | <object class="GtkVBox" id="vbox3"> |
300 | <property name="visible">True</property> |
301 | - <property name="orientation">vertical</property> |
302 | <child> |
303 | <object class="GtkLabel" id="label1"> |
304 | <property name="visible">True</property> |
305 | @@ -161,7 +158,6 @@ |
306 | <child> |
307 | <object class="GtkVBox" id="vbox6"> |
308 | <property name="visible">True</property> |
309 | - <property name="orientation">vertical</property> |
310 | <child> |
311 | <object class="GtkLabel" id="label3"> |
312 | <property name="visible">True</property> |
313 | @@ -271,7 +267,7 @@ |
314 | <property name="has_separator">False</property> |
315 | <property name="program_name">Computer Janitor</property> |
316 | <property name="version">x.y</property> |
317 | - <property name="copyright" translatable="yes">Copyright 2008, 2009 Canonical Ltd. |
318 | + <property name="copyright" translatable="yes">Copyright 2008, 2009, 2010 Canonical Ltd. |
319 | Icon Copyright 2008 Marco Rodrigues</property> |
320 | <property name="comments" translatable="yes">This application helps you find and remove software packages you might not need anymore. It also suggests configuration changes that might benefit you.</property> |
321 | <property name="website">https://launchpad.net/~computer-janitor-hackers</property> |
322 | @@ -280,7 +276,6 @@ |
323 | <child internal-child="vbox"> |
324 | <object class="GtkVBox" id="dialog-vbox1"> |
325 | <property name="visible">True</property> |
326 | - <property name="orientation">vertical</property> |
327 | <property name="spacing">2</property> |
328 | <child> |
329 | <placeholder/> |
330 | @@ -312,12 +307,10 @@ |
331 | <child internal-child="vbox"> |
332 | <object class="GtkVBox" id="dialog-vbox2"> |
333 | <property name="visible">True</property> |
334 | - <property name="orientation">vertical</property> |
335 | <property name="spacing">2</property> |
336 | <child> |
337 | <object class="GtkVBox" id="vbox5"> |
338 | <property name="visible">True</property> |
339 | - <property name="orientation">vertical</property> |
340 | <child> |
341 | <object class="GtkLabel" id="label4"> |
342 | <property name="visible">True</property> |
343 | @@ -387,7 +380,6 @@ |
344 | <child internal-child="vbox"> |
345 | <object class="GtkVBox" id="dialog-vbox3"> |
346 | <property name="visible">True</property> |
347 | - <property name="orientation">vertical</property> |
348 | <property name="spacing">2</property> |
349 | <child internal-child="action_area"> |
350 | <object class="GtkHButtonBox" id="dialog-action_area3"> |
351 | |
352 | === modified file 'debian/changelog' |
353 | --- debian/changelog 2010-03-15 18:45:29 +0000 |
354 | +++ debian/changelog 2010-04-01 17:35:45 +0000 |
355 | @@ -1,3 +1,36 @@ |
356 | +computer-janitor (2.0-0ubuntu5) lucid; urgency=low |
357 | + |
358 | + * Move some FIXME comments around for less gettext confusion. |
359 | + |
360 | + -- Barry Warsaw <barry@canonical.com> Thu, 01 Apr 2010 13:32:24 -0400 |
361 | + |
362 | +computer-janitor (2.0-0ubuntu4) lucid; urgency=low |
363 | + |
364 | + * FFe review resolution (LP: #541990) |
365 | + - Reverted some strings back to Karmic versions to satisfy FFe for C-J |
366 | + 2.0 in Lucid. Strings marked with FIXME for updating in Lucid+1. |
367 | + - Catch DBusExceptions in both cli and gtk front-ends and print a |
368 | + better error message. |
369 | + |
370 | + -- Barry Warsaw <barry@canonical.com> Wed, 31 Mar 2010 15:37:08 -0400 |
371 | + |
372 | +computer-janitor (2.0-0ubuntu3) lucid; urgency=low |
373 | + |
374 | + * Some cleanup indicated by visual inspection. |
375 | + - Move more exception classes to the error.py module. |
376 | + - Update docstring. |
377 | + - Do not translate logged error messages (can make log analysis |
378 | + scripts more difficult). |
379 | + - Update copyright years in About dialog. |
380 | + |
381 | + -- Barry Warsaw <barry@canonical.com> Tue, 30 Mar 2010 15:18:03 -0400 |
382 | + |
383 | +computer-janitor (2.0-0ubuntu2) lucid; urgency=low |
384 | + |
385 | + * Disable the Do... button when there is no cruft to clean up. |
386 | + |
387 | + -- Barry Warsaw <barry@canonical.com> Tue, 30 Mar 2010 15:22:23 -0400 |
388 | + |
389 | computer-janitor (2.0-0ubuntu1) lucid; urgency=low |
390 | |
391 | * Refactor all package change operations into a dbus service. |
392 | |
393 | === modified file 'po/POTFILES.in' |
394 | --- po/POTFILES.in 2010-03-18 13:10:39 +0000 |
395 | +++ po/POTFILES.in 2010-04-01 17:35:45 +0000 |
396 | @@ -1,18 +1,18 @@ |
397 | [encoding: UTF-8] |
398 | +computerjanitorapp/gtk/main.py |
399 | +computerjanitorapp/gtk/areyousure.py |
400 | +computerjanitorapp/gtk/ui.py |
401 | +computerjanitorapp/gtk/__init__.py |
402 | +computerjanitorapp/gtk/store.py |
403 | +computerjanitorapp/tests/test_all.py |
404 | +computerjanitorapp/tests/test_utilities.py |
405 | +computerjanitorapp/tests/test_terminalsize.py |
406 | +computerjanitorapp/tests/__init__.py |
407 | +computerjanitorapp/cli/main.py |
408 | +computerjanitorapp/cli/__init__.py |
409 | computerjanitorapp/terminalsize.py |
410 | computerjanitorapp/__init__.py |
411 | computerjanitorapp/utilities.py |
412 | -computerjanitorapp/cli/main.py |
413 | -computerjanitorapp/cli/__init__.py |
414 | -computerjanitorapp/tests/__init__.py |
415 | -computerjanitorapp/tests/test_terminalsize.py |
416 | -computerjanitorapp/tests/test_utilities.py |
417 | -computerjanitorapp/tests/test_all.py |
418 | -computerjanitorapp/gtk/ui.py |
419 | -computerjanitorapp/gtk/main.py |
420 | -computerjanitorapp/gtk/__init__.py |
421 | -computerjanitorapp/gtk/areyousure.py |
422 | -computerjanitorapp/gtk/store.py |
423 | data/computer-janitor-gtk.desktop.in |
424 | data/ComputerJanitor.ui |
425 | plugins/add_nfs_common_plugin.py |
426 | |
427 | === modified file 'po/computerjanitor.pot' |
428 | --- po/computerjanitor.pot 2010-03-18 13:10:39 +0000 |
429 | +++ po/computerjanitor.pot 2010-04-01 17:35:45 +0000 |
430 | @@ -8,7 +8,7 @@ |
431 | msgstr "" |
432 | "Project-Id-Version: PACKAGE VERSION\n" |
433 | "Report-Msgid-Bugs-To: \n" |
434 | -"POT-Creation-Date: 2010-03-18 09:09-0400\n" |
435 | +"POT-Creation-Date: 2010-04-01 13:31-0400\n" |
436 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
437 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
438 | "Language-Team: LANGUAGE <LL@li.org>\n" |
439 | @@ -16,6 +16,66 @@ |
440 | "Content-Type: text/plain; charset=CHARSET\n" |
441 | "Content-Transfer-Encoding: 8bit\n" |
442 | |
443 | +#. It would be nice if we could produce better messages than these, but |
444 | +#. that would require a richer interface to the dbus service, and |
445 | +#. probably to the cruft plugin architecture underneath that. |
446 | +#. |
447 | +#: ../computerjanitorapp/gtk/areyousure.py:49 |
448 | +msgid "Are you sure you want to clean up?" |
449 | +msgstr "" |
450 | + |
451 | +#. FIXME: For lucid+1 use this message. (LP: #552777) |
452 | +#. messages.insert(1, _('Non-package items to remove: {others}.')) |
453 | +#. |
454 | +#: ../computerjanitorapp/gtk/areyousure.py:57 |
455 | +#: ../computerjanitorapp/gtk/areyousure.py:80 |
456 | +msgid "Clean up" |
457 | +msgstr "" |
458 | + |
459 | +#: ../computerjanitorapp/gtk/areyousure.py:64 |
460 | +#, python-format |
461 | +msgid "" |
462 | +"You have chosen to <b>remove %d software packages.</b> Removing packages " |
463 | +"that are still needed can cause errors." |
464 | +msgstr "" |
465 | + |
466 | +#. FIXME: For lucid+1 use this. (LP: #552777) |
467 | +#. # messages = [ |
468 | +#. # _('<b>Software packages to remove: {packages}</b>.'), |
469 | +#. # _('\nRemoving packages that are still in use can ' |
470 | +#. # 'cause errors.'), |
471 | +#. # ] |
472 | +#. # |
473 | +#: ../computerjanitorapp/gtk/areyousure.py:75 |
474 | +msgid "Remove packages" |
475 | +msgstr "" |
476 | + |
477 | +#: ../computerjanitorapp/gtk/ui.py:48 |
478 | +msgid "Package will be <b>removed</b>." |
479 | +msgstr "" |
480 | + |
481 | +#: ../computerjanitorapp/gtk/ui.py:49 |
482 | +msgid "Package will be <b>installed</b>." |
483 | +msgstr "" |
484 | + |
485 | +#: ../computerjanitorapp/gtk/ui.py:50 |
486 | +msgid "File will be <b>removed</b>." |
487 | +msgstr "" |
488 | + |
489 | +#: ../computerjanitorapp/gtk/ui.py:264 |
490 | +#, python-format |
491 | +msgid "Size: %s." |
492 | +msgstr "" |
493 | + |
494 | +#: ../computerjanitorapp/gtk/ui.py:348 |
495 | +msgid "Processing {0}" |
496 | +msgstr "" |
497 | + |
498 | +#: ../computerjanitorapp/gtk/ui.py:471 |
499 | +#: ../data/computer-janitor-gtk.desktop.in.h:2 |
500 | +msgid "Computer Janitor" |
501 | +msgstr "" |
502 | + |
503 | #: ../computerjanitorapp/cli/main.py:51 |
504 | msgid "" |
505 | " Find and remove cruft from your system.\n" |
506 | @@ -97,57 +157,6 @@ |
507 | msgid "removable" |
508 | msgstr "" |
509 | |
510 | -#: ../computerjanitorapp/gtk/ui.py:48 |
511 | -msgid "Package will be <b>removed</b>." |
512 | -msgstr "" |
513 | - |
514 | -#: ../computerjanitorapp/gtk/ui.py:49 |
515 | -msgid "Package will be <b>installed</b>." |
516 | -msgstr "" |
517 | - |
518 | -#: ../computerjanitorapp/gtk/ui.py:50 |
519 | -msgid "File will be <b>removed</b>." |
520 | -msgstr "" |
521 | - |
522 | -#: ../computerjanitorapp/gtk/ui.py:336 |
523 | -msgid "Processing {0}" |
524 | -msgstr "" |
525 | - |
526 | -#: ../computerjanitorapp/gtk/ui.py:459 |
527 | -#: ../data/computer-janitor-gtk.desktop.in.h:2 |
528 | -msgid "Computer Janitor" |
529 | -msgstr "" |
530 | - |
531 | -#. It would be nice if we could produce better messages than these, but |
532 | -#. that would require a richer interface to the dbus service, and |
533 | -#. probably to the cruft plugin architecture underneath that. |
534 | -#: ../computerjanitorapp/gtk/areyousure.py:48 |
535 | -msgid "Are you sure you want to clean your system?" |
536 | -msgstr "" |
537 | - |
538 | -#: ../computerjanitorapp/gtk/areyousure.py:54 |
539 | -#: ../computerjanitorapp/gtk/areyousure.py:66 |
540 | -msgid "Clean up" |
541 | -msgstr "" |
542 | - |
543 | -#: ../computerjanitorapp/gtk/areyousure.py:60 |
544 | -msgid "<b>Software packages to remove: {packages}</b>." |
545 | -msgstr "" |
546 | - |
547 | -#: ../computerjanitorapp/gtk/areyousure.py:61 |
548 | -msgid "" |
549 | -"\n" |
550 | -"Removing packages that are still in use can cause errors." |
551 | -msgstr "" |
552 | - |
553 | -#: ../computerjanitorapp/gtk/areyousure.py:63 |
554 | -msgid "Remove packages" |
555 | -msgstr "" |
556 | - |
557 | -#: ../computerjanitorapp/gtk/areyousure.py:65 |
558 | -msgid "Non-package items to remove: {others}." |
559 | -msgstr "" |
560 | - |
561 | #: ../data/computer-janitor-gtk.desktop.in.h:1 |
562 | msgid "Clean up a system so it's more like a freshly installed one" |
563 | msgstr "" |
564 | |
565 | === modified file 'po/es.po' |
566 | --- po/es.po 2010-03-18 13:10:39 +0000 |
567 | +++ po/es.po 2010-04-01 17:35:45 +0000 |
568 | @@ -9,7 +9,7 @@ |
569 | msgstr "" |
570 | "Project-Id-Version: PACKAGE VERSION\n" |
571 | "Report-Msgid-Bugs-To: \n" |
572 | -"POT-Creation-Date: 2010-03-18 09:09-0400\n" |
573 | +"POT-Creation-Date: 2010-04-01 13:31-0400\n" |
574 | "PO-Revision-Date: 2008-10-26 23:38+0100\n" |
575 | "Last-Translator: Ricardo Pérez López <ricardo@ubuntu.com>\n" |
576 | "Language-Team: \n" |
577 | @@ -17,6 +17,68 @@ |
578 | "Content-Type: text/plain; charset=UTF-8\n" |
579 | "Content-Transfer-Encoding: 8bit\n" |
580 | |
581 | +#. It would be nice if we could produce better messages than these, but |
582 | +#. that would require a richer interface to the dbus service, and |
583 | +#. probably to the cruft plugin architecture underneath that. |
584 | +#. |
585 | +#: ../computerjanitorapp/gtk/areyousure.py:49 |
586 | +msgid "Are you sure you want to clean up?" |
587 | +msgstr "" |
588 | + |
589 | +#. FIXME: For lucid+1 use this message. (LP: #552777) |
590 | +#. messages.insert(1, _('Non-package items to remove: {others}.')) |
591 | +#. |
592 | +#: ../computerjanitorapp/gtk/areyousure.py:57 |
593 | +#: ../computerjanitorapp/gtk/areyousure.py:80 |
594 | +#, fuzzy |
595 | +msgid "Clean up" |
596 | +msgstr "_Limpiar" |
597 | + |
598 | +#: ../computerjanitorapp/gtk/areyousure.py:64 |
599 | +#, python-format |
600 | +msgid "" |
601 | +"You have chosen to <b>remove %d software packages.</b> Removing packages " |
602 | +"that are still needed can cause errors." |
603 | +msgstr "" |
604 | + |
605 | +#. FIXME: For lucid+1 use this. (LP: #552777) |
606 | +#. # messages = [ |
607 | +#. # _('<b>Software packages to remove: {packages}</b>.'), |
608 | +#. # _('\nRemoving packages that are still in use can ' |
609 | +#. # 'cause errors.'), |
610 | +#. # ] |
611 | +#. # |
612 | +#: ../computerjanitorapp/gtk/areyousure.py:75 |
613 | +#, fuzzy |
614 | +msgid "Remove packages" |
615 | +msgstr "paquete .deb" |
616 | + |
617 | +#: ../computerjanitorapp/gtk/ui.py:48 |
618 | +msgid "Package will be <b>removed</b>." |
619 | +msgstr "" |
620 | + |
621 | +#: ../computerjanitorapp/gtk/ui.py:49 |
622 | +msgid "Package will be <b>installed</b>." |
623 | +msgstr "" |
624 | + |
625 | +#: ../computerjanitorapp/gtk/ui.py:50 |
626 | +msgid "File will be <b>removed</b>." |
627 | +msgstr "" |
628 | + |
629 | +#: ../computerjanitorapp/gtk/ui.py:264 |
630 | +#, python-format |
631 | +msgid "Size: %s." |
632 | +msgstr "" |
633 | + |
634 | +#: ../computerjanitorapp/gtk/ui.py:348 |
635 | +msgid "Processing {0}" |
636 | +msgstr "" |
637 | + |
638 | +#: ../computerjanitorapp/gtk/ui.py:471 |
639 | +#: ../data/computer-janitor-gtk.desktop.in.h:2 |
640 | +msgid "Computer Janitor" |
641 | +msgstr "" |
642 | + |
643 | #: ../computerjanitorapp/cli/main.py:51 |
644 | #, fuzzy |
645 | msgid "" |
646 | @@ -115,59 +177,6 @@ |
647 | msgid "removable" |
648 | msgstr "desinstalable" |
649 | |
650 | -#: ../computerjanitorapp/gtk/ui.py:48 |
651 | -msgid "Package will be <b>removed</b>." |
652 | -msgstr "" |
653 | - |
654 | -#: ../computerjanitorapp/gtk/ui.py:49 |
655 | -msgid "Package will be <b>installed</b>." |
656 | -msgstr "" |
657 | - |
658 | -#: ../computerjanitorapp/gtk/ui.py:50 |
659 | -msgid "File will be <b>removed</b>." |
660 | -msgstr "" |
661 | - |
662 | -#: ../computerjanitorapp/gtk/ui.py:336 |
663 | -msgid "Processing {0}" |
664 | -msgstr "" |
665 | - |
666 | -#: ../computerjanitorapp/gtk/ui.py:459 |
667 | -#: ../data/computer-janitor-gtk.desktop.in.h:2 |
668 | -msgid "Computer Janitor" |
669 | -msgstr "" |
670 | - |
671 | -#. It would be nice if we could produce better messages than these, but |
672 | -#. that would require a richer interface to the dbus service, and |
673 | -#. probably to the cruft plugin architecture underneath that. |
674 | -#: ../computerjanitorapp/gtk/areyousure.py:48 |
675 | -msgid "Are you sure you want to clean your system?" |
676 | -msgstr "" |
677 | - |
678 | -#: ../computerjanitorapp/gtk/areyousure.py:54 |
679 | -#: ../computerjanitorapp/gtk/areyousure.py:66 |
680 | -#, fuzzy |
681 | -msgid "Clean up" |
682 | -msgstr "_Limpiar" |
683 | - |
684 | -#: ../computerjanitorapp/gtk/areyousure.py:60 |
685 | -msgid "<b>Software packages to remove: {packages}</b>." |
686 | -msgstr "" |
687 | - |
688 | -#: ../computerjanitorapp/gtk/areyousure.py:61 |
689 | -msgid "" |
690 | -"\n" |
691 | -"Removing packages that are still in use can cause errors." |
692 | -msgstr "" |
693 | - |
694 | -#: ../computerjanitorapp/gtk/areyousure.py:63 |
695 | -#, fuzzy |
696 | -msgid "Remove packages" |
697 | -msgstr "paquete .deb" |
698 | - |
699 | -#: ../computerjanitorapp/gtk/areyousure.py:65 |
700 | -msgid "Non-package items to remove: {others}." |
701 | -msgstr "" |
702 | - |
703 | #: ../data/computer-janitor-gtk.desktop.in.h:1 |
704 | msgid "Clean up a system so it's more like a freshly installed one" |
705 | msgstr "Limpia un sistema para que se parezca más a uno recién instalado" |
706 | |
707 | === modified file 'po/fi.po' |
708 | --- po/fi.po 2010-03-18 13:10:39 +0000 |
709 | +++ po/fi.po 2010-04-01 17:35:45 +0000 |
710 | @@ -8,7 +8,7 @@ |
711 | msgstr "" |
712 | "Project-Id-Version: cruft-remover 1.10\n" |
713 | "Report-Msgid-Bugs-To: \n" |
714 | -"POT-Creation-Date: 2010-03-18 09:09-0400\n" |
715 | +"POT-Creation-Date: 2010-04-01 13:31-0400\n" |
716 | "PO-Revision-Date: 2008-10-09 23:02+0300\n" |
717 | "Last-Translator: Lars Wirzenius <lars@ubuntu.com>\n" |
718 | "Language-Team: Finnish\n" |
719 | @@ -17,6 +17,68 @@ |
720 | "Content-Transfer-Encoding: 8bit\n" |
721 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
722 | |
723 | +#. It would be nice if we could produce better messages than these, but |
724 | +#. that would require a richer interface to the dbus service, and |
725 | +#. probably to the cruft plugin architecture underneath that. |
726 | +#. |
727 | +#: ../computerjanitorapp/gtk/areyousure.py:49 |
728 | +msgid "Are you sure you want to clean up?" |
729 | +msgstr "" |
730 | + |
731 | +#. FIXME: For lucid+1 use this message. (LP: #552777) |
732 | +#. messages.insert(1, _('Non-package items to remove: {others}.')) |
733 | +#. |
734 | +#: ../computerjanitorapp/gtk/areyousure.py:57 |
735 | +#: ../computerjanitorapp/gtk/areyousure.py:80 |
736 | +#, fuzzy |
737 | +msgid "Clean up" |
738 | +msgstr "_Puhdista" |
739 | + |
740 | +#: ../computerjanitorapp/gtk/areyousure.py:64 |
741 | +#, python-format |
742 | +msgid "" |
743 | +"You have chosen to <b>remove %d software packages.</b> Removing packages " |
744 | +"that are still needed can cause errors." |
745 | +msgstr "" |
746 | + |
747 | +#. FIXME: For lucid+1 use this. (LP: #552777) |
748 | +#. # messages = [ |
749 | +#. # _('<b>Software packages to remove: {packages}</b>.'), |
750 | +#. # _('\nRemoving packages that are still in use can ' |
751 | +#. # 'cause errors.'), |
752 | +#. # ] |
753 | +#. # |
754 | +#: ../computerjanitorapp/gtk/areyousure.py:75 |
755 | +#, fuzzy |
756 | +msgid "Remove packages" |
757 | +msgstr ".deb-paketti" |
758 | + |
759 | +#: ../computerjanitorapp/gtk/ui.py:48 |
760 | +msgid "Package will be <b>removed</b>." |
761 | +msgstr "" |
762 | + |
763 | +#: ../computerjanitorapp/gtk/ui.py:49 |
764 | +msgid "Package will be <b>installed</b>." |
765 | +msgstr "" |
766 | + |
767 | +#: ../computerjanitorapp/gtk/ui.py:50 |
768 | +msgid "File will be <b>removed</b>." |
769 | +msgstr "" |
770 | + |
771 | +#: ../computerjanitorapp/gtk/ui.py:264 |
772 | +#, python-format |
773 | +msgid "Size: %s." |
774 | +msgstr "" |
775 | + |
776 | +#: ../computerjanitorapp/gtk/ui.py:348 |
777 | +msgid "Processing {0}" |
778 | +msgstr "" |
779 | + |
780 | +#: ../computerjanitorapp/gtk/ui.py:471 |
781 | +#: ../data/computer-janitor-gtk.desktop.in.h:2 |
782 | +msgid "Computer Janitor" |
783 | +msgstr "" |
784 | + |
785 | #: ../computerjanitorapp/cli/main.py:51 |
786 | #, fuzzy |
787 | msgid "" |
788 | @@ -110,59 +172,6 @@ |
789 | msgid "removable" |
790 | msgstr "poistettavissa" |
791 | |
792 | -#: ../computerjanitorapp/gtk/ui.py:48 |
793 | -msgid "Package will be <b>removed</b>." |
794 | -msgstr "" |
795 | - |
796 | -#: ../computerjanitorapp/gtk/ui.py:49 |
797 | -msgid "Package will be <b>installed</b>." |
798 | -msgstr "" |
799 | - |
800 | -#: ../computerjanitorapp/gtk/ui.py:50 |
801 | -msgid "File will be <b>removed</b>." |
802 | -msgstr "" |
803 | - |
804 | -#: ../computerjanitorapp/gtk/ui.py:336 |
805 | -msgid "Processing {0}" |
806 | -msgstr "" |
807 | - |
808 | -#: ../computerjanitorapp/gtk/ui.py:459 |
809 | -#: ../data/computer-janitor-gtk.desktop.in.h:2 |
810 | -msgid "Computer Janitor" |
811 | -msgstr "" |
812 | - |
813 | -#. It would be nice if we could produce better messages than these, but |
814 | -#. that would require a richer interface to the dbus service, and |
815 | -#. probably to the cruft plugin architecture underneath that. |
816 | -#: ../computerjanitorapp/gtk/areyousure.py:48 |
817 | -msgid "Are you sure you want to clean your system?" |
818 | -msgstr "" |
819 | - |
820 | -#: ../computerjanitorapp/gtk/areyousure.py:54 |
821 | -#: ../computerjanitorapp/gtk/areyousure.py:66 |
822 | -#, fuzzy |
823 | -msgid "Clean up" |
824 | -msgstr "_Puhdista" |
825 | - |
826 | -#: ../computerjanitorapp/gtk/areyousure.py:60 |
827 | -msgid "<b>Software packages to remove: {packages}</b>." |
828 | -msgstr "" |
829 | - |
830 | -#: ../computerjanitorapp/gtk/areyousure.py:61 |
831 | -msgid "" |
832 | -"\n" |
833 | -"Removing packages that are still in use can cause errors." |
834 | -msgstr "" |
835 | - |
836 | -#: ../computerjanitorapp/gtk/areyousure.py:63 |
837 | -#, fuzzy |
838 | -msgid "Remove packages" |
839 | -msgstr ".deb-paketti" |
840 | - |
841 | -#: ../computerjanitorapp/gtk/areyousure.py:65 |
842 | -msgid "Non-package items to remove: {others}." |
843 | -msgstr "" |
844 | - |
845 | #: ../data/computer-janitor-gtk.desktop.in.h:1 |
846 | msgid "Clean up a system so it's more like a freshly installed one" |
847 | msgstr "" |
848 | |
849 | === modified file 'po/fr.po' |
850 | --- po/fr.po 2010-03-18 13:10:39 +0000 |
851 | +++ po/fr.po 2010-04-01 17:35:45 +0000 |
852 | @@ -8,7 +8,7 @@ |
853 | msgstr "" |
854 | "Project-Id-Version: cruft-remover 1.10\n" |
855 | "Report-Msgid-Bugs-To: \n" |
856 | -"POT-Creation-Date: 2010-03-18 09:09-0400\n" |
857 | +"POT-Creation-Date: 2010-04-01 13:31-0400\n" |
858 | "PO-Revision-Date: 2008-10-26 23:02+0300\n" |
859 | "Last-Translator: Jonathan Ernst <jonathan@ernstfamily.ch>\n" |
860 | "Language-Team: French\n" |
861 | @@ -17,6 +17,68 @@ |
862 | "Content-Transfer-Encoding: 8bit\n" |
863 | "Plural-Forms: nplurals=2; plural=n > 1;\n" |
864 | |
865 | +#. It would be nice if we could produce better messages than these, but |
866 | +#. that would require a richer interface to the dbus service, and |
867 | +#. probably to the cruft plugin architecture underneath that. |
868 | +#. |
869 | +#: ../computerjanitorapp/gtk/areyousure.py:49 |
870 | +msgid "Are you sure you want to clean up?" |
871 | +msgstr "" |
872 | + |
873 | +#. FIXME: For lucid+1 use this message. (LP: #552777) |
874 | +#. messages.insert(1, _('Non-package items to remove: {others}.')) |
875 | +#. |
876 | +#: ../computerjanitorapp/gtk/areyousure.py:57 |
877 | +#: ../computerjanitorapp/gtk/areyousure.py:80 |
878 | +#, fuzzy |
879 | +msgid "Clean up" |
880 | +msgstr "_Nettoyer" |
881 | + |
882 | +#: ../computerjanitorapp/gtk/areyousure.py:64 |
883 | +#, python-format |
884 | +msgid "" |
885 | +"You have chosen to <b>remove %d software packages.</b> Removing packages " |
886 | +"that are still needed can cause errors." |
887 | +msgstr "" |
888 | + |
889 | +#. FIXME: For lucid+1 use this. (LP: #552777) |
890 | +#. # messages = [ |
891 | +#. # _('<b>Software packages to remove: {packages}</b>.'), |
892 | +#. # _('\nRemoving packages that are still in use can ' |
893 | +#. # 'cause errors.'), |
894 | +#. # ] |
895 | +#. # |
896 | +#: ../computerjanitorapp/gtk/areyousure.py:75 |
897 | +#, fuzzy |
898 | +msgid "Remove packages" |
899 | +msgstr "paquet .deb" |
900 | + |
901 | +#: ../computerjanitorapp/gtk/ui.py:48 |
902 | +msgid "Package will be <b>removed</b>." |
903 | +msgstr "" |
904 | + |
905 | +#: ../computerjanitorapp/gtk/ui.py:49 |
906 | +msgid "Package will be <b>installed</b>." |
907 | +msgstr "" |
908 | + |
909 | +#: ../computerjanitorapp/gtk/ui.py:50 |
910 | +msgid "File will be <b>removed</b>." |
911 | +msgstr "" |
912 | + |
913 | +#: ../computerjanitorapp/gtk/ui.py:264 |
914 | +#, python-format |
915 | +msgid "Size: %s." |
916 | +msgstr "" |
917 | + |
918 | +#: ../computerjanitorapp/gtk/ui.py:348 |
919 | +msgid "Processing {0}" |
920 | +msgstr "" |
921 | + |
922 | +#: ../computerjanitorapp/gtk/ui.py:471 |
923 | +#: ../data/computer-janitor-gtk.desktop.in.h:2 |
924 | +msgid "Computer Janitor" |
925 | +msgstr "" |
926 | + |
927 | #: ../computerjanitorapp/cli/main.py:51 |
928 | #, fuzzy |
929 | msgid "" |
930 | @@ -115,59 +177,6 @@ |
931 | msgid "removable" |
932 | msgstr "peut être supprimé" |
933 | |
934 | -#: ../computerjanitorapp/gtk/ui.py:48 |
935 | -msgid "Package will be <b>removed</b>." |
936 | -msgstr "" |
937 | - |
938 | -#: ../computerjanitorapp/gtk/ui.py:49 |
939 | -msgid "Package will be <b>installed</b>." |
940 | -msgstr "" |
941 | - |
942 | -#: ../computerjanitorapp/gtk/ui.py:50 |
943 | -msgid "File will be <b>removed</b>." |
944 | -msgstr "" |
945 | - |
946 | -#: ../computerjanitorapp/gtk/ui.py:336 |
947 | -msgid "Processing {0}" |
948 | -msgstr "" |
949 | - |
950 | -#: ../computerjanitorapp/gtk/ui.py:459 |
951 | -#: ../data/computer-janitor-gtk.desktop.in.h:2 |
952 | -msgid "Computer Janitor" |
953 | -msgstr "" |
954 | - |
955 | -#. It would be nice if we could produce better messages than these, but |
956 | -#. that would require a richer interface to the dbus service, and |
957 | -#. probably to the cruft plugin architecture underneath that. |
958 | -#: ../computerjanitorapp/gtk/areyousure.py:48 |
959 | -msgid "Are you sure you want to clean your system?" |
960 | -msgstr "" |
961 | - |
962 | -#: ../computerjanitorapp/gtk/areyousure.py:54 |
963 | -#: ../computerjanitorapp/gtk/areyousure.py:66 |
964 | -#, fuzzy |
965 | -msgid "Clean up" |
966 | -msgstr "_Nettoyer" |
967 | - |
968 | -#: ../computerjanitorapp/gtk/areyousure.py:60 |
969 | -msgid "<b>Software packages to remove: {packages}</b>." |
970 | -msgstr "" |
971 | - |
972 | -#: ../computerjanitorapp/gtk/areyousure.py:61 |
973 | -msgid "" |
974 | -"\n" |
975 | -"Removing packages that are still in use can cause errors." |
976 | -msgstr "" |
977 | - |
978 | -#: ../computerjanitorapp/gtk/areyousure.py:63 |
979 | -#, fuzzy |
980 | -msgid "Remove packages" |
981 | -msgstr "paquet .deb" |
982 | - |
983 | -#: ../computerjanitorapp/gtk/areyousure.py:65 |
984 | -msgid "Non-package items to remove: {others}." |
985 | -msgstr "" |
986 | - |
987 | #: ../data/computer-janitor-gtk.desktop.in.h:1 |
988 | msgid "Clean up a system so it's more like a freshly installed one" |
989 | msgstr "" |
990 | |
991 | === modified file 'po/ja.po' |
992 | --- po/ja.po 2010-03-18 13:10:39 +0000 |
993 | +++ po/ja.po 2010-04-01 17:35:45 +0000 |
994 | @@ -8,7 +8,7 @@ |
995 | msgstr "" |
996 | "Project-Id-Version: cruft-remover 1.10\n" |
997 | "Report-Msgid-Bugs-To: \n" |
998 | -"POT-Creation-Date: 2010-03-18 09:09-0400\n" |
999 | +"POT-Creation-Date: 2010-04-01 13:31-0400\n" |
1000 | "PO-Revision-Date: 2008-10-25 00:08+0900\n" |
1001 | "Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n" |
1002 | "Language-Team: Ubuntu Japanese Team <ubuntu-jp@lists.ubuntu.com>\n" |
1003 | @@ -16,6 +16,68 @@ |
1004 | "Content-Type: text/plain; charset=UTF-8\n" |
1005 | "Content-Transfer-Encoding: 8bit\n" |
1006 | |
1007 | +#. It would be nice if we could produce better messages than these, but |
1008 | +#. that would require a richer interface to the dbus service, and |
1009 | +#. probably to the cruft plugin architecture underneath that. |
1010 | +#. |
1011 | +#: ../computerjanitorapp/gtk/areyousure.py:49 |
1012 | +msgid "Are you sure you want to clean up?" |
1013 | +msgstr "" |
1014 | + |
1015 | +#. FIXME: For lucid+1 use this message. (LP: #552777) |
1016 | +#. messages.insert(1, _('Non-package items to remove: {others}.')) |
1017 | +#. |
1018 | +#: ../computerjanitorapp/gtk/areyousure.py:57 |
1019 | +#: ../computerjanitorapp/gtk/areyousure.py:80 |
1020 | +#, fuzzy |
1021 | +msgid "Clean up" |
1022 | +msgstr "整頓する(_C)" |
1023 | + |
1024 | +#: ../computerjanitorapp/gtk/areyousure.py:64 |
1025 | +#, python-format |
1026 | +msgid "" |
1027 | +"You have chosen to <b>remove %d software packages.</b> Removing packages " |
1028 | +"that are still needed can cause errors." |
1029 | +msgstr "" |
1030 | + |
1031 | +#. FIXME: For lucid+1 use this. (LP: #552777) |
1032 | +#. # messages = [ |
1033 | +#. # _('<b>Software packages to remove: {packages}</b>.'), |
1034 | +#. # _('\nRemoving packages that are still in use can ' |
1035 | +#. # 'cause errors.'), |
1036 | +#. # ] |
1037 | +#. # |
1038 | +#: ../computerjanitorapp/gtk/areyousure.py:75 |
1039 | +#, fuzzy |
1040 | +msgid "Remove packages" |
1041 | +msgstr "deb パッケージ" |
1042 | + |
1043 | +#: ../computerjanitorapp/gtk/ui.py:48 |
1044 | +msgid "Package will be <b>removed</b>." |
1045 | +msgstr "" |
1046 | + |
1047 | +#: ../computerjanitorapp/gtk/ui.py:49 |
1048 | +msgid "Package will be <b>installed</b>." |
1049 | +msgstr "" |
1050 | + |
1051 | +#: ../computerjanitorapp/gtk/ui.py:50 |
1052 | +msgid "File will be <b>removed</b>." |
1053 | +msgstr "" |
1054 | + |
1055 | +#: ../computerjanitorapp/gtk/ui.py:264 |
1056 | +#, python-format |
1057 | +msgid "Size: %s." |
1058 | +msgstr "" |
1059 | + |
1060 | +#: ../computerjanitorapp/gtk/ui.py:348 |
1061 | +msgid "Processing {0}" |
1062 | +msgstr "" |
1063 | + |
1064 | +#: ../computerjanitorapp/gtk/ui.py:471 |
1065 | +#: ../data/computer-janitor-gtk.desktop.in.h:2 |
1066 | +msgid "Computer Janitor" |
1067 | +msgstr "" |
1068 | + |
1069 | #: ../computerjanitorapp/cli/main.py:51 |
1070 | #, fuzzy |
1071 | msgid "" |
1072 | @@ -112,59 +174,6 @@ |
1073 | msgid "removable" |
1074 | msgstr "削除可能" |
1075 | |
1076 | -#: ../computerjanitorapp/gtk/ui.py:48 |
1077 | -msgid "Package will be <b>removed</b>." |
1078 | -msgstr "" |
1079 | - |
1080 | -#: ../computerjanitorapp/gtk/ui.py:49 |
1081 | -msgid "Package will be <b>installed</b>." |
1082 | -msgstr "" |
1083 | - |
1084 | -#: ../computerjanitorapp/gtk/ui.py:50 |
1085 | -msgid "File will be <b>removed</b>." |
1086 | -msgstr "" |
1087 | - |
1088 | -#: ../computerjanitorapp/gtk/ui.py:336 |
1089 | -msgid "Processing {0}" |
1090 | -msgstr "" |
1091 | - |
1092 | -#: ../computerjanitorapp/gtk/ui.py:459 |
1093 | -#: ../data/computer-janitor-gtk.desktop.in.h:2 |
1094 | -msgid "Computer Janitor" |
1095 | -msgstr "" |
1096 | - |
1097 | -#. It would be nice if we could produce better messages than these, but |
1098 | -#. that would require a richer interface to the dbus service, and |
1099 | -#. probably to the cruft plugin architecture underneath that. |
1100 | -#: ../computerjanitorapp/gtk/areyousure.py:48 |
1101 | -msgid "Are you sure you want to clean your system?" |
1102 | -msgstr "" |
1103 | - |
1104 | -#: ../computerjanitorapp/gtk/areyousure.py:54 |
1105 | -#: ../computerjanitorapp/gtk/areyousure.py:66 |
1106 | -#, fuzzy |
1107 | -msgid "Clean up" |
1108 | -msgstr "整頓する(_C)" |
1109 | - |
1110 | -#: ../computerjanitorapp/gtk/areyousure.py:60 |
1111 | -msgid "<b>Software packages to remove: {packages}</b>." |
1112 | -msgstr "" |
1113 | - |
1114 | -#: ../computerjanitorapp/gtk/areyousure.py:61 |
1115 | -msgid "" |
1116 | -"\n" |
1117 | -"Removing packages that are still in use can cause errors." |
1118 | -msgstr "" |
1119 | - |
1120 | -#: ../computerjanitorapp/gtk/areyousure.py:63 |
1121 | -#, fuzzy |
1122 | -msgid "Remove packages" |
1123 | -msgstr "deb パッケージ" |
1124 | - |
1125 | -#: ../computerjanitorapp/gtk/areyousure.py:65 |
1126 | -msgid "Non-package items to remove: {others}." |
1127 | -msgstr "" |
1128 | - |
1129 | #: ../data/computer-janitor-gtk.desktop.in.h:1 |
1130 | msgid "Clean up a system so it's more like a freshly installed one" |
1131 | msgstr "システムをインストール直後のような状態に整頓します" |
1132 | |
1133 | === modified file 'po/pl.po' |
1134 | --- po/pl.po 2010-03-18 13:10:39 +0000 |
1135 | +++ po/pl.po 2010-04-01 17:35:45 +0000 |
1136 | @@ -3,7 +3,7 @@ |
1137 | msgstr "" |
1138 | "Project-Id-Version: Cruft Remover\n" |
1139 | "Report-Msgid-Bugs-To: \n" |
1140 | -"POT-Creation-Date: 2010-03-18 09:09-0400\n" |
1141 | +"POT-Creation-Date: 2010-04-01 13:31-0400\n" |
1142 | "PO-Revision-Date: 2008-10-28 10:35+0100\n" |
1143 | "Last-Translator: Piotr Makowski <pzaryk@aviary.pl>\n" |
1144 | "Language-Team: Piotr Makowski (Aviary.pl) <pmakowski@aviary.pl>\n" |
1145 | @@ -16,6 +16,68 @@ |
1146 | "X-Poedit-Country: POLAND\n" |
1147 | "X-Poedit-SourceCharset: utf-8\n" |
1148 | |
1149 | +#. It would be nice if we could produce better messages than these, but |
1150 | +#. that would require a richer interface to the dbus service, and |
1151 | +#. probably to the cruft plugin architecture underneath that. |
1152 | +#. |
1153 | +#: ../computerjanitorapp/gtk/areyousure.py:49 |
1154 | +msgid "Are you sure you want to clean up?" |
1155 | +msgstr "" |
1156 | + |
1157 | +#. FIXME: For lucid+1 use this message. (LP: #552777) |
1158 | +#. messages.insert(1, _('Non-package items to remove: {others}.')) |
1159 | +#. |
1160 | +#: ../computerjanitorapp/gtk/areyousure.py:57 |
1161 | +#: ../computerjanitorapp/gtk/areyousure.py:80 |
1162 | +#, fuzzy |
1163 | +msgid "Clean up" |
1164 | +msgstr "_Wyczyść" |
1165 | + |
1166 | +#: ../computerjanitorapp/gtk/areyousure.py:64 |
1167 | +#, python-format |
1168 | +msgid "" |
1169 | +"You have chosen to <b>remove %d software packages.</b> Removing packages " |
1170 | +"that are still needed can cause errors." |
1171 | +msgstr "" |
1172 | + |
1173 | +#. FIXME: For lucid+1 use this. (LP: #552777) |
1174 | +#. # messages = [ |
1175 | +#. # _('<b>Software packages to remove: {packages}</b>.'), |
1176 | +#. # _('\nRemoving packages that are still in use can ' |
1177 | +#. # 'cause errors.'), |
1178 | +#. # ] |
1179 | +#. # |
1180 | +#: ../computerjanitorapp/gtk/areyousure.py:75 |
1181 | +#, fuzzy |
1182 | +msgid "Remove packages" |
1183 | +msgstr "pakiet .deb" |
1184 | + |
1185 | +#: ../computerjanitorapp/gtk/ui.py:48 |
1186 | +msgid "Package will be <b>removed</b>." |
1187 | +msgstr "" |
1188 | + |
1189 | +#: ../computerjanitorapp/gtk/ui.py:49 |
1190 | +msgid "Package will be <b>installed</b>." |
1191 | +msgstr "" |
1192 | + |
1193 | +#: ../computerjanitorapp/gtk/ui.py:50 |
1194 | +msgid "File will be <b>removed</b>." |
1195 | +msgstr "" |
1196 | + |
1197 | +#: ../computerjanitorapp/gtk/ui.py:264 |
1198 | +#, python-format |
1199 | +msgid "Size: %s." |
1200 | +msgstr "" |
1201 | + |
1202 | +#: ../computerjanitorapp/gtk/ui.py:348 |
1203 | +msgid "Processing {0}" |
1204 | +msgstr "" |
1205 | + |
1206 | +#: ../computerjanitorapp/gtk/ui.py:471 |
1207 | +#: ../data/computer-janitor-gtk.desktop.in.h:2 |
1208 | +msgid "Computer Janitor" |
1209 | +msgstr "" |
1210 | + |
1211 | #: ../computerjanitorapp/cli/main.py:51 |
1212 | #, fuzzy |
1213 | msgid "" |
1214 | @@ -108,59 +170,6 @@ |
1215 | msgid "removable" |
1216 | msgstr "możliwe do usunięcia" |
1217 | |
1218 | -#: ../computerjanitorapp/gtk/ui.py:48 |
1219 | -msgid "Package will be <b>removed</b>." |
1220 | -msgstr "" |
1221 | - |
1222 | -#: ../computerjanitorapp/gtk/ui.py:49 |
1223 | -msgid "Package will be <b>installed</b>." |
1224 | -msgstr "" |
1225 | - |
1226 | -#: ../computerjanitorapp/gtk/ui.py:50 |
1227 | -msgid "File will be <b>removed</b>." |
1228 | -msgstr "" |
1229 | - |
1230 | -#: ../computerjanitorapp/gtk/ui.py:336 |
1231 | -msgid "Processing {0}" |
1232 | -msgstr "" |
1233 | - |
1234 | -#: ../computerjanitorapp/gtk/ui.py:459 |
1235 | -#: ../data/computer-janitor-gtk.desktop.in.h:2 |
1236 | -msgid "Computer Janitor" |
1237 | -msgstr "" |
1238 | - |
1239 | -#. It would be nice if we could produce better messages than these, but |
1240 | -#. that would require a richer interface to the dbus service, and |
1241 | -#. probably to the cruft plugin architecture underneath that. |
1242 | -#: ../computerjanitorapp/gtk/areyousure.py:48 |
1243 | -msgid "Are you sure you want to clean your system?" |
1244 | -msgstr "" |
1245 | - |
1246 | -#: ../computerjanitorapp/gtk/areyousure.py:54 |
1247 | -#: ../computerjanitorapp/gtk/areyousure.py:66 |
1248 | -#, fuzzy |
1249 | -msgid "Clean up" |
1250 | -msgstr "_Wyczyść" |
1251 | - |
1252 | -#: ../computerjanitorapp/gtk/areyousure.py:60 |
1253 | -msgid "<b>Software packages to remove: {packages}</b>." |
1254 | -msgstr "" |
1255 | - |
1256 | -#: ../computerjanitorapp/gtk/areyousure.py:61 |
1257 | -msgid "" |
1258 | -"\n" |
1259 | -"Removing packages that are still in use can cause errors." |
1260 | -msgstr "" |
1261 | - |
1262 | -#: ../computerjanitorapp/gtk/areyousure.py:63 |
1263 | -#, fuzzy |
1264 | -msgid "Remove packages" |
1265 | -msgstr "pakiet .deb" |
1266 | - |
1267 | -#: ../computerjanitorapp/gtk/areyousure.py:65 |
1268 | -msgid "Non-package items to remove: {others}." |
1269 | -msgstr "" |
1270 | - |
1271 | #: ../data/computer-janitor-gtk.desktop.in.h:1 |
1272 | msgid "Clean up a system so it's more like a freshly installed one" |
1273 | msgstr "" |
Thanks, this looks fine.
Please note a minor gotcha:
+ #message = _('Are you sure you want to clean your system?')
+ message = _('Are you sure you want to clean up?')
A comment right above a gettext invocation is usually considered a translator comment, and will appear in .po files and Rosetta when translating. That might look a little confusing here, but I don't think it's a big deal.
(You might move the future string below it, though)