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

[Matthew Paul Thomas]

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.)

[lp:~mpt/aptdaemon/language-fixes]

454. By Matthew Paul Thomas on 2010-08-17

Adds a missing word.

[Sebastian Heinlein (glatzor)]

review: Approve

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2010-08-12 10:02:28 +0000
+++ aptdaemon/core.py	2010-08-17 15:28:43 +0000
@@ -476,7 +476,7 @@
         medium -- the CD/DVD label
         drive -- mount point of the drive
         """
-        log_trans.debug("Emitting MediumRequierd: %s, %s" % (medium, drive))
+        log_trans.debug("Emitting MediumRequired: %s, %s" % (medium, drive))
 
     @dbus.service.signal(dbus_interface=APTDAEMON_TRANSACTION_DBUS_INTERFACE,
                          signature="ss")

=== modified file 'aptdaemon/enums.py'
--- aptdaemon/enums.py	2010-07-14 08:38:42 +0000
+++ aptdaemon/enums.py	2010-08-17 15:28:43 +0000
@@ -230,17 +230,16 @@
                            "Terminal: apt-get install -f"),
     ERROR_KEY_NOT_INSTALLED : _("The selected file may not be a GPG key file "
                                 "or it might be corrupt."),
-    ERROR_KEY_NOT_REMOVED : _("The selected key couldn't be removed "
-                               "Check if you provided a valid fingerprint."),
+    ERROR_KEY_NOT_REMOVED : _("The selected key couldn't be removed. "
+                              "Check that you provided a valid fingerprint."),
     ERROR_NO_LOCK : _("Check if you are currently running another "
                       "software management tool, e.g. Synaptic or aptitude. "
-                      "Only one tool is allowed to make changes at the "
-                      "same time."),
+                      "Only one tool is allowed to make changes at a time."),
     ERROR_NO_CACHE : _("This is a serious problem. Try again later. If this "
                        "problem appears again, please report an error to the "
                        "developers."),
-    ERROR_NO_PACKAGE : _("Check the spelling of the package name and if you "
-                         "have got enabled the corresponding repository."),
+    ERROR_NO_PACKAGE : _("Check the spelling of the package name, and "
+                         "that the appropriate repository is enabled."),
     ERROR_PACKAGE_UPTODATE : _("There isn't any need for an update."),
     ERROR_PACKAGE_ALREADY_INSTALLED : _("There isn't any need for an "
                                         "installation"),

=== modified file 'aptdaemon/gtkwidgets.py'
--- aptdaemon/gtkwidgets.py	2010-08-12 10:19:19 +0000
+++ aptdaemon/gtkwidgets.py	2010-08-17 15:28:43 +0000
@@ -247,11 +247,11 @@
 
     def _on_status_changed(self, transaction, status):
         """Set the status text according to the changed status"""
-        self.set_markup("<i>%s</i>" % get_status_string_from_enum(status))
+        self.set_markup(get_status_string_from_enum(status))
 
     def _on_status_details_changed(self, transaction, text):
         """Set the status text to the one reported by apt"""
-        self.set_markup("<i>%s</i>" % text)
+        self.set_markup(text)
 
 
 class AptProgressBar(gtk.ProgressBar):
@@ -489,7 +489,7 @@
             progress = 100
         text = desc[:]
         text += "\n<small>"
-        #TRANSLATORS: %s is the a fill size in Bytes, e.g. 198M
+        #TRANSLATORS: %s is the full size in Bytes, e.g. 198M
         if status == DOWNLOAD_FETCHING:
             text += _("Downloaded %sB of %sB") % \
                     (apt_pkg.size_to_str(downloaded),
@@ -779,7 +779,7 @@
         text = _("CD/DVD '%s' is required") % medium
         #TRANSLATORS: %s is the name of the CD/DVD drive
         desc = _("Please insert the above CD/DVD into the drive '%s' to "
-                 "install software packages from the medium.") % drive
+                 "install software packages from it.") % drive
         self.set_markup("<big><b>%s</b></big>\n\n%s" % (text, desc))
         self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
                          _("C_ontinue"), gtk.RESPONSE_OK)
@@ -852,7 +852,7 @@
         """Show a message and the dependencies in the dialog."""
         self.treestore.clear()
         for index, msg in enumerate([_("Install"),
-                                     _("Re-install"),
+                                     _("Reinstall"),
                                      _("Remove"),
                                      _("Purge"),
                                      _("Upgrade"),
@@ -899,7 +899,7 @@
             self.treeview.collapse_all()
         if self.trans.download:
             msg += "\n"
-            msg += _("You have to totally download %sB.") % \
+            msg += _("%sB will be downloaded in total.") % \
                     apt_pkg.size_to_str(self.trans.download)
         if self.trans.space < 0:
             msg += "\n"
@@ -907,7 +907,7 @@
                     apt_pkg.size_to_str(self.trans.space)
         elif self.trans.space > 0:
             msg += "\n"
-            msg += _("%sB of additional disk space will be used.") % \
+            msg += _("%sB more disk space will be used.") % \
                     apt_pkg.size_to_str(self.trans.space)
         self.label.set_markup("<b><big>%s</big></b>\n\n%s" % (title, msg))
 

=== modified file 'aptdaemon/progress.py'
--- aptdaemon/progress.py	2010-07-17 15:35:00 +0000
+++ aptdaemon/progress.py	2010-08-17 15:28:43 +0000
@@ -402,7 +402,7 @@
                 try:
                     os.write(target, char)
                 except OSError:
-                    log.debug("Faild to write to controlling terminal")
+                    log.debug("Failed to write to controlling terminal")
             return True
         os.close(source)
         return False

=== modified file 'aptdaemon/worker.py'
--- aptdaemon/worker.py	2010-08-13 06:02:39 +0000
+++ aptdaemon/worker.py	2010-08-17 15:28:43 +0000
@@ -131,7 +131,7 @@
         """
         log.info("Processing transaction %s", transaction.tid)
         if self.trans:
