* merged from the debian/sid bzr branch

* Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512)

* python/arfile.cc:
  - use APT::Configuration::getCompressionTypes() instead of duplicating
    the supported methods here
* tests/test_debfile.py:
  - add test for raise on unknown data.tar.xxx
* tests/test_aptsources_ports.py, tests/test_aptsources.py:
  - use tmpdir during the tests to fix test failure with apt from
    experimental
* Upload to unstable
* Increase Breaks for update-notifier to 0.99.3debian9
* utils/get_debian_mirrors.py: Adjust for new Alioth SCM urls
* debian/control: Standards-Version 3.9.2
* Fix Lintian overrides
* Fix spelling errors reported by Lintian (sep[a->e]rated, overrid[d]en)
* po/urd.po: Remove, ur.po is the correct file
* debian/source/format: Add, set it to "3.0 (native)"
* Fix get_changelog in Python 3 (Closes: #626532)
* apt/package.py: fix a few typos [formated->formatted] (Closes: #597054)
* doc/source/tutorials/contributing.rst: minor improvements (Closes: #625225)
  - one typo [2to => 2to3], one broken link [pep8.py link]
* Esperanto (Closes: #626430)

2 files changed, 295 insertions, 685 deletions

diff --git a/po/eo.po b/po/eo.po
index f411a28c..dcac3593 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,272 +1,329 @@
 # Esperanto translation for update-manager
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# Copyright (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the update-manager package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+# Ed GLEZ <herzo2@gmail.com>, 2006.
+# Aisano < >, 2010.
+# Patrick (Petriko) OUDEJANS < >, 2010.
+# Roĉjo HUURMAN < >, 2010.
+# Michael MORONI < >, 2009, 2011.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+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"
+"POT-Creation-Date: 2011-05-27 15:56+0200\n"
+"PO-Revision-Date: 2011-05-09 16:09+0200\n"
+"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
+"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"X-Launchpad-Export-Date: 2011-05-09 14:00+0000\n"
+"X-Generator: Launchpad (build 12981)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:31
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "KD kun Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:43
+msgid "Canonical Partners"
+msgstr "Partneroj de Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:45
+msgid "Software packaged by Canonical for their partners"
+msgstr "Programaro pakita de Canonical por iliaj partneroj"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:46
+msgid "This software is not part of Ubuntu."
+msgstr "Tiuj ĉi programoj ne estas parto de Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:53
+msgid "Independent"
+msgstr "Sendepende"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:55
+msgid "Provided by third-party software developers"
+msgstr "Ofertitaj de aliaj programistoj kaj firmaoj"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:56
+msgid "Software offered by third party developers."
+msgstr "Programoj ofertitaj de aliaj programistoj kaj firmaoj"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:94
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:112
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "KD kun Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:155
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 9.10 'Karmic Koala'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:173
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "KD kun Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:216
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:234
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "KD kun Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:277
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:295
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "KD kun Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:339
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "KD kun Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:402
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "KD kun Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:465
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:483
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "KD kun Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:525
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Community-maintained"
-msgstr ""
+msgstr "Komunume prizorgata"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:536
 msgid "Restricted software"
-msgstr ""
+msgstr "Limigita programaro"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:543
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "KD kun Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:585
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:588
 msgid "Canonical-supported Open Source software"
-msgstr ""
+msgstr "Malfermitkoda programaro subtenata de Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:590
 msgid "Community-maintained (universe)"
-msgstr ""
+msgstr "Komunume prizorgata (universo)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:591
 msgid "Community-maintained Open Source software"
-msgstr ""
+msgstr "Komunume prizorgata malfermitkoda programaro"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:593
 msgid "Non-free drivers"
-msgstr ""
+msgstr "Neliberaj peliloj"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:594
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Fermitkoda peliloj por aparatoj"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:596
 msgid "Restricted software (Multiverse)"
-msgstr ""
+msgstr "Limigita programaro (multiverso)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:597
 msgid "Software restricted by copyright or legal issues"
-msgstr ""
+msgstr "Programaro limigita per kopirajto aŭ leĝaj temoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:603
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "KD kun Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:619
 msgid "Important security updates"
-msgstr ""
+msgstr "Gravaj sekurecaj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:624
 msgid "Recommended updates"
-msgstr ""
+msgstr "Rekomenditaj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:629
 msgid "Pre-released updates"
-msgstr ""
+msgstr "Antaŭ-eldonataj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:634
 msgid "Unsupported updates"
-msgstr ""
+msgstr "Nesubtenataj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:645
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:659
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "KD kun Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:675
 msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 Sekurecaj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:680
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 Ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:685
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Retroportoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:696
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:710
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "KD kun Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:713 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Oficiale subtenata"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:726
 msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 Sekurecaj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:731
 msgid "Ubuntu 5.04 Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 Ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:736
 msgid "Ubuntu 5.04 Backports"
-msgstr ""
+msgstr "Ubuntu 5.04 Retroportoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:742
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:748
 msgid "Community-maintained (Universe)"
-msgstr ""
+msgstr "Komunume flegata (univreso)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:750
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Mallibere (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:756
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "KD kun Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:759
 msgid "No longer officially supported"
-msgstr ""
+msgstr "Ne plu oficiale subtenata"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:761
 msgid "Restricted copyright"
-msgstr ""
+msgstr "Limigita kopirajto"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:768
 msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 Sekurecaj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:773
 msgid "Ubuntu 4.10 Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 Ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:778
 msgid "Ubuntu 4.10 Backports"
-msgstr ""
+msgstr "Ubuntu 4.10 Retroportoj"
 
 #. ChangelogURI
 #: ../data/templates/Debian.info.in.h:4
@@ -276,114 +333,110 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-#, fuzzy
 msgid "Debian 6.0 'Squeeze' "
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debiano 6.0 'Squeeze' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
 msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debiano 5.0 'Lenny' "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
 msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debiano 4.0 'Etch'"
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debiano 3.1 'Sarge'"
 
 #. Description
 #: ../data/templates/Debian.info.in:94
 msgid "Proposed updates"
-msgstr ""
+msgstr "Proponitaj ĝisdatigoj"
 
 #. Description
 #: ../data/templates/Debian.info.in:101
 msgid "Security updates"
-msgstr ""
+msgstr "Sekurecaj ĝisdatigoj"
 
 #. Description
 #: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Debiana aktuala stabila eldono"
 
 #. Description
 #: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
-msgstr ""
+msgstr "Debiana testado"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
-msgstr ""
+msgstr "Debiano 'Sid' (nestabile)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-kongrua programaro kun malliberaj dependecoj"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Ne-DFSG-kongruaj programaroj"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:209 ../aptsources/distro.py:427
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Servilo por %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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:227 ../aptsources/distro.py:233
+#: ../aptsources/distro.py:249
 msgid "Main server"
-msgstr ""
+msgstr "Ĉefa servilo"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:253
 msgid "Custom servers"
-msgstr ""
+msgstr "Propraj serviloj"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
+msgstr "Elŝutante dosieron %(current)li sur %(total)li per %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
+msgstr "Elŝutante dosieron %(current)li sur %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:342
 msgid "Details"
 msgstr "Detaloj"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:430
 msgid "Starting..."
-msgstr ""
+msgstr "Komencante..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:436
 msgid "Complete"
-msgstr ""
+msgstr "Komplete"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:358
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
+msgstr "Nevalida unikodaĵo en priskribo por '%s' (%s). Bonvolu raporti."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1065 ../apt/package.py:1171
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "La listo de ŝanĝoj ne haveblas"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1177
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -391,109 +444,161 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"La listo de ŝanĝoj ankoraŭ ne haveblas.\n"
+"\n"
+"Bonvolu uzi http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"ĝis kiam la ŝanĝoj havebliĝos aŭ poste reklopodi."
 
-#: ../apt/package.py:1053
-#, fuzzy
+#: ../apt/package.py:1184
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
-msgstr "Bonvolu kontroli vian interretan konekton."
+msgstr ""
+"Malsukcesis elŝuti la liston de ŝanĝoj. \n"
+"Bonvolu kontroli vian interretan konekton."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Listo de dosieroj de '%s' ne legeblis"
+
+#: ../apt/debfile.py:167
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr "Dependeco ne plenumita: %s\n"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:188
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "Conflicts with the installed package '%s'"
+msgstr "Konfliktas kun la instalita pakaĵo '%s'"
+
+#. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
+#: ../apt/debfile.py:327
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' dependaĵo %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 
-#: ../apt/debfile.py:149
+#. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
+#: ../apt/debfile.py:343
 #, python-format
-msgid "Dependency is not satisfiable: %s\n"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 msgstr ""
+"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' konflikto: %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:353
 #, python-format
-msgid "Conflicts with the installed package '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
+"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' kiu konfliktas kun: "
+"'%(targetpkg)s'. Sed la '%(debfile)s' ofertas ĝin per: '%(provides)s'"
+
+#: ../apt/debfile.py:399
+msgid "No Architecture field in the package"
+msgstr "Neniu arĥitekturo-kampo en la pakaĵo"
 
-#: ../apt/debfile.py:319
+#: ../apt/debfile.py:404
 #, python-format
 msgid "Wrong architecture '%s'"
-msgstr ""
+msgstr "Malkorekta arĥitekturo: '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:411
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Pli nova versio estas jam instalita"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:436
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Fiaskis plenumi ĉiujn dependecojn (difektita kaŝmemoro)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:466
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Ne eblis instalo de '%s'"
+msgstr "Ne instaleblas '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:508
+msgid "Python-debian module not available"
+msgstr "Modulo Python-debian ne haveblas"
+
+#: ../apt/debfile.py:542
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Aŭtomate malpakita:\n"
+"\n"
+
+#: ../apt/debfile.py:548
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Aŭtomate konvertita al presebla 'ascii':\n"
+
+#: ../apt/debfile.py:638
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
+msgstr "Instali kunmet-dependecojn por fontpakaĵo '%s', kiu kunmetas %s\n"
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:648
 msgid "An essential package would be removed"
-msgstr ""
+msgstr "Esenca pakaĵo estus forigita"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Farite"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Trafo "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Ign "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Era "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Akiri:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [laborante]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Ŝanĝo de datenportilo: bonvolu enmeti la diskon nomitan\n"
+" '%s'\n"
+"en la diskingon '%s' kaj puŝi la enigan klavon\n"
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
+#: ../apt/progress/text.py:223
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Prenis %sB en %s (%sB/s)\n"
 
-#: ../apt/progress/text.py:229
+#: ../apt/progress/text.py:239
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Bonvolu doni nomon al tiu ĉi disko, ekzemple 'Disko 1 de Debian 2.1r1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Bonvolu enmeti diskon en la diskingon kaj puŝi la enigan klavon"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:149
 msgid "Building data structures"
-msgstr ""
+msgstr "Konstruado de datenaj strukturoj"
diff --git a/po/urd.po b/po/urd.po
deleted file mode 100644
index fc492682..00000000
--- a/po/urd.po
+++ /dev/null
@@ -1,495 +0,0 @@
-# Urdu translation for update-manager
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the update-manager package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
-
-#. ChangelogURI
-#: ../data/templates/Ubuntu.info.in.h:4
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. ChangelogURI
-#: ../data/templates/Debian.info.in.h:4
-#, no-c-format
-msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. More than one server is used. Since we don't handle this case
-#. in the user interface we set "custom servers" to true and
-#. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "روز"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""