From 659868a2c75856e1bb51ceb2e8ebee52e6f3d820 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Tue, 12 Sep 2006 15:18:43 +0200 Subject: * Remove the obsolete Enabled property completely from the code --- SoftwareProperties/SoftwareProperties.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'SoftwareProperties') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index a18fec20..f2a2cc19 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -261,7 +261,7 @@ class SoftwareProperties(SimpleGladeApp): # TRANSLATORS: Label for the components in the Internet section # first %s is the description of the component # second %s is the code name of the comp, eg main, universe - label = _("%s (%s)") % (self.distro.source_template.components[comp][2], + label = _("%s (%s)") % (self.distro.source_template.components[comp][1], comp) checkbox = gtk.CheckButton(label) # check if the comp is enabled @@ -721,7 +721,7 @@ class SoftwareProperties(SimpleGladeApp): for comp in source.comps: if source.template.components.has_key(comp): print source.template.components[comp] - (desc, enabled, desc_long) = source.template.components[comp] + (desc, desc_long) = source.template.components[comp] contents += "\n%s" % desc else: contents += "\n%s" % comp -- cgit v1.2.3 From c5c5f86db727831f68c93e7a388e4e2cb8491cb6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Sep 2006 16:51:08 +0200 Subject: * typo fixes (thanks to Bruce Cowan) --- DistUpgrade/DistUpgradeCache.py | 4 ++-- DistUpgrade/DistUpgradeControler.py | 2 +- DistUpgrade/DistUpgradeViewGtk.py | 12 ++++++------ SoftwareProperties/SoftwareProperties.py | 2 +- UpdateManager/DistUpgradeFetcher.py | 2 +- data/channels/Ubuntu.info.in | 14 +++++++------- data/update-manager.schemas.in | 4 ++-- debian/changelog | 8 ++++++++ 8 files changed, 28 insertions(+), 20 deletions(-) (limited to 'SoftwareProperties') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 680e7d9e..3c0efffa 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -155,7 +155,7 @@ class MyCache(apt.Cache): except SystemError, e: # FIXME: change the text to something more useful view.error(_("Could not calculate the upgrade"), - _("A unresolvable problem occured while " + _("A unresolvable problem occurred while " "calculating the upgrade.\n\n" "Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ " @@ -259,7 +259,7 @@ class MyCache(apt.Cache): "ubuntu-desktop, kubuntu-desktop or " "edubuntu-desktop package and it was not " "possible to detect which version of " - "ubuntu you are runing.\n " + "ubuntu you are running.\n " "Please install one of the packages " "above first using synaptic or " "apt-get before proceeding.")) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 800590cb..52670371 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -293,7 +293,7 @@ class DistUpgradeControler(object): if self.sources_disabled: self._view.information(_("Third party sources disabled"), - _("Some third party entries in your souces.list " + _("Some third party entries in your sources.list " "were disabled. You can re-enable them " "after the upgrade with the " "'software-properties' tool or with synaptic." diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 5a3779e9..1385d18f 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -484,19 +484,19 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): if pkgs_remove > 0: # FIXME: make those two seperate lines to make it clear # that the "%" applies to the result of ngettext - msg += gettext.ngettext("%s package is going to be removed.", - "%s packages are going to be removed.", + msg += gettext.ngettext("%d package is going to be removed.", + "%d packages are going to be removed.", pkgs_remove) % pkgs_remove msg += " " if pkgs_inst > 0: - msg += gettext.ngettext("%s new package is going to be " + msg += gettext.ngettext("%d new package is going to be " "installed.", - "%s new packages are going to be " + "%d new packages are going to be " "installed.",pkgs_inst) % pkgs_inst msg += " " if pkgs_upgrade > 0: - msg += gettext.ngettext("%s package is going to be upgraded.", - "%s packages are going to be upgraded.", + msg += gettext.ngettext("%d package is going to be upgraded.", + "%d packages are going to be upgraded.", pkgs_upgrade) % pkgs_upgrade msg +=" " if downloadSize > 0: diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index f2a2cc19..1c8a3425 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -1033,7 +1033,7 @@ class SoftwareProperties(SimpleGladeApp): type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK, message_format=None) - dialog.set_markup(_("Error scaning the CD\n\n%s"%msg)) + dialog.set_markup(_("Error scanning the CD\n\n%s"%msg)) res = dialog.run() dialog.destroy() return diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index af07cfb4..cda27e2f 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -219,7 +219,7 @@ class DistUpgradeFetcher(object): if not self.verifyDistUprader(): error(self.window_main, _("Verfication failed"), - _("Verfing the upgrade failed. There may be a problem " + _("Verifying the upgrade failed. There may be a problem " "with the network or with the server. ")) self.cleanup() return diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index d6070790..1afc66c9 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -25,7 +25,7 @@ BaseURI: cdrom:\[Ubuntu.*6.10 _Description: Cdrom with Ubuntu 6.10 'Edgy Eft' Available: False Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright @@ -76,7 +76,7 @@ BaseURI: cdrom:\[Ubuntu.*6.06 _Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' Available: False Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright @@ -123,7 +123,7 @@ BaseURI: cdrom:\[Ubuntu.*5.10 _Description: Cdrom with Ubuntu 5.10 'Breezy Badger' Available: False Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright @@ -151,7 +151,7 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright Component: universe @@ -165,7 +165,7 @@ BaseURI: cdrom:\[Ubuntu.*5.04 _Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' Available: False Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright @@ -192,7 +192,7 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 'Warty Warthog' Component: main -_CompDescription: No longer oficially supported +_CompDescription: No longer officially supported Component: restricted _CompDescription: Restricted copyright Component: universe @@ -206,7 +206,7 @@ BaseURI: cdrom:\[Ubuntu.*4.10 _Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main -_CompDescription: No longer oficially supported +_CompDescription: No longer officially supported Component: restricted _CompDescription: Restricted copyright diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index ad72c893..3740318c 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -11,7 +11,7 @@ Remind to reload the channel list - If automatic checking for updates is disabeld, you have + If automatic checking for updates is disabled, you have to reload the channel list manually. This option allows to hide the reminder shown in this case. @@ -28,7 +28,7 @@ Show details of an update Stores the state of the expander that contains the - list of changs and the description + list of changes and the description diff --git a/debian/changelog b/debian/changelog index 71fd5f23..a6886655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +update-manager (0.44.12) edgy; urgency=low + + * DistUpgrade/DistUpgradeViewGtk.py: + - use '%d' instead of '%s' where appropriate + * fixed lots of typos (lp: #60633) + + -- Michael Vogt Mon, 18 Sep 2006 16:37:52 +0200 + update-manager (0.44.11) edgy; urgency=low * UpdateManager/UpdateManager.py: -- cgit v1.2.3