diff options
| -rw-r--r-- | apt/cache.py | 7 | ||||
| -rw-r--r-- | apt/debfile.py | 4 | ||||
| -rw-r--r-- | apt/utils.py | 6 | ||||
| -rw-r--r-- | aptsources/distinfo.py | 29 | ||||
| -rw-r--r-- | aptsources/distro.py | 5 | ||||
| -rw-r--r-- | aptsources/sourceslist.py | 22 | ||||
| -rw-r--r-- | data/templates/Ubuntu.info.in | 368 | ||||
| -rw-r--r-- | debian/changelog | 37 | ||||
| -rw-r--r-- | doc/source/library/apt_inst.rst | 6 | ||||
| -rw-r--r-- | po/da.po | 152 | ||||
| -rw-r--r-- | po/pt_BR.po | 310 | ||||
| -rw-r--r-- | po/python-apt.pot | 168 | ||||
| -rw-r--r-- | po/sr.po | 198 | ||||
| -rw-r--r-- | python/tar.cc | 4 | ||||
| -rw-r--r-- | tests/test_apt_cache.py | 2 | ||||
| -rw-r--r-- | tests/test_progress.py | 2 | ||||
| -rw-r--r-- | tests/test_utils.py | 56 | ||||
| -rwxr-xr-x | utils/get_ubuntu_mirrors_from_lp.py | 1 |
18 files changed, 977 insertions, 400 deletions
diff --git a/apt/cache.py b/apt/cache.py index be137b76..bab5c277 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -46,8 +46,7 @@ class LockFailedException(IOError): class Cache(object): """Dictionary-like package cache. - This class has all the packages that are available in it's - dictionary. + The dictionary of this class contains all available packages. Keyword arguments: progress -- a OpProgress object @@ -507,7 +506,7 @@ class Cache(object): self._callbacks[name].append(callback) def actiongroup(self): - """Return an ActionGroup() object for the current cache. + """Return an action group object for the current cache. Action groups can be used to speedup actions. The action group is active as soon as it is created, and disabled when the object is @@ -520,7 +519,7 @@ class Cache(object): for package in my_selected_packages: package.mark_install() - This way, the ActionGroup is automatically released as soon as the + This way, the action group is automatically released as soon as the with statement block is left. It also has the benefit of making it clear which parts of the code run with a action group and which don't. diff --git a/apt/debfile.py b/apt/debfile.py index d0f41def..104b0814 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -472,7 +472,7 @@ class DebPackage(object): def missing_deps(self): """Return missing dependencies.""" self._dbg(1, "Installing: %s" % self._need_pkgs) - if self._need_pkgs is None: + if not self._need_pkgs: self.check() return self._need_pkgs @@ -485,6 +485,8 @@ class DebPackage(object): install = [] remove = [] unauthenticated = [] + if not self._cache: + self.check() for pkg in self._cache: if pkg.marked_install or pkg.marked_upgrade: install.append(pkg.name) diff --git a/apt/utils.py b/apt/utils.py index 4b3da39f..49e8bed5 100644 --- a/apt/utils.py +++ b/apt/utils.py @@ -28,11 +28,13 @@ def get_maintenance_end_date(release_date, m_months): ends. Needs the data of the release and the number of months that its is supported as input """ - years = m_months / 12 + # calc end date + years = m_months // 12 months = m_months % 12 support_end_year = (release_date.year + years + - (release_date.month + months)/12) + (release_date.month + months)//12) support_end_month = (release_date.month + months) % 12 + # special case: this happens when e.g. doing 2010-06 + 18 months if support_end_month == 0: support_end_month = 12 support_end_year -= 1 diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index b21e95b3..c8ec5c46 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -22,11 +22,11 @@ # USA import errno +import logging import os import gettext from os import getenv from subprocess import Popen, PIPE -import ConfigParser import re import apt_pkg @@ -173,9 +173,9 @@ class DistInfo(object): try: dist = Popen(["lsb_release", "-i", "-s"], stdout=PIPE).communicate()[0].strip() - except OSError, exc: + except OSError as exc: if exc.errno != errno.ENOENT: - print 'WARNING: lsb_release failed, using defaults:', exc + logging.warn('lsb_release failed, using defaults:' % exc) dist = "Debian" self.dist = dist @@ -184,9 +184,6 @@ class DistInfo(object): dist_fname = "%s/%s.info" % (base_dir, dist) with open(dist_fname) as dist_file: - - - template = None component = None for line in dist_file: @@ -299,17 +296,17 @@ class DistInfo(object): if __name__ == "__main__": d = DistInfo("Ubuntu", "/usr/share/python-apt/templates") - print d.changelogs_uri + logging.info(d.changelogs_uri) for template in d.templates: - print "\nSuite: %s" % template.name - print "Desc: %s" % template.description - print "BaseURI: %s" % template.base_uri - print "MatchURI: %s" % template.match_uri + logging.info("\nSuite: %s" % template.name) + logging.info("Desc: %s" % template.description) + logging.info("BaseURI: %s" % template.base_uri) + logging.info("MatchURI: %s" % template.match_uri) if template.mirror_set != {}: - print "Mirrors: %s" % template.mirror_set.keys() + logging.info("Mirrors: %s" % template.mirror_set.keys()) for comp in template.components: - print " %s -%s -%s" % (comp.name, - comp.description, - comp.description_long) + logging.info(" %s -%s -%s" % (comp.name, + comp.description, + comp.description_long)) for child in template.children: - print " %s" % child.description + logging.info(" %s" % child.description) diff --git a/aptsources/distro.py b/aptsources/distro.py index 28d5b96f..f777a4ea 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -22,6 +22,7 @@ # USA import gettext +import logging import re import os import sys @@ -464,9 +465,9 @@ def _lsb_release(): # Convert to unicode string, needed for Python 3.1 out = out.decode("utf-8") result.update(l.split(":\t") for l in out.split("\n") if ':\t' in l) - except OSError, exc: + except OSError as exc: if exc.errno != errno.ENOENT: - print 'WARNING: lsb_release failed, using defaults:', exc + logging.warn('lsb_release failed, using defaults:' % exc) return result diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 353cce2d..40a0379b 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -25,6 +25,7 @@ import gettext import glob +import logging import os.path import re import shutil @@ -32,7 +33,7 @@ import sys import time import apt_pkg -from aptsources.distinfo import DistInfo +from distinfo import DistInfo from apt.deprecation import function_deprecated_by @@ -373,7 +374,7 @@ class SourcesList(object): source = SourceEntry(line, file) self.list.append(source) except: - print "could not open file '%s'" % file + logging.warn("could not open file '%s'\n" % file) def save(self): """ save the current sources """ @@ -449,7 +450,10 @@ class SourceEntryMatcher(object): found = False for template in self.templates: if (re.search(template.match_uri, source.uri) and - re.match(template.match_name, source.dist)): + re.match(template.match_name, source.dist) and + # deb is a valid fallback for deb-src (if that is not + # definied, see #760035 + (source.type == template.type or template.type == "deb")): found = True source.template = template break @@ -467,14 +471,14 @@ if __name__ == "__main__": sources = SourcesList() for entry in sources: - print entry.str() + logging.info("entry %s" % entry.str()) #print entry.uri mirror = is_mirror("http://archive.ubuntu.com/ubuntu/", "http://de.archive.ubuntu.com/ubuntu/") - print "is_mirror(): %s" % mirror + logging.info("is_mirror(): %s" % mirror) - print is_mirror("http://archive.ubuntu.com/ubuntu", - "http://de.archive.ubuntu.com/ubuntu/") - print is_mirror("http://archive.ubuntu.com/ubuntu/", - "http://de.archive.ubuntu.com/ubuntu") + logging.info(is_mirror("http://archive.ubuntu.com/ubuntu", + "http://de.archive.ubuntu.com/ubuntu/")) + logging.info(is_mirror("http://archive.ubuntu.com/ubuntu/", + "http://de.archive.ubuntu.com/ubuntu")) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index c6d38910..9e62c0fa 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,360 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 12.04 'Precise Pangolin' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported Open Source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained Open Source software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: precise +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Ubuntu 12.04 'Precise Pangolin' + +Suite: precise +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*12.04 +MatchURI: cdrom:\[Ubuntu.*12.04 +_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +_Description: Canonical Partners +Component: partner +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +_Description: Independent +Component: main +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +_Description: Important security updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb +_Description: Recommended updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb +_Description: Pre-released updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb +_Description: Unsupported updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + +Suite: oneiric +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 11.10 'Oneiric Ocelot' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported Open Source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained Open Source software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: oneiric +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Ubuntu 11.10 'Oneiric Ocelot' + +Suite: oneiric +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*11.10 +MatchURI: cdrom:\[Ubuntu.*11.10 +_Description: Cdrom with Ubuntu 11.10 'Oneiric Ocelot' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: oneiric +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +_Description: Canonical Partners +Component: partner +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. + +Suite: oneiric +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +_Description: Independent +Component: main +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. + +Suite: oneiric-security +ParentSuite: oneiric +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: oneiric-security +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +_Description: Important security updates + +Suite: oneiric-updates +ParentSuite: oneiric +RepositoryType: deb +_Description: Recommended updates + +Suite: oneiric-updates +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + +Suite: oneiric-proposed +ParentSuite: oneiric +RepositoryType: deb +_Description: Pre-released updates + +Suite: oneiric-proposed +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + +Suite: oneiric-backports +ParentSuite: oneiric +RepositoryType: deb +_Description: Unsupported updates + +Suite: oneiric-backports +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + + +Suite: natty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 11.04 'Natty Narwhal' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported Open Source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained Open Source software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: natty +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Ubuntu 11.04 'Natty Narwhal' + +Suite: natty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*11.04 +MatchURI: cdrom:\[Ubuntu.*11.04 +_Description: Cdrom with Ubuntu 11.04 'Natty Narwhal' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: natty +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +_Description: Canonical Partners +Component: partner +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. + +Suite: natty +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +_Description: Independent +Component: main +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. + +Suite: natty-security +ParentSuite: natty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: natty-security +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +_Description: Important security updates + +Suite: natty-updates +ParentSuite: natty +RepositoryType: deb +_Description: Recommended updates + +Suite: natty-updates +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb +_Description: Pre-released updates + +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb +_Description: Unsupported updates + +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + Suite: maverick RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ @@ -26,6 +381,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: maverick +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*10.10 MatchURI: cdrom:\[Ubuntu.*10.10 @@ -108,6 +464,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: lucid +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*10.04 MatchURI: cdrom:\[Ubuntu.*10.04 @@ -170,6 +527,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: karmic +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*9.10 MatchURI: cdrom:\[Ubuntu.*9.10 @@ -231,6 +589,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: jaunty +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*9.04 MatchURI: cdrom:\[Ubuntu.*9.04 @@ -293,6 +652,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: intrepid +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*8.10 MatchURI: cdrom:\[Ubuntu.*8.10 @@ -356,6 +716,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: hardy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*8.04 MatchURI: cdrom:\[Ubuntu.*8.04 @@ -419,6 +780,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: gutsy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*7.10 MatchURI: cdrom:\[Ubuntu.*7.10 @@ -482,6 +844,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: feisty +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*7.04 MatchURI: cdrom:\[Ubuntu.*7.04 @@ -542,6 +905,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: edgy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*6.10 MatchURI: cdrom:\[Ubuntu.*6.10 @@ -602,6 +966,7 @@ _CompDescription: Restricted software (Multiverse) _CompDescriptionLong: Software restricted by copyright or legal issues Suite: dapper +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*6.06 MatchURI: cdrom:\[Ubuntu.*6.06 @@ -658,6 +1023,7 @@ Component: multiverse _CompDescription: Non-free (Multiverse) Suite: breezy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*5.10 MatchURI: cdrom:\[Ubuntu.*5.10 @@ -709,6 +1075,7 @@ Component: multiverse _CompDescription: Non-free (Multiverse) Suite: hoary +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*5.04 MatchURI: cdrom:\[Ubuntu.*5.04 @@ -755,6 +1122,7 @@ Component: multiverse _CompDescription: Non-free (Multiverse) Suite: warty +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*4.10 MatchURI: cdrom:\[Ubuntu.*4.10 diff --git a/debian/changelog b/debian/changelog index 33b0d6e6..39c506e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,29 @@ -python-apt (0.8.1) UNRELEASED; urgency=low +python-apt (0.8.2) UNRELEASED; urgency=low + + [ Michael Vogt ] + * merged from ubuntu: + - use logging instead of print + - update distro template Ubuntu.info.in + - add xz compression support + * po/python-apt.pot: + - refreshed + * po/pt_BR.po: + - updated, thanks to Sergio Cipolla (closes: #628398) + * po/da.po: + - updated, thanks to Joe Dalton (closes: #631309) + * po/sr.po: + - updated, thanks to Nikola Nenadic (closes: #638308) + + [ Tshepang Lekhonkhobe ] + * rm usage of camelcase in cache.py doc (closes: #626617) + * grammar fix in the cache.py doc (closes: #626610) + * apt/debfile.py: Remove the need to explcitly call check() in order + to get output from require_changes and missing_deps + (closes: #624379) + + -- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2011 18:03:42 +0200 + +python-apt (0.8.1) unstable; urgency=low [ Julian Andres Klode ] * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) @@ -16,11 +41,11 @@ python-apt (0.8.1) UNRELEASED; urgency=low - fix test by providing proper fixture data - fix test if sources.list is not readable (as is the case on some PPA buildds) - * tests/test_all.py: - - print library dir to hunt down build failure on amd64 - * aptsources/distinfo.py: - - make mirror a valid protocol name * apt/package.py: + - fix py3 compatiblity with print + * tests/test_all.py: + - skip all tests if sources.list is not readable (as is the case on + some builds) - packages in marked_install state can also be auto-removable * add concept of "ParentComponent" for e.g. ubuntu/multiverse that needs universe enabled as well (plus add test) @@ -35,7 +60,7 @@ python-apt (0.8.1) UNRELEASED; urgency=low * debian/control: - add recommends to xz-lzma to ensure we have the unlzma command - -- Julian Andres Klode <jak@debian.org> Tue, 07 Jun 2011 14:00:22 +0200 + -- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2011 16:39:13 +0200 python-apt (0.8.0) unstable; urgency=low diff --git a/doc/source/library/apt_inst.rst b/doc/source/library/apt_inst.rst index d9403a9e..9e6772f5 100644 --- a/doc/source/library/apt_inst.rst +++ b/doc/source/library/apt_inst.rst @@ -134,8 +134,8 @@ Debian Packages .. attribute:: data - The :class:`TarFile` object associated with the data.tar.{gz,bz2,lzma} - member. + The :class:`TarFile` object associated with the + data.tar.{gz,bz2,lzma,xz} member. .. attribute:: debian_binary @@ -307,7 +307,7 @@ function can be replaced. Call the function *func* for each member of the tar file *file*. The parameter *comp* is a string determining the compressor used. Possible - options are "lzma", "bzip2" and "gzip". The parameter *file* may be + options are "xz", "lzma", "bzip2" and "gzip". The parameter *file* may be a :class:`file()` object, a file descriptor, or anything implementing a :meth:`fileno` method. @@ -1,21 +1,23 @@ -# Danish 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. +# Danish translation python-apt. +# Copyright (C) 2011 python-apt & nedenstående oversætttere. +# This file is distributed under the same license as the python-apt package. +# Mads Bille Lundby <lundbymads@gmail.com>, 2009. +# AJenbo <anders@jenbo.dk>, 2011. +# Ask, 2011. +# Joe Hansen <joedalton2@yahoo.dk>, 2011. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: update-manager\n" +"Project-Id-Version: python-apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-07-19 15:59+0200\n" -"PO-Revision-Date: 2006-10-16 15:55+0000\n" -"Last-Translator: Lasse Bang Mikkelsen <lbm@fatalerror.dk>\n" -"Language-Team: Danish <da@li.org>\n" +"PO-Revision-Date: 2011-06-22 14:44+0200\n" +"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" +"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n" +"Language: \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 @@ -25,75 +27,63 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:13 -#, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 9.10 \"Karmic Koala\"" #. Description #: ../data/templates/Ubuntu.info.in:31 -#, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Cd-rom med Ubuntu 9.10 \"Karmic Koala\"" #. Description #: ../data/templates/Ubuntu.info.in:74 -#, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 9.04 \"Jaunty Jackalope\"" #. Description #: ../data/templates/Ubuntu.info.in:92 -#, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Cd-rom med Ubuntu 9.04 \"Jaunty Jackalope\"" #. Description #: ../data/templates/Ubuntu.info.in:135 -#, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 8.10 \"Intrepid Ibex\"" #. Description #: ../data/templates/Ubuntu.info.in:153 -#, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Cd-rom med Ubuntu 8.10 \"Intrepid Ibex\"" #. Description #: ../data/templates/Ubuntu.info.in:197 -#, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 8.04 \"Hardy Heron\"" #. Description #: ../data/templates/Ubuntu.info.in:215 -#, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Cd-rom med Ubuntu 8.04 \"Hardy Heron\"" #. Description #: ../data/templates/Ubuntu.info.in:252 -#, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 5.04 sikkerhedsopdateringer" +msgstr "Ubuntu 7.10 \"Gutsy Gibbon\"" #. Description #: ../data/templates/Ubuntu.info.in:270 -#, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" +msgstr "Cd-rom med Ubuntu 7.10 \"Gutsy Gibbon\"" #. Description #: ../data/templates/Ubuntu.info.in:305 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.04 sikkerhedsopdateringer" +msgstr "Ubuntu 7.04 \"Feisty Fawn\"" #. Description #: ../data/templates/Ubuntu.info.in:323 -#, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" +msgstr "Cd-rom med Ubuntu 7.04 \"Feisty Fawn\"" #. Description #: ../data/templates/Ubuntu.info.in:357 @@ -102,7 +92,6 @@ msgstr "Ubuntu 6.10 \"Edgy Eft\"" #. CompDescription #: ../data/templates/Ubuntu.info.in:362 -#, fuzzy msgid "Community-maintained" msgstr "Vedligeholdt af fællesskabet" @@ -123,21 +112,18 @@ msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:412 -#, fuzzy msgid "Canonical-supported Open Source software" -msgstr "Fri software understøttet af Canonical" +msgstr "Canonical-understøttet software med åben kildekode" #. CompDescription #: ../data/templates/Ubuntu.info.in:414 -#, fuzzy msgid "Community-maintained (universe)" msgstr "Vedligeholdt af fællesskabet (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:415 -#, fuzzy msgid "Community-maintained Open Source software" -msgstr "Fri software vedligeholdt af fællesskabet" +msgstr "Software med åben kildekode vedligeholdt af fællesskabet" #. CompDescription #: ../data/templates/Ubuntu.info.in:417 @@ -176,15 +162,13 @@ msgstr "Anbefalede opdateringer" #. Description #: ../data/templates/Ubuntu.info.in:449 -#, fuzzy msgid "Pre-released updates" -msgstr "Foreslåede opdateringer" +msgstr "Ikke-frigivne opdateringer" #. Description #: ../data/templates/Ubuntu.info.in:454 -#, fuzzy msgid "Unsupported updates" -msgstr "Tilbageporterede opdateringer" +msgstr "Ikke-understøttede opdateringer" #. Description #: ../data/templates/Ubuntu.info.in:461 @@ -248,9 +232,8 @@ msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/templates/Ubuntu.info.in:552 -#, fuzzy msgid "Community-maintained (Universe)" -msgstr "Vedligeholdt af fællesskabet (universe)" +msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription #: ../data/templates/Ubuntu.info.in:554 @@ -295,25 +278,21 @@ 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 "Debian 6.0 \"Squeeze\" " #. Description #: ../data/templates/Debian.info.in:33 -#, fuzzy msgid "Debian 5.0 'Lenny' " -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debian 5.0 \"Lenny\" " #. Description #: ../data/templates/Debian.info.in:58 -#, fuzzy msgid "Debian 4.0 'Etch'" -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debian 4.0 \"Etch\"" #. Description #: ../data/templates/Debian.info.in:83 -#, fuzzy msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 \"Sarge\"" @@ -324,26 +303,23 @@ msgstr "Foreslåede opdateringer" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Vigtige sikkerhedsopdateringer" +msgstr "Sikkerhedsopdateringer" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Debian aktuel stabil udgivelse" #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian tester" #. Description #: ../data/templates/Debian.info.in:146 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" +msgstr "Debian \"Sid\" (ustabil)" #. CompDescription #: ../data/templates/Debian.info.in:150 @@ -390,16 +366,16 @@ msgstr "Detaljer" #: ../apt/progress/gtk2.py:367 msgid "Starting..." -msgstr "" +msgstr "Starter..." #: ../apt/progress/gtk2.py:373 msgid "Complete" -msgstr "" +msgstr "Færdig" #: ../apt/package.py:301 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" +msgstr "Ugyldig unicode i beskrivelsen af \"%s\" (%s). Se venligst rapport." #: ../apt/package.py:937 ../apt/package.py:1043 msgid "The list of changes is not available" @@ -413,6 +389,10 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"Listen over ændringer er ikke tilgængelig endnu\n" +"\n" +"Se venligst http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"indtil ændringerne bliver tilgængelige eller prøv igen senere." #: ../apt/package.py:1053 msgid "" @@ -425,76 +405,75 @@ msgstr "" #: ../apt/debfile.py:56 #, python-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "" +msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler \"%s-medlem\"" #: ../apt/debfile.py:81 #, python-format msgid "List of files for '%s'could not be read" -msgstr "" +msgstr "Listen over filer for \"%s\" kunne ikke læses" #: ../apt/debfile.py:149 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Afhængighed kan ikke opfyldes; %s\n" #: ../apt/debfile.py:173 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "I konflikt med den installerede pakke \"%s\"" #: ../apt/debfile.py:319 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Forkert arkitektur \"%s\"" #. the deb is older than the installed #: ../apt/debfile.py:325 msgid "A later version is already installed" -msgstr "" +msgstr "Der er allerede installeret en senere version" #: ../apt/debfile.py:345 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Kunne ikke opfylde alle afhængigheder (beskadiget cache)" #: ../apt/debfile.py:376 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" msgstr "Kan ikke installere \"%s\"" #: ../apt/debfile.py:484 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" +msgstr "Installér bygge-afhængigheder til kildepakke \"%s\" der bygger %s\n" #: ../apt/debfile.py:494 -#, fuzzy msgid "An essential package would be removed" -msgstr "Det ville være nødvendigt at fjerne en vital pakke" +msgstr "En nødvendig pakke vil blive fjernet" #: ../apt/progress/text.py:81 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Færdig" #: ../apt/progress/text.py:118 msgid "Hit " -msgstr "" +msgstr "Tjekkede " #: ../apt/progress/text.py:126 msgid "Ign " -msgstr "" +msgstr "Ign " #: ../apt/progress/text.py:128 msgid "Err " -msgstr "" +msgstr "Fejl " #: ../apt/progress/text.py:138 msgid "Get:" -msgstr "" +msgstr "Henter:" #: ../apt/progress/text.py:198 msgid " [Working]" -msgstr "" +msgstr " [Arbejder]" #: ../apt/progress/text.py:208 #, python-format @@ -503,21 +482,26 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Medieskift: Indsæt disken med navnet\n" +" '%s'\n" +"i drevet '%s' og tryk retur\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:216 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Hentede %sB på %s (%sB/s)\n" #: ../apt/progress/text.py:229 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'" #: ../apt/progress/text.py:241 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Indsæt en disk i drevet og tryk retur" #: ../apt/cache.py:96 msgid "Building data structures" -msgstr "" +msgstr "Opbygger datastrukturer" + + diff --git a/po/pt_BR.po b/po/pt_BR.po index 7f95b222..fb350b10 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,14 +1,16 @@ -# Portuguese Brazilian translation for update-manager +# Brazilian Portuguese translation for python-apt. # This file is distributed under the same licence as the update-manager package. +# Sérgio Cipolla <secipolla@gmail.com>, 2010, 2011. # 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: 2010-08-19 17:13-0300\n" +"POT-Creation-Date: 2011-05-28 13:01-0300\n" +"PO-Revision-Date: 2011-05-28 13:25-0300\n" "Last-Translator: Sérgio Cipolla <secipolla@gmail.com>\n" -"Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n" +"Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +26,297 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:13 +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 "CD-ROM com o Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:43 +msgid "Canonical Partners" +msgstr "Parceiros da Canonical" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:45 +msgid "Software packaged by Canonical for their partners" +msgstr "Aplicativos empacotados pela Canonical para os seus parceiros" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:46 +msgid "This software is not part of Ubuntu." +msgstr "Estes aplicativos não são parte do Ubuntu." + +#. Description +#: ../data/templates/Ubuntu.info.in:53 +msgid "Independent" +msgstr "Independentes" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:55 +msgid "Provided by third-party software developers" +msgstr "Fornecidos por desenvolvedores de software terceiros" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:56 +msgid "Software offered by third party developers." +msgstr "Aplicativos oferecidos por desenvolvedores terceiros." + +#. 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 "CD-ROM com o 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:31 +#: ../data/templates/Ubuntu.info.in:173 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM com o 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 "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 "CD-ROM com o 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 "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 "CD-ROM com o 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 "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 "CD-ROM com o 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 "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 "CD-ROM com o 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 "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 "CD-ROM com o 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 "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:530 msgid "Community-maintained" msgstr "Mantido pela comunidade" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:536 msgid "Restricted software" msgstr "Aplicativos restritos" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:543 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM com o 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 "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 "Aplicativo de Código Aberto suportado pela Canonical" +msgstr "Aplicativo de código aberto suportado pela Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:590 msgid "Community-maintained (universe)" msgstr "Mantido pela comunidade (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:591 msgid "Community-maintained Open Source software" -msgstr "Aplicativo de Código Aberto mantido pela comunidade" +msgstr "Aplicativo de código aberto mantido pela comunidade" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:593 msgid "Non-free drivers" msgstr "Drivers não-livres" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:594 msgid "Proprietary drivers for devices" msgstr "Drivers proprietários para dispositivos" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:596 msgid "Restricted software (Multiverse)" msgstr "Aplicativos restritos (multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:597 msgid "Software restricted by copyright or legal issues" msgstr "Aplicativos restritos por copyright ou questões legais" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:603 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM com o Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:619 msgid "Important security updates" msgstr "Atualizações de segurança importantes" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:624 msgid "Recommended updates" msgstr "Atualizações recomendadas" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:629 msgid "Pre-released updates" msgstr "Atualizações de pré-lançamento" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:634 msgid "Unsupported updates" msgstr "Atualizações não suportadas" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:645 msgid "Ubuntu 5.10 'Breezy Badger'" 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 "CD-ROM com o 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 "Atualizações de segurança do Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:680 msgid "Ubuntu 5.10 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:685 msgid "Ubuntu 5.10 Backports" msgstr "Backports do Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:696 msgid "Ubuntu 5.04 'Hoary Hedgehog'" 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 "CD-ROM com o 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 "Suportados oficialmente" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:726 msgid "Ubuntu 5.04 Security Updates" msgstr "Atualizações de segurança do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:731 msgid "Ubuntu 5.04 Updates" msgstr "Atualizações do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:736 msgid "Ubuntu 5.04 Backports" msgstr "Backports do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:742 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:748 msgid "Community-maintained (Universe)" msgstr "Mantido pela comunidade (universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:750 msgid "Non-free (Multiverse)" msgstr "Não-livres (multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:756 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM com o Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:759 msgid "No longer officially supported" msgstr "Não mais suportado oficialmente" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:761 msgid "Restricted copyright" msgstr "Copyright restrito" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:768 msgid "Ubuntu 4.10 Security Updates" msgstr "Atualizações de segurança do Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:773 msgid "Ubuntu 4.10 Updates" msgstr "Atualizações do Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:778 msgid "Ubuntu 4.10 Backports" msgstr "Backports do Ubuntu 4.10" @@ -315,23 +367,23 @@ msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Aplicativos compatíveis com a DFSG mas com dependências não-livres" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Aplicativos não compatíveis com a DFSG" #. 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 "Servidor - %s" @@ -339,50 +391,52 @@ msgstr "Servidor - %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 "Servidor principal" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:253 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../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 "Baixando arquivo %(current)li de %(total)li a %(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 "Baixando arquivo %(current)li de %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:342 msgid "Details" msgstr "Detalhes" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:430 msgid "Starting..." msgstr "Iniciando..." -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:436 msgid "Complete" msgstr "Completo" -#: ../apt/package.py:301 +#: ../apt/package.py:358 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "Unicode inválido na descrição de '%s' (%s). Por favor, relate o erro." -#: ../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 "A lista de alterações não está disponível" -#: ../apt/package.py:1047 +#: ../apt/package.py:1177 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -395,7 +449,7 @@ msgstr "" "Por favor, utilize http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "até que as alterações estejam disponíveis ou tente novamente mais tarde." -#: ../apt/package.py:1053 +#: ../apt/package.py:1184 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -403,80 +457,112 @@ msgstr "" "Falha ao baixar a lista de alterações. \n" "Por favor verifique sua conexão com a Internet." -#: ../apt/debfile.py:56 -#, python-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" - -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:82 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of files for '%s' could not be read" msgstr "A lista de arquivos de '%s' não pôde ser lida" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:167 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "A dependência não é contentável: %s\n" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:188 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "Conflita com o pacote instalado '%s'" -#: ../apt/debfile.py:319 +#. 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 "Quebra o pacote existente '%(pkgname)s', dependência %(depname)s (%(deprelation)s %(depversion)s)" + +#. 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 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s %(targetver)s)" +msgstr "Quebra o pacote existente '%(pkgname)s', conflito: %(targetpkg)s (%(comptype)s %(targetver)s)" + +#: ../apt/debfile.py:353 +#, python-format +msgid "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But the '%(debfile)s' provides it via: '%(provides)s'" +msgstr "Quebra o pacote existente '%(pkgname)s' que conflita com '%(targetpkg)s'. Mas '%(debfile)s' o provê via '%(provides)s'" + +#: ../apt/debfile.py:399 +msgid "No Architecture field in the package" +msgstr "Sem campo de arquitetura no pacote" + +#: ../apt/debfile.py:404 #, python-format msgid "Wrong architecture '%s'" msgstr "Arquitetura incorreta '%s'" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:411 msgid "A later version is already installed" msgstr "Uma versão mais atual já está instalada" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:436 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "Falha na satisfação de todas as dependências (cache quebrado)" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:466 #, python-format msgid "Cannot install '%s'" msgstr "Incapaz de instalar '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:508 +msgid "Python-debian module not available" +msgstr "Módulo python-debian não disponível" + +#: ../apt/debfile.py:542 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" +"Descompactado automaticamente:\n" +"\n" + +#: ../apt/debfile.py:548 +msgid "Automatically converted to printable ascii:\n" +msgstr "Convertido automaticamente para ascii imprimível:\n" + +#: ../apt/debfile.py:638 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "Instalar Dependências-Construtivas para o pacote fonte '%s' que constrói %s\n" +msgstr "Instalar dependências construtivas para o pacote fonte '%s' que constrói %s\n" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:648 msgid "An essential package would be removed" msgstr "Um pacote essencial teria de ser removido" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "%c%s... Feito" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " -msgstr "Atingido" +msgstr "Atingido " -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " -msgstr "Ignorado" +msgstr "Ignorando " -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " -msgstr "Erro" +msgstr "Erro " -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" -msgstr "Obter:" +msgstr "Obtendo:" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr " [Trabalhando]" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -488,20 +574,32 @@ msgstr "" "no drive '%s' e tecle Enter\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 "Obtidos %sB em %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 "Por favor, forneça um nome para este disco, como 'Debian 2.1r1 Disco 1'" +msgstr "Por favor, forneça um nome para este disco, como 'Debian 6.0.1 Disco 1'" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor, insira um disco no drive e tecle Enter" -#: ../apt/cache.py:96 +#: ../apt/cache.py:149 msgid "Building data structures" msgstr "Construindo estruturas de dados" +#. std::cout << "something is wrong!" << std::endl; +#: ../python/depcache.cc:136 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Falha ao buscar %s, %s\n" + +#: ../python/depcache.cc:143 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing e troca de mídia não são suportados atualmente" + +#~ msgid "This is not a valid DEB archive, missing '%s' member" +#~ msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" diff --git a/po/python-apt.pot b/po/python-apt.pot index bd9198c9..70c68099 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: 2011-09-28 16:23+0200\n" +"POT-Creation-Date: 2011-10-19 18:07+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,297 +24,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:33 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:40 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:151 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:270 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:277 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:368 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:32 +#: ../data/templates/Ubuntu.info.in:388 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:44 +#: ../data/templates/Ubuntu.info.in:400 msgid "Canonical Partners" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:46 +#: ../data/templates/Ubuntu.info.in:402 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:47 +#: ../data/templates/Ubuntu.info.in:403 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:54 +#: ../data/templates/Ubuntu.info.in:410 msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:56 +#: ../data/templates/Ubuntu.info.in:412 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:57 +#: ../data/templates/Ubuntu.info.in:413 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:95 +#: ../data/templates/Ubuntu.info.in:451 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:114 +#: ../data/templates/Ubuntu.info.in:471 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:157 +#: ../data/templates/Ubuntu.info.in:514 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:176 +#: ../data/templates/Ubuntu.info.in:534 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:219 +#: ../data/templates/Ubuntu.info.in:577 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:237 +#: ../data/templates/Ubuntu.info.in:596 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:280 +#: ../data/templates/Ubuntu.info.in:639 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:299 +#: ../data/templates/Ubuntu.info.in:659 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:343 +#: ../data/templates/Ubuntu.info.in:703 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:723 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:407 +#: ../data/templates/Ubuntu.info.in:768 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:425 +#: ../data/templates/Ubuntu.info.in:787 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:470 +#: ../data/templates/Ubuntu.info.in:832 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:488 +#: ../data/templates/Ubuntu.info.in:851 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:893 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:898 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:541 +#: ../data/templates/Ubuntu.info.in:904 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:548 +#: ../data/templates/Ubuntu.info.in:912 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:590 +#: ../data/templates/Ubuntu.info.in:954 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:593 +#: ../data/templates/Ubuntu.info.in:957 msgid "Canonical-supported Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:595 +#: ../data/templates/Ubuntu.info.in:959 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:596 +#: ../data/templates/Ubuntu.info.in:960 msgid "Community-maintained Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:598 +#: ../data/templates/Ubuntu.info.in:962 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:599 +#: ../data/templates/Ubuntu.info.in:963 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:601 +#: ../data/templates/Ubuntu.info.in:965 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:602 +#: ../data/templates/Ubuntu.info.in:966 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:608 +#: ../data/templates/Ubuntu.info.in:973 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:624 +#: ../data/templates/Ubuntu.info.in:989 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:629 +#: ../data/templates/Ubuntu.info.in:994 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:634 +#: ../data/templates/Ubuntu.info.in:999 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:639 +#: ../data/templates/Ubuntu.info.in:1004 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:650 +#: ../data/templates/Ubuntu.info.in:1015 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:664 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:680 +#: ../data/templates/Ubuntu.info.in:1046 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:685 +#: ../data/templates/Ubuntu.info.in:1051 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:690 +#: ../data/templates/Ubuntu.info.in:1056 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:701 +#: ../data/templates/Ubuntu.info.in:1067 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:715 +#: ../data/templates/Ubuntu.info.in:1082 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:718 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1085 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:731 +#: ../data/templates/Ubuntu.info.in:1098 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:736 +#: ../data/templates/Ubuntu.info.in:1103 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:741 +#: ../data/templates/Ubuntu.info.in:1108 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:747 +#: ../data/templates/Ubuntu.info.in:1114 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:753 +#: ../data/templates/Ubuntu.info.in:1120 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:755 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:761 +#: ../data/templates/Ubuntu.info.in:1129 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:764 +#: ../data/templates/Ubuntu.info.in:1132 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:766 +#: ../data/templates/Ubuntu.info.in:1134 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:773 +#: ../data/templates/Ubuntu.info.in:1141 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:778 +#: ../data/templates/Ubuntu.info.in:1146 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:783 +#: ../data/templates/Ubuntu.info.in:1151 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -380,7 +410,7 @@ msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:209 ../aptsources/distro.py:437 +#: ../aptsources/distro.py:210 ../aptsources/distro.py:438 #, python-format msgid "Server for %s" msgstr "" @@ -388,35 +418,35 @@ 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:227 ../aptsources/distro.py:233 -#: ../aptsources/distro.py:249 +#: ../aptsources/distro.py:228 ../aptsources/distro.py:234 +#: ../aptsources/distro.py:250 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:253 +#: ../aptsources/distro.py:254 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316 +#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322 +#: ../apt/progress/gtk2.py:267 ../apt/progress/gtk2.py:323 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:342 +#: ../apt/progress/gtk2.py:343 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:430 +#: ../apt/progress/gtk2.py:431 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:436 +#: ../apt/progress/gtk2.py:437 msgid "Complete" msgstr "" @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-07-19 15:59+0200\n" "PO-Revision-Date: 2006-10-16 04:17+0000\n" -"Last-Translator: Vladimir Samardzic <vladosam@hotmail.com>\n" +"Last-Translator: Nikola Nenadic <nikola.nenadic@gmail.com>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,319 +22,319 @@ msgstr "" #: ../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 "" +msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:31 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" +msgstr "Оптички диск са Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:74 msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" +msgstr "Ubuntu 9.04 'Jaunty Jackalope" #. Description #: ../data/templates/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" +msgstr "Оптички диск са Ubuntu 9.04 'Jaunty Jackalope" #. Description #: ../data/templates/Ubuntu.info.in:135 msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" +msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:153 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" +msgstr "Оптички диск са Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:197 msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" +msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:215 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" +msgstr "Оптички диск са Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:252 msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" +msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:270 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" +msgstr "Оптички диск са Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:305 msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" +msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:323 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" +msgstr "Оптички диск са Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:357 msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" +msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription #: ../data/templates/Ubuntu.info.in:362 msgid "Community-maintained" -msgstr "" +msgstr "Одржаван од стране заједнице" #. CompDescription #: ../data/templates/Ubuntu.info.in:368 msgid "Restricted software" -msgstr "" +msgstr "Ограничени софтвер" #. Description #: ../data/templates/Ubuntu.info.in:375 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" +msgstr "Оптички диск са Ubuntu 6.10 'Edgy Eft'" #. Description #: ../data/templates/Ubuntu.info.in:409 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" +msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:412 msgid "Canonical-supported Open Source software" -msgstr "" +msgstr "Canonical-подржава софтвер отвореног кода" #. CompDescription #: ../data/templates/Ubuntu.info.in:414 msgid "Community-maintained (universe)" -msgstr "" +msgstr "Одржаван од стране заједнице" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:415 msgid "Community-maintained Open Source software" -msgstr "" +msgstr "Заједница урећује софтвер отвореног кода" #. CompDescription #: ../data/templates/Ubuntu.info.in:417 msgid "Non-free drivers" -msgstr "" +msgstr "Не слободни драјвери" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:418 msgid "Proprietary drivers for devices" -msgstr "" +msgstr "Власнички драјвери за уређаје" #. CompDescription #: ../data/templates/Ubuntu.info.in:420 msgid "Restricted software (Multiverse)" -msgstr "" +msgstr "Ограничени софтвер" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:421 msgid "Software restricted by copyright or legal issues" -msgstr "" +msgstr "Софтвер ограничен ауторским правом или правним регулативама" #. Description #: ../data/templates/Ubuntu.info.in:427 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" +msgstr "Оптички диск са Ubuntu 6.06 LTS 'Dapper Drake'" #. Description #: ../data/templates/Ubuntu.info.in:439 msgid "Important security updates" -msgstr "" +msgstr "Важне сигурносне исправке" #. Description #: ../data/templates/Ubuntu.info.in:444 msgid "Recommended updates" -msgstr "" +msgstr "Препоручено ажурирање" #. Description #: ../data/templates/Ubuntu.info.in:449 msgid "Pre-released updates" -msgstr "" +msgstr "Унапријед објављене исправке" #. Description #: ../data/templates/Ubuntu.info.in:454 msgid "Unsupported updates" -msgstr "" +msgstr "Некомпитабилна ажурирања" #. Description #: ../data/templates/Ubuntu.info.in:461 msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:475 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" +msgstr "Оптички диск са Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:487 msgid "Ubuntu 5.10 Security Updates" -msgstr "" +msgstr "Ubuntu 5.10 сигурносне исправке" #. Description #: ../data/templates/Ubuntu.info.in:492 msgid "Ubuntu 5.10 Updates" -msgstr "" +msgstr "Ubuntu 5.10 исправке" #. Description #: ../data/templates/Ubuntu.info.in:497 msgid "Ubuntu 5.10 Backports" -msgstr "" +msgstr "Ubuntu 5.10 Backports" #. Description #: ../data/templates/Ubuntu.info.in:504 msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" +msgstr "Оптички диск са Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 msgid "Officially supported" -msgstr "" +msgstr "Званично подржани" #. Description #: ../data/templates/Ubuntu.info.in:530 msgid "Ubuntu 5.04 Security Updates" -msgstr "" +msgstr "Ubuntu 5.04 Security Updates" #. Description #: ../data/templates/Ubuntu.info.in:535 msgid "Ubuntu 5.04 Updates" -msgstr "" +msgstr "Ubuntu 5.04 Исправке" #. Description #: ../data/templates/Ubuntu.info.in:540 msgid "Ubuntu 5.04 Backports" -msgstr "" +msgstr "Ubuntu 5.04 Backports" #. Description #: ../data/templates/Ubuntu.info.in:546 msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" +msgstr "Ubuntu 4.10 'Warty Warthog" #. CompDescription #: ../data/templates/Ubuntu.info.in:552 msgid "Community-maintained (Universe)" -msgstr "" +msgstr "Одржаван од стране заједнице" #. CompDescription #: ../data/templates/Ubuntu.info.in:554 msgid "Non-free (Multiverse)" -msgstr "" +msgstr "Не слободни драјвери" #. Description #: ../data/templates/Ubuntu.info.in:560 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" +msgstr "Оптички диск са Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:563 msgid "No longer officially supported" -msgstr "" +msgstr "Званично није више подржано" #. CompDescription #: ../data/templates/Ubuntu.info.in:565 msgid "Restricted copyright" -msgstr "" +msgstr "Ограничена права" #. Description #: ../data/templates/Ubuntu.info.in:572 msgid "Ubuntu 4.10 Security Updates" -msgstr "" +msgstr "Ubuntu 4.10 сигурносне исправке" #. Description #: ../data/templates/Ubuntu.info.in:577 msgid "Ubuntu 4.10 Updates" -msgstr "" +msgstr "Ubuntu 4.10 Исправке" #. Description #: ../data/templates/Ubuntu.info.in:582 msgid "Ubuntu 4.10 Backports" -msgstr "" +msgstr "Ubuntu 4.10 Backports" #. 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 "" +msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" +msgid "Debian 6.0 'Squeeze'" +msgstr "Debian 6.0 'Squeeze'" #. Description #: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" +msgid "Debian 5.0 'Lenny'" +msgstr "Debian 5.0 'Lenny'" #. Description #: ../data/templates/Debian.info.in:58 msgid "Debian 4.0 'Etch'" -msgstr "" +msgstr "Debian 4.0 'Etch'" #. Description #: ../data/templates/Debian.info.in:83 msgid "Debian 3.1 'Sarge'" -msgstr "" +msgstr "Debian 3.1 'Sarge'" #. Description #: ../data/templates/Debian.info.in:94 msgid "Proposed updates" -msgstr "" +msgstr "Предложене исправке (ажурирања)" #. Description #: ../data/templates/Debian.info.in:101 msgid "Security updates" -msgstr "" +msgstr "Сигурносне исправке" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Дебиан-тренутно стабилно издање" #. Description #: ../data/templates/Debian.info.in:121 msgid "Debian testing" -msgstr "" +msgstr "Дебиан-тестирање" #. Description #: ../data/templates/Debian.info.in:146 msgid "Debian 'Sid' (unstable)" -msgstr "" +msgstr "Debian 'Sid' (нестабилно)" #. CompDescription #: ../data/templates/Debian.info.in:150 msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" +msgstr "DFSG-компитабилан са не слободним софтвером" #. CompDescription #: ../data/templates/Debian.info.in:152 msgid "Non-DFSG-compatible Software" -msgstr "" +msgstr "Непостоји-DFSG компитабилног софтвера" #. TRANSLATORS: %s is a country #: ../aptsources/distro.py:208 ../aptsources/distro.py:423 #, python-format msgid "Server for %s" -msgstr "" +msgstr "Сервер за %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 @@ -342,21 +342,21 @@ msgstr "" #: ../aptsources/distro.py:226 ../aptsources/distro.py:232 #: ../aptsources/distro.py:248 msgid "Main server" -msgstr "" +msgstr "Главни сервер" #: ../aptsources/distro.py:252 msgid "Custom servers" -msgstr "" +msgstr "Прилагођени сервер" #: ../apt/progress/gtk2.py:259 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" +msgstr "Преужимам фајл %(current)li од %(total)li са %(speed)s/s" #: ../apt/progress/gtk2.py:265 #, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "" +msgstr "Преужимам фајл %(current)li од %(total)li" #. Setup some child widgets #: ../apt/progress/gtk2.py:285 @@ -365,20 +365,20 @@ msgstr "Детаљи" #: ../apt/progress/gtk2.py:367 msgid "Starting..." -msgstr "" +msgstr "Покретање..." #: ../apt/progress/gtk2.py:373 msgid "Complete" -msgstr "" +msgstr "Крај" #: ../apt/package.py:301 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" +msgstr "Неважећи unicode у опису за '%s' (%s). Молим извјештај" #: ../apt/package.py:937 ../apt/package.py:1043 msgid "The list of changes is not available" -msgstr "" +msgstr "Листа промјена није доступна" #: ../apt/package.py:1047 #, python-format @@ -388,85 +388,91 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"Листа промјена није још доступна.\n" +"Молимо искористите http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"док промјене не постану доступне или покушајте поново касније." + #: ../apt/package.py:1053 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" +"Преузиманје листе промјена неуспјешно. \n" +"Молимо провјерите своју конекцију са интернетом." #: ../apt/debfile.py:56 #, python-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "" +msgstr "Ово није валидна DEB архива, недостаје '% с' члан" #: ../apt/debfile.py:81 #, python-format -msgid "List of files for '%s'could not be read" -msgstr "" +msgid "List of files for '%s' could not be read" +msgstr "Листа фајлова за '%s' не може да се прочита" #: ../apt/debfile.py:149 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Зависнот није задовољена: %s\n" #: ../apt/debfile.py:173 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Сукоби међу инсталираним пакетима" #: ../apt/debfile.py:319 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Погрешна архитектура '%s'" #. the deb is older than the installed #: ../apt/debfile.py:325 msgid "A later version is already installed" -msgstr "" +msgstr "Новија верзија је већ инсталирана" #: ../apt/debfile.py:345 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Није успео да задовољи све зависности (грешка у кешу)" #: ../apt/debfile.py:376 #, fuzzy, python-format msgid "Cannot install '%s'" -msgstr "Инсталирај %s" +msgstr "Не могу да се инсталирају %s" #: ../apt/debfile.py:484 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" +msgstr "Инсталирајте Build-Dependencies за кодни пакет '%s' који гради %s\n" #: ../apt/debfile.py:494 msgid "An essential package would be removed" -msgstr "" +msgstr "Битан пакет би био уклоњен" #: ../apt/progress/text.py:81 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Крај" #: ../apt/progress/text.py:118 msgid "Hit " -msgstr "" +msgstr "Погодак" #: ../apt/progress/text.py:126 msgid "Ign " -msgstr "" +msgstr "Игнорисано" #: ../apt/progress/text.py:128 msgid "Err " -msgstr "" +msgstr "Грешка" #: ../apt/progress/text.py:138 msgid "Get:" -msgstr "" +msgstr "УзимамЧ" #: ../apt/progress/text.py:198 msgid " [Working]" -msgstr "" +msgstr "[Радим]" #: ../apt/progress/text.py:208 #, python-format @@ -475,21 +481,23 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Молимо вас да убаците означени диск\n " +"у оптички диск '%s' и притиснете enter\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:216 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Преузето %sB in %s (%sB/s)\n" #: ../apt/progress/text.py:229 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Молимо обезбједите име за диск, као нпр. 'Debian 2.1r1 Disk 1'" #: ../apt/progress/text.py:241 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Молимо Вас да убаците диск у оптички уређај и притиснете enter" #: ../apt/cache.py:96 msgid "Building data structures" -msgstr "" +msgstr "Изградња структуре података" diff --git a/python/tar.cc b/python/tar.cc index 4109776c..e42a9c50 100644 --- a/python/tar.cc +++ b/python/tar.cc @@ -181,7 +181,9 @@ PyObject *debExtract(PyObject *Self,PyObject *Args) if (strcmp(".bz2", &Chunk[strlen(Chunk)-4]) == 0) Comp = "bzip2"; else if(strcmp(".lzma", &Chunk[strlen(Chunk)-5]) == 0) - Comp = "unlzma"; + Comp = "lzma"; + else if(strcmp(".xz", &Chunk[strlen(Chunk)-3]) == 0) + Comp = "xz"; ExtractTar Tar(Deb.GetFile(),Member->Size,Comp); ProcessTar Proc(Function); if (Tar.Go(Proc) == false) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 9c1f549f..2b742dfa 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -133,7 +133,7 @@ class TestAptCache(unittest.TestCase): old_source_list = apt_pkg.config.find("dir::etc::sourcelist") old_source_parts = apt_pkg.config.find("dir::etc::sourceparts") apt_pkg.config.set("dir::etc::sourcelist", base_sources) - apt_pkg.config.set("dir::etc::sourceparts", "xxx") + apt_pkg.config.set("dir::etc::sourceparts", "/tmp") # main sources.list sources_list = base_sources with open(sources_list, "w") as f: diff --git a/tests/test_progress.py b/tests/test_progress.py index 73853dfa..3b6285d6 100644 --- a/tests/test_progress.py +++ b/tests/test_progress.py @@ -27,7 +27,7 @@ class TestProgress(unittest.TestCase): apt_pkg.init() apt_pkg.config.set("APT::Architecture", "amd64") apt_pkg.config.set("Dir::Etc", basedir) - apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") + apt_pkg.config.set("Dir::Etc::sourceparts", "/tmp") # setup lists dir if not os.path.exists("./tmp/partial"): os.makedirs("./tmp/partial") diff --git a/tests/test_utils.py b/tests/test_utils.py new file mode 100644 index 00000000..23511f32 --- /dev/null +++ b/tests/test_utils.py @@ -0,0 +1,56 @@ +#!/usr/bin/python +# +# Copyright (C) 2010 Michael Vogt <michael.vogt@ubuntu.com> +# +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. + +import sys +sys.path.insert(0, "..") +import apt_pkg +import apt.utils +import datetime +import unittest + +class TestUtils(unittest.TestCase): + + + def test_maintenance_time(self): + from apt.utils import get_maintenance_end_date + months_of_support = 18 + # test historic releases, jaunty + release_date = datetime.datetime(2009, 4, 23) + (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support) + self.assertEqual(end_year, 2010) + self.assertEqual(end_month, 10) + # test historic releases, karmic + release_date = datetime.datetime(2009, 10, 29) + (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support) + self.assertEqual(end_year, 2011) + self.assertEqual(end_month, 4) + # test maverick + release_date = datetime.datetime(2010, 10, 10) + (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support) + self.assertEqual(end_year, 2012) + self.assertEqual(end_month, 4) + + # test with modulo zero + release_date = datetime.datetime(2010, 6, 10) + (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support) + self.assertEqual(end_year, 2011) + self.assertEqual(end_month, 12) + + # test dapper + months_of_support = 60 + release_date = datetime.datetime(2008, 4, 24) + (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support) + self.assertEqual(end_year, 2013) + self.assertEqual(end_month, 4) + + # what datetime says + #d = datetime.timedelta(18*30) + #print "end date: ", release_date + d + +if __name__ == "__main__": + unittest.main() diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py index 341dba8a..ed0ee936 100755 --- a/utils/get_ubuntu_mirrors_from_lp.py +++ b/utils/get_ubuntu_mirrors_from_lp.py @@ -42,6 +42,7 @@ for entry in d.entries: keys = countries.keys() keys.sort() +print "mirror://mirrors.ubuntu.com/mirrors.txt" for country in keys: print "#LOC:%s" % country print "\n".join(sorted(countries[country])) |