86 files changed, 670 insertions, 476 deletions
diff --git a/apt/cache.py b/apt/cache.py
index 9e682bd8..65f3c9d9 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -25,6 +25,16 @@ import apt.progress
 import os
 import sys
 
+class FetchCancelledException(IOError):
+    " Exception that is thrown when the user cancels a fetch operation "
+    pass
+class FetchFailedException(IOError):
+    " Exception that is thrown when fetching fails "
+    pass
+class LockFailedException(IOError):
+    " Exception that is thrown when locking fails "
+    pass
+
 class Cache(object):
     """ Dictionary-like package cache 
         This class has all the packages that are available in it's
@@ -129,9 +139,11 @@ class Cache(object):
             errMsg += "Failed to fetch %s %s\n" % (item.DescURI,item.ErrorText)
             failed = True
 
-        # we raise a exception if the download failed
-        if failed:
-            raise IOError, errMsg
+        # we raise a exception if the download failed or it was cancelt
+        if res == fetcher.ResultCancelled:
+            raise FetchCancelledException, errMsg
+        elif failed:
+            raise FetchFailedException, errMsg
         return res
 
     def _fetchArchives(self, fetcher, pm):
@@ -141,7 +153,7 @@ class Cache(object):
         lockfile = apt_pkg.Config.FindDir("Dir::Cache::Archives") + "lock"
         lock = apt_pkg.GetLock(lockfile)
         if lock < 0:
-            raise IOError, "Failed to lock %s" % lockfile
+            raise LockFailedException, "Failed to lock %s" % lockfile
 
         try:
             # this may as well throw a SystemError exception
@@ -157,7 +169,7 @@ class Cache(object):
         lockfile = apt_pkg.Config.FindDir("Dir::State::Lists") + "lock"
         lock = apt_pkg.GetLock(lockfile)
         if lock < 0:
-            raise IOError, "Failed to lock %s" % lockfile
+            raise LockFailedException, "Failed to lock %s" % lockfile
 
         try:
             if fetchProgress == None:
diff --git a/apt/debfile.py b/apt/debfile.py
new file mode 100644
index 00000000..ddde5bf1
--- /dev/null
+++ b/apt/debfile.py
@@ -0,0 +1,58 @@
+import apt_inst
+import apt_pkg
+from apt_inst import arCheckMember
+
+from gettext import gettext as _
+
+class NoDebArchiveException(IOError):
+    pass
+
+class DebPackage(object):
+
+    _supported_data_members = ("data.tar.gz", "data.tar.bz2", "data.tar.lzma")
+
+    def __init__(self, filename=None):
+        self._section = {}
+        if filename:
+            self.open(filename)
+
+    def open(self, filename):
+        " open given debfile "
+        self.filename = filename
+        if not arCheckMember(open(self.filename), "debian-binary"):
+            raise NoDebArchiveException, _("This is not a valid DEB archive, missing '%s' member" % "debian-binary")
+        control = apt_inst.debExtractControl(open(self.filename))
+        self._sections = apt_pkg.ParseSection(control)
+        self.pkgname = self._sections["Package"]
+
+    def __getitem__(self, key):
+        return self._sections[key]
+        
+    def filelist(self):
+        """ return the list of files in the deb """
+        files = []
+        def extract_cb(What,Name,Link,Mode,UID,GID,Size,MTime,Major,Minor):
+            #print "%s '%s','%s',%u,%u,%u,%u,%u,%u,%u"\
+            #      % (What,Name,Link,Mode,UID,GID,Size, MTime, Major, Minor)
+            files.append(Name)
+        for member in self._supported_data_members:
+            if arCheckMember(open(self.filename), member):
+                try:
+                    apt_inst.debExtract(open(self.filename), extract_cb, member)
+                    break
+                except SystemError, e:
+                    return [_("List of files for '%s'could not be read" % self.filename)]
+        return files
+    filelist = property(filelist)
+
+
+
+if __name__ == "__main__":
+    import sys
+    
+    d = DebPackage(sys.argv[1])
+    print d["Section"]
+    print d["Maintainer"]
+    print "Files:"
+    print "\n".join(d.filelist)
+    
diff --git a/apt/package.py b/apt/package.py
index b82f1aa0..4524a47d 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -40,6 +40,23 @@ class Dependency(object):
     def __init__(self, alternatives):
         self.or_dependencies = alternatives
 
+class Record(object):
+    """ represents a pkgRecord, can be accessed like a
+        dictionary and gives the original package record
+        if accessed as a string """
+    def __init__(self, s):
+        self._str = s
+        self._rec = apt_pkg.ParseSection(s)
+    def __str__(self):
+        return self._str
+    def __getitem__(self, key):
+        k = self._rec.get(key)
+        if k is None:
+            raise KeyError
+        return k
+    def has_key(self, key):
+        return self._rec.has_key(key)
+
 class Package(object):
     """ This class represents a package in the cache
     """
@@ -244,14 +261,14 @@ class Package(object):
         " return the full pkgrecord as string of the candidate version "
         if not self._lookupRecord(True):
             return None
-        return self._records.Record
+        return Record(self._records.Record)
     candidateRecord = property(candidateRecord)
 
     def installedRecord(self):
         " return the full pkgrecord as string of the installed version "
         if not self._lookupRecord(False):
             return None
-        return self._records.Record
+        return Record(self._records.Record)
     installedRecord = property(installedRecord)
 
     # depcache states
diff --git a/aptsources/distro.py b/aptsources/distro.py
index 9d3b4105..debbb12a 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -31,6 +31,9 @@ import gettext
 def _(s): return gettext.dgettext("python-apt", s)
 
 
+class NoDistroTemplateException(Exception):
+  pass
+
 class Distribution:
   def __init__(self, id, codename, description, release):
     """ Container for distribution specific informations """
@@ -78,9 +81,8 @@ class Distribution:
             self.source_template = template
             break
     if self.source_template == None:
-        print "Error: could not find a distribution template"
-        # FIXME: will go away - only for debugging issues
-        sys.exit(1)
+        raise (NoDistroTemplateException,
+               "Error: could not find a distribution template")
 
     # find main and child sources
     media = []
@@ -131,7 +133,7 @@ class Distribution:
 
     self.get_mirrors()
   
-  def get_mirrors(self):
+  def get_mirrors(self, mirror_template=None):
     """
     Provide a set of mirrors where you can get the distribution from
     """
@@ -149,6 +151,97 @@ class Distribution:
     else:
         self.default_server = self.main_sources[0].uri
 
+    # get a list of country codes and real names
+    self.countries = {}
+    try:
+        f = open("/usr/share/iso-codes/iso_3166.tab", "r")
+        lines = f.readlines()
+        for line in lines:
+            parts = line.split("\t")
+            self.countries[parts[0].lower()] = parts[1].strip()
+    except:
+        print "could not open file '%s'" % file
+    else:
+        f.close()
+
+    # try to guess the nearest mirror from the locale
+    self.country = None
+    self.country_code = None
+    locale = os.getenv("LANG", default="en.UK")
+    a = locale.find("_")
+    z = locale.find(".")
+    if z == -1:
+        z = len(locale)
+    country_code = locale[a+1:z].lower()
+
+    if mirror_template:
+      self.nearest_server = mirror_template % country_code
+
+    if self.countries.has_key(country_code):
+        self.country = self.countries[country_code]
+        self.country_code = country_code
+
+  def _get_mirror_name(self, server):
+      ''' Try to get a human readable name for the main mirror of a country
+          Customize for different distributions '''
+      country = None
+      i = server.find("://")
+      l = server.find(".archive.ubuntu.com")
+      if i != -1 and l != -1:
+          country = server[i+len("://"):l]
+      if self.countries.has_key(country):
+          # TRANSLATORS: %s is a country
+          return _("Server for %s") % \
+                 gettext.dgettext("iso_3166",
+                                  self.countries[country].rstrip()).rstrip()
+      else:
+          return("%s" % server.rstrip("/ "))
+
+  def get_server_list(self):
+    ''' Return a list of used and suggested servers '''
+    def compare_mirrors(mir1, mir2):
+        '''Helper function that handles comaprision of mirror urls
+           that could contain trailing slashes'''
+        return re.match(mir1.strip("/ "), mir2.rstrip("/ "))
+    
+    # Store all available servers:
+    # Name, URI, active
+    mirrors = []
+    if len(self.used_servers) < 1 or \
+       (len(self.used_servers) == 1 and \
+        compare_mirrors(self.used_servers[0], self.main_server)):
+        mirrors.append([_("Main server"), self.main_server, True]) 
+        mirrors.append([self._get_mirror_name(self.nearest_server), 
+                       self.nearest_server, False])
+    elif len(self.used_servers) == 1 and not \
+         compare_mirrors(self.used_servers[0], self.main_server):
+        mirrors.append([_("Main server"), self.main_server, False]) 
+        # Only one server is used
+        server = self.used_servers[0]
+
+        # Append the nearest server if it's not already used            
+        if not compare_mirrors(server, self.nearest_server):
+            mirrors.append([self._get_mirror_name(self.nearest_server), 
+                           self.nearest_server, False])
+        mirrors.append([self._get_mirror_name(server), server, True])
+
+    elif len(self.used_servers) > 1:
+        # 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 
+        mirrors.append([_("Main server"), self.main_server, False])
+        mirrors.append([self._get_mirror_name(self.nearest_server), 
+                                        self.nearest_server, False])
+        mirrors.append([_("Custom servers"), None, True])
+        for server in self.used_servers:
+            if compare_mirrors(server, self.nearest_server) or\
+               compare_mirrors(server, self.main_server):
+                continue
+            elif not [self._get_mirror_name(server), server, False] in mirrors:
+                mirrors.append([self._get_mirror_name(server), server, False])
+
+    return mirrors
+
   def add_source(self, type=None, 
                  uri=None, dist=None, comps=None, comment=""):
     """
