diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-03-21 15:15:37 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-03-21 15:15:37 +0100 |
| commit | ddf4cdd43c9b7d876376a99a4cddaf8e235472d1 (patch) | |
| tree | 8debc122498868508e53f832b16e30f050b3f55c /po/python-apt.pot | |
| parent | 50cd25232b87fcf0be1a87bf2757f76a369ee175 (diff) | |
| parent | e3ebbfe848d3d03baaf969374ac55641873bb798 (diff) | |
| download | python-apt-ddf4cdd43c9b7d876376a99a4cddaf8e235472d1.tar.gz | |
* merged fix for parse_depends() in a multiarch environment
from debian/sid branch
* apt/progress/text.py:
- only run ioctl for termios.TIOCGWINSZ if the fd is a tty
* apt/debfile.py, tests/test_debfile.py:
- strip "./" from _get_content and add tests, this fixes a control
file extraction bug in gdebi
* python/depcache.cc:
- when using the actiongroup as a contextmanager incref/decref
on enter and leave. this should fix the instablity issues
that aptdaemon runs into (LP: #691134)
* debian/python3-apt.install:
- fix py3 extension module install location (thanks to
Barry)
* python/depcache.cc:
- provide bindings for new libapt SetCandidateRelease()
* debian/control:
- require new libapt-pkg-dev SetCandidateRelease()
* py3 compatible exception handline
* debian/control:
- bump minimal python version to >= 2.6
* python/apt_pkgmodule.cc:
- strip multiarch by default in RealParseDepends
- add optional parameter to allow parse_depends() to keep the
multiarch parameter
* tests/test_deps.py:
- add test forapt_pkg.parse_depends(strip_multiarch=True)
Diffstat (limited to 'po/python-apt.pot')
| -rw-r--r-- | po/python-apt.pot | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/po/python-apt.pot b/po/python-apt.pot index e3feb5e7..ec222e09 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: 2010-11-24 10:29+0100\n" +"POT-Creation-Date: 2011-03-21 15:14+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" @@ -519,51 +519,51 @@ msgstr "" msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:539 +#: ../apt/debfile.py:541 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:545 +#: ../apt/debfile.py:547 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:635 +#: ../apt/debfile.py:637 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:645 +#: ../apt/debfile.py:647 msgid "An essential package would be removed" msgstr "" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:120 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:129 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:131 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:142 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:202 +#: ../apt/progress/text.py:204 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:213 +#: ../apt/progress/text.py:215 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -572,16 +572,16 @@ msgid "" msgstr "" #. Trick for getting a translation from apt -#: ../apt/progress/text.py:222 +#: ../apt/progress/text.py:224 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: ../apt/progress/text.py:238 +#: ../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:254 +#: ../apt/progress/text.py:256 msgid "Please insert a Disc in the drive and press enter" msgstr "" |