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