-            raise Exception("There is already a running transacion")
+            raise Exception("There is already a running transaction")
         self.trans = transaction
         gobject.idle_add(self._process_transaction)
 
@@ -1044,7 +1044,7 @@
         """
         log.info("Processing transaction %s", transaction.tid)
         if self.trans:
-            raise Exception("There is already a running transacion")
+            raise Exception("There is already a running transaction")
         self.trans = transaction
         self.last_action_timestamp = time.time()
         self.trans.status = STATUS_RUNNING

=== modified file 'data/org.debian.apt.policy.in'
--- data/org.debian.apt.policy.in	2010-07-20 14:22:57 +0000
+++ data/org.debian.apt.policy.in	2010-08-17 15:28:43 +0000
@@ -10,7 +10,7 @@
 
   <action id="org.debian.apt.install-packages">
     <_description>Install packages</_description>
-    <_message>Authentication is required to install software packages</_message>
+    <_message>To install software, you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -21,7 +21,7 @@
   <action id="org.debian.apt.add-vendor-key">
     <description>Add a vendor key to the trusted ones</description>
     <message>
-      Authentication is required to install a repository key.
+      To install a repository key, you need to authenticate.
     </message>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -33,7 +33,7 @@
   <action id="org.debian.apt.remove-vendor-key">
     <description>Remove a trusted vendor key</description>
     <message>
-      Authentication is required to remove repository key.
+      To remove a repository key, you need to authenticate.
     </message>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -45,7 +45,7 @@
   <action id="org.debian.apt.get-trusted-vendor-keys">
     <description>List keys of trusted vendors</description>
     <message>
-      Authentication is required to view trusted keys.
+      To view the list of trusted keys, you need to authenticate.
     </message>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -57,7 +57,7 @@
   <action id="org.debian.apt.change-repository">
     <description>Change software repository</description>
     <message>
-      Authentication is required to add, remove or modify software repositories.
+      To change software repository settings, you need to authenticate.
     </message>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -69,7 +69,7 @@
   <action id="org.debian.apt.install-file">
     <_description>Install package file</_description>
     <_message>
-      Authentication is required to install a local package file.
+      To install this package, you need to authenticate.
     </_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -80,7 +80,7 @@
 
   <action id="org.debian.apt.fix">
     <_description>Repair broken installations</_description>
-    <_message>Authentication is required to repair broken installations</_message>
+    <_message>To repair installed software, you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -90,7 +90,7 @@
 
   <action id="org.debian.apt.update-cache">
     <_description>Update package information</_description>
-    <_message>Authentication is required to query the software repositories for installable packages</_message>
+    <_message>To update the software catalog, you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -100,7 +100,7 @@
 
   <action id="org.debian.apt.remove-packages">
     <_description>Remove packages</_description>
-    <_message>Authentication is required to remove software packages</_message>
+    <_message>To remove software, you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -110,7 +110,7 @@
 
   <action id="org.debian.apt.upgrade-packages">
     <_description>Upgrade packages</_description>
-    <_message>Authentication is required to upgrade software packages</_message>
+    <_message>To install updated software, you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -120,7 +120,7 @@
 
   <action id="org.debian.apt.upgrade-system">
     <_description>Upgrade system</_description>
-    <_message>Authentication is required to upgrade the system</_message>
+    <_message>To upgrade the operating system, you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -131,8 +131,7 @@
   <action id="org.debian.apt.cancel-foreign">
     <_description>Cancel the task of another user</_description>
     <_message>
-      Authentication is required to cancel the package management tasks of
-      another user.
+      To cancel someone else&#8217;s software changes, you need to authenticate.
     </_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -144,8 +143,7 @@
   <action id="org.debian.apt.set-proxy">
     <_description>Set a proxy for software downloads</_description>
     <_message>
-      Authentication is required to use a proxy server for
-      downloading software packages.
+      To use a proxy server for downloading software, you need to authenticate.
     </_message>
     <defaults>
       <allow_any>auth_admin</allow_any>