Revert "Merge remote-tracking branch 'mvo/feature/srcrec-enum' into debian/sid"

This reverts commit 1b6b123a052ca2d53e90b62da09ce300d701265a, reversing
changes made to 9de6a183f09f0d0adbcc5817872c5a0024f5ef47.

1 files changed, 109 insertions, 119 deletions

diff --git a/po/python-apt.pot b/po/python-apt.pot
index 08650c1f..8d8b1261 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: 2014-06-06 11:07+0200\n"
+"POT-Creation-Date: 2014-01-01 09:20+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"
@@ -30,376 +30,366 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:140
-msgid "Ubuntu 14.10 'Utopic Unicorn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:147
-msgid "Cdrom with Ubuntu 14.10 'Utopic Unicorn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:259
 msgid "Ubuntu 14.04 'Trusty Tahr'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:266
+#: ../data/templates/Ubuntu.info.in:147
 msgid "Cdrom with Ubuntu 14.04 'Trusty Tahr'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:259
 msgid "Ubuntu 13.10 'Saucy Salamander'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:385
+#: ../data/templates/Ubuntu.info.in:266
 msgid "Cdrom with Ubuntu 13.10 'Saucy Salamander'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:378
 msgid "Ubuntu 13.04 'Raring Ringtail'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:385
 msgid "Cdrom with Ubuntu 13.04 'Raring Ringtail'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:616
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 12.10 'Quantal Quetzal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:623
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Cdrom with Ubuntu 12.10 'Quantal Quetzal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:734
+#: ../data/templates/Ubuntu.info.in:615
 msgid "Ubuntu 12.04 'Precise Pangolin'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:741
+#: ../data/templates/Ubuntu.info.in:622
 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:852
+#: ../data/templates/Ubuntu.info.in:733
 msgid "Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:859
+#: ../data/templates/Ubuntu.info.in:740
 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:971
+#: ../data/templates/Ubuntu.info.in:852
 msgid "Ubuntu 11.04 'Natty Narwhal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:978
+#: ../data/templates/Ubuntu.info.in:859
 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1069
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 10.10 'Maverick Meerkat'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1089
+#: ../data/templates/Ubuntu.info.in:970
 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1101
+#: ../data/templates/Ubuntu.info.in:982
 msgid "Canonical Partners"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1103
+#: ../data/templates/Ubuntu.info.in:984
 msgid "Software packaged by Canonical for their partners"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1104
+#: ../data/templates/Ubuntu.info.in:985
 msgid "This software is not part of Ubuntu."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1111
+#: ../data/templates/Ubuntu.info.in:992
 msgid "Independent"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1113
+#: ../data/templates/Ubuntu.info.in:994
 msgid "Provided by third-party software developers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1114
+#: ../data/templates/Ubuntu.info.in:995
 msgid "Software offered by third party developers."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1152
+#: ../data/templates/Ubuntu.info.in:1033
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1172
+#: ../data/templates/Ubuntu.info.in:1053
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1215
+#: ../data/templates/Ubuntu.info.in:1096
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1235
+#: ../data/templates/Ubuntu.info.in:1116
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1278
+#: ../data/templates/Ubuntu.info.in:1159
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1297
+#: ../data/templates/Ubuntu.info.in:1178
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1340
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1360
+#: ../data/templates/Ubuntu.info.in:1241
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1404
+#: ../data/templates/Ubuntu.info.in:1285
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1424
+#: ../data/templates/Ubuntu.info.in:1305
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1469
+#: ../data/templates/Ubuntu.info.in:1350
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1488
+#: ../data/templates/Ubuntu.info.in:1369
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1533
+#: ../data/templates/Ubuntu.info.in:1414
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1552
+#: ../data/templates/Ubuntu.info.in:1433
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1594
+#: ../data/templates/Ubuntu.info.in:1475
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1599
+#: ../data/templates/Ubuntu.info.in:1480
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1605
+#: ../data/templates/Ubuntu.info.in:1486
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1613
+#: ../data/templates/Ubuntu.info.in:1494
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1655
+#: ../data/templates/Ubuntu.info.in:1536
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1658
+#: ../data/templates/Ubuntu.info.in:1539
 msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1660
+#: ../data/templates/Ubuntu.info.in:1541
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1661
+#: ../data/templates/Ubuntu.info.in:1542
 msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1663
+#: ../data/templates/Ubuntu.info.in:1544
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1664
+#: ../data/templates/Ubuntu.info.in:1545
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1666
+#: ../data/templates/Ubuntu.info.in:1547
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1667
+#: ../data/templates/Ubuntu.info.in:1548
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1674
+#: ../data/templates/Ubuntu.info.in:1555
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1690
+#: ../data/templates/Ubuntu.info.in:1571
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1695 ../data/templates/Debian.info.in:56
+#: ../data/templates/Ubuntu.info.in:1576 ../data/templates/Debian.info.in:56
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1700
+#: ../data/templates/Ubuntu.info.in:1581
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1705
+#: ../data/templates/Ubuntu.info.in:1586
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1716
+#: ../data/templates/Ubuntu.info.in:1597
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1731
+#: ../data/templates/Ubuntu.info.in:1612
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1747
+#: ../data/templates/Ubuntu.info.in:1628
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1752
+#: ../data/templates/Ubuntu.info.in:1633
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1757
+#: ../data/templates/Ubuntu.info.in:1638
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1768
+#: ../data/templates/Ubuntu.info.in:1649
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1783
+#: ../data/templates/Ubuntu.info.in:1664
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1786 ../data/templates/Debian.info.in:209
+#: ../data/templates/Ubuntu.info.in:1667 ../data/templates/Debian.info.in:209
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1799
+#: ../data/templates/Ubuntu.info.in:1680
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1804
+#: ../data/templates/Ubuntu.info.in:1685
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1809
+#: ../data/templates/Ubuntu.info.in:1690
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1815
+#: ../data/templates/Ubuntu.info.in:1696
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1821
+#: ../data/templates/Ubuntu.info.in:1702
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1823
+#: ../data/templates/Ubuntu.info.in:1704
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1830
+#: ../data/templates/Ubuntu.info.in:1711
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1833
+#: ../data/templates/Ubuntu.info.in:1714
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1835
+#: ../data/templates/Ubuntu.info.in:1716
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1842
+#: ../data/templates/Ubuntu.info.in:1723
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1847
+#: ../data/templates/Ubuntu.info.in:1728
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1852
+#: ../data/templates/Ubuntu.info.in:1733
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -492,39 +482,39 @@ msgstr ""
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:245
+#: ../apt/progress/gtk2.py:243
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:251
+#: ../apt/progress/gtk2.py:249
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:274
+#: ../apt/progress/gtk2.py:272
 msgid "Details"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:347
+#: ../apt/progress/gtk2.py:345
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:353
+#: ../apt/progress/gtk2.py:351
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:380
+#: ../apt/package.py:328
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:950 ../apt/package.py:1056
+#: ../apt/package.py:901 ../apt/package.py:1007
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1062
+#: ../apt/package.py:1013
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -533,120 +523,120 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1069
+#: ../apt/package.py:1020
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:89
+#: ../apt/debfile.py:87
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:101
+#: ../apt/debfile.py:99
 #, python-format
 msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:226
+#: ../apt/debfile.py:224
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:249
+#: ../apt/debfile.py:247
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:396
+#: ../apt/debfile.py:394
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
 "(%(deprelation)s %(depversion)s)"
 msgstr ""
 
-#: ../apt/debfile.py:423
+#: ../apt/debfile.py:421
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
 "%(targetver)s)"
 msgstr ""
 
-#: ../apt/debfile.py:437
+#: ../apt/debfile.py:435
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
 "the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
 
-#: ../apt/debfile.py:488
+#: ../apt/debfile.py:486
 msgid "No Architecture field in the package"
 msgstr ""
 
-#: ../apt/debfile.py:498
+#: ../apt/debfile.py:496
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:506
+#: ../apt/debfile.py:504
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:531
+#: ../apt/debfile.py:529
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:560
+#: ../apt/debfile.py:558
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:636
+#: ../apt/debfile.py:634
 msgid ""
 "Automatically decompressed:\n"
 "\n"
 msgstr ""
 
-#: ../apt/debfile.py:642
+#: ../apt/debfile.py:640
 msgid "Automatically converted to printable ascii:\n"
 msgstr ""
 
-#: ../apt/debfile.py:733
+#: ../apt/debfile.py:731
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:744
+#: ../apt/debfile.py:742
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:89
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:129
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:140
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:151
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:211
+#: ../apt/progress/text.py:204
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:222
+#: ../apt/progress/text.py:215
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -655,19 +645,19 @@ msgid ""
 msgstr ""
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:231
+#: ../apt/progress/text.py:224
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: ../apt/progress/text.py:247
+#: ../apt/progress/text.py:240
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr ""
 
-#: ../apt/progress/text.py:263
+#: ../apt/progress/text.py:256
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:163
+#: ../apt/cache.py:164
 msgid "Building data structures"
 msgstr ""