* merged from sebi (http://glatzor.de/bzr/python-apt/sebi)

author: Michael Vogt <michael.vogt@ubuntu.com> 2007-05-02 14:28:44 +0200
committer: Michael Vogt <michael.vogt@ubuntu.com> 2007-05-02 14:28:44 +0200
commit: db02c37cbd9111315dbcbaba5b1625bab5c13cfe (patch)
tree: b4335465ebdb0050af6d5ff1a541f9e700388462
parent: 8d639a08510c2c8ce7700ac11ff42989a7736cb4 (diff)
parent: d57e7084d4bb261f5201a44b81796fb7e47e6ea0 (diff)
download: python-apt-db02c37cbd9111315dbcbaba5b1625bab5c13cfe.tar.gz
77 files changed, 1420 insertions, 436 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 45a7172d..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)
 
@@ -341,7 +343,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("/ "))
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py
index 270b8489..e0f32f8d 100644
--- a/aptsources/sourceslist.py
+++ b/aptsources/sourceslist.py
@@ -254,7 +254,6 @@ class SourcesList:
     The method will search for existing matching repos and will try to 
     reuse them as far as possible
     """
-
     # create a working copy of the component list so that
     # we can modify it later
     comps = orig_comps[:]
diff --git a/debian/changelog b/debian/changelog
index 52d53919..d61646a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
 python-apt (0.6.21ubuntu1) gutsy; urgency=low
 
+  [Michael Vogt]
   * python/apt_pkgmodule.cc:
     - added pkgCache::State::PkgCurrentState enums
+  [Sebastian Heinlein]
+  * Fix the addition of of sources that are already enabled but not with
+    all components - fix LP#98795
+  * Handle changes of forced servers of child repositories in a more
+    sane way - fix LP#85060
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  2 May 2007 14:27:54 +0200
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  2 May 2007 14:24:11 +0200
-  
 python-apt (0.6.21) unstable; urgency=low
 
   * apt/cdrom.py:
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
diff --git a/po/am.po b/po/am.po
index f5d90ce0..164dc89d 100644
--- a/po/am.po
+++ b/po/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-09 15:49+0000\n"
 "Last-Translator: Habte <adbaru@gmail.com>\n"
 "Language-Team: Amharic <am@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "በየቀኑ"
 
diff --git a/po/ar.po b/po/ar.po
index f396b7a0..42725119 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:14+0000\n"
 "Last-Translator: Saleh Odeh <kirk.lock@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -277,6 +277,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "يوميا"
 
diff --git a/po/be.po b/po/be.po
index a8709395..c47bac25 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:05+0000\n"
 "Last-Translator: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>\n"
 "Language-Team: Belarusian <be@li.org>\n"
@@ -275,6 +275,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Штодзённа"
 
diff --git a/po/bg.po b/po/bg.po
index c029bc63..857310f1 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:01+0000\n"
 "Last-Translator: Nikola Kasabov <nikola.kasabov@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -308,6 +308,24 @@ msgstr "DFSG-съвместим софтуер с несвободни зави�
 msgid "Non-DFSG-compatible Software"
 msgstr "Софтуер несъвместим с DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Ежедневно"
 
diff --git a/po/bn.po b/po/bn.po
index b9fcc3ac..489a7122 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:02+0000\n"
 "Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n"
 "Language-Team: Bengali <bn@li.org>\n"
@@ -300,6 +300,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "দৈনিক"
 
diff --git a/po/br.po b/po/br.po
index 6b285d78..51b8fce1 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-05-19 02:42+0000\n"
 "Last-Translator: Oublieuse <oublieuse@gmail.com>\n"
 "Language-Team: Breton <br@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Every %s days"
 #~ msgstr "Bep %s devezh"
 
diff --git a/po/ca.po b/po/ca.po
index 2c72165d..8373396f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:14+0000\n"
 "Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -305,6 +305,25 @@ msgstr "Programari compatible DFSG amb dependències no lliures"
 msgid "Non-DFSG-compatible Software"
 msgstr "Programari no compatible DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 "Servidor principal"
+
+#: ../aptsources/distro.py:377
+#, fuzzy
+msgid "Custom servers"
+msgstr "Servidor més proper"
+
 #~ msgid "Daily"
 #~ msgstr "Diàriament"
 
@@ -332,12 +351,6 @@ msgstr "Programari no compatible DFSG"
 #~ msgid "After %s days"
 #~ msgstr "Després de %s dies"
 
-#~ msgid "Main server"
-#~ msgstr "Servidor principal"
-
-#~ msgid "Nearest server"
-#~ msgstr "Servidor més proper"
-
 #, fuzzy
 #~ msgid "Software Channel"
 #~ msgstr "Actualitzacions de programari"
diff --git a/po/cs.po b/po/cs.po
index ec6d82bd..e619f3e2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-18 22:54+0000\n"
 "Last-Translator: Dominik Sauer <Dominik.Sauer@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -288,6 +288,24 @@ msgstr "Software kompatibilní s DFSG, ale závisející na nesvobodných balíc
 msgid "Non-DFSG-compatible Software"
 msgstr "Software nekompatibilní s DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Server pro zemi \"%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 "Hlavní server"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Uživatelem vybrané servery"
+
 #~ msgid "Daily"
 #~ msgstr "Denně"
 
@@ -321,18 +339,9 @@ msgstr "Software nekompatibilní s DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Hlavní server"
-
-#~ msgid "Server for %s"
-#~ msgstr "Server pro zemi \"%s\""
-
 #~ msgid "Nearest server"
 #~ msgstr "Nejbližší server"
 
-#~ msgid "Custom servers"
-#~ msgstr "Uživatelem vybrané servery"
-
 #~ msgid "Software Channel"
 #~ msgstr "Softwarový kanál"
 
diff --git a/po/csb.po b/po/csb.po
index 9bde9e83..a16e0b0c 100644
--- a/po/csb.po
+++ b/po/csb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-08 04:10+0000\n"
 "Last-Translator: Michôł Òstrowsczi <ostrowski.michal@gmail.com>\n"
 "Language-Team: Kashubian <csb@li.org>\n"
@@ -277,6 +277,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Serwera dlô kraju %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 "Przédny serwera"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Jine serwerë"
+
 #~ msgid "Daily"
 #~ msgstr "Codniowò"
 
@@ -307,18 +325,9 @@ msgstr ""
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Przédny serwera"
-
-#~ msgid "Server for %s"
-#~ msgstr "Serwera dlô kraju %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Nôblëższi serwera"
 
-#~ msgid "Custom servers"
-#~ msgstr "Jine serwerë"
-
 #~ msgid "Software Channel"
 #~ msgstr "Kanal òprogramòwania"
 
diff --git a/po/da.po b/po/da.po
index 734749a7..9639a1f9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 15:55+0000\n"
 "Last-Translator: Lasse Bang Mikkelsen <lbm@fatalerror.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -287,6 +287,24 @@ msgstr "DFSG-kompatibel software med ikke-frie afhængigheder"
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel software"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Server for %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 "Hovedserver"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Brugerdefinerede servere"
+
 #~ msgid "Daily"
 #~ msgstr "Dagligt"
 
@@ -320,18 +338,9 @@ msgstr "Ikke-DFSG-kompatibel software"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Hovedserver"
-
-#~ msgid "Server for %s"
-#~ msgstr "Server for %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Nærmeste server"
 
-#~ msgid "Custom servers"
-#~ msgstr "Brugerdefinerede servere"
-
 #~ msgid "Software Channel"
 #~ msgstr "Softwarekanal"
 
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 <ubuntu@glatzor.de>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\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"
diff --git a/po/el.po b/po/el.po
index 8a253cee..2d0b3719 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:13+0000\n"
 "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
@@ -287,6 +287,24 @@ msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες
 msgid "Non-DFSG-compatible Software"
 msgstr "Λογισμικό μη συμβατό με DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Εξυπηρετητής για %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 "Κύριος εξυπηρετητής"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Προσαρμοσμένοι εξυπηρετητές"
+
 #~ msgid "Daily"
 #~ msgstr "Ημερησίως"
 
@@ -320,18 +338,9 @@ msgstr "Λογισμικό μη συμβατό με DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Κύριος εξυπηρετητής"
-
-#~ msgid "Server for %s"
-#~ msgstr "Εξυπηρετητής για %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Κοντινότερος εξυπηρετητής"
 
-#~ msgid "Custom servers"
-#~ msgstr "Προσαρμοσμένοι εξυπηρετητές"
-
 #~ msgid "Software Channel"
 #~ msgstr "Κανάλι λογισμικού"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index ea10f31e..a43a816d 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:01+0000\n"
 "Last-Translator: David Satchell <david@davidsatchell.net>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -287,6 +287,24 @@ msgstr "DFSG-compatible Software with Non-Free Dependencies"
 msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Server for %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 "Main server"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Custom servers"
+
 #~ msgid "Daily"
 #~ msgstr "Daily"
 
@@ -320,18 +338,9 @@ msgstr "Non-DFSG-compatible Software"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Main server"
-
-#~ msgid "Server for %s"
-#~ msgstr "Server for %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Nearest server"
 
-#~ msgid "Custom servers"
-#~ msgstr "Custom servers"
-
 #~ msgid "Software Channel"
 #~ msgstr "Software Channel"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index f1ce13e8..5a35f6fb 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:06+0000\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -308,6 +308,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Daily"
 #~ msgstr "<b>Details</b>"
diff --git a/po/en_GB.po b/po/en_GB.po
index b73f9228..b73af91c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:14+0000\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: \n"
@@ -288,6 +288,24 @@ msgstr "DFSG-compatible Software with Non-Free Dependencies"
 msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Server for %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 "Main server"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Custom servers"
+
 #~ msgid "Daily"
 #~ msgstr "Daily"
 
@@ -321,18 +339,9 @@ msgstr "Non-DFSG-compatible Software"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Main server"
-
-#~ msgid "Server for %s"
-#~ msgstr "Server for %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Nearest server"
 
-#~ msgid "Custom servers"
-#~ msgstr "Custom servers"
-
 #~ msgid "Software Channel"
 #~ msgstr "Software Channel"
 
diff --git a/po/eo.po b/po/eo.po
index 44821538..b192a027 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:05+0000\n"
 "Last-Translator: Ed Glez <herzo2@gmail.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -275,6 +275,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "After one week"
 #~ msgstr "Post unu semajno"
 
diff --git a/po/es.po b/po/es.po
index 57315b5f..637bbcf5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:15+0000\n"
 "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
@@ -289,6 +289,24 @@ msgstr "Software compatible con la DFSG con dependencias no libres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software no compatible con la DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Servidor para %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 "Servidor principal"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Servidores personalizados"
+
 #~ msgid "Daily"
 #~ msgstr "Una vez al día"
 
@@ -322,18 +340,9 @@ msgstr "Software no compatible con la DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Servidor principal"
-
-#~ msgid "Server for %s"
-#~ msgstr "Servidor para %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Servidor maś cercano"
 
-#~ msgid "Custom servers"
-#~ msgstr "Servidores personalizados"
-
 #~ msgid "Software Channel"
 #~ msgstr "Canal de software"
 
diff --git a/po/et.po b/po/et.po
index c5a96a43..ed200538 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-09 15:49+0000\n"
 "Last-Translator: margus723 <margus723@hot.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Iga päev"
 
diff --git a/po/eu.po b/po/eu.po
index c8127acc..c29206ad 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-09 15:49+0000\n"
 "Last-Translator: Xabi Ezpeleta <xezpeleta@mendikute.com>\n"
 "Language-Team: Basque <eu@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Egunero"
 
diff --git a/po/fa.po b/po/fa.po
index 21aefec8..c762a396 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-09 15:49+0000\n"
 "Last-Translator: Pedram Ganjeh Hadidi <pedram.ganjeh-hadidi@students.jku."
 "at>\n"
@@ -275,5 +275,23 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "    "
 #~ msgstr "    "
diff --git a/po/fi.po b/po/fi.po
index 3d54bf75..370ffa6e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-23 12:24+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
@@ -287,6 +287,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-epäyhteensopivat ohjelmistot"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Palvelin maalle: %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 "Pääpalvelin"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Määrittele palvelin"
+
 #~ msgid "Daily"
 #~ msgstr "Päivittäin"
 
@@ -320,18 +338,9 @@ msgstr "DFSG-epäyhteensopivat ohjelmistot"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Pääpalvelin"
-
-#~ msgid "Server for %s"
-#~ msgstr "Palvelin maalle: %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Lähin palvelin"
 
-#~ msgid "Custom servers"
-#~ msgstr "Määrittele palvelin"
-
 #~ msgid "Software Channel"
 #~ msgstr "Ohjelmistokanava"
 
diff --git a/po/fr.po b/po/fr.po
index 7e4b0709..252e304b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.37.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:02+0000\n"
 "Last-Translator: E.Malandain <etienne.malandain@free.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -289,6 +289,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Serveur pour %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 "Serveur principal"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Serveurs personnalisés"
+
 #~ msgid "Daily"
 #~ msgstr "Quotidiennement"
 
@@ -322,18 +340,9 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Serveur principal"
-
-#~ msgid "Server for %s"
-#~ msgstr "Serveur pour %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Serveur le plus proche"
 
-#~ msgid "Custom servers"
-#~ msgstr "Serveurs personnalisés"
-
 #~ msgid "Software Channel"
 #~ msgstr "Source de mise à jour"
 
diff --git a/po/fur.po b/po/fur.po
index ed50e66f..59569c9e 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-08-25 05:55+0000\n"
 "Last-Translator: Marco <marcuz@linux.it>\n"
 "Language-Team: Friulian <fur@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Ogni dì"
 
diff --git a/po/gl.po b/po/gl.po
index 725eba2f..ee2ad743 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-19 00:43+0000\n"
 "Last-Translator: Felipe Gil Castiñeira <xil@det.uvigo.es>\n"
 "Language-Team: galician\n"
@@ -289,6 +289,24 @@ msgstr "Software compatible coa DFSG con dependencias non libres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatible coa DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Servidor desde %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 "Servidor principal"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Servidores personalizados"
+
 #~ msgid "Daily"
 #~ msgstr "Unha vez ao día"
 
@@ -322,18 +340,9 @@ msgstr "Software non compatible coa DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Servidor principal"
-
-#~ msgid "Server for %s"
-#~ msgstr "Servidor desde %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Servidor máis próximo"
 
-#~ msgid "Custom servers"
-#~ msgstr "Servidores personalizados"
-
 #~ msgid "Software Channel"
 #~ msgstr "Canle de Software"
 
diff --git a/po/he.po b/po/he.po
index b68fc0c2..97f629b4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 08:48+0000\n"
 "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -295,6 +295,25 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "השרת ב%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 "שרת ראשי"
+
+#: ../aptsources/distro.py:377
+#, fuzzy
+msgid "Custom servers"
+msgstr "השרת הקרוב ביותר"
+
 #~ msgid "Daily"
 #~ msgstr "מידי יום"
 
@@ -329,15 +348,6 @@ msgstr ""
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "שרת ראשי"
-
-#~ msgid "Server for %s"
-#~ msgstr "השרת ב%s"
-
-#~ msgid "Nearest server"
-#~ msgstr "השרת הקרוב ביותר"
-
 #, fuzzy
 #~ msgid "Software Channel"
 #~ msgstr "עדכוני תוכנה"
diff --git a/po/hi.po b/po/hi.po
index e892487c..5fcbe0b8 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-08-01 15:30+0000\n"
 "Last-Translator: Gaurav Mishra <gauravtechie@gmail.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "प्रतिदिन"
 
diff --git a/po/hr.po b/po/hr.po
index acdcac25..4ad13ffd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-18 19:37+0000\n"
 "Last-Translator: Ante Karamatić <ivoks@grad.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -288,6 +288,24 @@ msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima"
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-nekompatibilni programi"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Poslužitelj za %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 "Glavni poslužitelj"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Osobni poslužitelji"
+
 #~ msgid "Daily"
 #~ msgstr "Dnevno"
 
@@ -321,18 +339,9 @@ msgstr "DFSG-nekompatibilni programi"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Glavni poslužitelj"
-
-#~ msgid "Server for %s"
-#~ msgstr "Poslužitelj za %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Najbliži poslužitelj"
 
-#~ msgid "Custom servers"
-#~ msgstr "Osobni poslužitelji"
-
 #~ msgid "Software Channel"
 #~ msgstr "Softverski repozitorij"
 
diff --git a/po/hu.po b/po/hu.po
index c5113d02..17803cb3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:03+0000\n"
 "Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -287,6 +287,24 @@ msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel"
 msgid "Non-DFSG-compatible Software"
 msgstr "Nem DFSG-kompatibilis szoftver"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Kiszolgáló a következőhöz: %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 "Fő kiszolgáló"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Egyéni kiszolgálók"
+
 #~ msgid "Daily"
 #~ msgstr "Naponta"
 
@@ -320,18 +338,9 @@ msgstr "Nem DFSG-kompatibilis szoftver"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Fő kiszolgáló"
-
-#~ msgid "Server for %s"
-#~ msgstr "Kiszolgáló a következőhöz: %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Legközelebbi kiszolgáló"
 
-#~ msgid "Custom servers"
-#~ msgstr "Egyéni kiszolgálók"
-
 #~ msgid "Software Channel"
 #~ msgstr "Szoftvercsatorna"
 
diff --git a/po/id.po b/po/id.po
index 1003fc3f..ee341dc1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:03+0000\n"
 "Last-Translator: Andy Apdhani <imtheface@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -303,6 +303,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Harian"
 
diff --git a/po/it.po b/po/it.po
index ad63c879..b8685c52 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-22 10:13+0000\n"
 "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -289,6 +289,24 @@ msgstr "Software compatibile con le DFSG con dipendenze non libere"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatibile con le DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Server in %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 "Server principale"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Server personalizzati"
+
 #~ msgid "Daily"
 #~ msgstr "Ogni giorno"
 
@@ -322,18 +340,9 @@ msgstr "Software non compatibile con le DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Server principale"
-
-#~ msgid "Server for %s"
-#~ msgstr "Server in %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Server più vicino"
 
-#~ msgid "Custom servers"
-#~ msgstr "Server personalizzati"
-
 #~ msgid "Software Channel"
 #~ msgstr "Canale software"
 
diff --git a/po/ja.po b/po/ja.po
index 1ab7dd6b..f4812ba2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.42.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:03+0000\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n"
@@ -300,6 +300,24 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア"
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSGに適合しないソフトウェア"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "%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 "メインサーバ"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "カスタムサーバ"
+
 #~ msgid "Daily"
 #~ msgstr "毎日"
 
@@ -334,18 +352,9 @@ msgstr "DFSGに適合しないソフトウェア"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "メインサーバ"
-
-#~ msgid "Server for %s"
-#~ msgstr "%s のサーバ"
-
 #~ msgid "Nearest server"
 #~ msgstr "最も近いサーバ"
 
-#~ msgid "Custom servers"
-#~ msgstr "カスタムサーバ"
-
 #~ msgid "Software Channel"
 #~ msgstr "ソフトウェアチャンネル"
 
diff --git a/po/ka.po b/po/ka.po
index 25758e84..63676486 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-18 01:28+0000\n"
 "Last-Translator: Malkhaz Barkalaya <malxaz@gmail.com>\n"
 "Language-Team: Georgian <geognome@googlegroups.com>\n"
@@ -289,6 +289,24 @@ msgstr "არათავისუფალ პროგრამებზე �
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-არათავსებადი პროგრამები"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "%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 "მთავარი სერვერი"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "საკუთარი სერვერები"
+
 #~ msgid "Daily"
 #~ msgstr "ყოველდღიურად"
 
@@ -322,18 +340,9 @@ msgstr "DFSG-არათავსებადი პროგრამები
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "მთავარი სერვერი"
-
-#~ msgid "Server for %s"
-#~ msgstr "%s სერვერი"
-
 #~ msgid "Nearest server"
 #~ msgstr "უახლოესი სერვერი"
 
-#~ msgid "Custom servers"
-#~ msgstr "საკუთარი სერვერები"
-
 #~ msgid "Software Channel"
 #~ msgstr "პროგრამების მიღება წყაროებიდან"
 
diff --git a/po/ko.po b/po/ko.po
index 832d9c46..cc2a5b03 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: Eungkyu Song <eungkyu@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -286,6 +286,24 @@ msgstr "DFSG 호환이 되지만 비자유 소프트웨어에 의존하는 소�
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG와 호환이 되지 않는 소프트웨어"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "%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 "주 서버"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "사용자 정의 서버"
+
 #~ msgid "Daily"
 #~ msgstr "매일"
 
@@ -319,18 +337,9 @@ msgstr "DFSG와 호환이 되지 않는 소프트웨어"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "주 서버"
-
-#~ msgid "Server for %s"
-#~ msgstr "%s 서버"
-
 #~ msgid "Nearest server"
 #~ msgstr "가장 가까운 서버"
 
-#~ msgid "Custom servers"
-#~ msgstr "사용자 정의 서버"
-
 #~ msgid "Software Channel"
 #~ msgstr "소프트웨어 채널"
 
diff --git a/po/ku.po b/po/ku.po
index 54bcab55..755b693c 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-17 09:50+0000\n"
 "Last-Translator: rizoye-xerzi <rizoxerzi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -288,6 +288,24 @@ msgstr "DFSG-nivîsbariya hevgirtî ya ne azad"
 msgid "Non-DFSG-compatible Software"
 msgstr "nivîsbariya hevgirtî ya ne li gorî -DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Pêşkêşkera %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 "Pêşkêşkera Mak"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Pêşkêşkera taybet"
+
 #~ msgid "Daily"
 #~ msgstr "Rojane"
 
@@ -321,18 +339,9 @@ msgstr "nivîsbariya hevgirtî ya ne li gorî -DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Pêşkêşkera Mak"
-
-#~ msgid "Server for %s"
-#~ msgstr "Pêşkêşkera %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Pêşkêşkera herî nêzîk"
 
-#~ msgid "Custom servers"
-#~ msgstr "Pêşkêşkera taybet"
-
 #~ msgid "Software Channel"
 #~ msgstr "Qanala Nivîsbariyê"
 
diff --git a/po/lt.po b/po/lt.po
index 280302cc..12bf58aa 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -292,6 +292,24 @@ msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis
 msgid "Non-DFSG-compatible Software"
 msgstr "Su DFSG nesuderinama programinė įranga"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Kasdien"
 
diff --git a/po/lv.po b/po/lv.po
index d1ef9e54..64a5d6e8 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lp-upd-manager-lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-09-05 20:00+0000\n"
 "Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
 "Language-Team: Latvian <locale@laka.lv>\n"
@@ -283,6 +283,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 "Galvenais serveris"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Ikdienas"
 
@@ -313,9 +331,6 @@ msgstr ""
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Galvenais serveris"
-
 #~ msgid "Active"
 #~ msgstr "Aktīvs"
 
diff --git a/po/mk.po b/po/mk.po
index 8cf9e0ae..22b7ef3b 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -307,6 +307,24 @@ msgstr "DFSG-компатибилен софтвер со неслободни �
 msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-компатибилен софтвер"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Daily"
 #~ msgstr "Дневно"
diff --git a/po/mr.po b/po/mr.po
index fff6e17b..6a30ffdb 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Marathi <mr@li.org>\n"
@@ -273,3 +273,21 @@ msgstr ""
 #: ../data/templates/Debian.info.in:98
 msgid "Non-DFSG-compatible Software"
 msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 196aec86..16c60cde 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: azlinux <azlinux@gmail.com>\n"
 "Language-Team: Malay <ms@li.org>\n"
@@ -275,6 +275,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Harian"
 
diff --git a/po/nb.po b/po/nb.po
index a4a1d98d..d59ffb5d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: Hans Petter Birkeland <hanspb@bluezone.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -309,6 +309,26 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter"
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel programvare"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, fuzzy, python-format
+msgid "Server for %s"
+msgstr "Tjener for %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
+#, fuzzy
+msgid "Main server"
+msgstr "Hovedtjener"
+
+#: ../aptsources/distro.py:377
+#, fuzzy
+msgid "Custom servers"
+msgstr "Egendefinerte tjenere"
+
 #~ msgid "Daily"
 #~ msgstr "Daglig"
 
@@ -341,22 +361,10 @@ msgstr "Ikke-DFSG-kompatibel programvare"
 #~ msgstr "Installerer oppdateringer"
 
 #, fuzzy
-#~ msgid "Main server"
-#~ msgstr "Hovedtjener"
-
-#, fuzzy
-#~ msgid "Server for %s"
-#~ msgstr "Tjener for %s"
-
-#, fuzzy
 #~ msgid "Nearest server"
 #~ msgstr "Nermeste tjener"
 
 #, fuzzy
-#~ msgid "Custom servers"
-#~ msgstr "Egendefinerte tjenere"
-
-#, fuzzy
 #~ msgid "Software Channel"
 #~ msgstr "Programvareoppdateringer"
 
diff --git a/po/ne.po b/po/ne.po
index cbe12e6d..0ebf43a4 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:13+0000\n"
 "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -311,6 +311,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Daily"
 #~ msgstr "<b>विवरणहरु</b>"
diff --git a/po/nl.po b/po/nl.po
index 403947f2..746b1a49 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-21 13:15+0000\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -287,6 +287,24 @@ msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software niet compatibel met DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Server voor %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 "Hoofdserver"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Andere servers"
+
 #~ msgid "Daily"
 #~ msgstr "Dagelijks"
 
@@ -320,18 +338,9 @@ msgstr "Software niet compatibel met DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Hoofdserver"
-
-#~ msgid "Server for %s"
-#~ msgstr "Server voor %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "dichtsbijzijnde server"
 
-#~ msgid "Custom servers"
-#~ msgstr "Andere servers"
-
 #~ msgid "Software Channel"
 #~ msgstr "Softwarekanaal"
 
diff --git a/po/nn.po b/po/nn.po
index 66ff131f..afb52661 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-09 15:50+0000\n"
 "Last-Translator: Willy André Bergstrøm <root@willyandre.net>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Kvar dag"
 
diff --git a/po/no.po b/po/no.po
index 128e699d..b44737c7 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2005-06-08 23:10+0200\n"
 "Last-Translator: Terance Edward Sola <terance@lyse.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -311,6 +311,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Daily"
 #~ msgstr "<b>Detaljer</b>"
diff --git a/po/oc.po b/po/oc.po
index 752e3866..f17eba0e 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-18 10:01+0000\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
 "com>\n"
@@ -293,6 +293,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Servidor per %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 "Servidor principal"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Servidors personalizats"
+
 #~ msgid "Daily"
 #~ msgstr "Cada jorn"
 
@@ -326,18 +344,9 @@ msgstr ""
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Servidor principal"
-
-#~ msgid "Server for %s"
-#~ msgstr "Servidor per %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Servidor mai prèp"
 
-#~ msgid "Custom servers"
-#~ msgstr "Servidors personalizats"
-
 #~ msgid "Active"
 #~ msgstr "Actiu"
 
diff --git a/po/pa.po b/po/pa.po
index cb50ab0a..c9537d28 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:16+0000\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n"
@@ -279,6 +279,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Daily"
 #~ msgstr "<b>ਵੇਰਵਾ</b>"
diff --git a/po/pl.po b/po/pl.po
index 5f16f936..e9c561f1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-21 12:05+0000\n"
 "Last-Translator: Dominik Zablotny <doza@sztorm.net>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
@@ -288,6 +288,24 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free"
 msgid "Non-DFSG-compatible Software"
 msgstr "Oprogramowanie niekompatybilne z DFSG."
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Serwer dla kraju %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 "Serwer główny"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Inne serwery"
+
 #~ msgid "Daily"
 #~ msgstr "Codziennie"
 
@@ -321,18 +339,9 @@ msgstr "Oprogramowanie niekompatybilne z DFSG."
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Serwer główny"
-
-#~ msgid "Server for %s"
-#~ msgstr "Serwer dla kraju %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Najbliższy serwer"
 
-#~ msgid "Custom servers"
-#~ msgstr "Inne serwery"
-
 #~ msgid "Software Channel"
 #~ msgstr "Kanał oprogramowania"
 
diff --git a/po/ps.po b/po/ps.po
index ae5de0a3..682c9804 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Pushto <ps@li.org>\n"
@@ -273,3 +273,21 @@ msgstr ""
 #: ../data/templates/Debian.info.in:98
 msgid "Non-DFSG-compatible Software"
 msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 3cb41857..3dd7d497 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 11:04+0000\n"
 "Last-Translator: Tiago Silva <tiagosilva29@gmail.com>\n"
 "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n"
@@ -285,6 +285,24 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software compatível-DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Servidor para %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 "Servidor principal"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Servidores personalizados"
+
 #~ msgid "Daily"
 #~ msgstr "Diariamente"
 
@@ -318,18 +336,9 @@ msgstr "Software compatível-DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Servidor principal"
-
-#~ msgid "Server for %s"
-#~ msgstr "Servidor para %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Servidor mais próximo"
 
-#~ msgid "Custom servers"
-#~ msgstr "Servidores personalizados"
-
 #~ msgid "Software Channel"
 #~ msgstr "Canal de Software"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 02374d82..0fbe7412 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-21 01:31+0000\n"
 "Last-Translator: Rafael Proença <cypherbios@ubuntu.com>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
@@ -286,6 +286,24 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Programas não compatíveis com a DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Servidor no(a) %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 "Servidor principal"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Servidores personalizados"
+
 #~ msgid "Daily"
 #~ msgstr "Diário"
 
@@ -319,18 +337,9 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Servidor principal"
-
-#~ msgid "Server for %s"
-#~ msgstr "Servidor no(a) %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Servidor mais próximo"
 
-#~ msgid "Custom servers"
-#~ msgstr "Servidores personalizados"
-
 #~ msgid "Software Channel"
 #~ msgstr "Canais de Programas"
 
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 6f949d88..2ed35a69 100644
--- a/po/python-apt.pot
+++ b/po/python-apt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -272,3 +272,21 @@ msgstr ""
 #: ../data/templates/Debian.info.in:98
 msgid "Non-DFSG-compatible Software"
 msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
diff --git a/po/qu.po b/po/qu.po
index 755a1801..a5d77be4 100644
--- a/po/qu.po
+++ b/po/qu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-09 15:50+0000\n"
 "Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n"
 "Language-Team: Quechua <qu@li.org>\n"
@@ -274,5 +274,23 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "    "
 #~ msgstr "    "
diff --git a/po/ro.po b/po/ro.po
index 37a34964..4f40bea7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:13+0000\n"
 "Last-Translator: Sami POTIRCA <spotirca@gmail.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -290,6 +290,24 @@ msgstr "Software compatibil DFSG cu dependenţe negratuite"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software incompatibil DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Server pentru %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 "Server principal"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Servere preferenţiale"
+
 #~ msgid "Daily"
 #~ msgstr "Zilnic"
 
@@ -320,18 +338,9 @@ msgstr "Software incompatibil DFSG"
 #~ msgid "%s updates"
 #~ msgstr "%s actualizări"
 
-#~ msgid "Main server"
-#~ msgstr "Server principal"
-
-#~ msgid "Server for %s"
-#~ msgstr "Server pentru %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Cel mai apropiat server"
 
-#~ msgid "Custom servers"
-#~ msgstr "Servere preferenţiale"
-
 #~ msgid "Software Channel"
 #~ msgstr "Canal software"
 
diff --git a/po/ru.po b/po/ru.po
index 8e202b4d..5c14cc98 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-18 09:11+0000\n"
 "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -288,6 +288,24 @@ msgstr "DFSG-совместимое ПО с зависимостями от не
 msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-совместимое ПО"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Сервер %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 "Основной сервер"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Свои сервера"
+
 #~ msgid "Daily"
 #~ msgstr "Ежедневно"
 
@@ -321,18 +339,9 @@ msgstr "Не-DFSG-совместимое ПО"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Основной сервер"
-
-#~ msgid "Server for %s"
-#~ msgstr "Сервер %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Ближайший сервер"
 
-#~ msgid "Custom servers"
-#~ msgstr "Свои сервера"
-
 #~ msgid "Software Channel"
 #~ msgstr "Источник программ"
 
diff --git a/po/rw.po b/po/rw.po
index 8d4fdbc6..a2a3e80e 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -311,6 +311,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Daily"
 #~ msgstr "<B B"
diff --git a/po/sk.po b/po/sk.po
index 5d101e6a..b8c4fcec 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
 "Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -307,6 +307,26 @@ msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére"
 msgid "Non-DFSG-compatible Software"
 msgstr "Softvér nekompatibilný s DFSG"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Server pre %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
+#, fuzzy
+msgid "Main server"
+msgstr "Najbližší server"
+
+#: ../aptsources/distro.py:377
+#, fuzzy
+msgid "Custom servers"
+msgstr "Najbližší server"
+
 #~ msgid "Daily"
 #~ msgstr "Denne"
 
@@ -342,12 +362,6 @@ msgstr "Softvér nekompatibilný s DFSG"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Server for %s"
-#~ msgstr "Server pre %s"
-
-#~ msgid "Nearest server"
-#~ msgstr "Najbližší server"
-
 #, fuzzy
 #~ msgid "Software Channel"
 #~ msgstr "Aktualizácie softvéru"
diff --git a/po/sl.po b/po/sl.po
index ad007641..c349c667 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:06+0000\n"
 "Last-Translator: Tadej <tadej.888@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -275,6 +275,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Dnevno"
 
diff --git a/po/sq.po b/po/sq.po
index 996d8c6d..3c06e017 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-09 15:50+0000\n"
 "Last-Translator: Alejdin Tirolli <a.tirolli@hotmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
@@ -276,6 +276,26 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "Serveri pë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
+#, fuzzy
+msgid "Main server"
+msgstr "Serveri më i afërt"
+
+#: ../aptsources/distro.py:377
+#, fuzzy
+msgid "Custom servers"
+msgstr "Serveri më i afërt"
+
 #~ msgid "Daily"
 #~ msgstr "Përditë"
 
@@ -306,12 +326,6 @@ msgstr ""
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Server for %s"
-#~ msgstr "Serveri për %s"
-
-#~ msgid "Nearest server"
-#~ msgstr "Serveri më i afërt"
-
 #~ msgid "Active"
 #~ msgstr "Aktiv"
 
diff --git a/po/sr.po b/po/sr.po
index 19201904..4ede031f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
 "Last-Translator: Vladimir Samardzic <vladosam@hotmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -275,6 +275,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Svaki dan"
 
diff --git a/po/sv.po b/po/sv.po
index 38c7fe93..545e5ba2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 05:06+0000\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -288,6 +288,24 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden"
 msgid "Non-DFSG-compatible Software"
 msgstr "Icke-DFSG-kompatibel programvara"
 
+#. 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 "Huvudserver"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Anpassade servrar"
+
 #~ msgid "Daily"
 #~ msgstr "Dagligen"
 
@@ -321,18 +339,9 @@ msgstr "Icke-DFSG-kompatibel programvara"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Huvudserver"
-
-#~ msgid "Server for %s"
-#~ msgstr "Server för %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "Närmaste server"
 
-#~ msgid "Custom servers"
-#~ msgstr "Anpassade servrar"
-
 #~ msgid "Software Channel"
 #~ msgstr "Programvarukanal"
 
diff --git a/po/ta.po b/po/ta.po
index 0f969df2..d96ecb02 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:06+0000\n"
 "Last-Translator: Raghavan <vijay.raghavan08@gmail.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "தினமும்"
 
diff --git a/po/th.po b/po/th.po
index 4076b20c..4d780be0 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
 "Last-Translator: Roys Hengwatanakul <roysheng@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -286,6 +286,24 @@ msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอ
 msgid "Non-DFSG-compatible Software"
 msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "เซิร์ฟเวอร์สำหรับประเทศ %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 "เซิร์ฟเวอร์หลัก"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "เซิร์ฟเวอร์ที่กำหนดเอาเอง"
+
 #~ msgid "Daily"
 #~ msgstr "ทุกวัน"
 
@@ -319,18 +337,9 @@ msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "เซิร์ฟเวอร์หลัก"
-
-#~ msgid "Server for %s"
-#~ msgstr "เซิร์ฟเวอร์สำหรับประเทศ %s"
-
 #~ msgid "Nearest server"
 #~ msgstr "เซิร์ฟเวอร์ที่ใกล้ที่สุด"
 
-#~ msgid "Custom servers"
-#~ msgstr "เซิร์ฟเวอร์ที่กำหนดเอาเอง"
-
 #~ msgid "Software Channel"
 #~ msgstr "ซอฟต์แวร์แชนเนล"
 
diff --git a/po/tl.po b/po/tl.po
index 8244b6da..c01bb6c9 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-09-16 15:44+0000\n"
 "Last-Translator: Ariel S. Betan <ariel.betan@up.edu.ph>\n"
 "Language-Team: Tagalog <tl@li.org>\n"
@@ -284,6 +284,24 @@ msgstr "Software na DFSG-compatible na may Di-Malayang mga Dependensiya"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software na Di-DFSG-compatible"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Araw-araw"
 
diff --git a/po/tr.po b/po/tr.po
index 58b9b010..b2314cd2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-21 20:58+0000\n"
 "Last-Translator: Atilla Karaman <atillakaraman@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -287,6 +287,24 @@ msgstr "Özgür Olmayan Bağımlılığı Bulunan DFSG Uyumlu Yazılım"
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG Uyumlu Olmayan Yazılım"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "%s sunucusu"
+
+#. 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 "Ana sunucu"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "Özel sunucular"
+
 #~ msgid "Daily"
 #~ msgstr "Günlük"
 
@@ -320,18 +338,9 @@ msgstr "DFSG Uyumlu Olmayan Yazılım"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "Ana sunucu"
-
-#~ msgid "Server for %s"
-#~ msgstr "%s sunucusu"
-
 #~ msgid "Nearest server"
 #~ msgstr "En yakın sunucu"
 
-#~ msgid "Custom servers"
-#~ msgstr "Özel sunucular"
-
 #~ msgid "Software Channel"
 #~ msgstr "Yazılım Kanalı"
 
diff --git a/po/uk.po b/po/uk.po
index f8adebe9..4fc9d03b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk(5)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:15+0000\n"
 "Last-Translator: Vadim Abramchuck <abram@email.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -284,6 +284,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Щодня"
 
diff --git a/po/ur.po b/po/ur.po
index 6332f2c6..19c870d8 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-05-19 02:46+0000\n"
 "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
 "Language-Team: Urdu <urd@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "روز"
 
diff --git a/po/urd.po b/po/urd.po
index 5d797037..d8700ba3 100644
--- a/po/urd.po
+++ b/po/urd.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-05-07 01:53+0000\n"
 "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
 "Language-Team: Urdu <urd@li.org>\n"
@@ -274,6 +274,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "روز"
 
diff --git a/po/vi.po b/po/vi.po
index 2800abe8..55d643fa 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager Gnome HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
 "Last-Translator: Tran The Trung <tttrung@hotmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -309,6 +309,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "Hằng ngày"
 
diff --git a/po/xh.po b/po/xh.po
index b6ede169..d7879b33 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-05 20:45+0000\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -279,6 +279,24 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Software Channel"
 #~ msgstr "Bonisa izihlaziyo"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bce5fe2f..9709b18a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:00+0000\n"
 "Last-Translator: catinsnow <catinsnow@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -287,6 +287,24 @@ msgstr "带有非自由依赖关系的DFSG兼容软件"
 msgid "Non-DFSG-compatible Software"
 msgstr "非DFSG兼容软件"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "%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 "主服务器"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "自定义服务器"
+
 #~ msgid "Daily"
 #~ msgstr "每天"
 
@@ -320,18 +338,9 @@ msgstr "非DFSG兼容软件"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "主服务器"
-
-#~ msgid "Server for %s"
-#~ msgstr "%s 的服务器"
-
 #~ msgid "Nearest server"
 #~ msgstr "最近服务器"
 
-#~ msgid "Custom servers"
-#~ msgstr "自定义服务器"
-
 #~ msgid "Software Channel"
 #~ msgstr "软件频道"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index b2a758e1..729d1af9 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.42.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:15+0000\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -282,6 +282,24 @@ msgstr "符合 DFSG 的軟件，但依賴於非自由軟件"
 msgid "Non-DFSG-compatible Software"
 msgstr "和 DFSG 不相容的軟件"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#. 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 ""
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr ""
+
 #~ msgid "Daily"
 #~ msgstr "每天"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 80afb9b3..51931b72 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 15:16+0100\n"
+"POT-Creation-Date: 2007-04-07 10:08+0200\n"
 "PO-Revision-Date: 2006-10-16 04:15+0000\n"
 "Last-Translator: SOC Ho <soc.scho@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n"
@@ -280,6 +280,24 @@ msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體"
 msgid "Non-DFSG-compatible Software"
 msgstr "不符合 DFSG 的軟體"
 
+#. TRANSLATORS: %s is a country
+#: ../aptsources/distro.py:343
+#, python-format
+msgid "Server for %s"
+msgstr "位於%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 "主要伺服器"
+
+#: ../aptsources/distro.py:377
+msgid "Custom servers"
+msgstr "個人伺服器"
+
 #~ msgid "Daily"
 #~ msgstr "每天"
 
@@ -314,18 +332,9 @@ msgstr "不符合 DFSG 的軟體"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Main server"
-#~ msgstr "主要伺服器"
-
-#~ msgid "Server for %s"
-#~ msgstr "位於%s的伺服器"
-
 #~ msgid "Nearest server"
 #~ msgstr "最近的伺服器"
 
-#~ msgid "Custom servers"
-#~ msgstr "個人伺服器"
-
 #~ msgid "Software Channel"
 #~ msgstr "軟體頻道"
author	Michael Vogt <michael.vogt@ubuntu.com>	2007-05-02 14:28:44 +0200
committer	Michael Vogt <michael.vogt@ubuntu.com>	2007-05-02 14:28:44 +0200
commit	db02c37cbd9111315dbcbaba5b1625bab5c13cfe (patch)
tree	b4335465ebdb0050af6d5ff1a541f9e700388462
parent	8d639a08510c2c8ce7700ac11ff42989a7736cb4 (diff)
parent	d57e7084d4bb261f5201a44b81796fb7e47e6ea0 (diff)
download	python-apt-db02c37cbd9111315dbcbaba5b1625bab5c13cfe.tar.gz