From 5f1f74aabdbae3796555f57c3784c9c4da610b8f Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 23 Apr 2006 16:16:19 +0200 Subject: * Fix a "poor" wording - #40727 --- data/UpdateManager.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index 01660613..97fcbafb 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -89,7 +89,7 @@ True - Software updates can correct errors, eliminate security vulnerabilities, and provide new features to you. + Software updates correct errors, eliminate security vulnerabilities and provide new features. False False GTK_JUSTIFY_LEFT @@ -1364,7 +1364,7 @@ Your system does not check for updates automatically. You can configure this beh True <big><b>Analysing your system</b></big> -Software updates can correct errors, eliminate security vulnerabilities, and provide new features to you. +Software updates correct errors, eliminate security vulnerabilities and provide new features. False True GTK_JUSTIFY_LEFT -- cgit v1.2.3 From c694583903af0139d3e73ddf2eee34eb5a506d80 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 23 Apr 2006 20:52:54 +0200 Subject: * Fix the use of gettext in UpdateManager : You can install X updates * Do not mention the need of the unanttended-updates package - the tooltip isn't even shown if the option is disabled * Fix the channel terminolgy in the add custom apt line dialog --- DistUpgrade/DistUpgradeViewGtk.py | 3 ++- UpdateManager/UpdateManager.py | 9 ++++++--- data/SoftwareProperties.glade | 2 +- data/SoftwarePropertiesDialogs.glade | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 3236ba14..dba8014f 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -299,7 +299,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): logging.error("not handled expection:\n%s" % "\n".join(lines)) self.error(_("A fatal error occured"), _("Please report this as a bug and include the " - "files ~/dist-upgrade.log and ~/dist-upgrade-apt.log " + "files '/var/log/dist-upgrade.log' and " + "'/var/log/dist-upgrade-apt.log' " "in your report. The upgrade aborts now. "), "\n".join(lines)) sys.exit(1) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 59a19612..b4090589 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -437,9 +437,12 @@ class UpdateManager(SimpleGladeApp): self.textview_changes.get_buffer().set_text("") self.textview_descr.get_buffer().set_text("") else: - text_header = ""+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"" - - text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size)) + text_header = "" + \ + gettext.ngettext("You can install %s update", + "You can install %s updates", + len(self.store)) % \ + len(self.store) + "" + text_download = _("Download size: %s") % apt_pkg.SizeToStr(self.dl_size) self.notebook_details.set_sensitive(True) self.treeview_update.set_sensitive(True) self.button_install.grab_default() diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 58584826..a1f7f8f9 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -390,7 +390,7 @@ True - Only security updates from the official Ubuntu servers will be installed automatically. The software package "unattended-upgrades" needs to be installed therefor + Only security updates from the official Ubuntu servers will be installed automatically True _Install security updates without confirmation True diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index 549a9c7c..8c5b00c6 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/SoftwarePropertiesDialogs.glade @@ -451,7 +451,7 @@ True <big><b>Enter the complete APT line of the channel that you want to add</b></big> -The APT line contains the type, location and sections of a channel, for example <i>"deb http://ftp.debian.org sarge main"</i>. +The APT line includes the type, location and components of a channel, for example <i>"deb http://ftp.debian.org sarge main"</i>. False True GTK_JUSTIFY_LEFT -- cgit v1.2.3 From 07abcc6b0dbf317b134f8486541b9c12d3637ee6 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 25 Apr 2006 15:52:01 +0200 Subject: * avoid an American/British English spelling issue - fix for bug #40425 --- data/UpdateManager.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index 97fcbafb..6600dd05 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -1362,7 +1362,7 @@ Your system does not check for updates automatically. You can configure this beh True - <big><b>Analysing your system</b></big> + <big><b>Examining your system</b></big> Software updates correct errors, eliminate security vulnerabilities and provide new features. False -- cgit v1.2.3