diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | po/python-apt.pot | 224 |
2 files changed, 128 insertions, 102 deletions
diff --git a/debian/changelog b/debian/changelog index e513563c..eb4a1b36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.8.9.2) UNRELEASED; urgency=low + + * some fixes from a coverity scan run + + -- Michael Vogt <mvo@debian.org> Mon, 05 Aug 2013 22:55:02 +0200 + python-apt (0.8.9.1) unstable; urgency=low [ Michael Vogt ] diff --git a/po/python-apt.pot b/po/python-apt.pot index 940cd13a..d9cc96c9 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: 2012-06-25 14:31+0200\n" +"POT-Creation-Date: 2013-08-05 22:44+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" @@ -24,327 +24,347 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:151 +#: ../data/templates/Ubuntu.info.in:33 +msgid "Ubuntu 13.04 'Raring Ringtail'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:40 +msgid "Cdrom with Ubuntu 13.04 'Raring Ringtail'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:152 +msgid "Ubuntu 12.10 'Quantal Quetzal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:159 +msgid "Cdrom with Ubuntu 12.10 'Quantal Quetzal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:270 msgid "Ubuntu 12.04 'Precise Pangolin'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:158 +#: ../data/templates/Ubuntu.info.in:277 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:269 +#: ../data/templates/Ubuntu.info.in:388 msgid "Ubuntu 11.10 'Oneiric Ocelot'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:276 +#: ../data/templates/Ubuntu.info.in:395 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:388 +#: ../data/templates/Ubuntu.info.in:507 msgid "Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:395 +#: ../data/templates/Ubuntu.info.in:514 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:486 +#: ../data/templates/Ubuntu.info.in:605 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:506 +#: ../data/templates/Ubuntu.info.in:625 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:637 msgid "Canonical Partners" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:520 +#: ../data/templates/Ubuntu.info.in:639 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 +#: ../data/templates/Ubuntu.info.in:640 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:528 +#: ../data/templates/Ubuntu.info.in:647 msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:649 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 +#: ../data/templates/Ubuntu.info.in:650 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:569 +#: ../data/templates/Ubuntu.info.in:688 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:589 +#: ../data/templates/Ubuntu.info.in:708 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:632 +#: ../data/templates/Ubuntu.info.in:751 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:652 +#: ../data/templates/Ubuntu.info.in:771 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:695 +#: ../data/templates/Ubuntu.info.in:814 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:714 +#: ../data/templates/Ubuntu.info.in:833 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:757 +#: ../data/templates/Ubuntu.info.in:876 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:777 +#: ../data/templates/Ubuntu.info.in:896 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:821 +#: ../data/templates/Ubuntu.info.in:940 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:841 +#: ../data/templates/Ubuntu.info.in:960 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:886 +#: ../data/templates/Ubuntu.info.in:1005 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:905 +#: ../data/templates/Ubuntu.info.in:1024 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:950 +#: ../data/templates/Ubuntu.info.in:1069 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:969 +#: ../data/templates/Ubuntu.info.in:1088 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1011 +#: ../data/templates/Ubuntu.info.in:1130 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 +#: ../data/templates/Ubuntu.info.in:1135 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 +#: ../data/templates/Ubuntu.info.in:1141 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1030 +#: ../data/templates/Ubuntu.info.in:1149 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1072 +#: ../data/templates/Ubuntu.info.in:1191 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 +#: ../data/templates/Ubuntu.info.in:1194 msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 +#: ../data/templates/Ubuntu.info.in:1196 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 +#: ../data/templates/Ubuntu.info.in:1197 msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 +#: ../data/templates/Ubuntu.info.in:1199 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 +#: ../data/templates/Ubuntu.info.in:1202 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 +#: ../data/templates/Ubuntu.info.in:1203 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1091 +#: ../data/templates/Ubuntu.info.in:1210 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1107 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1112 +#: ../data/templates/Ubuntu.info.in:1231 ../data/templates/Debian.info.in:26 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1117 +#: ../data/templates/Ubuntu.info.in:1236 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1122 +#: ../data/templates/Ubuntu.info.in:1241 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1133 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1148 +#: ../data/templates/Ubuntu.info.in:1267 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1164 +#: ../data/templates/Ubuntu.info.in:1283 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1169 +#: ../data/templates/Ubuntu.info.in:1288 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1174 +#: ../data/templates/Ubuntu.info.in:1293 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1185 +#: ../data/templates/Ubuntu.info.in:1304 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1200 +#: ../data/templates/Ubuntu.info.in:1319 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 +#: ../data/templates/Ubuntu.info.in:1322 ../data/templates/Debian.info.in:179 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1216 +#: ../data/templates/Ubuntu.info.in:1335 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1221 +#: ../data/templates/Ubuntu.info.in:1340 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1226 +#: ../data/templates/Ubuntu.info.in:1345 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1232 +#: ../data/templates/Ubuntu.info.in:1351 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 +#: ../data/templates/Ubuntu.info.in:1357 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 +#: ../data/templates/Ubuntu.info.in:1359 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1247 +#: ../data/templates/Ubuntu.info.in:1366 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 +#: ../data/templates/Ubuntu.info.in:1369 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 +#: ../data/templates/Ubuntu.info.in:1371 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1259 +#: ../data/templates/Ubuntu.info.in:1378 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1264 +#: ../data/templates/Ubuntu.info.in:1383 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1269 +#: ../data/templates/Ubuntu.info.in:1388 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -360,62 +380,62 @@ msgid "Debian 7.0 'Wheezy' " msgstr "" #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:38 msgid "Debian 6.0 'Squeeze' " msgstr "" #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:63 msgid "Debian 5.0 'Lenny' " msgstr "" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:88 msgid "Debian 4.0 'Etch'" msgstr "" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:113 msgid "Debian 3.1 'Sarge'" msgstr "" #. Description -#: ../data/templates/Debian.info.in:119 +#: ../data/templates/Debian.info.in:124 msgid "Proposed updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:126 +#: ../data/templates/Debian.info.in:131 msgid "Security updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:133 +#: ../data/templates/Debian.info.in:138 msgid "Debian current stable release" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:151 msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:172 +#: ../data/templates/Debian.info.in:177 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:176 +#: ../data/templates/Debian.info.in:181 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:178 +#: ../data/templates/Debian.info.in:183 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 +#: ../aptsources/distro.py:211 ../aptsources/distro.py:441 #, python-format msgid "Server for %s" msgstr "" @@ -423,12 +443,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:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 +#: ../aptsources/distro.py:229 ../aptsources/distro.py:235 +#: ../aptsources/distro.py:251 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:250 +#: ../aptsources/distro.py:255 msgid "Custom servers" msgstr "" @@ -455,16 +475,16 @@ msgstr "" msgid "Complete" msgstr "" -#: ../apt/package.py:359 +#: ../apt/package.py:361 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:1088 ../apt/package.py:1194 +#: ../apt/package.py:1093 ../apt/package.py:1199 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1200 +#: ../apt/package.py:1205 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -473,34 +493,34 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1207 +#: ../apt/package.py:1212 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:82 +#: ../apt/debfile.py:85 #, python-format msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:93 +#: ../apt/debfile.py:96 #, python-format msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:211 +#: ../apt/debfile.py:215 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:232 +#: ../apt/debfile.py:236 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" #. 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:373 +#: ../apt/debfile.py:377 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -508,59 +528,59 @@ msgid "" msgstr "" #. 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:389 +#: ../apt/debfile.py:393 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" -#: ../apt/debfile.py:399 +#: ../apt/debfile.py:403 #, 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:447 +#: ../apt/debfile.py:451 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:457 +#: ../apt/debfile.py:461 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:464 +#: ../apt/debfile.py:468 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:489 +#: ../apt/debfile.py:493 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:519 +#: ../apt/debfile.py:523 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:593 +#: ../apt/debfile.py:597 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:599 +#: ../apt/debfile.py:603 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:689 +#: ../apt/debfile.py:693 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:700 +#: ../apt/debfile.py:704 msgid "An essential package would be removed" msgstr "" @@ -611,6 +631,6 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:157 +#: ../apt/cache.py:162 msgid "Building data structures" msgstr "" |