@@ -295,96 +388,31 @@ class DebianDistribution(Distribution):
     else:
         return False
 
+  def _get_mirror_name(self, server):
+      ''' Try to get a human readable name for the main mirror of a country
+          Debian specific '''
+      country = None
+      i = server.find("://ftp.")
+      l = server.find(".debian.org")
+      if i != -1 and l != -1:
+          country = server[i+len("://ftp."):l]
+      if self.countries.has_key(country):
+          # TRANSLATORS: %s is a country
+          return _("Server for %s") % \
+                 gettext.dgettext("iso_3166",
+                                  self.countries[country].rstrip()).rstrip()
+      else:
+          return("%s" % server.rstrip("/ "))
+
+  def get_mirrors(self):
+    Distribution.get_mirrors(self,
+                             mirror_template="http://ftp.%s.debian.org/debian/")
+
 class UbuntuDistribution(Distribution):
   ''' Class to support specific Ubuntu features '''
   def get_mirrors(self):
-    Distribution.get_mirrors(self)
-    # get a list of country codes and real names
-    self.countries = {}
-    try:
-        f = open("/usr/share/iso-codes/iso_3166.tab", "r")
-        lines = f.readlines()
-        for line in lines:
-            parts = line.split("\t")
-            self.countries[parts[0].lower()] = parts[1].strip()
-    except:
-        print "could not open file '%s'" % file
-    else:
-        f.close()
-
-    # try to guess the nearest mirror from the locale
-    self.country = None
-    self.country_code = None
-    locale = os.getenv("LANG", default="en.UK")
-    a = locale.find("_")
-    z = locale.find(".")
-    if z == -1:
-        z = len(locale)
-    country_code = locale[a+1:z].lower()
-    self.nearest_server = "http://%s.archive.ubuntu.com/ubuntu/" % \
-                          country_code
-    if self.countries.has_key(country_code):
-        self.country = self.countries[country_code]
-        self.country_code = country_code
-
-  def get_server_list(self):
-    ''' Return a list of used and suggested servers '''
-    def compare_mirrors(mir1, mir2):
-        '''Helper function that handles comaprision of mirror urls
-           that could contain trailing slashes'''
-        return re.match(mir1.strip("/ "), mir2.rstrip("/ "))
-    def get_mirror_name(server):
-        ''' Try to get a human readable name for the main mirror of a country'''
-        country = None
-        i = server.find("://")
-        l = server.find(".archive.ubuntu.com")
-        if i != -1 and l != -1:
-            country = server[i+len("://"):l]
-        if self.countries.has_key(country):
-            # TRANSLATORS: %s is a country
-            return _("Server for %s") % \
-                   gettext.dgettext("iso_3166",
-                                    self.countries[country].rstrip()).rstrip()
-        else:
-            return("%s" % server.rstrip("/ "))
-    
-    # Store all available servers:
-    # Name, URI, active
-    mirrors = []
-    if len(self.used_servers) < 1 or \
-       (len(self.used_servers) == 1 and \
-        compare_mirrors(self.used_servers[0], self.main_server)):
-        mirrors.append([_("Main server"), self.main_server, True]) 
-        mirrors.append([get_mirror_name(self.nearest_server), 
-                       self.nearest_server, False])
-    elif len(self.used_servers) == 1 and not \
-         compare_mirrors(self.used_servers[0], self.main_server):
-        mirrors.append([_("Main server"), self.main_server, False]) 
-        # Only one server is used
-        server = self.used_servers[0]
-
-        # Append the nearest server if it's not already used            
-        if not compare_mirrors(server, self.nearest_server):
-            mirrors.append([get_mirror_name(self.nearest_server), 
-                           self.nearest_server, False])
-        mirrors.append([get_mirror_name(server), server, True])
-
-    elif len(self.used_servers) > 1:
-        # 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 
-        mirrors.append([_("Main server"), self.main_server, False])
-        mirrors.append([get_mirror_name(self.nearest_server), 
-                                        self.nearest_server, False])
-        mirrors.append([_("Custom servers"), None, True])
-        for server in self.used_servers:
-            if compare_mirrors(server, self.nearest_server) or\
-               compare_mirrors(server, self.main_server):
-                continue
-            elif not [get_mirror_name(server), server, False] in mirrors:
-                mirrors.append([get_mirror_name(server), server, False])
-
-    return mirrors
+    Distribution.get_mirrors(self,
+                             mirror_template="http://%s.archive.ubuntu.com/ubuntu/")
 
 def get_distro():
     ''' Check the currently used distribution and return the corresponding
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py
index 16784ec4..e0f32f8d 100644
--- a/aptsources/sourceslist.py
+++ b/aptsources/sourceslist.py
@@ -254,12 +254,9 @@ 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
-    # FIXME: perhaps could be done in a prittier way
-    comps = []
-    for c in orig_comps:
-        comps.append(c)
+    # create a working copy of the component list so that
+    # we can modify it later
+    comps = orig_comps[:]
     # check if we have this source already in the sources.list
     for source in self.list:
       if source.disabled == False and source.invalid == False and \
diff --git a/debian/changelog b/debian/changelog
index 5536d8e1..f206ad0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,48 @@
+python-apt (0.7.4) UNRELEASED; urgency=low
+
+  * apt/debfile.py:
+    - added wrapper around apt_inst.debExtract()
+    - support dictionary like access 
+  * python/apt_instmodule.cc:
+    - added arCheckMember()
+  * aptsources/distro.py:
+    - throw NoDistroTemplateException if not distribution template
+      can be found
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 Jul 2007 22:33:59 +0200
+
+python-apt (0.7.3.1) unstable; urgency=low
+
+  * NMU
+  * Fix version to not use CPU and OS since it's not available on APT
+    anymore (closes: #435653, #435674)
+
+ -- Otavio Salvador <otavio@debian.org>  Thu, 02 Aug 2007 18:45:25 -0300
+
+python-apt (0.7.3) unstable; urgency=low
+
+  * apt/package.py:
+    - added Record class that can be accessed like a dictionary
+      and return it in candidateRecord and installedRecord
+      (thanks to Alexander Sack for discussing this with me)
+  * doc/examples/records.py:
+    - added example how to use the new Records class
+  * apt/cache.py:
+    - throw FetchCancelleException, FetchFailedException, 
+      LockFailedException exceptions when something goes wrong
+  * aptsources/distro.py:
+    - generalized some code, bringing it into the Distribution
+      class, and wrote some missing methods for the DebianDistribution
+      one (thanks to Gustavo Noronha Silva)
+  * debian/control:
+    - updated for python-distutils-extra (>= 1.9.0)
+  * debian/python-apt.install:
+    - fix i18n files
+  * python/indexfile.cc:
+    - increase str buffer in PackageIndexFileRepr
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 27 Jul 2007 16:57:28 +0200
+
 python-apt (0.7.2) unstable; urgency=low
 
   * build against the new apt
diff --git a/debian/control b/debian/control
index d8c080d7..1f583e2f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 Standards-Version: 3.7.2.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.0), apt-utils, python-all-dev, python-distutils-extra, cdbs, python-central (>= 0.5), python-all-dbg
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.0), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.5), python-all-dbg
 XS-Vcs-Bzr: http://people.debian.org/~mvo/bzr/python-apt/debian-sid
 
 Package: python-apt
diff --git a/debian/python-apt.install b/debian/python-apt.install
index 3e08ba50..4910e8ed 100644
--- a/debian/python-apt.install
+++ b/debian/python-apt.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/lib/python*
+debian/tmp/usr/share/locale
 debian/tmp/usr/share/python-apt
diff --git a/doc/examples/records.py b/doc/examples/records.py
new file mode 100755
index 00000000..ef04b555
--- /dev/null
+++ b/doc/examples/records.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+import apt
+
+cache = apt.Cache()
+
+for pkg in cache:
+   if not pkg.candidateRecord:
+      continue
+   if pkg.candidateRecord.has_key("Task"):
+      print "Pkg %s is part of '%s'" % (pkg.name, pkg.candidateRecord["Task"].split())
+      #print pkg.candidateRecord
diff --git a/po/am.po b/po/am.po
index 164dc89d..673ed669 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index 42725119..39265a8c 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -278,7 +278,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -286,12 +286,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/be.po b/po/be.po
index c47bac25..d4c45847 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -276,7 +276,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -284,12 +284,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 857310f1..f0a7a011 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -309,7 +309,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Софтуер несъвместим с DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -317,12 +317,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/bn.po b/po/bn.po
index 489a7122..ee0a4818 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -301,7 +301,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -309,12 +309,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/br.po b/po/br.po
index 51b8fce1..f8684645 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 8373396f..9d3fef77 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -306,7 +306,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Programari no compatible DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -314,12 +314,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 #, fuzzy
 msgid "Custom servers"
 msgstr "Servidor més proper"
diff --git a/po/cs.po b/po/cs.po
index e619f3e2..cf748690 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -289,7 +289,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Software nekompatibilní s DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server pro zemi \"%s\""
@@ -297,12 +297,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Hlavní server"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Uživatelem vybrané servery"
 
diff --git a/po/csb.po b/po/csb.po
index a16e0b0c..11bee656 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -278,7 +278,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Serwera dlô kraju %s"
@@ -286,12 +286,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Przédny serwera"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Jine serwerë"
 
diff --git a/po/da.po b/po/da.po
index 9639a1f9..8bca0917 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -288,7 +288,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server for %s"
@@ -296,12 +296,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Hovedserver"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Brugerdefinerede servere"
 
diff --git a/po/de.po b/po/de.po
index 7a96d6d4..0b9e0af5 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -276,7 +276,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Nicht DFSG-kompatible Software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server für %s"
@@ -284,12 +284,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Haupt-Server"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Benutzerdefinierte Server"
 
diff --git a/po/el.po b/po/el.po
index 2d0b3719..15cbe529 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -288,7 +288,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Λογισμικό μη συμβατό με DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Εξυπηρετητής για %s"
@@ -296,12 +296,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Κύριος εξυπηρετητής"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Προσαρμοσμένοι εξυπηρετητές"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index a43a816d..2c620c48 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -288,7 +288,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server for %s"
@@ -296,12 +296,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Main server"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Custom servers"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 5a35f6fb..e84193f1 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -309,7 +309,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -317,12 +317,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index b73af91c..a99cfda9 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+0200\n"
 "PO-Revision-Date: 2006-10-16 04:14+0000\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: \n"
@@ -289,7 +289,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server for %s"
@@ -297,12 +297,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Main server"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Custom servers"
 
diff --git a/po/eo.po b/po/eo.po
index b192a027..324d644b 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -276,7 +276,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -284,12 +284,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 637bbcf5..70459807 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -290,7 +290,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Software no compatible con la DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor para %s"
@@ -298,12 +298,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
diff --git a/po/et.po b/po/et.po
index ed200538..02d4129f 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/eu.po b/po/eu.po
index c29206ad..954857ad 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index c762a396..43e4fb8a 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+0200\n"
 "PO-Revision-Date: 2006-10-09 15:49+0000\n"
 "Last-Translator: Pedram Ganjeh Hadidi <pedram.ganjeh-hadidi@students.jku."
 "at>\n"
@@ -276,7 +276,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -284,12 +284,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 370ffa6e..16bcf1fa 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -288,7 +288,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-epäyhteensopivat ohjelmistot"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Palvelin maalle: %s"
@@ -296,12 +296,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Pääpalvelin"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Määrittele palvelin"
 
diff --git a/po/fr.po b/po/fr.po
index 252e304b..ee8d3c50 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -290,7 +290,7 @@ 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
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Serveur pour %s"
@@ -298,12 +298,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Serveur principal"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Serveurs personnalisés"
 
diff --git a/po/fur.po b/po/fur.po
index 59569c9e..ba8259cc 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index ee2ad743..1b14a089 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -290,7 +290,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatible coa DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor desde %s"
@@ -298,12 +298,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
diff --git a/po/he.po b/po/he.po
index 97f629b4..38f2353c 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -296,7 +296,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "השרת ב%s"
@@ -304,12 +304,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "שרת ראשי"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 #, fuzzy
 msgid "Custom servers"
 msgstr "השרת הקרוב ביותר"
diff --git a/po/hi.po b/po/hi.po
index 5fcbe0b8..f0976b7f 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 4ad13ffd..0697c590 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -289,7 +289,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-nekompatibilni programi"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Poslužitelj za %s"
@@ -297,12 +297,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Glavni poslužitelj"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Osobni poslužitelji"
 
diff --git a/po/hu.po b/po/hu.po
index 17803cb3..ad42d3b8 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -288,7 +288,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Nem DFSG-kompatibilis szoftver"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Kiszolgáló a következőhöz: %s"
@@ -296,12 +296,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Fő kiszolgáló"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Egyéni kiszolgálók"
 
diff --git a/po/id.po b/po/id.po
index ee341dc1..0c67a0db 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -304,7 +304,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -312,12 +312,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index b8685c52..35439e6e 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -290,7 +290,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatibile con le DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server in %s"
@@ -298,12 +298,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Server principale"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Server personalizzati"
 
diff --git a/po/ja.po b/po/ja.po
index f4812ba2..df1cb04f 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -301,7 +301,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "DFSGに適合しないソフトウェア"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "%s のサーバ"
@@ -309,12 +309,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "メインサーバ"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "カスタムサーバ"
 
diff --git a/po/ka.po b/po/ka.po
index 63676486..71e21f88 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -290,7 +290,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-არათავსებადი პროგრამები"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "%s სერვერი"
@@ -298,12 +298,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "მთავარი სერვერი"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "საკუთარი სერვერები"
 
diff --git a/po/ko.po b/po/ko.po
index cc2a5b03..e2a6d174 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -287,7 +287,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "DFSG와 호환이 되지 않는 소프트웨어"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "%s 서버"
@@ -295,12 +295,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "주 서버"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "사용자 정의 서버"
 
diff --git a/po/ku.po b/po/ku.po
index 755b693c..d15f136f 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -289,7 +289,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "nivîsbariya hevgirtî ya ne li gorî -DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Pêşkêşkera %s"
@@ -297,12 +297,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Pêşkêşkera Mak"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Pêşkêşkera taybet"
 
diff --git a/po/lt.po b/po/lt.po
index 12bf58aa..4db952d8 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -293,7 +293,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Su DFSG nesuderinama programinė įranga"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -301,12 +301,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/lv.po b/po/lv.po
index 64a5d6e8..060eb352 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -284,7 +284,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -292,12 +292,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Galvenais serveris"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/mk.po b/po/mk.po
index 22b7ef3b..aab640fe 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -308,7 +308,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-компатибилен софтвер"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -316,12 +316,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 6a30ffdb..66c5a0db 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,11 +283,11 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 16c60cde..787aabf8 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -276,7 +276,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -284,12 +284,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index d59ffb5d..a96f1bbf 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -310,7 +310,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel programvare"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, fuzzy, python-format
 msgid "Server for %s"
 msgstr "Tjener for %s"
@@ -318,13 +318,13 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 #, fuzzy
 msgid "Main server"
 msgstr "Hovedtjener"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 #, fuzzy
 msgid "Custom servers"
 msgstr "Egendefinerte tjenere"
diff --git a/po/ne.po b/po/ne.po
index 0ebf43a4..59f7c78d 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -312,7 +312,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -320,12 +320,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 746b1a49..f458a837 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -288,7 +288,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Software niet compatibel met DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server voor %s"
@@ -296,12 +296,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Hoofdserver"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Andere servers"
 
diff --git a/po/nn.po b/po/nn.po
index afb52661..d0ad627b 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/no.po b/po/no.po
index b44737c7..daffe607 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -312,7 +312,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -320,12 +320,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/oc.po b/po/oc.po
index f17eba0e..9f2b3938 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+0200\n"
 "PO-Revision-Date: 2006-10-18 10:01+0000\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
 "com>\n"
@@ -294,7 +294,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor per %s"
@@ -302,12 +302,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Servidors personalizats"
 
diff --git a/po/pa.po b/po/pa.po
index c9537d28..766049de 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -280,7 +280,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -288,12 +288,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index e9c561f1..45732f58 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -289,7 +289,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Oprogramowanie niekompatybilne z DFSG."
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Serwer dla kraju %s"
@@ -297,12 +297,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Serwer główny"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Inne serwery"
 
diff --git a/po/ps.po b/po/ps.po
index 682c9804..69a681ee 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,11 +283,11 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 3dd7d497..afaf18c3 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -286,7 +286,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Software compatível-DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor para %s"
@@ -294,12 +294,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0fbe7412..70b19cc6 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -287,7 +287,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Programas não compatíveis com a DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor no(a) %s"
@@ -295,12 +295,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 2ed35a69..e8fbfc41 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -274,7 +274,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -282,11 +282,11 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
diff --git a/po/qu.po b/po/qu.po
index a5d77be4..3d2ef49c 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 4f40bea7..57ddf8b9 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -291,7 +291,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Software incompatibil DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server pentru %s"
@@ -299,12 +299,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Server principal"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Servere preferenţiale"
 
diff --git a/po/ru.po b/po/ru.po
index 5c14cc98..408a7e36 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -289,7 +289,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-совместимое ПО"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Сервер %s"
@@ -297,12 +297,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Основной сервер"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Свои сервера"
 
diff --git a/po/rw.po b/po/rw.po
index a2a3e80e..64a456ef 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -312,7 +312,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -320,12 +320,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index b8c4fcec..cc679d98 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -308,7 +308,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Softvér nekompatibilný s DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server pre %s"
@@ -316,13 +316,13 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 #, fuzzy
 msgid "Main server"
 msgstr "Najbližší server"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 #, fuzzy
 msgid "Custom servers"
 msgstr "Najbližší server"
diff --git a/po/sl.po b/po/sl.po
index c349c667..62865651 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -276,7 +276,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -284,12 +284,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 3c06e017..cc975b1d 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -277,7 +277,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Serveri për %s"
@@ -285,13 +285,13 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 #, fuzzy
 msgid "Main server"
 msgstr "Serveri më i afërt"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 #, fuzzy
 msgid "Custom servers"
 msgstr "Serveri më i afërt"
diff --git a/po/sr.po b/po/sr.po
index 4ede031f..461de261 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -276,7 +276,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -284,12 +284,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 545e5ba2..570ae6ea 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -289,7 +289,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Icke-DFSG-kompatibel programvara"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "Server för %s"
@@ -297,12 +297,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Huvudserver"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Anpassade servrar"
 
diff --git a/po/ta.po b/po/ta.po
index d96ecb02..07a9220e 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 4d780be0..af6bd96b 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -287,7 +287,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "เซิร์ฟเวอร์สำหรับประเทศ %s"
@@ -295,12 +295,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "เซิร์ฟเวอร์หลัก"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "เซิร์ฟเวอร์ที่กำหนดเอาเอง"
 
diff --git a/po/tl.po b/po/tl.po
index c01bb6c9..b49987cc 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -285,7 +285,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "Software na Di-DFSG-compatible"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -293,12 +293,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index b2314cd2..22f74965 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -288,7 +288,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "DFSG Uyumlu Olmayan Yazılım"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "%s sunucusu"
@@ -296,12 +296,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "Ana sunucu"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "Özel sunucular"
 
diff --git a/po/uk.po b/po/uk.po
index 4fc9d03b..93f1db6e 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -285,7 +285,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -293,12 +293,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/ur.po b/po/ur.po
index 19c870d8..8754bff0 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/urd.po b/po/urd.po
index d8700ba3..b8c487b8 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -275,7 +275,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -283,12 +283,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 55d643fa..a03be4cd 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -310,7 +310,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -318,12 +318,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/xh.po b/po/xh.po
index d7879b33..b3e5cc74 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -280,7 +280,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -288,12 +288,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9709b18a..af823ea3 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -288,7 +288,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "非DFSG兼容软件"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "%s 的服务器"
@@ -296,12 +296,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "主服务器"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "自定义服务器"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 729d1af9..6571d85d 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -283,7 +283,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "和 DFSG 不相容的軟件"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -291,12 +291,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 51931b72..e5ac71de 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-04-07 10:08+0200\n"
+"POT-Creation-Date: 2007-07-30 22:28+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"
@@ -281,7 +281,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr "不符合 DFSG 的軟體"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:343
+#: ../aptsources/distro.py:192 ../aptsources/distro.py:399
 #, python-format
 msgid "Server for %s"
 msgstr "位於%s的伺服器"
@@ -289,12 +289,12 @@ 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
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:216
+#: ../aptsources/distro.py:230
 msgid "Main server"
 msgstr "主要伺服器"
 
-#: ../aptsources/distro.py:377
+#: ../aptsources/distro.py:233
 msgid "Custom servers"
 msgstr "個人伺服器"
 
diff --git a/python/apt_instmodule.cc b/python/apt_instmodule.cc
index d672a40a..43d5e7f7 100644
--- a/python/apt_instmodule.cc
+++ b/python/apt_instmodule.cc
@@ -102,15 +102,44 @@ static PyObject *debExtractArchive(PyObject *Self,PyObject *Args)
    return HandleErrors(Py_BuildValue("b",res));
 }
 									/*}}}*/
+// arFindMember - Find member in AR archive              		/*{{{*/
+// ---------------------------------------------------------------------
+static char *doc_arCheckMember =
+"arCheckMember(File, membername) -> Bool\n";
+static PyObject *arCheckMember(PyObject *Self,PyObject *Args)
+{
+   char *Member = NULL;
+   bool res = false;
+   PyObject *File;
+   if (PyArg_ParseTuple(Args,"O!s",&PyFile_Type,&File,&Member) == 0)
+      return 0;
+   
+   // Open the file and associate the .deb
+   FileFd Fd(fileno(PyFile_AsFile(File)),false);
+   ARArchive AR(Fd);
+   if (_error->PendingError() == true)
+      return HandleErrors(Py_BuildValue("b",res));
+   
+   if(AR.FindMember(Member) != 0)
+      res = true;
+
+   return HandleErrors(Py_BuildValue("b",res));
+}
+									/*}}}*/
 
 // initapt_inst - Core Module Initialization				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 static PyMethodDef methods[] =
 {
-   // Stuff
+   // access to ar files
+   {"arCheckMember", arCheckMember, METH_VARARGS, doc_arCheckMember},
+
+   // access to deb files
    {"debExtractControl",debExtractControl,METH_VARARGS,doc_debExtractControl},
    {"debExtractArchive",debExtractArchive,METH_VARARGS,doc_debExtractArchive},
+
+   // access to tar streams
    {"tarExtract",tarExtract,METH_VARARGS,doc_tarExtract},
    {"debExtract",debExtract,METH_VARARGS,doc_debExtract},
 
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index a0352d4e..15f7d238 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -483,8 +483,6 @@ extern "C" void initapt_pkg()
    // Version..
    AddStr(Dict,"Version",pkgVersion);
    AddStr(Dict,"LibVersion",pkgLibVersion);
-   AddStr(Dict,"CPU",pkgCPU);
-   AddStr(Dict,"OS",pkgOS);
    AddStr(Dict,"Date",__DATE__);
    AddStr(Dict,"Time",__TIME__);
 
diff --git a/python/indexfile.cc b/python/indexfile.cc
index ef6ffc8a..4e32f2ab 100644
--- a/python/indexfile.cc
+++ b/python/indexfile.cc
@@ -56,7 +56,7 @@ static PyObject *PackageIndexFileRepr(PyObject *Self)
 {
    pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
    
-   char S[300];
+   char S[1024];
    snprintf(S,sizeof(S),"<pkIndexFile object: "
 			"Label:'%s' Describe='%s' Exists='%i' "
 	                "HasPackages='%i' Size='%i'  "
diff --git a/setup.cfg b/setup.cfg
index 718b6e23..c0c0440e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,3 @@
-[build]
-l10n=True
-
 [build_l10n]
 domain=python-apt
 
diff --git a/setup.py b/setup.py
index 99bc62c6..b8819b31 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 from distutils.core import setup, Extension
 from distutils.sysconfig import parse_makefile
-from DistUtilsExtra.distutils_extra import build_extra, build_l10n
+from DistUtilsExtra.command import *
 import glob, os, string
 
 # The apt_pkg module
@@ -40,8 +40,8 @@ setup(name="python-apt",
                     glob.glob('build/data/templates/*.info')),
                     ('share/python-apt/templates',
                     glob.glob('data/templates/*.mirrors'))],
-      cmdclass = { "build" : build_extra,
-                   "build_l10n" :  build_l10n },
+      cmdclass = { "build" : build_extra.build_extra,
+                   "build_i18n" :  build_i18n.build_i18n },
       license = 'GNU GPL',
       platforms = 'posix'
       )