Merge lp:~mpt/aptdaemon/language-fixes into lp:aptdaemon

Proposed by Matthew Paul Thomas
Status: Merged
Merged at revision: 452
Proposed branch: lp:~mpt/aptdaemon/language-fixes
Merge into: lp:aptdaemon
Diff against target: 260 lines (+29/-32)
6 files modified
aptdaemon/core.py (+1/-1)
aptdaemon/enums.py (+5/-6)
aptdaemon/gtkwidgets.py (+7/-7)
aptdaemon/progress.py (+1/-1)
aptdaemon/worker.py (+2/-2)
data/org.debian.apt.policy.in (+13/-15)
To merge this branch: bzr merge lp:~mpt/aptdaemon/language-fixes
Reviewer Review Type Date Requested Status
Sebastian Heinlein Approve
Review via email: mp+32880@code.launchpad.net

Description of the change

Shortens PolicyKit prompt text, and rewords it to put the reason for authentication at the start of the sentence. For example, "Authentication is required to install software packages" becomes "To install software, you need to authenticate.". Also corrects various spelling and grammar glitches elsewhere in aptdaemon. Error messages will need to be fixed later.

Disclaimer: I have not tested my changes at all. (I'm not even sure how to go about that.)

To post a comment you must log in.
lp:~mpt/aptdaemon/language-fixes updated
454. By Matthew Paul Thomas

Adds a missing word.

Revision history for this message
Sebastian Heinlein (glatzor) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'aptdaemon/core.py'
2--- aptdaemon/core.py 2010-08-12 10:02:28 +0000
3+++ aptdaemon/core.py 2010-08-17 15:28:43 +0000
4@@ -476,7 +476,7 @@
5 medium -- the CD/DVD label
6 drive -- mount point of the drive
7 """
8- log_trans.debug("Emitting MediumRequierd: %s, %s" % (medium, drive))
9+ log_trans.debug("Emitting MediumRequired: %s, %s" % (medium, drive))
10
11 @dbus.service.signal(dbus_interface=APTDAEMON_TRANSACTION_DBUS_INTERFACE,
12 signature="ss")
13
14=== modified file 'aptdaemon/enums.py'
15--- aptdaemon/enums.py 2010-07-14 08:38:42 +0000
16+++ aptdaemon/enums.py 2010-08-17 15:28:43 +0000
17@@ -230,17 +230,16 @@
18 "Terminal: apt-get install -f"),
19 ERROR_KEY_NOT_INSTALLED : _("The selected file may not be a GPG key file "
20 "or it might be corrupt."),
21- ERROR_KEY_NOT_REMOVED : _("The selected key couldn't be removed "
22- "Check if you provided a valid fingerprint."),
23+ ERROR_KEY_NOT_REMOVED : _("The selected key couldn't be removed. "
24+ "Check that you provided a valid fingerprint."),
25 ERROR_NO_LOCK : _("Check if you are currently running another "
26 "software management tool, e.g. Synaptic or aptitude. "
27- "Only one tool is allowed to make changes at the "
28- "same time."),
29+ "Only one tool is allowed to make changes at a time."),
30 ERROR_NO_CACHE : _("This is a serious problem. Try again later. If this "
31 "problem appears again, please report an error to the "
32 "developers."),
33- ERROR_NO_PACKAGE : _("Check the spelling of the package name and if you "
34- "have got enabled the corresponding repository."),
35+ ERROR_NO_PACKAGE : _("Check the spelling of the package name, and "
36+ "that the appropriate repository is enabled."),
37 ERROR_PACKAGE_UPTODATE : _("There isn't any need for an update."),
38 ERROR_PACKAGE_ALREADY_INSTALLED : _("There isn't any need for an "
39 "installation"),
40
41=== modified file 'aptdaemon/gtkwidgets.py'
42--- aptdaemon/gtkwidgets.py 2010-08-12 10:19:19 +0000
43+++ aptdaemon/gtkwidgets.py 2010-08-17 15:28:43 +0000
44@@ -247,11 +247,11 @@
45
46 def _on_status_changed(self, transaction, status):
47 """Set the status text according to the changed status"""
48- self.set_markup("<i>%s</i>" % get_status_string_from_enum(status))
49+ self.set_markup(get_status_string_from_enum(status))
50
51 def _on_status_details_changed(self, transaction, text):
52 """Set the status text to the one reported by apt"""
53- self.set_markup("<i>%s</i>" % text)
54+ self.set_markup(text)
55
56
57 class AptProgressBar(gtk.ProgressBar):
58@@ -489,7 +489,7 @@
59 progress = 100
60 text = desc[:]
61 text += "\n<small>"
62- #TRANSLATORS: %s is the a fill size in Bytes, e.g. 198M
63+ #TRANSLATORS: %s is the full size in Bytes, e.g. 198M
64 if status == DOWNLOAD_FETCHING:
65 text += _("Downloaded %sB of %sB") % \
66 (apt_pkg.size_to_str(downloaded),
67@@ -779,7 +779,7 @@
68 text = _("CD/DVD '%s' is required") % medium
69 #TRANSLATORS: %s is the name of the CD/DVD drive
70 desc = _("Please insert the above CD/DVD into the drive '%s' to "
71- "install software packages from the medium.") % drive
72+ "install software packages from it.") % drive
73 self.set_markup("<big><b>%s</b></big>\n\n%s" % (text, desc))
74 self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
75 _("C_ontinue"), gtk.RESPONSE_OK)
76@@ -852,7 +852,7 @@
77 """Show a message and the dependencies in the dialog."""
78 self.treestore.clear()
79 for index, msg in enumerate([_("Install"),
80- _("Re-install"),
81+ _("Reinstall"),
82 _("Remove"),
83 _("Purge"),
84 _("Upgrade"),
85@@ -899,7 +899,7 @@
86 self.treeview.collapse_all()
87 if self.trans.download:
88 msg += "\n"
89- msg += _("You have to totally download %sB.") % \
90+ msg += _("%sB will be downloaded in total.") % \
91 apt_pkg.size_to_str(self.trans.download)
92 if self.trans.space < 0:
93 msg += "\n"
94@@ -907,7 +907,7 @@
95 apt_pkg.size_to_str(self.trans.space)
96 elif self.trans.space > 0:
97 msg += "\n"
98- msg += _("%sB of additional disk space will be used.") % \
99+ msg += _("%sB more disk space will be used.") % \
100 apt_pkg.size_to_str(self.trans.space)
101 self.label.set_markup("<b><big>%s</big></b>\n\n%s" % (title, msg))
102
103
104=== modified file 'aptdaemon/progress.py'
105--- aptdaemon/progress.py 2010-07-17 15:35:00 +0000
106+++ aptdaemon/progress.py 2010-08-17 15:28:43 +0000
107@@ -402,7 +402,7 @@
108 try:
109 os.write(target, char)
110 except OSError:
111- log.debug("Faild to write to controlling terminal")
112+ log.debug("Failed to write to controlling terminal")
113 return True
114 os.close(source)
115 return False
116
117=== modified file 'aptdaemon/worker.py'
118--- aptdaemon/worker.py 2010-08-13 06:02:39 +0000
119+++ aptdaemon/worker.py 2010-08-17 15:28:43 +0000
120@@ -131,7 +131,7 @@
121 """
122 log.info("Processing transaction %s", transaction.tid)
123 if self.trans:
124- raise Exception("There is already a running transacion")
125+ raise Exception("There is already a running transaction")
126 self.trans = transaction
127 gobject.idle_add(self._process_transaction)
128
129@@ -1044,7 +1044,7 @@
130 """
131 log.info("Processing transaction %s", transaction.tid)
132 if self.trans:
133- raise Exception("There is already a running transacion")
134+ raise Exception("There is already a running transaction")
135 self.trans = transaction
136 self.last_action_timestamp = time.time()
137 self.trans.status = STATUS_RUNNING
138
139=== modified file 'data/org.debian.apt.policy.in'
140--- data/org.debian.apt.policy.in 2010-07-20 14:22:57 +0000
141+++ data/org.debian.apt.policy.in 2010-08-17 15:28:43 +0000
142@@ -10,7 +10,7 @@
143
144 <action id="org.debian.apt.install-packages">
145 <_description>Install packages</_description>
146- <_message>Authentication is required to install software packages</_message>
147+ <_message>To install software, you need to authenticate.</_message>
148 <defaults>
149 <allow_any>auth_admin</allow_any>
150 <allow_inactive>auth_admin</allow_inactive>
151@@ -21,7 +21,7 @@
152 <action id="org.debian.apt.add-vendor-key">
153 <description>Add a vendor key to the trusted ones</description>
154 <message>
155- Authentication is required to install a repository key.
156+ To install a repository key, you need to authenticate.
157 </message>
158 <defaults>
159 <allow_any>auth_admin</allow_any>
160@@ -33,7 +33,7 @@
161 <action id="org.debian.apt.remove-vendor-key">
162 <description>Remove a trusted vendor key</description>
163 <message>
164- Authentication is required to remove repository key.
165+ To remove a repository key, you need to authenticate.
166 </message>
167 <defaults>
168 <allow_any>auth_admin</allow_any>
169@@ -45,7 +45,7 @@
170 <action id="org.debian.apt.get-trusted-vendor-keys">
171 <description>List keys of trusted vendors</description>
172 <message>
173- Authentication is required to view trusted keys.
174+ To view the list of trusted keys, you need to authenticate.
175 </message>
176 <defaults>
177 <allow_any>auth_admin</allow_any>
178@@ -57,7 +57,7 @@
179 <action id="org.debian.apt.change-repository">
180 <description>Change software repository</description>
181 <message>
182- Authentication is required to add, remove or modify software repositories.
183+ To change software repository settings, you need to authenticate.
184 </message>
185 <defaults>
186 <allow_any>auth_admin</allow_any>
187@@ -69,7 +69,7 @@
188 <action id="org.debian.apt.install-file">
189 <_description>Install package file</_description>
190 <_message>
191- Authentication is required to install a local package file.
192+ To install this package, you need to authenticate.
193 </_message>
194 <defaults>
195 <allow_any>auth_admin</allow_any>
196@@ -80,7 +80,7 @@
197
198 <action id="org.debian.apt.fix">
199 <_description>Repair broken installations</_description>
200- <_message>Authentication is required to repair broken installations</_message>
201+ <_message>To repair installed software, you need to authenticate.</_message>
202 <defaults>
203 <allow_any>auth_admin</allow_any>
204 <allow_inactive>auth_admin</allow_inactive>
205@@ -90,7 +90,7 @@
206
207 <action id="org.debian.apt.update-cache">
208 <_description>Update package information</_description>
209- <_message>Authentication is required to query the software repositories for installable packages</_message>
210+ <_message>To update the software catalog, you need to authenticate.</_message>
211 <defaults>
212 <allow_any>auth_admin</allow_any>
213 <allow_inactive>auth_admin</allow_inactive>
214@@ -100,7 +100,7 @@
215
216 <action id="org.debian.apt.remove-packages">
217 <_description>Remove packages</_description>
218- <_message>Authentication is required to remove software packages</_message>
219+ <_message>To remove software, you need to authenticate.</_message>
220 <defaults>
221 <allow_any>auth_admin</allow_any>
222 <allow_inactive>auth_admin</allow_inactive>
223@@ -110,7 +110,7 @@
224
225 <action id="org.debian.apt.upgrade-packages">
226 <_description>Upgrade packages</_description>
227- <_message>Authentication is required to upgrade software packages</_message>
228+ <_message>To install updated software, you need to authenticate.</_message>
229 <defaults>
230 <allow_any>auth_admin</allow_any>
231 <allow_inactive>auth_admin</allow_inactive>
232@@ -120,7 +120,7 @@
233
234 <action id="org.debian.apt.upgrade-system">
235 <_description>Upgrade system</_description>
236- <_message>Authentication is required to upgrade the system</_message>
237+ <_message>To upgrade the operating system, you need to authenticate.</_message>
238 <defaults>
239 <allow_any>auth_admin</allow_any>
240 <allow_inactive>auth_admin</allow_inactive>
241@@ -131,8 +131,7 @@
242 <action id="org.debian.apt.cancel-foreign">
243 <_description>Cancel the task of another user</_description>
244 <_message>
245- Authentication is required to cancel the package management tasks of
246- another user.
247+ To cancel someone else&#8217;s software changes, you need to authenticate.
248 </_message>
249 <defaults>
250 <allow_any>auth_admin</allow_any>
251@@ -144,8 +143,7 @@
252 <action id="org.debian.apt.set-proxy">
253 <_description>Set a proxy for software downloads</_description>
254 <_message>
255- Authentication is required to use a proxy server for
256- downloading software packages.
257+ To use a proxy server for downloading software, you need to authenticate.
258 </_message>
259 <defaults>
260 <allow_any>auth_admin</allow_any>

Subscribers

People subscribed via source and target branches

to status/vote changes: