From 3c1ef640a38705c80476ccf8d8572602fb5e4f3f Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sat, 7 Apr 2007 10:09:18 +0200 Subject: * make some strings translatable - fix LP#103292 --- po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index d5a84db2..aa82c8cb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ [encoding: UTF-8] [type: gettext/rfc822deb] data/templates/Ubuntu.info.in [type: gettext/rfc822deb] data/templates/Debian.info.in +aptsources/distro.py -- cgit v1.2.3 From e7e07a42983a9f1c14f4f5811d9972933a53e2fb Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sat, 7 Apr 2007 11:08:46 +0200 Subject: * the gettext domain of the iso codes changed --- aptsources/distro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aptsources/distro.py b/aptsources/distro.py index 45a7172d..a5210ace 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -341,7 +341,7 @@ class UbuntuDistribution(Distribution): if self.countries.has_key(country): # TRANSLATORS: %s is a country return _("Server for %s") % \ - gettext.dgettext("iso-3166", + gettext.dgettext("iso_3166", self.countries[country].rstrip()).rstrip() else: return("%s" % server.rstrip("/ ")) -- cgit v1.2.3 From 9569b3127fe51fb514b43033c0462356560f741f Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sat, 7 Apr 2007 11:15:37 +0200 Subject: * Update the German translation --- po/de.po | 99 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 47 insertions(+), 52 deletions(-) diff --git a/po/de.po b/po/de.po index eed6f078..7a96d6d4 100644 --- a/po/de.po +++ b/po/de.po @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-22 15:16+0100\n" -"PO-Revision-Date: 2006-10-16 04:02+0000\n" +"POT-Creation-Date: 2007-04-07 10:08+0200\n" +"PO-Revision-Date: 2007-04-07 11:15+0200\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" +"Plural-Forms: nplurals=2; plural=n != 1" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -26,24 +26,21 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:8 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" +msgstr "Ubuntu 7.04 »Feisty Fawn«" #. Description #: ../data/templates/Ubuntu.info.in:25 -#, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "CD-ROM mit Ubuntu 5.10 \"Breezy Badger\"" +msgstr "CD mit Ubuntu 7.04 »Feisty Fawn«" #. Description #: ../data/templates/Ubuntu.info.in:59 msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 6.10 »Edgy Eft«" #. CompDescription #: ../data/templates/Ubuntu.info.in:64 -#, fuzzy msgid "Community-maintained" msgstr "Von der Ubuntu-Gemeinde betreut" @@ -60,30 +57,27 @@ msgstr "Eingeschränkte Software" #. Description #: ../data/templates/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "CD-ROM mit Ubuntu 6.10 \"Edgy Eft\"" +msgstr "CD mit Ubuntu 6.10 »Edgy Eft«" #. Description #: ../data/templates/Ubuntu.info.in:110 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 LTS »Dapper Drake«" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:113 -#, fuzzy msgid "Canonical-supported Open Source software" -msgstr "Von der Gemeinschaft betreut (Universe)" +msgstr "Von Canonical unterstütze Open-Source-Software" #. CompDescription #: ../data/templates/Ubuntu.info.in:115 -#, fuzzy msgid "Community-maintained (universe)" -msgstr "Von der Gemeinschaft betreut (universe)" +msgstr "Von der Gemeinde betreut (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:116 -#, fuzzy msgid "Community-maintained Open Source software" -msgstr "Von der Ubuntu-Gemeinde betreute Open Source-Software" +msgstr "Von der Ubuntu-Gemeinde betreute Open-Source-Software" #. CompDescription #: ../data/templates/Ubuntu.info.in:118 @@ -103,12 +97,12 @@ msgstr "Eingeschränkte Software (Multiverse)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:122 msgid "Software restricted by copyright or legal issues" -msgstr "" +msgstr "Rechtlich eingeschränkte Software" #. Description #: ../data/templates/Ubuntu.info.in:127 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "CD-ROM mit Ubuntu 6.06 LTS »Dapper Drake«" +msgstr "CD mit Ubuntu 6.06 LTS »Dapper Drake«" #. Description #: ../data/templates/Ubuntu.info.in:139 @@ -118,29 +112,27 @@ msgstr "Wichtige Sicherheitsaktualisierungen" #. Description #: ../data/templates/Ubuntu.info.in:144 msgid "Recommended updates" -msgstr "Empfohlene Updates" +msgstr "Empfohlene Aktualisierungen" #. Description #: ../data/templates/Ubuntu.info.in:149 -#, fuzzy msgid "Pre-released updates" -msgstr "Vorgeschlagene Aktualisierungen" +msgstr "Vorabveröffentlichte Aktualisierungen" #. Description #: ../data/templates/Ubuntu.info.in:154 -#, fuzzy msgid "Unsupported updates" -msgstr "Zurückportierte Aktualisierungen" +msgstr "Nicht unterstütze Aktualisierungen" #. Description #: ../data/templates/Ubuntu.info.in:161 msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "Ubuntu 5.10 \"Breezy Badger\"" +msgstr "Ubuntu 5.10 »Breezy Badger«" #. Description #: ../data/templates/Ubuntu.info.in:174 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "CD-ROM mit Ubuntu 5.10 \"Breezy Badger\"" +msgstr "CD mit Ubuntu 5.10 »Breezy Badger«" #. Description #: ../data/templates/Ubuntu.info.in:186 @@ -160,12 +152,12 @@ msgstr "Ubuntu 5.10 Backports" #. Description #: ../data/templates/Ubuntu.info.in:203 msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 »Hoary Hedgehog«" #. Description #: ../data/templates/Ubuntu.info.in:216 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "CD-ROM mit Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD mit Ubuntu 5.04 »Hoary Hedgehog«" #. CompDescription #: ../data/templates/Ubuntu.info.in:219 ../data/templates/Debian.info.in:94 @@ -190,13 +182,12 @@ msgstr "Ubuntu 5.04 Backports" #. Description #: ../data/templates/Ubuntu.info.in:244 msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 4.10 »Warty Warthog«" #. CompDescription #: ../data/templates/Ubuntu.info.in:250 -#, fuzzy msgid "Community-maintained (Universe)" -msgstr "Von der Gemeinschaft verwaltet (Universe)" +msgstr "Von der Ubuntu-Gemeinde betreut (Universe)" #. CompDescription #: ../data/templates/Ubuntu.info.in:252 @@ -210,9 +201,8 @@ msgstr "CD-ROM mit Ubuntu 4.10 »Warty Warthog«" #. CompDescription #: ../data/templates/Ubuntu.info.in:260 -#, fuzzy msgid "No longer officially supported" -msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" +msgstr "Unterstützung ist ausgelaufen" #. CompDescription #: ../data/templates/Ubuntu.info.in:262 @@ -243,13 +233,12 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 msgid "Debian 4.0 'Etch' " -msgstr "" +msgstr "Debian 4.0 »Etch«" #. Description #: ../data/templates/Debian.info.in:31 -#, fuzzy msgid "Debian 3.1 'Sarge'" -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debian 3.1 »Sarge«" #. Description #: ../data/templates/Debian.info.in:42 @@ -258,26 +247,23 @@ msgstr "Vorgeschlagene Aktualisierungen" #. Description #: ../data/templates/Debian.info.in:47 -#, fuzzy msgid "Security updates" -msgstr "Wichtige Sicherheitsaktualisierungen" +msgstr "Sicherheitsaktualisierungen" #. Description #: ../data/templates/Debian.info.in:54 msgid "Debian current stable release" -msgstr "" +msgstr "Aktuelle stabile Freigabe von Debian" #. Description #: ../data/templates/Debian.info.in:67 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian Testing" #. Description #: ../data/templates/Debian.info.in:92 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" +msgstr "Debian »Sid« (unstable)" #. CompDescription #: ../data/templates/Debian.info.in:96 @@ -289,6 +275,24 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" +#. TRANSLATORS: %s is a country +#: ../aptsources/distro.py:343 +#, python-format +msgid "Server for %s" +msgstr "Server für %s" + +#. More than one server is used. Since we don't handle this case +#. in the user interface we set "custom servers" to true and +#. append a list of all used servers +#: ../aptsources/distro.py:355 ../aptsources/distro.py:360 +#: ../aptsources/distro.py:374 +msgid "Main server" +msgstr "Haupt-Server" + +#: ../aptsources/distro.py:377 +msgid "Custom servers" +msgstr "Benutzerdefinierte Server" + #~ msgid "Daily" #~ msgstr "Täglich" @@ -322,18 +326,9 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "%s (%s)" #~ msgstr "%s (%s)" -#~ msgid "Main server" -#~ msgstr "Haupt-Server" - -#~ msgid "Server for %s" -#~ msgstr "Server für %s" - #~ msgid "Nearest server" #~ msgstr "Nächstgelegener Server" -#~ msgid "Custom servers" -#~ msgstr "Benutzerdefinierte Server" - #, fuzzy #~ msgid "Software Channel" #~ msgstr "Software Kanal" -- cgit v1.2.3 From fd5ca3c33012ce51c4d8a181cc0810e50fe31e6d Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 24 Apr 2007 07:41:05 +0200 Subject: * do not set the child base_uri to the parent one automatically, since we want to know if it a special server was forced * check if a server was forced for a child source before changing it --- aptsources/distinfo.py | 2 -- aptsources/distro.py | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index 674c1bf5..fdd063a5 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -181,8 +181,6 @@ class DistInfo: template.match_uri = nanny.match_uri if template.mirror_set == {}: template.mirror_set = nanny.mirror_set - if template.base_uri == None: - template.base_uri = nanny.base_uri elif field == 'Available': template.available = value elif field == 'RepositoryType': diff --git a/aptsources/distro.py b/aptsources/distro.py index a5210ace..9d3b4105 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -267,11 +267,13 @@ class Distribution: seen_binary = [] seen_source = [] self.default_server = uri - sources = [] - sources.extend(self.main_sources) - sources.extend(self.child_sources) - for source in sources: + for source in self.main_sources: change_server_of_source(source, uri, seen_binary) + for source in self.child_sources: + # Do not change the forces server of a child source + if source.template.base_uri == None or \ + source.template.base_uri != source.uri: + change_server_of_source(source, uri, seen_binary) for source in self.source_code_sources: change_server_of_source(source, uri, seen_source) -- cgit v1.2.3