* apt/gtk/widgets.py:

  - Handle older versions of python-gobject which do not ship glib
* apt/package.py: Introduce the Version class
  - Deprecate Package.candidate*() and Package.installed*(), except for
    installedFiles.
  - Provide Version.get_source() (LP: #118788)
  - Provide Package.versions (Closes: #513236)
* apt/progress/: New package, replaces apt.progress and apt.gtk
  - apt/progress/gtk2.py: Moved here from apt/gtk/widgets.py
  - apt/progress/__init__.py: Move here from apt/progress.py
* doc/source/*: Improve the documentation
  - Document more attributes and functions of apt_pkg (they are all listed)
* aptsources/distro.py:
  - use iso_3166.xml instead of iso_3166.tab
  - fix incorrect indent
* debian/control:
  - add Recommends to iso-codes (for iso_3166.xml)
* apt/package.py:
  - make sure to set the defaulttimeout back to the
    original value (in getChangelog(), LP: #314212)
* apt/cache.py:
  - when setting a alternative rootdir, read the
    config from it as well
* python/configuration.cc, python/apt_pkgmodule.cc:
  - add apt_pkg.ReadConfigDir()
* python/cache.cc, tests/getcache_mem_corruption.py:
  - test if progress objects have the right methods
    and raise error if not (thanks to Emanuele Rocca)
    closes: #497049
* apt/package.py:
  - avoid uneeded interal references in the Package objects
* apt/__init__.py:
  - remove the future warning

2 files changed, 87 insertions, 18 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0cf708e1..767fa3ca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,4 +2,6 @@
 [type: gettext/rfc822deb] data/templates/Ubuntu.info.in
 [type: gettext/rfc822deb] data/templates/Debian.info.in
 aptsources/distro.py
-apt/gtk/widgets.py
\ No newline at end of file
+apt/progress/gtk2.py
+apt/package.py
+apt/debfile.py
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 6af898db..0de7caab 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: 2009-01-09 18:08+0100\n"
+"POT-Creation-Date: 2009-03-08 19:15+0100\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"
@@ -82,11 +82,6 @@ msgstr ""
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:307
 msgid "Restricted software"
@@ -124,7 +119,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:357
-msgid "Proprietary drivers for devices "
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
@@ -275,7 +270,7 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 4.0 'Etch'"
 msgstr ""
 
 #. Description
@@ -319,7 +314,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -327,34 +322,106 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/gtk/widgets.py:243
+#: ../apt/progress/gtk2.py:246
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/gtk/widgets.py:249
+#: ../apt/progress/gtk2.py:252
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/gtk/widgets.py:269
+#: ../apt/progress/gtk2.py:272
 msgid "Details"
 msgstr ""
 
-#: ../apt/gtk/widgets.py:351
+#: ../apt/progress/gtk2.py:354
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/gtk/widgets.py:357
+#: ../apt/progress/gtk2.py:360
 msgid "Complete"
 msgstr ""
+
+#: ../apt/package.py:266
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
+
+#: ../apt/package.py:644 ../apt/package.py:748
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../apt/package.py:752
+#, python-format
+msgid ""
+"The list of changes is not available yet.\n"
+"\n"
+"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"until the changes become available or try again later."
+msgstr ""
+
+#: ../apt/package.py:758
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#: ../apt/debfile.py:59
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
+
+#: ../apt/debfile.py:84
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
+
+#: ../apt/debfile.py:152
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
+
+#: ../apt/debfile.py:176
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
+
+#: ../apt/debfile.py:322
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
+
+#. the deb is older than the installed
+#: ../apt/debfile.py:328
+msgid "A later version is already installed"
+msgstr ""
+
+#: ../apt/debfile.py:348
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
+
+#: ../apt/debfile.py:379
+#, python-format
+msgid "Cannot install '%s'"
+msgstr ""
+
+#: ../apt/debfile.py:487
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
+
+#: ../apt/debfile.py:497
+msgid "An essential package would be removed"
+msgstr ""