From 3b4330920da718d2dbb2a4a94577c07eaa58a8c5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Jun 2010 11:55:18 +0200 Subject: * apt/utils.py: - fix end date calculation for releases in june --- apt/utils.py | 5 +++++ debian/changelog | 7 +++++++ tests/test_utils.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 tests/test_utils.py diff --git a/apt/utils.py b/apt/utils.py index 80ba6d65..8fc69215 100644 --- a/apt/utils.py +++ b/apt/utils.py @@ -28,11 +28,16 @@ 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 """ + # calc end date years = m_months / 12 months = m_months % 12 support_end_year = (release_date.year + years + (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 return (support_end_year, support_end_month) diff --git a/debian/changelog b/debian/changelog index dde80a4f..9fe79188 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.95ubuntu2) maverick; urgency=low + + * apt/utils.py: + - fix end date calculation for releases in june + + -- Michael Vogt Thu, 10 Jun 2010 11:50:21 +0200 + python-apt (0.7.95ubuntu1) maverick; urgency=low * merge from debian bzr, remaining changes: diff --git a/tests/test_utils.py b/tests/test_utils.py new file mode 100644 index 00000000..19dd977d --- /dev/null +++ b/tests/test_utils.py @@ -0,0 +1,56 @@ +#!/usr/bin/python +# +# Copyright (C) 2010 Michael Vogt +# +# 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, 04, 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, 04) + # 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, 04) + + # test with modulo zero + release_date = datetime.datetime(2010, 06, 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, 04, 24) + (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support) + self.assertEqual(end_year, 2013) + self.assertEqual(end_month, 04) + + # what datetime says + #d = datetime.timedelta(18*30) + #print "end date: ", release_date + d + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From 18e3642b04ca7b6c1400a699606727a511bfbec3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 12:47:07 +0200 Subject: rebuild against lastest libapt --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3083d377..08922d2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.7.96.1ubuntu3) maverick; urgency=low + + * rebuild against lastest libapt + + -- Michael Vogt Thu, 29 Jul 2010 12:23:27 +0200 + python-apt (0.7.96.1ubuntu2) maverick; urgency=low [ Michael Vogt ] diff --git a/debian/control b/debian/control index 65f72367..77a87bad 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 XS-Python-Version: all Build-Depends: apt-utils, debhelper (>= 7.3.5), - libapt-pkg-dev (>= 0.7.22~), + libapt-pkg-dev (>= 0.7.26~exp11), python-all-dev, python-all-dbg, python-central (>= 0.5), -- cgit v1.2.3 From 28ad58115b7a113da5797f42d8ec154f105777a5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 5 Aug 2010 23:39:50 +0200 Subject: releasing version 0.7.96.1ubuntu4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index de4e8259..6f3d2326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -python-apt (0.7.96.1ubuntu4) UNRELEASED; urgency=low +python-apt (0.7.96.1ubuntu4) maverick; urgency=low * apt/debfile.py: - fix crash in DscFile handling and add regression test - -- Michael Vogt Thu, 05 Aug 2010 13:28:58 +0200 + -- Michael Vogt Thu, 05 Aug 2010 23:36:53 +0200 python-apt (0.7.96.1ubuntu3) maverick; urgency=low -- cgit v1.2.3 From d16f52e874378f1ebf1fe0b2491585b46bfe2e55 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 27 Aug 2010 11:18:44 +0200 Subject: * apt/debfile.py: - add missing init for _installed_conflicts (LP: #618597) --- apt/debfile.py | 1 + debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/apt/debfile.py b/apt/debfile.py index 33f0f04d..9bf27da3 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -598,6 +598,7 @@ class DscSrcPackage(DebPackage): self.filename = filename self._depends = [] self._conflicts = [] + self._installed_conflicts = set() self.pkgname = "" self.binaries = [] if self.filename is not None: diff --git a/debian/changelog b/debian/changelog index af215801..1fb41d07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.96.1ubuntu6) maverick; urgency=low + + * apt/debfile.py: + - add missing init for _installed_conflicts (LP: #618597) + + -- Michael Vogt Fri, 27 Aug 2010 11:18:13 +0200 + python-apt (0.7.96.1ubuntu5) maverick; urgency=low * python/acquire.cc: -- cgit v1.2.3 From 4b91eac101b839c188835aa0e8d5284e32c6bdc1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 31 Aug 2010 15:31:26 +0200 Subject: * cherry pick debfile fix from lp:~mvo/python-apt/mvo (402..405): * apt/debfile.py: - fix error when reading binary content and add regresion test --- apt/debfile.py | 4 ++-- debian/changelog | 8 ++++++++ tests/data/test_debs/gdebi-test11.deb | Bin 0 -> 634 bytes tests/data/test_debs/gdebi-test12.deb | Bin 0 -> 966 bytes tests/test_debfile.py | 13 +++++++++++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 tests/data/test_debs/gdebi-test11.deb create mode 100644 tests/data/test_debs/gdebi-test12.deb diff --git a/apt/debfile.py b/apt/debfile.py index 9bf27da3..f4a31379 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -512,7 +512,7 @@ class DebPackage(object): return sorted(content) @staticmethod - def to_hex(self, in_data): + def to_hex(in_data): hex = "" for (i, c) in enumerate(in_data): if i%80 == 0: @@ -521,7 +521,7 @@ class DebPackage(object): return hex @staticmethod - def to_strish(self, in_data): + def to_strish(in_data): s = "" for c in in_data: if ord(c) < 10 or ord(c) > 127: diff --git a/debian/changelog b/debian/changelog index 1fb41d07..e926c124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.96.1ubuntu7) UNRELEASED; urgency=low + + * cherry pick debfile fix from lp:~mvo/python-apt/mvo (402..405): + * apt/debfile.py: + - fix error when reading binary content and add regresion test + + -- Michael Vogt Tue, 31 Aug 2010 15:21:08 +0200 + python-apt (0.7.96.1ubuntu6) maverick; urgency=low * apt/debfile.py: diff --git a/tests/data/test_debs/gdebi-test11.deb b/tests/data/test_debs/gdebi-test11.deb new file mode 100644 index 00000000..af9b441f Binary files /dev/null and b/tests/data/test_debs/gdebi-test11.deb differ diff --git a/tests/data/test_debs/gdebi-test12.deb b/tests/data/test_debs/gdebi-test12.deb new file mode 100644 index 00000000..36544cc7 Binary files /dev/null and b/tests/data/test_debs/gdebi-test12.deb differ diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 5874dfc4..42cda6f6 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -77,6 +77,19 @@ class TestDebfilee(unittest.TestCase): "Unexpected result for package '%s' (got %s wanted %s)\n%s" % ( filename, res, expected_res, deb._failure_string)) + def testContent(self): + # normal + deb = apt.debfile.DebPackage(cache=self.cache) + deb.open(os.path.join("data", "test_debs", "gdebi-test11.deb")) + self.assertEqual('#!/bin/sh\necho "test"\n', + deb.data_content("usr/bin/test")) + # binary + deb = apt.debfile.DebPackage(cache=self.cache) + deb.open(os.path.join("data", "test_debs", "gdebi-test12.deb")) + content = deb.data_content("usr/bin/binary") + self.assertTrue(content.startswith("Automatically converted to printable ascii:\n\x7fELF ")) + + if __name__ == "__main__": #logging.basicConfig(level=logging.DEBUG) unittest.main() -- cgit v1.2.3 From a4053adcbc23d909d09e060f29acd39e7ec1e03f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 2 Sep 2010 10:56:04 +0200 Subject: releasing version 0.7.96.1ubuntu7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e926c124..6edf0a61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -python-apt (0.7.96.1ubuntu7) UNRELEASED; urgency=low +python-apt (0.7.96.1ubuntu7) maverick; urgency=low * cherry pick debfile fix from lp:~mvo/python-apt/mvo (402..405): * apt/debfile.py: - fix error when reading binary content and add regresion test - -- Michael Vogt Tue, 31 Aug 2010 15:21:08 +0200 + -- Michael Vogt Thu, 02 Sep 2010 10:53:46 +0200 python-apt (0.7.96.1ubuntu6) maverick; urgency=low -- cgit v1.2.3 From 92246a6af0ef54b3cb49a7448ad972e4f1b2186c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Sep 2010 18:34:09 +0200 Subject: * debian/control: - add missing build-depends on python-debian (needed to run the tests for apt.debfile.DebPackage() --- debian/changelog | 8 ++++++++ debian/control | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6edf0a61..dcd87b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.96.1ubuntu8) maverick; urgency=low + + * debian/control: + - add missing build-depends on python-debian (needed to run the + tests for apt.debfile.DebPackage() + + -- Michael Vogt Fri, 03 Sep 2010 18:33:50 +0200 + python-apt (0.7.96.1ubuntu7) maverick; urgency=low * cherry pick debfile fix from lp:~mvo/python-apt/mvo (402..405): diff --git a/debian/control b/debian/control index 77a87bad..5015022c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Build-Depends: apt-utils, python-all-dbg, python-central (>= 0.5), python-distutils-extra (>= 2.0), - python-sphinx (>= 0.5) + python-sphinx (>= 0.5), + python-debian Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes -- cgit v1.2.3 From bc301a8f07e50c7a14973b10fa4cb95f7a2beff2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 7 Sep 2010 11:56:17 +0200 Subject: * apt/debfile: - don't fail if we conflict with the pkgs we are reinstalling --- apt/debfile.py | 3 ++- debian/changelog | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apt/debfile.py b/apt/debfile.py index f4a31379..d8159546 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -347,7 +347,8 @@ class DebPackage(object): 'targetver' : c_or.target_ver } self._cache.op_progress.done() return False - if c_or.target_pkg.name in provides: + if (c_or.target_pkg.name in provides and + self.pkgname != pkg.name): self._dbg(2, "would break (conflicts) %s" % provides) self._failure_string += _("Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But the '%(debfile)s' provides it via: '%(provides)s'") % { 'provides' : ",".join(provides), diff --git a/debian/changelog b/debian/changelog index dcd87b64..44be9f23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.97.2) UNRELEASED; urgency=low + + [ Kiwinote ] + * apt/debfile: + - don't fail if we conflict with the pkgs we are reinstalling + + -- Michael Vogt Fri, 27 Aug 2010 11:22:23 +0200 + python-apt (0.7.96.1ubuntu8) maverick; urgency=low * debian/control: -- cgit v1.2.3 From a8e7d5e6931e56fbe67f5dd33c5da0705468fe0b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 7 Sep 2010 18:23:36 +0200 Subject: releasing version 0.7.96.1ubuntu9 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index afd31ff5..4eb436ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.96ubuntu9) UNRELEASED; urgency=low +python-apt (0.7.96.1ubuntu9) maverick; urgency=low [ Kiwinote ] * apt/debfile: @@ -17,7 +17,7 @@ python-apt (0.7.96ubuntu9) UNRELEASED; urgency=low - add missing build-depends on python-debian (needed to run the tests for apt.debfile.DebPackage() - -- Michael Vogt Tue, 07 Sep 2010 13:36:18 +0200 + -- Michael Vogt Tue, 07 Sep 2010 13:47:03 +0200 python-apt (0.7.96.1ubuntu8) maverick; urgency=low -- cgit v1.2.3 From d806cac23d66b55f4fc2e5e9e58ab0859301b595 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 13 Sep 2010 11:32:44 +0200 Subject: releasing version 0.7.96.1ubuntu10 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d10d5534..b56f1534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.96.1ubuntu10) UNRELEASED; urgency=low +python-apt (0.7.96.1ubuntu10) maverick; urgency=low * data/templates/Ubuntu.info.in: - add extras.ubuntu.com and archvie.canonical.com to the @@ -8,7 +8,7 @@ python-apt (0.7.96.1ubuntu10) UNRELEASED; urgency=low * python/tag.cc: - accept "byte" type as well in TacSecNew (for py3) - -- Michael Vogt Mon, 13 Sep 2010 11:09:27 +0200 + -- Michael Vogt Mon, 13 Sep 2010 11:28:24 +0200 python-apt (0.7.96.1ubuntu9) maverick; urgency=low -- cgit v1.2.3 From ba81885de8c079e096d19e301c972426fc3e7366 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 20 Sep 2010 10:46:04 +0200 Subject: releasing version 0.7.96.1ubuntu11 --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 37b5cbc4..f847f345 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -python-apt (0.7.96.1ubuntu11) unstable; urgency=low +python-apt (0.7.96.1ubuntu11) maverick; urgency=low - * fix return type of DebSize() and UsrSize(), thanks to - Sebastian Heinlein, LP: #642936 + * Fix return type of DebSize() and UsrSize(), its long long, + not float. Thanks to Sebastian Heinlein, LP: #642936 - -- Michael Vogt Mon, 20 Sep 2010 10:34:33 +0200 + -- Michael Vogt Mon, 20 Sep 2010 10:43:47 +0200 python-apt (0.7.96.1ubuntu10) maverick; urgency=low -- cgit v1.2.3 From 8fa5dba770ce8f77b266720e64f57d911e557f17 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Sep 2010 16:27:57 +0200 Subject: releasing version 0.7.96.1ubuntu12 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 010c30c1..beb93dd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ python-apt (0.7.96.1ubuntu12) maverick; urgency=low because PyString_FromFormat() does not support %llu in python versions below 2.7 - -- Michael Vogt Fri, 24 Sep 2010 21:22:38 +0200 + -- Michael Vogt Tue, 28 Sep 2010 16:01:21 +0200 python-apt (0.7.96.1ubuntu11) maverick; urgency=low -- cgit v1.2.3 From d9deeabe21f828ae4301c4aab5073f775f954e25 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Oct 2010 10:43:22 +0200 Subject: * data/templates/Ubuntu.info.in: - add natty, LP:661578 --- data/templates/Ubuntu.info.in | 81 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 +++- 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index a9b539af..ca041c26 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,86 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +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 +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: natty +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-updates +ParentSuite: natty +RepositoryType: deb +_Description: Recommended updates + +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb +_Description: Pre-released updates + +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb +_Description: Unsupported updates + Suite: maverick RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ diff --git a/debian/changelog b/debian/changelog index 40d61b9d..817d34bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -python-apt (0.7.98.1ubuntu1) maverick; urgency=low +python-apt (0.7.98.1ubuntu1) UNRELEASEDmaverick; urgency=low + [ Michael Vogt ] * merged from debian/sid, remaining changes: - updated mirror list + [ Jeremy Bicha ] + * data/templates/Ubuntu.info.in: + - add natty, LP:661578 + -- Michael Vogt Fri, 15 Oct 2010 10:30:58 +0200 python-apt (0.7.98.1) unstable; urgency=low -- cgit v1.2.3 From 3bf6b76611bf0b148d495e2e4aae08546e54fa94 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Oct 2010 11:51:44 +0200 Subject: fix compat issues with python3 --- apt/utils.py | 4 ++-- aptsources/distinfo.py | 28 ++++++++++++++-------------- aptsources/distro.py | 5 +++-- aptsources/sourceslist.py | 15 ++++++++------- debian/changelog | 5 +++-- tests/test_utils.py | 12 ++++++------ 6 files changed, 36 insertions(+), 33 deletions(-) diff --git a/apt/utils.py b/apt/utils.py index 8fc69215..49e8bed5 100644 --- a/apt/utils.py +++ b/apt/utils.py @@ -29,10 +29,10 @@ def get_maintenance_end_date(release_date, m_months): its is supported as input """ # calc end date - years = m_months / 12 + 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: diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index 6374f185..a69f944a 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 @@ -166,9 +166,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 @@ -232,7 +232,7 @@ class DistInfo(object): mirror_data = filter(match_mirror_line.match, [x.strip() for x in open(value)]) except Exception: - print "WARNING: Failed to read mirror file" + logging.warn("Failed to read mirror file") mirror_data = [] for line in mirror_data: if line.startswith("#LOC:"): @@ -286,17 +286,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 23192f50..d4b65645 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -22,6 +22,7 @@ # USA import gettext +import logging import re import os import sys @@ -451,9 +452,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 76bea43a..0c4335ec 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 @@ -346,7 +347,7 @@ class SourcesList(object): source = SourceEntry(line, file) self.list.append(source) except: - print "could not open file '%s'" % file + logging.error("could not open file '%s'" % file) else: f.close() @@ -437,14 +438,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/debian/changelog b/debian/changelog index 817d34bd..3bf12153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,15 @@ -python-apt (0.7.98.1ubuntu1) UNRELEASEDmaverick; urgency=low +python-apt (0.7.98.1ubuntu1) natty; urgency=low [ Michael Vogt ] * merged from debian/sid, remaining changes: - updated mirror list + - compat fixes for 3.x (pending upstream inclusion) [ Jeremy Bicha ] * data/templates/Ubuntu.info.in: - add natty, LP:661578 - -- Michael Vogt Fri, 15 Oct 2010 10:30:58 +0200 + -- Michael Vogt Mon, 18 Oct 2010 10:55:00 +0200 python-apt (0.7.98.1) unstable; urgency=low diff --git a/tests/test_utils.py b/tests/test_utils.py index 19dd977d..23511f32 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -20,7 +20,7 @@ class TestUtils(unittest.TestCase): from apt.utils import get_maintenance_end_date months_of_support = 18 # test historic releases, jaunty - release_date = datetime.datetime(2009, 04, 23) + 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) @@ -28,25 +28,25 @@ class TestUtils(unittest.TestCase): 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, 04) + 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, 04) + self.assertEqual(end_month, 4) # test with modulo zero - release_date = datetime.datetime(2010, 06, 10) + 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, 04, 24) + 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, 04) + self.assertEqual(end_month, 4) # what datetime says #d = datetime.timedelta(18*30) -- cgit v1.2.3 From 85665b9162f8b9c087e6f7fb4eade14bf2b236c2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 10 Nov 2010 18:17:40 +0100 Subject: releasing version 0.7.98.1ubuntu2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3bf12153..9f860c2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.7.98.1ubuntu2) natty; urgency=low + + * rebuild for python2.7 + + -- Michael Vogt Wed, 10 Nov 2010 17:49:45 +0100 + python-apt (0.7.98.1ubuntu1) natty; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 871ae7011578cd84269e0ddfe20609261cfb88a1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 24 Nov 2010 11:00:09 +0100 Subject: releasing version 0.7.100ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc90e997..4c320ba0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -python-apt (0.7.100ubuntu1) UNRELEASED; urgency=low +python-apt (0.7.100ubuntu1) natty; urgency=low * re-merged from debian/sid * tests/test_apt_cache.py: - fix tests to work if apt compressed indexes are enabled - -- Michael Vogt Wed, 24 Nov 2010 10:18:13 +0100 + -- Michael Vogt Wed, 24 Nov 2010 10:58:05 +0100 python-apt (0.7.100) unstable; urgency=low -- cgit v1.2.3 From 2a0259649b0656b9c262fea304ee8feb0c27ab1e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 7 Dec 2010 14:52:09 +0100 Subject: releasing version 0.7.100ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f55369d7..17c6abc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.100ubuntu2) UNRELEASED; urgency=low +python-apt (0.7.100ubuntu2) natty; urgency=low * python/generic.h: - set Object to NULL in CppDeallocPtr @@ -6,7 +6,7 @@ python-apt (0.7.100ubuntu2) UNRELEASED; urgency=low - don't run "actiongroup.release()" if the object was already deallocated - -- Michael Vogt Tue, 07 Dec 2010 13:41:07 +0100 + -- Michael Vogt Tue, 07 Dec 2010 14:49:42 +0100 python-apt (0.7.100ubuntu1) natty; urgency=low -- cgit v1.2.3 From 06720135e8a408369cbb74e7d1fa7e554dd36067 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Dec 2010 18:23:37 +0100 Subject: releasing version 0.7.100.1ubuntu1 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f36571f9..c1ab2f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -python-apt (0.7.100.1ubuntu1) UNRELEASEDnatty; urgency=low +python-apt (0.7.100.1ubuntu1) natty; urgency=low * merged from debian + * dropped python2.6 recommends * apt/progress/text.py: - only run ioctl for termios.TIOCGWINSZ if the fd is a tty * apt/debfile.py, tests/test_debfile.py: -- cgit v1.2.3 From e1d214484bdb2c6fed6a3bfeaff6229a31190fdd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Dec 2010 11:02:50 +0100 Subject: * debian/control: - really dropped python2.6 recommends --- debian/changelog | 4 +++- debian/control | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6956175..f155d1c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -python-apt (0.7.100.1ubuntu2) natty; urgency=low +python-apt (0.7.100.1ubuntu2) UNRELEASEDnatty; urgency=low * 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/control: + - really dropped python2.6 recommends -- Michael Vogt Wed, 22 Dec 2010 10:52:50 +0100 diff --git a/debian/control b/debian/control index 4b1b2d92..a5d2236a 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common -Recommends: lsb-release, iso-codes, python2.6 +Recommends: lsb-release, iso-codes Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4), ${python:Breaks} Provides: ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc -- cgit v1.2.3 From b0c7c1ab8c33d8f4c7dae341ac9c74bb7bc1c699 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Dec 2010 11:05:09 +0100 Subject: releasing version 0.7.100.1ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f155d1c7..0422b262 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.100.1ubuntu2) UNRELEASEDnatty; urgency=low +python-apt (0.7.100.1ubuntu2) natty; urgency=low * python/depcache.cc: - when using the actiongroup as a contextmanager incref/decref @@ -7,7 +7,7 @@ python-apt (0.7.100.1ubuntu2) UNRELEASEDnatty; urgency=low * debian/control: - really dropped python2.6 recommends - -- Michael Vogt Wed, 22 Dec 2010 10:52:50 +0100 + -- Michael Vogt Wed, 22 Dec 2010 11:03:07 +0100 python-apt (0.7.100.1ubuntu1) natty; urgency=low -- cgit v1.2.3 From 1764db1ac8ea738f18a98d010ad36613c32651c4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Jan 2011 22:08:27 +0100 Subject: update changelog to match current archive --- debian/changelog | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd43e56b..03e9b64b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,19 @@ -python-apt (0.7.100.2) UNRELEASED; urgency=low - - [ Michael Vogt ] - * python/depcache.cc: - - remove unneeded DECREF +python-apt (0.7.100.1ubunt4) UNRELEASED; urgency=low [ Michael Bienia ] * Use the new "except Exception as e" syntax from Python 2.6 (and later) to allow building with Python 3.2. * Bump XS-Python-Version to >= 2.6 therefor. - + -- Michael Vogt Tue, 07 Dec 2010 13:41:07 +0100 +python-apt (0.7.100.1ubuntu3) natty; urgency=low + + * python/depcache.cc: + - fix another refcount problem + + -- Michael Vogt Wed, 22 Dec 2010 16:39:49 +0100 + python-apt (0.7.100.1ubuntu2) natty; urgency=low * python/depcache.cc: -- cgit v1.2.3 From 4c0f43da5e3fc902193be578ad3aaa1e7c6457a7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Jan 2011 22:12:18 +0100 Subject: releasing version 0.7.100.1ubunt4 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4ac372b8..5162dd04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.100.1ubunt4) UNRELEASED; urgency=low +python-apt (0.7.100.1ubunt4) natty; urgency=low [ Michael Bienia ] * Use the new "except Exception as e" syntax from Python 2.6 (and later) to -- cgit v1.2.3 From 28b6f80373ad00704615e1cb0aa9ef65a794771c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Jan 2011 23:24:10 +0100 Subject: releasing version 0.7.100.1ubuntu4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5162dd04..7f935923 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.100.1ubunt4) natty; urgency=low +python-apt (0.7.100.1ubuntu4) natty; urgency=low [ Michael Bienia ] * Use the new "except Exception as e" syntax from Python 2.6 (and later) to @@ -10,7 +10,7 @@ python-apt (0.7.100.1ubunt4) natty; urgency=low - fix py3 extension module install location (thanks to Barry) - -- Michael Vogt Thu, 13 Jan 2011 22:09:39 +0100 + -- Michael Vogt Thu, 13 Jan 2011 22:58:43 +0100 python-apt (0.7.100.1ubuntu3) natty; urgency=low -- cgit v1.2.3 From 50cd25232b87fcf0be1a87bf2757f76a369ee175 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 18 Feb 2011 17:28:48 +0100 Subject: releasing version 0.7.100.1ubuntu5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 00207cbe..37062230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -python-apt (0.7.100.1ubuntu5) UNRELEASEDnatty; urgency=low +python-apt (0.7.100.1ubuntu5) natty; urgency=low * python/depcache.cc: - provide bindings for new libapt SetCandidateRelease() * debian/control: - require new libapt-pkg-dev SetCandidateRelease() - -- Michael Vogt Fri, 18 Feb 2011 17:16:01 +0100 + -- Michael Vogt Fri, 18 Feb 2011 17:26:47 +0100 python-apt (0.7.100.1ubuntu4) natty; urgency=low -- cgit v1.2.3 From 2820cf928b411a0227c07780dd2e74b9b0ebbd98 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 21 Mar 2011 15:24:56 +0100 Subject: releasing version 0.7.100.2ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a606a1c9..c45f483d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -python-apt (0.7.100.2ubuntu1) UNRELEASEDnatty; urgency=low +python-apt (0.7.100.2ubuntu1) natty; urgency=low * merged fix for parse_depends() in a multiarch environment from debian/sid branch - -- Michael Vogt Mon, 21 Mar 2011 15:14:38 +0100 + -- Michael Vogt Mon, 21 Mar 2011 15:23:59 +0100 python-apt (0.7.100.2) unstable; urgency=low -- cgit v1.2.3 From f88db9b5fab274879fe1aeae1309dc7a23257040 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 29 Mar 2011 09:16:26 +0200 Subject: PyFetchProgress::Pulse(): When ignoring a false return value from PyArg_Parse() after running the simple callback pulse(), there can be an exception on the stack, which must be cleared. (LP: #711225) --- debian/changelog | 9 +++++++++ python/progress.cc | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c45f483d..6f337b91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-apt (0.7.100.2ubuntu2) UNRELEASED; urgency=low + + [ Barry Warsaw ] + * PyFetchProgress::Pulse(): When ignoring a false return value from + PyArg_Parse() after running the simple callback pulse(), there can be + an exception on the stack, which must be cleared. (LP: #711225) + + -- Michael Vogt Mon, 21 Mar 2011 15:46:50 +0100 + python-apt (0.7.100.2ubuntu1) natty; urgency=low * merged fix for parse_depends() in a multiarch environment diff --git a/python/progress.cc b/python/progress.cc index 437309cf..5700a1b6 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -399,7 +399,9 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner) { // most of the time the user who subclasses the pulse() // method forgot to add a return {True,False} so we just - // assume he wants a True + // assume he wants a True. There may be a Python exception on the stack + // that must be cleared. + PyErr_Clear(); PyCbObj_BEGIN_ALLOW_THREADS return true; } -- cgit v1.2.3 From 33b79b4717953064130e5be3b3371613e2b7a210 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 29 Mar 2011 09:20:55 +0200 Subject: releasing version 0.7.100.2ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f337b91..89395ab4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -python-apt (0.7.100.2ubuntu2) UNRELEASED; urgency=low +python-apt (0.7.100.2ubuntu2) natty; urgency=low [ Barry Warsaw ] * PyFetchProgress::Pulse(): When ignoring a false return value from PyArg_Parse() after running the simple callback pulse(), there can be an exception on the stack, which must be cleared. (LP: #711225) - -- Michael Vogt Mon, 21 Mar 2011 15:46:50 +0100 + -- Barry Warsaw Mon, 28 Mar 2011 18:17:11 -0400 python-apt (0.7.100.2ubuntu1) natty; urgency=low -- cgit v1.2.3 From d108dcccc57a37f987459a1346f23fb6e8c79b57 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 30 Mar 2011 17:53:06 +0200 Subject: releasing version 0.7.100.2ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 346a42a2..b3c00782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.100.2ubuntu3) UNRELEASED; urgency=low +python-apt (0.7.100.2ubuntu3) natty; urgency=low [ Michael Vogt ] * python/arfile.cc, apt/debfile.py: @@ -7,7 +7,7 @@ python-apt (0.7.100.2ubuntu3) UNRELEASED; urgency=low - add test for xz compression * update priority of python3-apt to match the archive - -- Michael Vogt Mon, 21 Mar 2011 15:46:50 +0100 + -- Michael Vogt Wed, 30 Mar 2011 17:16:00 +0200 python-apt (0.7.100.2ubuntu2) natty; urgency=low -- cgit v1.2.3 From 50ad561deddca0b239f67ce25fd9800e8bbe94a9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 31 Mar 2011 18:16:34 +0200 Subject: tests/test_debfile.py: fix using tab by accident --- tests/test_debfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 32e52ddb..426bccde 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -113,7 +113,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading self.assertEqual(content, needle) def test_xz_data(self): - deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") + deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") self.assertEqual(deb.filelist, ["./", "usr/", "usr/bin/"]) -- cgit v1.2.3 From 6f4cc51023476625d97ed657073b948e8390fa01 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Apr 2011 16:57:01 +0200 Subject: cherry pick -r 504..505 http://bzr.debian.org/apt/python-apt/debian-experimental --- aptsources/sourceslist.py | 24 ++++++++++++++++++++++-- debian/changelog | 6 ++++++ tests/data/aptsources/sources.list | 5 ++++- tests/test_aptsources.py | 19 +++++++++++++++++-- 4 files changed, 49 insertions(+), 5 deletions(-) diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 76bea43a..3cfe1791 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -81,6 +81,7 @@ class SourceEntry(object): self.invalid = False # is the source entry valid self.disabled = False # is it disabled ('#' in front) self.type = "" # what type (deb, deb-src) + self.architectures = [] # architectures self.uri = "" # base-uri self.dist = "" # distribution (dapper, edgy, etc) self.comps = [] # list of available componetns @@ -113,7 +114,7 @@ class SourceEntry(object): p_found = False space_found = False for i in range(len(line)): - if line[i] == "[": + if line[i] == "[" and not space_found: p_found=True tmp += line[i] elif line[i] == "]": @@ -169,6 +170,20 @@ class SourceEntry(object): if self.type not in ("deb", "deb-src", "rpm", "rpm-src"): self.invalid = True return + + if pieces[1].strip()[0] == "[": + options = pieces.pop(1).strip("[]").split(";") + for option in options: + try: + key, value = option.split("=", 1) + except Exception: + self.invalid = True + else: + if key == "arch": + self.architectures = value.split(",") + else: + self.invalid = True + # URI self.uri = pieces[1].strip() if len(self.uri) < 1: @@ -204,7 +219,12 @@ class SourceEntry(object): line = "" if self.disabled: line = "# " - line += "%s %s %s" % (self.type, self.uri, self.dist) + + line += self.type + + if self.architectures: + line += " [arch=%s]" % ",".join(self.architectures) + line += " %s %s" % (self.uri, self.dist) if len(self.comps) > 0: line += " " + " ".join(self.comps) if self.comment != "": diff --git a/debian/changelog b/debian/changelog index 9f2cefaa..060299e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.8.0~exp2) UNRELEASED; urgency=low + + * aptsources: Parse multi-arch sources.list files correctly + + -- Julian Andres Klode Wed, 06 Apr 2011 09:46:52 +0200 + python-apt (0.7.100.3) unstable; urgency=low [ Barry Warsaw ] diff --git a/tests/data/aptsources/sources.list b/tests/data/aptsources/sources.list index 5481d4f0..376d6961 100644 --- a/tests/data/aptsources/sources.list +++ b/tests/data/aptsources/sources.list @@ -3,4 +3,7 @@ deb http://de.archive.ubuntu.com/ubuntu/ edgy main # comment 2 deb http://de.archive.ubuntu.com/ubuntu/ edgy restricted # comment 3 -deb http://de.archive.ubuntu.com/ubuntu/ edgy universe \ No newline at end of file +deb http://de.archive.ubuntu.com/ubuntu/ edgy universe + +# multi-arch +deb [arch=amd64,i386] http://de.archive.ubuntu.com/ubuntu/ natty main diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 331df935..aeb2ce31 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -39,11 +39,11 @@ class TestAptSources(unittest.TestCase): apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/" "sources.list") sources = aptsources.sourceslist.SourcesList(True, self.templates) - self.assertEqual(len(sources.list), 6) + self.assertEqual(len(sources.list), 9) # test load sources.list = [] sources.load("data/aptsources/sources.list") - self.assertEqual(len(sources.list), 6) + self.assertEqual(len(sources.list), 9) def testSourcesListAdding(self): """aptsources: Test additions to sources.list""" @@ -108,6 +108,21 @@ class TestAptSources(unittest.TestCase): if not s.template: self.fail("source entry '%s' has no matcher" % s) + def testMultiArch(self): + """aptsources: Test multi-arch parsing""" + + apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/" + "sources.list") + sources = aptsources.sourceslist.SourcesList(True, self.templates) + + assert sources.list[8].invalid == False + assert sources.list[8].type == "deb" + assert sources.list[8].architectures == ["amd64", "i386"] + assert sources.list[8].uri == "http://de.archive.ubuntu.com/ubuntu/" + assert sources.list[8].dist == "natty" + assert sources.list[8].comps == ["main"] + assert sources.list[8].line.strip() == str(sources.list[8]) + def testDistribution(self): """aptsources: Test distribution detection.""" apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/" -- cgit v1.2.3 From b2a0eb7ca6d8db6c8e4ac1875fa41f9466c78384 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Apr 2011 16:58:03 +0200 Subject: cherry pick -r 505..506 http://bzr.debian.org/apt/python-apt/debian-experimental --- aptsources/sourceslist.py | 17 +++++++++++++---- debian/changelog | 1 + tests/test_aptsources.py | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 3cfe1791..85db2de9 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -275,12 +275,14 @@ class SourcesList(object): yield entry raise StopIteration - def add(self, type, uri, dist, orig_comps, comment="", pos=-1, file=None): + def add(self, type, uri, dist, orig_comps, comment="", pos=-1, file=None, architectures=[]): """ Add a new source to the sources.list. The method will search for existing matching repos and will try to reuse them as far as possible """ + + architectures = set(architectures) # create a working copy of the component list so that # we can modify it later comps = orig_comps[:] @@ -288,7 +290,8 @@ class SourcesList(object): for source in self.list: if not source.disabled and not source.invalid and \ source.type == type and uri == source.uri and \ - source.dist == dist: + source.dist == dist and \ + set(source.architectures) == architectures: for new_comp in comps: if new_comp in source.comps: # we have this component already, delete it @@ -301,19 +304,25 @@ class SourcesList(object): # components if not source.disabled and not source.invalid and \ source.type == type and uri == source.uri and \ - source.dist == dist: + source.dist == dist and \ + set(source.architectures) == architectures: comps = uniq(source.comps + comps) source.comps = comps return source # if there is a corresponding repo which is disabled, enable it elif source.disabled and not source.invalid and \ source.type == type and uri == source.uri and \ + set(source.architectures) == architectures and \ source.dist == dist and \ len(set(source.comps) & set(comps)) == len(comps): source.disabled = False return source # there isn't any matching source, so create a new line and parse it - line = "%s %s %s" % (type, uri, dist) + + line = type + if architectures: + line += " [arch=%s]" % ",".join(architectures) + line += " %s %s" % (uri, dist) for c in comps: line = line + " " + c if comment != "": diff --git a/debian/changelog b/debian/changelog index 060299e5..cd9c8251 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-apt (0.8.0~exp2) UNRELEASED; urgency=low * aptsources: Parse multi-arch sources.list files correctly + * aptsources: Allow insertion of new multi-arch entries -- Julian Andres Klode Wed, 06 Apr 2011 09:46:52 +0200 diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index aeb2ce31..1597674e 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -62,6 +62,14 @@ class TestAptSources(unittest.TestCase): "edgy", ["restricted"]) self.assertTrue(sources.list == before.list) + + before = copy.deepcopy(sources) + sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/", + "natty", + ["main"], architectures=["amd64", "i386"]) + self.assertTrue(sources.list == before.list) + + # test to add something new: multiverse sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/", "edgy", @@ -74,6 +82,34 @@ class TestAptSources(unittest.TestCase): "multiverse" in entry.comps): found = True self.assertTrue(found) + + # add a new natty entry without architecture specification + sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/", + "natty", + ["multiverse"]) + found = False + for entry in sources: + if (entry.type == "deb" and + entry.uri == "http://de.archive.ubuntu.com/ubuntu/" and + entry.dist == "natty" and + entry.architectures == [] and + "multiverse" in entry.comps): + found = True + self.assertTrue(found) + + # Add universe to existing multi-arch line + sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/", + "natty", + ["universe"], architectures=["i386", "amd64"]) + found = False + for entry in sources: + if (entry.type == "deb" and + entry.uri == "http://de.archive.ubuntu.com/ubuntu/" and + entry.dist == "natty" and + set(entry.architectures) == set(["amd64", "i386"]) and + set(entry.comps) == set(["main", "universe"])): + found = True + self.assertTrue(found) # test to add something new: multiverse *and* # something that is already there before = copy.deepcopy(sources) -- cgit v1.2.3 From bf950bc2b0a1f247714aee3e3096ed6872166d91 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Apr 2011 17:20:16 +0200 Subject: merged upload from loic --- debian/changelog | 10 +++++++++- debian/control | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f22ad9f..6086ef61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.100.3ubuntu2) UNRELEASED; urgency=low +python-apt (0.7.100.3ubuntu3) UNRELEASED; urgency=low [ Michael Vogt ] * cherry pick multiarch support for aptsources from debian @@ -9,6 +9,14 @@ python-apt (0.7.100.3ubuntu2) UNRELEASED; urgency=low -- Michael Vogt Wed, 06 Apr 2011 16:59:07 +0200 +python-apt (0.7.100.3ubuntu2) natty; urgency=low + + * Rename Vcs-* to XS-Debian-Vcs-*. + * No other changes upload to build against latest apt and hopefully fix + LP #733741. + + -- Loïc Minier Tue, 05 Apr 2011 18:11:40 +0200 + python-apt (0.7.100.3ubuntu1) natty; urgency=low * merge fixes from debian-sid, most notably the fixes diff --git a/debian/control b/debian/control index 7b052bfc..8969af63 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: apt-utils, python-distutils-extra (>= 2.0), python-sphinx (>= 0.5), python-debian -Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes +XS-Debian-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid +XS-Debian-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any -- cgit v1.2.3 From a416a97ffcaef3bff627fa7c38d448cbf126a99d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Apr 2011 17:31:21 +0200 Subject: releasing version 0.7.100.3ubuntu3 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6086ef61..70fc2c12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.100.3ubuntu3) UNRELEASED; urgency=low +python-apt (0.7.100.3ubuntu3) natty; urgency=low [ Michael Vogt ] * cherry pick multiarch support for aptsources from debian -- cgit v1.2.3 From 67130f4b702a750f777042e4ad557bef9364f997 Mon Sep 17 00:00:00 2001 From: Stéphane Graber Date: Tue, 12 Apr 2011 10:49:58 -0400 Subject: releasing version 0.7.100.3ubuntu4 --- aptsources/distro.py | 3 +++ debian/changelog | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/aptsources/distro.py b/aptsources/distro.py index d4b65645..41c86981 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -337,6 +337,9 @@ class Distribution(object): for source in sources: add_component_only_once(source, comps_per_dist) + for source in self.source_code_sources: + add_component_only_once(source, comps_per_sdist) + # check if there is a main source code source at all if self.get_source_code == True: if len(self.source_code_sources) < 1: diff --git a/debian/changelog b/debian/changelog index 70fc2c12..695d59a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.7.100.3ubuntu4) natty; urgency=low + + * Update enable_component to also apply to -src entries (LP: #758732) + + -- Stéphane Graber Tue, 12 Apr 2011 10:49:34 -0400 + python-apt (0.7.100.3ubuntu3) natty; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 3db02c5215d36bb1cd2c912ad69e5ed2796380c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 20 Apr 2011 18:13:47 +0200 Subject: releasing version 0.7.100.3ubuntu5 --- aptsources/sourceslist.py | 5 ++++- data/templates/Ubuntu.info.in | 48 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 8 ++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 83d2c8b9..04f6a5a7 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -449,7 +449,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 diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index ca041c26..99bd5422 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -25,6 +25,13 @@ _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 + +Suite: natty +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*11.04 MatchURI: cdrom:\[Ubuntu.*11.04 @@ -66,21 +73,49 @@ 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/ @@ -106,6 +141,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 @@ -187,6 +223,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 @@ -248,6 +285,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 @@ -309,6 +347,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 @@ -370,6 +409,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 @@ -432,6 +472,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 @@ -495,6 +536,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 @@ -558,6 +600,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 @@ -618,6 +661,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 @@ -678,6 +722,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 @@ -734,6 +779,7 @@ Component: multiverse _CompDescription: Non-free (Multiverse) Suite: breezy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*5.10 MatchURI: cdrom:\[Ubuntu.*5.10 @@ -785,6 +831,7 @@ Component: multiverse _CompDescription: Non-free (Multiverse) Suite: hoary +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*5.04 MatchURI: cdrom:\[Ubuntu.*5.04 @@ -831,6 +878,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 695d59a4..6624e8c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.100.3ubuntu5) natty; urgency=low + + [ Stéphane Graber ] + * fix enable_components for deb-src entries on ports.ubuntu.com + (LP: #760035) + + -- Michael Vogt Wed, 20 Apr 2011 18:05:51 +0200 + python-apt (0.7.100.3ubuntu4) natty; urgency=low * Update enable_component to also apply to -src entries (LP: #758732) -- cgit v1.2.3 From dec3183d39128e6034ff1255cdc570ea53f9086b Mon Sep 17 00:00:00 2001 From: Robert Roth Date: Thu, 21 Apr 2011 18:46:13 +0300 Subject: Fix documentation problem --- doc/source/library/apt_pkg.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst index 426cb97e..3c9f8446 100644 --- a/doc/source/library/apt_pkg.rst +++ b/doc/source/library/apt_pkg.rst @@ -2092,7 +2092,7 @@ following three functions: .. function:: pkgsystem_unlock() Unlock the global pkgsystem. This reverts the effect of - :func:`pkgsystem_unlock`. + :func:`pkgsystem_lock`. Other classes -- cgit v1.2.3 From 35e1f9341f30acc3e059234945108a7e976a2eb8 Mon Sep 17 00:00:00 2001 From: Stéphane Graber Date: Sun, 24 Apr 2011 13:26:22 -0400 Subject: releasing version 0.7.100.3ubuntu6 --- data/templates/Ubuntu.info.in | 1 + debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 99bd5422..b49312e8 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -29,6 +29,7 @@ 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 diff --git a/debian/changelog b/debian/changelog index 6624e8c5..adf51acc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.100.3ubuntu6) natty; urgency=low + + * Add missing _Description entry to Ubuntu.info for new deb-src entries. + (LP: #768363) + + -- Stéphane Graber Sun, 24 Apr 2011 13:24:53 -0400 + python-apt (0.7.100.3ubuntu5) natty; urgency=low [ Stéphane Graber ] -- cgit v1.2.3 From 8c291baf30b7fe903461823100004bc994707086 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 Apr 2011 12:27:20 +0200 Subject: * data/templates/Ubuntu.info.in: - add oneiric templates --- data/templates/Ubuntu.info.in | 118 ++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 +++ 2 files changed, 125 insertions(+) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index b49312e8..39d9256e 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,123 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +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 +_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/ diff --git a/debian/changelog b/debian/changelog index adf51acc..983a480a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.100.3ubuntu7) UNRELEASEDoneiric; urgency=low + + * data/templates/Ubuntu.info.in: + - add oneiric templates + + -- Michael Vogt Thu, 28 Apr 2011 11:49:32 +0200 + python-apt (0.7.100.3ubuntu6) natty; urgency=low * Add missing _Description entry to Ubuntu.info for new deb-src entries. -- cgit v1.2.3 From e0b2560ab0fab5716187b7a1f93052373f5cbd23 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Apr 2011 17:32:34 +0200 Subject: releasing version 0.7.100.3ubuntu7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 983a480a..11e8819d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -python-apt (0.7.100.3ubuntu7) UNRELEASEDoneiric; urgency=low +python-apt (0.7.100.3ubuntu7) oneiric; urgency=low * data/templates/Ubuntu.info.in: - add oneiric templates - -- Michael Vogt Thu, 28 Apr 2011 11:49:32 +0200 + -- Michael Vogt Fri, 29 Apr 2011 17:30:29 +0200 python-apt (0.7.100.3ubuntu6) natty; urgency=low -- cgit v1.2.3 From 19e2e0f210da3fb4cb87cfe1ddd4bbc6c61d8cd1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 26 May 2011 18:01:26 +0200 Subject: merge from debian, omit disable of the 0.7 API --- apt/cache.py | 44 ++++- apt/cdrom.py | 7 +- apt/debfile.py | 2 +- apt/package.py | 50 ++++-- apt/progress/old.py | 5 +- apt/progress/text.py | 5 +- aptsources/distinfo.py | 167 +++++++++---------- aptsources/sourceslist.py | 87 +++++----- debian/changelog | 63 ++++++++ debian/rules | 8 +- doc/examples/architecture.py | 12 ++ doc/source/c++/api.rst | 60 +++++++ doc/source/library/apt.package.rst | 31 +++- doc/source/library/apt_pkg.rst | 306 ++++++++++++++++++++++++++++++++++- doc/source/tutorials/apt-cdrom.rst | 2 +- doc/source/whatsnew/0.8.0.rst | 38 +++++ pre-build.sh | 4 +- python/acquire-item.cc | 10 +- python/acquire.cc | 14 +- python/apt_pkgmodule.cc | 106 +++++++++---- python/apt_pkgmodule.h | 8 + python/arfile.cc | 12 +- python/cache.cc | 265 +++++++++++++++++++++++-------- python/cachegroup.cc | 188 ++++++++++++++++++++++ python/configuration.cc | 6 +- python/depcache.cc | 12 +- python/generic.h | 16 ++ python/indexfile.cc | 2 +- python/indexrecords.cc | 2 +- python/orderlist.cc | 317 +++++++++++++++++++++++++++++++++++++ python/pkgmanager.cc | 279 +++++++++++++++++++++++++++----- python/pkgsrcrecords.cc | 10 +- python/policy.cc | 2 +- python/progress.cc | 60 +++---- python/python-apt-helpers.cc | 2 + python/python-apt.h | 16 ++ python/string.cc | 14 +- python/tag.cc | 5 +- python/tarfile.cc | 14 +- setup.py | 3 +- tests/test_apt_cache.py | 31 ++-- tests/test_cache_invocation.py | 4 +- tests/test_configuration.py | 30 ++++ tests/test_group.py | 32 ++++ tests/test_hashes.py | 7 +- tests/test_progress.py | 3 +- 46 files changed, 1964 insertions(+), 397 deletions(-) create mode 100644 doc/examples/architecture.py create mode 100644 doc/source/whatsnew/0.8.0.rst create mode 100644 python/cachegroup.cc create mode 100644 python/orderlist.cc create mode 100644 tests/test_configuration.py create mode 100644 tests/test_group.py diff --git a/apt/cache.py b/apt/cache.py index bfa41edc..be137b76 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -66,7 +66,11 @@ class Cache(object): self._weakref = weakref.WeakValueDictionary() self._set = set() self._fullnameset = set() + self._changes_count = -1 self._sorted_set = None + + self.connect("cache_post_open", self._inc_changes_count) + self.connect("cache_post_change", self._inc_changes_count) if memonly: # force apt to build its caches in memory apt_pkg.config.set("Dir::Cache::pkgcache", "") @@ -87,6 +91,11 @@ class Cache(object): # recognized (LP: #320665) apt_pkg.init_system() self.open(progress) + + + def _inc_changes_count(self): + """Increase the number of changes""" + self._changes_count += 1 def _check_and_create_required_dirs(self, rootdir): """ @@ -107,7 +116,7 @@ class Cache(object): os.makedirs(rootdir + d) for f in files: if not os.path.exists(rootdir + f): - open(rootdir + f, "w") + open(rootdir + f, "w").close() def _run_callbacks(self, name): """ internal helper to run a callback """ @@ -288,6 +297,30 @@ class Cache(object): finally: os.close(lock) + def fetch_archives(self, progress=None, fetcher=None): + """Fetch the archives for all packages marked for install/upgrade. + + You can specify either an :class:`apt.progress.base.AcquireProgress()` + object for the parameter *progress*, or specify an already + existing :class:`apt_pkg.Acquire` object for the parameter *fetcher*. + + The return value of the function is undefined. If an error occured, + an exception of type :class:`FetchFailedException` or + :class:`FetchCancelledException` is raised. + + .. versionadded:: 0.8.0 + """ + if progress is not None and fetcher is not None: + raise ValueError("Takes a progress or a an Acquire object") + if progress is None: + progress = apt.progress.text.AcquireProgress() + if fetcher is None: + fetcher = apt_pkg.Acquire(progress) + + + return self._fetch_archives(fetcher, + apt_pkg.PackageManager(self._depcache)) + def is_virtual_package(self, pkgname): """Return whether the package is a virtual package.""" try: @@ -339,6 +372,10 @@ class Cache(object): raise_on_error=True, sources_list=None): """Run the equivalent of apt-get update. + You probably want to call open() afterwards, in order to utilise the + new cache. Otherwise, the old cache will be used which can lead to + strange bugs. + The first parameter *fetch_progress* may be set to an instance of apt.progress.FetchProgress, the default is apt.progress.FetchProgress() . @@ -548,6 +585,7 @@ class ProblemResolver(object): def __init__(self, cache): self._resolver = apt_pkg.ProblemResolver(cache._depcache) + self._cache = cache def clear(self, package): """Reset the package to the default state.""" @@ -567,11 +605,15 @@ class ProblemResolver(object): def resolve(self): """Resolve dependencies, try to remove packages where needed.""" + self._cache.cache_pre_change() self._resolver.resolve() + self._cache.cache_post_change() def resolve_by_keep(self): """Resolve dependencies, do not try to remove packages.""" + self._cache.cache_pre_change() self._resolver.resolve_by_keep() + self._cache.cache_post_change() # ----------------------------- experimental interface diff --git a/apt/cdrom.py b/apt/cdrom.py index 01caa12f..9688de9e 100644 --- a/apt/cdrom.py +++ b/apt/cdrom.py @@ -79,9 +79,10 @@ class Cdrom(apt_pkg.Cdrom): src.append(apt_pkg.config.find_file("Dir::Etc::sourcelist")) # Check each file for fname in src: - for line in open(fname): - if not line.lstrip().startswith("#") and cd_id in line: - return True + with open(fname) as fobj: + for line in fobj: + if not line.lstrip().startswith("#") and cd_id in line: + return True return False if apt_pkg._COMPAT_0_7: diff --git a/apt/debfile.py b/apt/debfile.py index fb4312a1..d0f41def 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -64,7 +64,7 @@ class DebPackage(object): self._installed_conflicts = set() self._failure_string = "" self.filename = filename - self._debfile = apt_inst.DebFile(open(self.filename)) + self._debfile = apt_inst.DebFile(self.filename) control = self._debfile.control.extractdata("control") self._sections = apt_pkg.TagSection(control) self.pkgname = self._sections["Package"] diff --git a/apt/package.py b/apt/package.py index d7d5d167..14e80594 100644 --- a/apt/package.py +++ b/apt/package.py @@ -50,9 +50,9 @@ __all__ = ('BaseDependency', 'Dependency', 'Origin', 'Package', 'Record', def _file_is_same(path, size, md5): """Return ``True`` if the file is the same.""" - if (os.path.exists(path) and os.path.getsize(path) == size and - apt_pkg.md5sum(open(path)) == md5): - return True + if os.path.exists(path) and os.path.getsize(path) == size: + with open(path) as fobj: + return apt_pkg.md5sum(fobj) == md5 class FetchError(Exception): @@ -162,10 +162,23 @@ class Origin(object): class Record(Mapping): - """Represent a pkgRecord. + """Record in a Packages file + + Represent a record as stored in a Packages file. You can use this like + a dictionary mapping the field names of the record to their values:: + + >>> record = Record("Package: python-apt\\nVersion: 0.8.0\\n\\n") + >>> record["Package"] + 'python-apt' + >>> record["Version"] + '0.8.0' + + For example, to get the tasks of a package from a cache, you could do:: + + package.candidate.record["Tasks"].split() + + Of course, you can also use the :attr:`Version.tasks` property. - It can be accessed like a dictionary and can also give the original package - record if accessed as a string. """ def __init__(self, record_str): @@ -209,6 +222,9 @@ class Record(Mapping): class Version(object): """Representation of a package version. + The Version class contains all information related to a + specific package version. + .. versionadded:: 0.7.9 """ @@ -393,7 +409,11 @@ class Version(object): @property def record(self): - """Return a Record() object for this version.""" + """Return a Record() object for this version. + + Return a Record() object for this version which provides access + to the raw attributes of the candidate version + """ return Record(self._records.record) def get_dependencies(self, *types): @@ -474,6 +494,16 @@ class Version(object): """ return self._records.sha256_hash + @property + def tasks(self): + """Get the tasks of the package. + + A set of the names of the tasks this package belongs to. + + .. versionadded:: 0.8.0 + """ + return set(self.record["Task"].split()) + def _uris(self): """Return an iterator over all available urls. @@ -994,11 +1024,8 @@ class Package(object): """ path = "/var/lib/dpkg/info/%s.list" % self.name try: - file_list = open(path, "rb") - try: + with open(path, "rb") as file_list: return file_list.read().decode("utf-8").split(u"\n") - finally: - file_list.close() except EnvironmentError: return [] @@ -1104,6 +1131,7 @@ class Package(object): # Check if the download was canceled if cancel_lock and cancel_lock.isSet(): return u"" + # FIXME: python3.2: Should be closed manually changelog_file = urllib2.urlopen(uri) # do only get the lines that are new changelog = u"" diff --git a/apt/progress/old.py b/apt/progress/old.py index 4bd79f2e..364cd2ce 100644 --- a/apt/progress/old.py +++ b/apt/progress/old.py @@ -149,10 +149,11 @@ class TextFetchProgress(FetchProgress): Return True to continue or False to cancel. """ FetchProgress.pulse(self) + if self.currentCPS > 0: s = "[%2.f%%] %sB/s %s" % (self.percent, - apt_pkg.size_to_str(int(self.currentCPS)), - apt_pkg.time_to_str(int(self.eta))) + apt_pkg.size_to_str(self.currentCPS), + apt_pkg.time_to_str(long(self.eta))) else: s = "%2.f%% [Working]" % (self.percent) print "\r%s" % (s), diff --git a/apt/progress/text.py b/apt/progress/text.py index d777837c..c5eec092 100644 --- a/apt/progress/text.py +++ b/apt/progress/text.py @@ -157,11 +157,10 @@ class AcquireProgress(base.AcquireProgress, TextProgress): shown = False tval = '%i%%' % percent - end = "" if self.current_cps: - eta = int(float(self.total_bytes - self.current_bytes) / - self.current_cps) + eta = long(float(self.total_bytes - self.current_bytes) / + self.current_cps) end = " %sB/s %s" % (apt_pkg.size_to_str(self.current_cps), apt_pkg.time_to_str(eta)) diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index a69f944a..249985e7 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -176,89 +176,90 @@ class DistInfo(object): map_mirror_sets = {} dist_fname = "%s/%s.info" % (base_dir, dist) - dist_file = open(dist_fname) - if not dist_file: - return - template = None - component = None - for line in dist_file: - tokens = line.split(':', 1) - if len(tokens) < 2: - continue - field = tokens[0].strip() - value = tokens[1].strip() - if field == 'ChangelogURI': - self.changelogs_uri = _(value) - elif field == 'MetaReleaseURI': - self.metarelease_uri = value - elif field == 'Suite': - self.finish_template(template, component) - component=None - template = Template() - template.name = value - template.distribution = dist - template.match_name = "^%s$" % value - elif field == 'MatchName': - template.match_name = value - elif field == 'ParentSuite': - template.child = True - for nanny in self.templates: - # look for parent and add back ref to it - if nanny.name == value: - template.parents.append(nanny) - nanny.children.append(template) - elif field == 'Available': - template.available = apt_pkg.string_to_bool(value) - elif field == 'Official': - template.official = apt_pkg.string_to_bool(value) - elif field == 'RepositoryType': - template.type = value - elif field == 'BaseURI' and not template.base_uri: - template.base_uri = value - elif field == 'BaseURI-%s' % self.arch: - template.base_uri = value - elif field == 'MatchURI' and not template.match_uri: - template.match_uri = value - elif field == 'MatchURI-%s' % self.arch: - template.match_uri = value - elif (field == 'MirrorsFile' or - field == 'MirrorsFile-%s' % self.arch): - # Make the path absolute. - value = os.path.isabs(value) and value or \ - os.path.abspath(os.path.join(base_dir, value)) - if value not in map_mirror_sets: - mirror_set = {} - try: - mirror_data = filter(match_mirror_line.match, - [x.strip() for x in open(value)]) - except Exception: - logging.warn("Failed to read mirror file") - mirror_data = [] - for line in mirror_data: - if line.startswith("#LOC:"): - location = match_loc.sub(r"\1", line) - continue - (proto, hostname, dir) = split_url(line) - if hostname in mirror_set: - mirror_set[hostname].add_repository(proto, dir) - else: - mirror_set[hostname] = Mirror( - proto, hostname, dir, location) - map_mirror_sets[value] = mirror_set - template.mirror_set = map_mirror_sets[value] - elif field == 'Description': - template.description = _(value) - elif field == 'Component': - if component and not template.has_component(component.name): - template.components.append(component) - component = Component(value) - elif field == 'CompDescription': - component.set_description(_(value)) - elif field == 'CompDescriptionLong': - component.set_description_long(_(value)) - self.finish_template(template, component) - template=None - component=None + with open(dist_fname) as dist_file: + template = None + component = None + for line in dist_file: + tokens = line.split(':', 1) + if len(tokens) < 2: + continue + field = tokens[0].strip() + value = tokens[1].strip() + if field == 'ChangelogURI': + self.changelogs_uri = _(value) + elif field == 'MetaReleaseURI': + self.metarelease_uri = value + elif field == 'Suite': + self.finish_template(template, component) + component=None + template = Template() + template.name = value + template.distribution = dist + template.match_name = "^%s$" % value + elif field == 'MatchName': + template.match_name = value + elif field == 'ParentSuite': + template.child = True + for nanny in self.templates: + # look for parent and add back ref to it + if nanny.name == value: + template.parents.append(nanny) + nanny.children.append(template) + elif field == 'Available': + template.available = apt_pkg.string_to_bool(value) + elif field == 'Official': + template.official = apt_pkg.string_to_bool(value) + elif field == 'RepositoryType': + template.type = value + elif field == 'BaseURI' and not template.base_uri: + template.base_uri = value + elif field == 'BaseURI-%s' % self.arch: + template.base_uri = value + elif field == 'MatchURI' and not template.match_uri: + template.match_uri = value + elif field == 'MatchURI-%s' % self.arch: + template.match_uri = value + elif (field == 'MirrorsFile' or + field == 'MirrorsFile-%s' % self.arch): + # Make the path absolute. + value = os.path.isabs(value) and value or \ + os.path.abspath(os.path.join(base_dir, value)) + if value not in map_mirror_sets: + mirror_set = {} + try: + with open(value) as value_f: + mirror_data = filter(match_mirror_line.match, + [x.strip() for x in + value_f]) + except Exception: + print "WARNING: Failed to read mirror file" + mirror_data = [] + for line in mirror_data: + if line.startswith("#LOC:"): + location = match_loc.sub(r"\1", line) + continue + (proto, hostname, dir) = split_url(line) + if hostname in mirror_set: + mirror_set[hostname].add_repository(proto, dir) + else: + mirror_set[hostname] = Mirror( + proto, hostname, dir, location) + map_mirror_sets[value] = mirror_set + template.mirror_set = map_mirror_sets[value] + elif field == 'Description': + template.description = _(value) + elif field == 'Component': + if (component and not + template.has_component(component.name)): + template.components.append(component) + component = Component(value) + elif field == 'CompDescription': + component.set_description(_(value)) + elif field == 'CompDescriptionLong': + component.set_description_long(_(value)) + self.finish_template(template, component) + template=None + component=None def finish_template(self, template, component): " finish the current tempalte " diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 04f6a5a7..b85e6947 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -1,4 +1,4 @@ -# aptsource.py - Provide an abstraction of the sources.list +# sourceslist.py - Provide an abstraction of the sources.list # # Copyright (c) 2004-2009 Canonical Ltd. # Copyright (c) 2004 Michiel Sikkes @@ -276,6 +276,12 @@ class SourcesList(object): yield entry raise StopIteration + def __find(self, *predicates, **attrs): + for source in self.list: + if (all(getattr(source, key) == attrs[key] for key in attrs) and + all(predicate(source) for predicate in predicates)): + yield source + def add(self, type, uri, dist, orig_comps, comment="", pos=-1, file=None, architectures=[]): """ Add a new source to the sources.list. @@ -287,39 +293,32 @@ class SourcesList(object): # create a working copy of the component list so that # we can modify it later comps = orig_comps[:] + sources = self.__find(lambda s: set(s.architectures) == architectures, + disabled=False, invalid=False, type=type, uri=uri, + dist=dist) # check if we have this source already in the sources.list - for source in self.list: - if not source.disabled and not source.invalid and \ - source.type == type and uri == source.uri and \ - source.dist == dist and \ - set(source.architectures) == architectures: - for new_comp in comps: - if new_comp in source.comps: - # we have this component already, delete it - # from the new_comps list - del comps[comps.index(new_comp)] - if len(comps) == 0: - return source - for source in self.list: + for source in sources: + for new_comp in comps: + if new_comp in source.comps: + # we have this component already, delete it + # from the new_comps list + del comps[comps.index(new_comp)] + if len(comps) == 0: + return source + + sources = self.__find(lambda s: set(s.architectures) == architectures, + invalid=False, type=type, uri=uri, dist=dist) + + for source in sources: # if there is a repo with the same (type, uri, dist) just add the # components - if not source.disabled and not source.invalid and \ - source.type == type and uri == source.uri and \ - source.dist == dist and \ - set(source.architectures) == architectures: - comps = uniq(source.comps + comps) - source.comps = comps - return source - # if there is a corresponding repo which is disabled, enable it - elif source.disabled and not source.invalid and \ - source.type == type and uri == source.uri and \ - set(source.architectures) == architectures and \ - source.dist == dist and \ - len(set(source.comps) & set(comps)) == len(comps): + if source.disabled and set(source.comps) == comps: source.disabled = False return source + elif not source.disabled: + source.comps = uniq(source.comps + comps) + return source # there isn't any matching source, so create a new line and parse it - line = type if architectures: line += " [arch=%s]" % ",".join(architectures) @@ -370,15 +369,12 @@ class SourcesList(object): def load(self, file): """ (re)load the current sources """ try: - f = open(file, "r") - lines = f.readlines() - for line in lines: - source = SourceEntry(line, file) - self.list.append(source) + with open(file, "r") as f: + for line in f: + source = SourceEntry(line, file) + self.list.append(source) except: - logging.error("could not open file '%s'" % file) - else: - f.close() + print "could not open file '%s'" % file def save(self): """ save the current sources """ @@ -390,14 +386,19 @@ class SourcesList(object): "## See sources.list(5) for more information, especialy\n" "# Remember that you can only use http, ftp or file URIs\n" "# CDROMs are managed through the apt-cdrom tool.\n") - open(path, "w").write(header) + + with open(path, "w") as f: + f.write(header) return - for source in self.list: - if source.file not in files: - files[source.file] = open(source.file, "w") - files[source.file].write(source.str()) - for f in files: - files[f].close() + + try: + for source in self.list: + if source.file not in files: + files[source.file] = open(source.file, "w") + files[source.file].write(source.str()) + finally: + for f in files: + files[f].close() def check_for_relations(self, sources_list): """get all parent and child channels in the sources list""" diff --git a/debian/changelog b/debian/changelog index 11e8819d..edd0081f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,66 @@ +python-apt (0.8.0~exp4ubuntu1) oneiric; urgency=low + + * Merged from debian/experimental, remaining changes: + - updated mirror list + - do not disable 0.7 compat API yet + + -- Michael Vogt Tue, 24 May 2011 10:08:56 +0200 + +python-apt (0.8.0~exp4) experimental; urgency=low + + * apt_pkg: Add OrderList, wanted for mancoosi (Closes: #623485) + * apt_pkg: Add subclassing fun to PackageManager, for #623485 as well + * apt.cache: Emit change signals in ProblemResolver + * apt.Cache: Add a _changes_count member for later use + + -- Julian Andres Klode Fri, 29 Apr 2011 13:57:30 +0200 + +python-apt (0.8.0~exp3) experimental; urgency=low + + [ Stéphane Graber ] + * Update enable_component to also apply to -src entries (LP: #758732) + + [ Julian Andres Klode ] + * apt_pkg: Add apt_pkg.Version.multi_arch and friends + + -- Julian Andres Klode Thu, 21 Apr 2011 15:33:38 +0200 + +python-apt (0.8.0~exp2) experimental; urgency=low + + * aptsources: Parse multi-arch sources.list files correctly + * aptsources: Allow insertion of new multi-arch entries + * aptsources: Various cleanup work + * all: Fix all instances of ResourceWarning about unclosed files + * tests/test_apt_cache.py: Use assertTrue() instead of assert_() + * apt_pkg: Raise error when parse_commandline gets empty argv (LP: #707416) + * apt_pkg: Fix time_to_str, time_rfc1123 to accept more correct values + (time_to_str accepts unsigned long, time_rfc1123 long long, y2k31-correct). + * apt.progress: Use long for ETA, natural type for size (LP: #377375) + * aptsources/sourceslist.py: s/aptsource.py/sourceslist.py/ (LP: #309603) + * doc/examples: Add example on how to get architecture names (LP: #194374) + * apt_pkg: Fix unsigned/long-vs-int issues (LP: #610820) + * apt.cache: Document that update() may need an open() (Closes: #622342) + * apt.cache: Add a fetch_archives() method (Closes: #622347) + * doc: Fix a minor formatting error, patch by Jakub Wilk (Closes: #608914) + * apt.package: Add 'tasks' to Version, improve doc (Closes: #619574) + * doc: Fix documentation of BaseDependency.relation (Closes: #607031) + + -- Julian Andres Klode Tue, 12 Apr 2011 15:25:38 +0200 + +python-apt (0.8.0~exp1) experimental; urgency=low + + * Disable the old-style API, and break all packages using it + * Add an 'is_multi_arch' attribute to apt_pkg.Cache + * Add apt_pkg.Group class, wrapping pkgCache::GrpIterator + * Change apt_pkg.Cache() so that passing None for 'progress' results in + no progress output + * Support (name, arch) tuples in apt_pkg.Cache mappings, wrapping + FindPkg() with two string parameters. + * Introduce apt_pkg.Cache.groups and apt_pkg.Cache.group_count + * Fix debian/rules to work correctly with tilde in version number + + -- Julian Andres Klode Tue, 05 Apr 2011 16:21:45 +0200 + python-apt (0.7.100.3ubuntu7) oneiric; urgency=low * data/templates/Ubuntu.info.in: diff --git a/debian/rules b/debian/rules index 5428375d..a85d1eb2 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,8 @@ # Should be include-links, but that somehow fails. export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') export CFLAGS=-Wno-write-strings -DCOMPAT_0_7 -export PATH :=$(CURDIR)/utils:$(PATH) -export SHELL = env PATH=$(PATH) sh +export PATH := $(CURDIR)/utils:$(PATH) +export pyversions := $(CURDIR)/utils/pyversions %: dh --with python2,python3 $@ @@ -28,14 +28,14 @@ override_dh_installdocs: override_dh_strip: dh_strip -p python-apt --dbg-package=python-apt-dbg dh_strip -p python3-apt --dbg-package=python3-apt-dbg - + override_dh_compress: dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv # We ignore failures on hurd, since its locking is broken override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - set -e; for python in $(shell pyversions -r); do \ + set -e; for python in $(shell $(pyversions) -r); do \ $$python tests/test_all.py -q || [ "$(DEB_BUILD_ARCH_OS)" = "hurd" ]; \ done; else diff --git a/doc/examples/architecture.py b/doc/examples/architecture.py new file mode 100644 index 00000000..75afb2d1 --- /dev/null +++ b/doc/examples/architecture.py @@ -0,0 +1,12 @@ +import apt_pkg + + +def main(): + apt_pkg.init_config() + + print "Native architecture:", apt_pkg.config["APT::Architecture"] + print "All architectures:", apt_pkg.config.value_list("APT::Architectures") + + +if __name__ == '__main__': + main() diff --git a/doc/source/c++/api.rst b/doc/source/c++/api.rst index 97ab24d1..63ed1599 100644 --- a/doc/source/c++/api.rst +++ b/doc/source/c++/api.rst @@ -389,6 +389,38 @@ Description (pkgCache::DescIterator) Return the :ctype:`pkgCache::DescIterator` reference contained in the Python object *object*. + +Group (pkgCache::GrpIterator) +---------------------------------- +.. versionadded:: 0.8.0 + +.. cvar:: PyTypeObject PyGroup_Type + + The type object for :class:`apt_pkg.Group` objects. + +.. cfunction:: int PyGroup_Check(PyObject *object) + + Check that the object *object* is an :class:`apt_pkg.Group` object, or + a subclass thereof. + +.. cfunction:: int PyGroup_CheckExact(PyObject *object) + + Check that the object *object* is an :class:`apt_pkg.Group` object + and no subclass thereof. + +.. cfunction:: PyObject* PyGroup_FromCpp(pkgCache::GrpIterator &cpp, bool delete, PyObject *owner) + + Create a new :class:`apt_pkg.Group` object from the :ctype:`pkgCache::GrpIterator` + reference given by the parameter *cpp*. If the parameter *delete* is + true, *cpp* will be deleted when the reference + count of the returned object reaches 0. The parameter *owner* should be + a PyObject of the type :cdata:`PyCache_Type`. + +.. cfunction:: pkgCache::GrpIterator& PyGroup_ToCpp(PyObject *object) + + Return the :ctype:`pkgCache::GrpIterator` reference contained in the + Python object *object*. + Hashes (Hashes) ---------------------------------- .. cvar:: PyTypeObject PyHashes_Type @@ -590,6 +622,34 @@ IndexFile (pkgIndexFile) Return the :ctype:`pkgIndexFile` pointer contained in the Python object *object*. +OrderList (pkgOrderList) +--------------------------- +.. cvar:: PyTypeObject PyOrderList_Type + + The type object for :class:`apt_pkg.OrderList` objects. + +.. cfunction:: int PyOrderList_Check(PyObject *object) + + Check that the object *object* is an :class:`apt_pkg.OrderList` object, or + a subclass thereof. + +.. cfunction:: int PyOrderList_CheckExact(PyObject *object) + + Check that the object *object* is an :class:`apt_pkg.OrderList` object + and no subclass thereof. + +.. cfunction:: PyObject* PyOrderList_FromCpp(pkgOrderList *cpp, bool delete, PyObject *owner) + + Create a new :class:`apt_pkg.OrderList` object from the :ctype:`pkgOrderList` + pointer given by the parameter *cpp*. If the parameter *delete* is + true, the object pointed to by *cpp* will be deleted when the reference + count of the returned object reaches 0. The owner must be a + :class:`apt_pkg.DepCache` object. + +.. cfunction:: pkgOrderList* PyOrderList_ToCpp(PyObject *object) + + Return the :ctype:`pkgOrderList` pointer contained in the Python object + *object*. PackageManager (pkgPackageManager) ---------------------------------- diff --git a/doc/source/library/apt.package.rst b/doc/source/library/apt.package.rst index 4b143b8a..01a26973 100644 --- a/doc/source/library/apt.package.rst +++ b/doc/source/library/apt.package.rst @@ -34,7 +34,7 @@ Dependency Information .. attribute:: relation - The relation (>>,>=,==,<<,<=,) + The relation (>,>=,==,<,<=,) .. attribute:: version @@ -90,6 +90,35 @@ Origin Information it provides a GPG-signed Release file and the GPG-key used is in the keyring used by apt (see apt-key). + + +The Record class +----------------- +.. autoclass:: Record + :members: + + .. note:: + .. versionchanged:: 0.7.100 + This class is a subclass of :class:`collections.Mapping` when used + in Python 2.6 or newer. + + .. describe:: record[name] + + Return the value of the field with the name *name*. + + .. describe:: name in record + + Return whether a field *name* exists in record. + + .. describe:: len(record) + + The number of fields in the record + + .. describe:: str(record) + + Display the record as a string + + Examples --------- .. code-block:: python diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst index 426cb97e..81f2d408 100644 --- a/doc/source/library/apt_pkg.rst +++ b/doc/source/library/apt_pkg.rst @@ -40,17 +40,43 @@ Working with the cache The constructor takes an optional argument which must be a subclass of :class:`apt.progress.base.OpProgress`. This object will then be used to display information during the cache opening process (or possible creation - of the cache). + of the cache). It may also be ``None``, in which case no progress will + be emitted. If not given, progress will be printed to standard output. + + .. note:: + + The cache supports colon-seperated name:architecture pairs. For + normal architectures, they are equal to a (name, architecture) + tuple. For the the "any" architecture behavior is different, as + "name:any" is equivalent to ("name:any", "any"). This is done so + that "name:any" matches all packages with that name which have + Multi-Arch: allowed set. .. describe:: cache[pkgname] Return the :class:`Package()` object for the package name given by - *pkgname*. + *pkgname*. If *pkgname* includes a colon, the part after the colon + is used as the architecture. + + .. describe:: cache[name, architecture] + + Return the :class:`Package()` object for the package with the given + name and architecture. + + .. versionadded: 0.8.0 .. describe:: pkgname in cache Check whether a package with the name given by *pkgname* exists in - the cache. + the cache for the native architecture. If *pkgname* includes a + colon, the part after the colon is used as the architecture. + + .. describe:: (name, architecture) in cache + + Check whether a package with the given name and architecture exists + in the cache. + + .. versionadded: 0.8.0 .. method:: update(progress, sources [, pulse_interval]) -> bool @@ -73,6 +99,44 @@ Working with the cache A list of all :class:`PackageFile` objects stored in the cache. + .. attribute:: group_count + + The number of groups in the cache. + + .. versionadded: 0.8.0 + + .. attribute:: groups + + A sequence of :class:`Group` objects, implemented as a + :class:`GroupList` object. + + .. versionadded: 0.8.0 + + .. class:: GroupList + + A simple sequence-like object which only provides a length and + an implementation of ``__getitem__`` for accessing groups at + a certain index. Apart from being iterable, it can be used in + the following ways: + + .. versionadded: 0.8.0 + + .. describe:: list[index] + + Get the :class:`Group` object for the group at the position + given by *index* in the GroupList *list*. + + .. describe:: len(list) + + Return the length of the GroupList object *list*. + + + .. attribute:: is_multi_arch + + An attribute determining whether the cache supports multi-arch. + + .. versionadded: 0.8.0 + .. attribute:: package_count The total number of packages available in the cache. This value is @@ -358,6 +422,158 @@ Installing with :class:`PackageManager` A constant for checking whether the the result of the call to :meth:`do_install` is 'incomplete'. + + All instances of this class also support the following methods: + + .. note:: + + This methods are provided mainly for subclassing purposes + and should not be used in most programs. This class is a + subclass of an internal :class:`_PackageManager` which does + not provide that methods. As the public C++ API creates such + an object without those methods, you should not rely on those + methods to be available unless you used the constructor of + :class:`PackageManager` to create the object. + + .. method:: configure(pkg: Package) -> bool + + Notify the package manager that the :class:`Package` given + by *pkg* is to be configured. Must return a ``True`` value + or ``None`` to continue, or a value which is ``False`` if + evaluated as boolean to abort. + + .. versionadded:: 0.8.0 + + .. method:: install(pkg: Package, filename: str) -> bool + + Notify the package manager that the :class:`Package` given + by *pkg* is to be installed from the .deb located at + *filename*. Must return a ``True`` value or ``None`` to + continue, or a value which is ``False`` if evaluated as + boolean to abort. + + + .. versionadded:: 0.8.0 + + .. method:: remove(pkg: Package, purge: bool) -> bool + + Notify the package manager that the :class:`Package` given + by *pkg* is to be removed. If *purge* is ``True``, the package + shall be purged. Must return a ``True`` value or ``None`` to + continue, or a value which is ``False`` if evaluated as boolean + to abort. + + + .. versionadded:: 0.8.0 + + .. method:: go(status_fd: int) -> bool + + Start dpkg, writing status information to the file descriptor + given by *status_fd*. Must return a ``True`` value or ``None`` to + continue, or a value which is ``False`` if evaluated as boolean + to abort. + + .. versionadded:: 0.8.0 + + .. method:: reset() + + Reset the package manager for a new round. + + .. versionadded:: 0.8.0 + + +Installation ordering with :class:`OrderList` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. class:: OrderList(depcache: DepCache) + + Represent a :ctype:`pkgOrderList`, used for installation + ordering. This class provides several methods and attributes, + is complicated and should not be used by normal programs. + + .. versionadded:: 0.8.0 + + This class is a sequence and supports the following operations: + + .. describe:: list[index] + + Get the package at the given index in the list. Negative + index is supported. + + .. describe:: len(list) + + The length of the list. + + It also supports the append() method from :class:`list`: + + .. method:: append(pkg: Package) + + Append a new package to the end of the list. Please note that + you may not append a package twice, as only as much packages + as in the cache can be added. + + The class also defines several specific attributes and methods, + to be described hereinafter. + + .. method:: score(pkg: Package) + + Return the score of the package. Packages are basically + ordered by descending score. + + This class allows flags to be set on packages. Those flags are: + + .. attribute:: FLAG_ADDED + .. attribute:: FLAG_ADD_PENDING + .. attribute:: FLAG_IMMEDIATE + .. attribute:: FLAG_LOOP + .. attribute:: FLAG_UNPACKED + .. attribute:: FLAG_CONFIGURED + .. attribute:: FLAG_REMOVED + .. attribute:: FLAG_STATES_MASK + + Same as ``FLAG_UNPACKED | FLAG_CONFIGURED | FLAG_REMOVED`` + + .. attribute:: FLAG_IN_LIST + .. attribute:: FLAG_AFTER + + The methods to work with those flags are: + + .. method:: flag(pkg: Package, flag: int[, unset_flags: int]) + + Flag a package. Sets the flags given in *flag* and unsets + any flags given in *unset_flags*. + + .. method:: is_flag(pkg: Package, flag: int) + + Check whether the flags in *flag* are set for the package. + + .. method:: wipe_flags(flags: int) + + Remove the flags in *flags* from all packages. + + .. method:: is_missing(pkg: Package) + + Check if the package is missing (not really usable right now) + + .. method:: is_now(pkg: Package) + + Check if the package is flagged for any state but removal. + + The following methods for ordering are provided: + + .. method:: order_critical() + + Order the packages for critical unpacking; that is, only + respect pre-dependencies. + + .. method:: order_unpack() + + Order the packages for unpacking, repecting Pre-Depends and + Conflicts. + + .. method:: order_configure() + + Order the packages for configuration, respecting Depends. Improve performance with :class:`ActionGroup` ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -432,6 +648,47 @@ Resolving Dependencies with :class:`ProblemResolver` Try to resolve the problems without installing or removing packages. +:class:`Group` of packages with the same name +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. class:: Group(cache: Cache, name: str) + + .. versionadded:: 0.8.0 + + A collection of packages in which all packages have the same name. Groups + are used in multi-arch environments, where two or more packages have the + same name, but different architectures. + + Group objects provide the following parts for sequential access: + + .. describe:: group[index] + + Get the package at the given **index** in the group. + + .. note:: + Groups are internally implemented using a linked list. The object + keeps a pointer to the current object and the first object, so + access to the first element, or accesses in order have a + complexity of O(1). Random-access complexity is ranges from + O(1) to O(n). + + Group objects also provide special methods to find single packages: + + .. method:: find_package(architecture: str) -> Package + + Find a package with the groups name and the architecture given + in the argument *architecture*. If no such package exists, return + ``None``. + + .. method:: find_preferred_package(prefer_nonvirtual: bool = True) -> Package + + Find the preferred package. This is the package of the native + architecture (specified in ``APT::Architecture``) if available, + or the package from the first foreign architecture. If no package + could be found, return ``None`` + + If **prefer_nonvirtual** is ``True``, the preferred package + will be a non-virtual package, if one exists. + :class:`Package` information ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -653,6 +910,49 @@ Example: .. attribute:: installed_size The size of the package (in kilobytes), when unpacked on the disk. + + .. attribute:: multi_arch + + The multi-arch state of the package. Can be one of the following + attributes. + + .. attribute:: MULTI_ARCH_NONE + + No multi-arch + + .. attribute:: MULTI_ARCH_ALL + + An ``Architecture: all`` package + + + .. attribute:: MULTI_ARCH_FOREIGN + + Can satisfy dependencies of foreign-architecture + packages + + .. attribute:: MULTI_ARCH_ALL_FOREIGN + + :attr:`MULTI_ARCH_FOREIGN` for ``Architecture: all`` + packages. + + .. attribute:: MULTI_ARCH_SAME + + Multiple versions from different architectures may be + installed in parallel, but may only satisfy dependencies + of packages from the same architecture + + .. attribute:: MULTI_ARCH_ALLOWED + + Installation in parallel and satisfying ``pkg:any`` + style dependencies is allowed. + + .. attribute:: MULTI_ARCH_ALL_ALLOWED + + :attr:`MULTI_ARCH_ALLOWED` for ``Architecture: all`` + packages. + + + .. attribute:: parent_pkg diff --git a/doc/source/tutorials/apt-cdrom.rst b/doc/source/tutorials/apt-cdrom.rst index 0561e082..5dd88743 100644 --- a/doc/source/tutorials/apt-cdrom.rst +++ b/doc/source/tutorials/apt-cdrom.rst @@ -98,7 +98,7 @@ it is a boolean argument. Afterwards you could use location of the mount pint. ``('c',"config-file","","ConfigFile")`` shows how to include configuration files. This option takes a parameter which points to a configuration file which will be added to the configuration space. -('o',"option","","ArbItem") is yet another type of option, which allows users +``('o',"option","","ArbItem")`` is yet another type of option, which allows users to set configuration options on the commandline. Now we have to check whether help or version is specified, and print a message diff --git a/doc/source/whatsnew/0.8.0.rst b/doc/source/whatsnew/0.8.0.rst new file mode 100644 index 00000000..2eeb135e --- /dev/null +++ b/doc/source/whatsnew/0.8.0.rst @@ -0,0 +1,38 @@ +What's New In python-apt 0.8 +============================ +Python-apt 0.8 is a new major release of the python bindings for the APT +package management libraries. + + +Removal of old API +------------------ +The old API that was deprecated in 0.7.100 is no longer available. Applications +that have not yet updated to the new API should do so. + +Multi-arch support +------------------ +This version of python-apt introduces multi-arch support: + + * A new class, :class:`apt_pkg.Group` has been added. + * :class:`apt_pkg.Cache` can now be indexed by ``(name, architecture)`` + tuples + +Features for mancoosi +---------------------- +Several new features related to ordering have been added on request +of the mancoosi project: + + * A new class :class:`apt_pkg.OrderList` has been added + * The :class:`apt_pkg.PackageManager` class now provides new methods + for registering install/remove/configure actions which can be + subclassed to check ordering. + +Other changes +------------- +This release of python-apt also features several other, smaller changes: + + * apt_pkg.Cache() now takes None for the progress parameter, preventing + progress reporting. + +There have been various other changes, see the changelog for a complete list +of changes. diff --git a/pre-build.sh b/pre-build.sh index 026a491e..a150272d 100755 --- a/pre-build.sh +++ b/pre-build.sh @@ -7,5 +7,5 @@ if [ -n "$https_proxy" ]; then fi utils/get_ubuntu_mirrors_from_lp.py > data/templates/Ubuntu.mirrors -echo "updating Debian mirror list" -utils/get_debian_mirrors.py > data/templates/Debian.mirrors +#echo "updating Debian mirror list" +#utils/get_debian_mirrors.py > data/templates/Debian.mirrors diff --git a/python/acquire-item.cc b/python/acquire-item.cc index 895d4a21..5e7423ab 100644 --- a/python/acquire-item.cc +++ b/python/acquire-item.cc @@ -65,13 +65,13 @@ static PyObject *acquireitem_get_error_text(PyObject *self, void *closure) static PyObject *acquireitem_get_filesize(PyObject *self, void *closure) { pkgAcquire::Item *item = acquireitem_tocpp(self); - return item ? Py_BuildValue("K", item->FileSize) : 0; + return item ? MkPyNumber(item->FileSize) : 0; } static PyObject *acquireitem_get_id(PyObject *self, void *closure) { pkgAcquire::Item *item = acquireitem_tocpp(self); - return item ? Py_BuildValue("k", item->ID) : 0; + return item ? MkPyNumber(item->ID) : 0; } static PyObject *acquireitem_get_mode(PyObject *self, void *closure) @@ -95,13 +95,13 @@ static PyObject *acquireitem_get_local(PyObject *self, void *closure) static PyObject *acquireitem_get_partialsize(PyObject *self, void *closure) { pkgAcquire::Item *item = acquireitem_tocpp(self); - return item ? Py_BuildValue("K", item->PartialSize) : 0; + return item ? MkPyNumber(item->PartialSize) : 0; } static PyObject *acquireitem_get_status(PyObject *self, void *closure) { pkgAcquire::Item *item = acquireitem_tocpp(self); - return item ? Py_BuildValue("i", item->Status) : 0; + return item ? MkPyNumber(item->Status) : 0; } static int acquireitem_set_id(PyObject *self, PyObject *value, void *closure) @@ -110,7 +110,7 @@ static int acquireitem_set_id(PyObject *self, PyObject *value, void *closure) if (Itm == 0) return -1; if (PyLong_Check(value)) { - Itm->ID = PyLong_AsLong(value); + Itm->ID = PyLong_AsUnsignedLong(value); } else if (PyInt_Check(value)) { Itm->ID = PyInt_AsLong(value); diff --git a/python/acquire.cc b/python/acquire.cc index ab90bbdd..6169ff40 100644 --- a/python/acquire.cc +++ b/python/acquire.cc @@ -51,17 +51,17 @@ static PyObject *acquireworker_get_status(PyObject *self, void *closure) static PyObject *acquireworker_get_current_size(PyObject *self, void *closure) { - return Py_BuildValue("k",GetCpp(self)->CurrentSize); + return MkPyNumber(GetCpp(self)->CurrentSize); } static PyObject *acquireworker_get_total_size(PyObject *self, void *closure) { - return Py_BuildValue("k",GetCpp(self)->TotalSize); + return MkPyNumber(GetCpp(self)->TotalSize); } static PyObject *acquireworker_get_resumepoint(PyObject *self, void *closure) { - return Py_BuildValue("k",GetCpp(self)->ResumePoint); + return MkPyNumber(GetCpp(self)->ResumePoint); } static PyGetSetDef acquireworker_getset[] = { @@ -225,7 +225,7 @@ static PyObject *PkgAcquireRun(PyObject *Self,PyObject *Args) pkgAcquire::RunResult run = fetcher->Run(pulseInterval); - return HandleErrors(Py_BuildValue("i",run)); + return HandleErrors(MkPyNumber(run)); } @@ -259,15 +259,15 @@ static PyMethodDef PkgAcquireMethods[] = { #define fetcher (GetCpp(Self)) static PyObject *PkgAcquireGetTotalNeeded(PyObject *Self,void*) { - return Py_BuildValue("L", fetcher->TotalNeeded()); + return MkPyNumber(fetcher->TotalNeeded()); } static PyObject *PkgAcquireGetFetchNeeded(PyObject *Self,void*) { - return Py_BuildValue("L", fetcher->FetchNeeded()); + return MkPyNumber(fetcher->FetchNeeded()); } static PyObject *PkgAcquireGetPartialPresent(PyObject *Self,void*) { - return Py_BuildValue("L", fetcher->PartialPresent()); + return MkPyNumber(fetcher->PartialPresent()); } #undef fetcher diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index d1ac33e0..e8490b4e 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -83,7 +84,7 @@ static PyObject *VersionCompare(PyObject *Self,PyObject *Args) return 0; } - return Py_BuildValue("i",_system->VS->DoCmpVersion(A,A+LenA,B,B+LenB)); + return MkPyNumber(_system->VS->DoCmpVersion(A,A+LenA,B,B+LenB)); } static char *doc_CheckDep = @@ -459,7 +460,7 @@ static PyObject *GetLock(PyObject *Self,PyObject *Args) int fd = GetLock(file, errors); - return HandleErrors(Py_BuildValue("i", fd)); + return HandleErrors(MkPyNumber(fd)); } static char *doc_PkgSystemLock = @@ -732,6 +733,12 @@ static struct _PyAptPkgAPIStruct API = { &PyVersion_Type, // version_type &PyVersion_FromCpp, // version_tocpp &PyVersion_ToCpp, // version_tocpp + &PyGroup_Type, // group_type + &PyGroup_FromCpp, // group_fromcpp + &PyGroup_ToCpp, // group_tocpp + &PyOrderList_Type, // orderlist_type + &PyOrderList_FromCpp, // orderlist_fromcpp + &PyOrderList_ToCpp // orderlist_tocpp }; @@ -811,6 +818,8 @@ extern "C" void initapt_pkg() ADDTYPE(Module,"DependencyList",&PyDependencyList_Type); // NO __new__(), internal ADDTYPE(Module,"Package",&PyPackage_Type); // NO __new__() ADDTYPE(Module,"Version",&PyVersion_Type); // NO __new__() + ADDTYPE(Module,"Group", &PyGroup_Type); + ADDTYPE(Module,"GroupList", &PyGroupList_Type); /* ============================ cdrom.cc ============================ */ ADDTYPE(Module,"Cdrom",&PyCdrom_Type); /* ========================= configuration.cc ========================= */ @@ -824,7 +833,8 @@ extern "C" void initapt_pkg() /* ========================= metaindex.cc ========================= */ ADDTYPE(Module,"MetaIndex",&PyMetaIndex_Type); // NO __new__() /* ========================= pkgmanager.cc ========================= */ - ADDTYPE(Module,"PackageManager",&PyPackageManager_Type); + ADDTYPE(Module,"_PackageManager",&PyPackageManager_Type); + ADDTYPE(Module,"PackageManager",&PyPackageManager2_Type); /* ========================= pkgrecords.cc ========================= */ ADDTYPE(Module,"PackageRecords",&PyPackageRecords_Type); /* ========================= pkgsrcrecords.cc ========================= */ @@ -838,6 +848,7 @@ extern "C" void initapt_pkg() ADDTYPE(Module,"AcquireItemDesc",&PyAcquireItemDesc_Type); ADDTYPE(Module,"SystemLock",&PySystemLock_Type); ADDTYPE(Module,"FileLock",&PyFileLock_Type); + ADDTYPE(Module,"OrderList",&PyOrderList_Type); // Tag file constants PyModule_AddObject(Module,"REWRITE_PACKAGE_ORDER", CharCharToList(TFRewritePackageOrder)); @@ -845,86 +856,110 @@ extern "C" void initapt_pkg() PyModule_AddObject(Module,"REWRITE_SOURCE_ORDER", CharCharToList(TFRewriteSourceOrder)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_ADDED", MkPyNumber(pkgOrderList::Added)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_ADD_PENDIG", MkPyNumber(pkgOrderList::AddPending)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_IMMEDIATE", MkPyNumber(pkgOrderList::Immediate)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_LOOP", MkPyNumber(pkgOrderList::Loop)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_UNPACKED", MkPyNumber(pkgOrderList::UnPacked)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_CONFIGURED", MkPyNumber(pkgOrderList::Configured)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_REMOVED", MkPyNumber(pkgOrderList::Removed)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_IN_LIST", MkPyNumber(pkgOrderList::InList)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_AFTER", MkPyNumber(pkgOrderList::After)); + PyDict_SetItemString(PyOrderList_Type.tp_dict, "FLAG_STATES_MASK", MkPyNumber(pkgOrderList::States)); // Acquire constants. // some constants PyDict_SetItemString(PyAcquire_Type.tp_dict, "RESULT_CANCELLED", - Py_BuildValue("i", pkgAcquire::Cancelled)); + MkPyNumber(pkgAcquire::Cancelled)); PyDict_SetItemString(PyAcquire_Type.tp_dict, "RESULT_CONTINUE", - Py_BuildValue("i", pkgAcquire::Continue)); + MkPyNumber(pkgAcquire::Continue)); PyDict_SetItemString(PyAcquire_Type.tp_dict, "RESULT_FAILED", - Py_BuildValue("i", pkgAcquire::Failed)); + MkPyNumber(pkgAcquire::Failed)); #ifdef COMPAT_0_7 PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultCancelled", - Py_BuildValue("i", pkgAcquire::Cancelled)); + MkPyNumber(pkgAcquire::Cancelled)); PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultContinue", - Py_BuildValue("i", pkgAcquire::Continue)); + MkPyNumber(pkgAcquire::Continue)); PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultFailed", - Py_BuildValue("i", pkgAcquire::Failed)); + MkPyNumber(pkgAcquire::Failed)); #endif // Dependency constants PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_DEPENDS", - Py_BuildValue("i", pkgCache::Dep::Depends)); + MkPyNumber(pkgCache::Dep::Depends)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_PREDEPENDS", - Py_BuildValue("i", pkgCache::Dep::PreDepends)); + MkPyNumber(pkgCache::Dep::PreDepends)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_SUGGESTS", - Py_BuildValue("i", pkgCache::Dep::Suggests)); + MkPyNumber(pkgCache::Dep::Suggests)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_RECOMMENDS", - Py_BuildValue("i", pkgCache::Dep::Suggests)); + MkPyNumber(pkgCache::Dep::Suggests)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_CONFLICTS", - Py_BuildValue("i", pkgCache::Dep::Conflicts)); + MkPyNumber(pkgCache::Dep::Conflicts)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_REPLACES", - Py_BuildValue("i", pkgCache::Dep::Replaces)); + MkPyNumber(pkgCache::Dep::Replaces)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_OBSOLETES", - Py_BuildValue("i", pkgCache::Dep::Obsoletes)); + MkPyNumber(pkgCache::Dep::Obsoletes)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_DPKG_BREAKS", - Py_BuildValue("i", pkgCache::Dep::DpkgBreaks)); + MkPyNumber(pkgCache::Dep::DpkgBreaks)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_ENHANCES", - Py_BuildValue("i", pkgCache::Dep::Enhances)); + MkPyNumber(pkgCache::Dep::Enhances)); // PackageManager constants PyDict_SetItemString(PyPackageManager_Type.tp_dict, "RESULT_COMPLETED", - Py_BuildValue("i", pkgPackageManager::Completed)); + MkPyNumber(pkgPackageManager::Completed)); PyDict_SetItemString(PyPackageManager_Type.tp_dict, "RESULT_FAILED", - Py_BuildValue("i", pkgPackageManager::Failed)); + MkPyNumber(pkgPackageManager::Failed)); PyDict_SetItemString(PyPackageManager_Type.tp_dict, "RESULT_INCOMPLETE", - Py_BuildValue("i", pkgPackageManager::Incomplete)); + MkPyNumber(pkgPackageManager::Incomplete)); #ifdef COMPAT_0_7 PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultCompleted", - Py_BuildValue("i", pkgPackageManager::Completed)); + MkPyNumber(pkgPackageManager::Completed)); PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultFailed", - Py_BuildValue("i", pkgPackageManager::Failed)); + MkPyNumber(pkgPackageManager::Failed)); PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultIncomplete", - Py_BuildValue("i", pkgPackageManager::Incomplete)); + MkPyNumber(pkgPackageManager::Incomplete)); #endif + PyDict_SetItemString(PyVersion_Type.tp_dict, "MULTI_ARCH_NONE", + MkPyNumber(pkgCache::Version::None)); + PyDict_SetItemString(PyVersion_Type.tp_dict, "MULTI_ARCH_ALL", + MkPyNumber(pkgCache::Version::All)); + PyDict_SetItemString(PyVersion_Type.tp_dict, "MULTI_ARCH_FOREIGN", + MkPyNumber(pkgCache::Version::Foreign)); + PyDict_SetItemString(PyVersion_Type.tp_dict, "MULTI_ARCH_SAME", + MkPyNumber(pkgCache::Version::Same)); + PyDict_SetItemString(PyVersion_Type.tp_dict, "MULTI_ARCH_ALLOWED", + MkPyNumber(pkgCache::Version::Allowed)); + PyDict_SetItemString(PyVersion_Type.tp_dict, "MULTI_ARCH_ALL_FOREIGN", + MkPyNumber(pkgCache::Version::AllForeign)); + PyDict_SetItemString(PyVersion_Type.tp_dict, "MULTI_ARCH_ALL_ALLOWED", + MkPyNumber(pkgCache::Version::AllAllowed)); // AcquireItem Constants. PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_IDLE", - Py_BuildValue("i", pkgAcquire::Item::StatIdle)); + MkPyNumber(pkgAcquire::Item::StatIdle)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_FETCHING", - Py_BuildValue("i", pkgAcquire::Item::StatFetching)); + MkPyNumber(pkgAcquire::Item::StatFetching)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_DONE", - Py_BuildValue("i", pkgAcquire::Item::StatDone)); + MkPyNumber(pkgAcquire::Item::StatDone)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_TRANSIENT_NETWORK_ERROR", - Py_BuildValue("i", pkgAcquire::Item::StatTransientNetworkError)); + MkPyNumber(pkgAcquire::Item::StatTransientNetworkError)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_ERROR", - Py_BuildValue("i", pkgAcquire::Item::StatError)); + MkPyNumber(pkgAcquire::Item::StatError)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_AUTH_ERROR", - Py_BuildValue("i", pkgAcquire::Item::StatAuthError)); + MkPyNumber(pkgAcquire::Item::StatAuthError)); #ifdef COMPAT_0_7 PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatIdle", - Py_BuildValue("i", pkgAcquire::Item::StatIdle)); + MkPyNumber(pkgAcquire::Item::StatIdle)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatFetching", - Py_BuildValue("i", pkgAcquire::Item::StatFetching)); + MkPyNumber(pkgAcquire::Item::StatFetching)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatDone", - Py_BuildValue("i", pkgAcquire::Item::StatDone)); + MkPyNumber(pkgAcquire::Item::StatDone)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatError", - Py_BuildValue("i", pkgAcquire::Item::StatError)); + MkPyNumber(pkgAcquire::Item::StatError)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatAuthError", - Py_BuildValue("i", pkgAcquire::Item::StatAuthError)); + MkPyNumber(pkgAcquire::Item::StatAuthError)); #endif #if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 1 @@ -964,6 +999,7 @@ extern "C" void initapt_pkg() PyModule_AddIntConstant(Module,"INSTSTATE_HOLD",pkgCache::State::Hold); PyModule_AddIntConstant(Module,"INSTSTATE_HOLD_REINSTREQ",pkgCache::State::HoldReInstReq); + // DEPRECATED API #ifdef COMPAT_0_7 PyModule_AddObject(Module,"RewritePackageOrder", diff --git a/python/apt_pkgmodule.h b/python/apt_pkgmodule.h index da647c3f..b3534a30 100644 --- a/python/apt_pkgmodule.h +++ b/python/apt_pkgmodule.h @@ -70,6 +70,8 @@ extern PyTypeObject PyCache_Type; extern PyTypeObject PyCacheFile_Type; extern PyTypeObject PyPackageList_Type; extern PyTypeObject PyDescription_Type; +extern PyTypeObject PyGroup_Type; +extern PyTypeObject PyGroupList_Type; /* internal */ extern PyTypeObject PyPackage_Type; extern PyTypeObject PyPackageFile_Type; extern PyTypeObject PyDependency_Type; @@ -100,6 +102,7 @@ PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject *kwds); // packagemanager extern PyTypeObject PyPackageManager_Type; +extern PyTypeObject PyPackageManager2_Type; PyObject *GetPkgManager(PyObject *Self,PyObject *Args); @@ -132,6 +135,7 @@ extern PyTypeObject PyAcquireItemDesc_Type; extern PyTypeObject PyAcquireWorker_Type; extern PyTypeObject PySystemLock_Type; extern PyTypeObject PyFileLock_Type; +extern PyTypeObject PyOrderList_Type; // Functions to be exported in the public API. @@ -149,6 +153,7 @@ extern PyTypeObject PyFileLock_Type; # define PyDependency_ToCpp GetCpp # define PyDependencyList_ToCpp GetCpp // TODO # define PyDescription_ToCpp GetCpp +# define PyGroup_ToCpp GetCpp # define PyHashes_ToCpp GetCpp # define PyHashString_ToCpp GetCpp # define PyIndexRecords_ToCpp GetCpp @@ -156,6 +161,7 @@ extern PyTypeObject PyFileLock_Type; # define PyPackage_ToCpp GetCpp # define PyPackageFile_ToCpp GetCpp # define PyIndexFile_ToCpp GetCpp +# define PyOrderList_ToCpp GetCpp # define PyPackageList_ToCpp GetCpp // TODO # define PyPackageManager_ToCpp GetCpp # define PyPackageRecords_ToCpp GetCpp // TODO @@ -186,7 +192,9 @@ PyObject* PyHashString_FromCpp(HashString* const &obj, bool Delete, PyObject *Ow PyObject* PyIndexRecords_FromCpp(indexRecords* const &obj, bool Delete, PyObject *Owner); PyObject* PyMetaIndex_FromCpp(metaIndex* const &obj, bool Delete, PyObject *Owner); PyObject* PyPackage_FromCpp(pkgCache::PkgIterator const &obj, bool Delete, PyObject *Owner); +PyObject* PyGroup_FromCpp(pkgCache::GrpIterator const &obj, bool Delete, PyObject *Owner); PyObject* PyIndexFile_FromCpp(pkgIndexFile* const &obj, bool Delete, PyObject *Owner); +PyObject* PyOrderList_FromCpp(pkgOrderList* const &obj, bool Delete, PyObject *Owner); PyObject* PyPackageFile_FromCpp(pkgCache::PkgFileIterator const &obj, bool Delete, PyObject *Owner); //PyObject* PyPackageList_FromCpp(PkgListStruct const &obj, bool Delete, PyObject *Owner); PyObject* PyPackageManager_FromCpp(pkgPackageManager* const &obj, bool Delete, PyObject *Owner); diff --git a/python/arfile.cc b/python/arfile.cc index 5377ca8d..c3aa74d1 100644 --- a/python/arfile.cc +++ b/python/arfile.cc @@ -39,32 +39,32 @@ static PyObject *armember_get_name(PyObject *self, void *closure) static PyObject *armember_get_mtime(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self)->MTime); + return MkPyNumber(GetCpp(self)->MTime); } static PyObject *armember_get_uid(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self)->UID); + return MkPyNumber(GetCpp(self)->UID); } static PyObject *armember_get_gid(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self)->GID); + return MkPyNumber(GetCpp(self)->GID); } static PyObject *armember_get_mode(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self)->Mode); + return MkPyNumber(GetCpp(self)->Mode); } static PyObject *armember_get_size(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self)->Size); + return MkPyNumber(GetCpp(self)->Size); } static PyObject *armember_get_start(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self)->Start); + return MkPyNumber(GetCpp(self)->Start); } static PyObject *armember_repr(PyObject *self) diff --git a/python/cache.cc b/python/cache.cc index 190d4f27..b263d320 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -39,13 +39,57 @@ const char *UntranslatedDepTypes[] = }; /*}}}*/ -struct PkgListStruct + +template struct IterListStruct { - pkgCache::PkgIterator Iter; + T Iter; unsigned long LastIndex; - PkgListStruct(pkgCache::PkgIterator const &I) : Iter(I), LastIndex(0) {} - PkgListStruct() {abort();}; // G++ Bug.. + IterListStruct(T const &I) : Iter(I), LastIndex(0) {} + IterListStruct() {}; + + bool move(unsigned long Index) { + if (Index < 0 || (unsigned)Index >= Count()) + { + PyErr_SetNone(PyExc_IndexError); + return false; + } + + if ((unsigned)Index < LastIndex) + { + LastIndex = 0; + Iter = Begin(); + } + + while ((unsigned)Index > LastIndex) + { + LastIndex++; + Iter++; + if (Iter.end() == true) + { + PyErr_SetNone(PyExc_IndexError); + return false; + } + } + return true; + } + + virtual unsigned Count() = 0; + virtual T Begin() = 0; + +}; + +struct PkgListStruct : public IterListStruct { + unsigned Count() { return Iter.Cache()->HeaderP->PackageCount; } + pkgCache::PkgIterator Begin() { return Iter.Cache()->PkgBegin(); } + + PkgListStruct(pkgCache::PkgIterator const &I) { Iter = I; } +}; + +struct GrpListStruct : public IterListStruct { + unsigned Count() { return Iter.Cache()->HeaderP->GroupCount; } + pkgCache::GrpIterator Begin() { return Iter.Cache()->GrpBegin(); } + GrpListStruct(pkgCache::GrpIterator const &I) { Iter = I; } }; struct RDepListStruct @@ -175,6 +219,16 @@ static PyMethodDef PkgCacheMethods[] = {} }; +static PyObject *PkgCacheGetGroupCount(PyObject *Self, void*) { + pkgCache *Cache = GetCpp(Self); + return MkPyNumber(Cache->HeaderP->GroupCount); +} + +static PyObject *PkgCacheGetGroups(PyObject *Self, void*) { + pkgCache *Cache = GetCpp(Self); + return CppPyObject_NEW(Self,&PyGroupList_Type,Cache->GrpBegin()); +} + static PyObject *PkgCacheGetPackages(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); return CppPyObject_NEW(Self,&PyPackageList_Type,Cache->PkgBegin()); @@ -182,31 +236,31 @@ static PyObject *PkgCacheGetPackages(PyObject *Self, void*) { static PyObject *PkgCacheGetPackageCount(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); - return Py_BuildValue("i",Cache->HeaderP->PackageCount); + return MkPyNumber((int)Cache->HeaderP->PackageCount); } static PyObject *PkgCacheGetVersionCount(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); - return Py_BuildValue("i",Cache->HeaderP->VersionCount); + return MkPyNumber(Cache->HeaderP->VersionCount); } static PyObject *PkgCacheGetDependsCount(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); - return Py_BuildValue("i",Cache->HeaderP->DependsCount); + return MkPyNumber(Cache->HeaderP->DependsCount); } static PyObject *PkgCacheGetPackageFileCount(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); - return Py_BuildValue("i",Cache->HeaderP->PackageFileCount); + return MkPyNumber(Cache->HeaderP->PackageFileCount); } static PyObject *PkgCacheGetVerFileCount(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); - return Py_BuildValue("i",Cache->HeaderP->VerFileCount); + return MkPyNumber(Cache->HeaderP->VerFileCount); } static PyObject *PkgCacheGetProvidesCount(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); - return Py_BuildValue("i",Cache->HeaderP->ProvidesCount); + return MkPyNumber(Cache->HeaderP->ProvidesCount); } static PyObject *PkgCacheGetFileList(PyObject *Self, void*) { @@ -222,11 +276,21 @@ static PyObject *PkgCacheGetFileList(PyObject *Self, void*) { return List; } +static PyObject *PkgCacheGetIsMultiArch(PyObject *Self, void*) { + pkgCache *Cache = GetCpp(Self); + PyBool_FromLong(Cache->MultiArchCache()); +} + static PyGetSetDef PkgCacheGetSet[] = { {"depends_count",PkgCacheGetDependsCount,0, "The number of apt_pkg.Dependency objects stored in the cache."}, {"file_list",PkgCacheGetFileList,0, "A list of apt_pkg.PackageFile objects stored in the cache."}, + {"group_count",PkgCacheGetGroupCount,0, + "The number of apt_pkg.Group objects stored in the cache."}, + {"groups", PkgCacheGetGroups, 0, "A list of Group objects in the cache"}, + {"is_multi_arch", PkgCacheGetIsMultiArch, 0, + "Whether the cache supports multi-arch."}, {"package_count",PkgCacheGetPackageCount,0, "The number of apt_pkg.Package objects stored in the cache."}, {"package_file_count",PkgCacheGetPackageFileCount,0, @@ -242,24 +306,37 @@ static PyGetSetDef PkgCacheGetSet[] = { {} }; +// Helper to call FindPkg(name) or FindPkg(name, architecture) +static pkgCache::PkgIterator CacheFindPkg(PyObject *self, PyObject *arg) +{ + const char *name; + const char *architecture; + pkgCache *cache = GetCpp(self); + name = PyObject_AsString(arg); -// Map access, operator [] -static PyObject *CacheMapOp(PyObject *Self,PyObject *Arg) -{ - pkgCache *Cache = GetCpp(Self); + if (name != NULL) + return cache->FindPkg(name); - // Get the name of the package, unicode and normal strings. - const char *Name = PyObject_AsString(Arg); - if (Name == NULL) - return 0; + PyErr_Clear(); + if (PyArg_ParseTuple(arg, "ss", &name, &architecture) == 0) { + PyErr_Clear(); + PyErr_Format(PyExc_TypeError, "Expected a string or a pair of strings"); + return pkgCache::PkgIterator(); + } + + return cache->FindPkg(name, architecture); +} - // Search for the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(Name); +// Map access, operator [] +static PyObject *CacheMapOp(PyObject *Self,PyObject *Arg) +{ + pkgCache::PkgIterator Pkg = CacheFindPkg(Self, Arg); if (Pkg.end() == true) { - PyErr_SetString(PyExc_KeyError,Name); + if (!PyErr_Occurred()) + PyErr_SetObject(PyExc_KeyError,Arg); return 0; } @@ -269,11 +346,9 @@ static PyObject *CacheMapOp(PyObject *Self,PyObject *Arg) // Check whether the cache contains a package with a given name. static int CacheContains(PyObject *Self,PyObject *Arg) { - // Get the name of the package, unicode and normal strings. - const char *Name = PyObject_AsString(Arg); - if (Name == NULL) - return 0; - return (GetCpp(Self)->FindPkg(Name).end() == false); + bool res = (CacheFindPkg(Self, Arg).end() == false); + PyErr_Clear(); + return res; } static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) @@ -292,7 +367,11 @@ static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) pkgCacheFile *Cache = new pkgCacheFile(); - if(pyCallbackInst != 0) { + if (pyCallbackInst == Py_None) { + OpProgress Prog; + if (Cache->Open(Prog,false) == false) + return HandleErrors(); + } else if(pyCallbackInst != 0) { // sanity check for the progress object, see #497049 if (PyObject_HasAttrString(pyCallbackInst, "done") != true) { PyErr_SetString(PyExc_ValueError, @@ -342,9 +421,11 @@ static char *doc_PkgCache = "Cache([progress]) -> Cache() object.\n\n" "apt.progress.base.OpProgress() object (or similar) which reports\n" "progress information while the cache is being opened. If this\n" "parameter is not supplied, the progress will be reported in simple,\n" - "human-readable text to standard output.\n\n" + "human-readable text to standard output. If it is None, no output\n" + "will be made.\n\n" "The cache can be used like a mapping from package names to Package\n" - "objects (although only getting items is supported)."; + "objects (although only getting items is supported). Instead of a name,\n" + "a tuple of a name and an architecture may be used."; static PySequenceMethods CacheSeq = {0,0,0,0,0,0,0,CacheContains,0,0}; static PyMappingMethods CacheMap = {CacheMapLen,CacheMapOp,0}; PyTypeObject PyCache_Type = @@ -418,7 +499,7 @@ PyTypeObject PyCacheFile_Type = 0, // tp_as_buffer Py_TPFLAGS_DEFAULT, // tp_flags }; - /*}}}*/ + // Package List Class /*{{{*/ // --------------------------------------------------------------------- static Py_ssize_t PkgListLen(PyObject *Self) @@ -429,29 +510,9 @@ static Py_ssize_t PkgListLen(PyObject *Self) static PyObject *PkgListItem(PyObject *iSelf,Py_ssize_t Index) { PkgListStruct &Self = GetCpp(iSelf); - if (Index < 0 || (unsigned)Index >= Self.Iter.Cache()->HeaderP->PackageCount) - { - PyErr_SetNone(PyExc_IndexError); - return 0; - } - - if ((unsigned)Index < Self.LastIndex) - { - Self.LastIndex = 0; - Self.Iter = Self.Iter.Cache()->PkgBegin(); - } - - while ((unsigned)Index > Self.LastIndex) - { - Self.LastIndex++; - Self.Iter++; - if (Self.Iter.end() == true) - { - PyErr_SetNone(PyExc_IndexError); - return 0; - } - } + if (!Self.move(Index)) + return 0; return CppPyObject_NEW(GetOwner(iSelf),&PyPackage_Type, Self.Iter); } @@ -501,6 +562,68 @@ PyTypeObject PyPackageList_Type = CppClear, // tp_clear }; +/* The same for groups */ +static Py_ssize_t GrpListLen(PyObject *Self) +{ + return GetCpp(Self).Iter.Cache()->HeaderP->GroupCount; +} + +static PyObject *GrpListItem(PyObject *iSelf,Py_ssize_t Index) +{ + GrpListStruct &Self = GetCpp(iSelf); + + if (!Self.move(Index)) + return 0; + return CppPyObject_NEW(GetOwner(iSelf),&PyGroup_Type, + Self.Iter); +} + +static PySequenceMethods GrpListSeq = +{ + GrpListLen, + 0, // concat + 0, // repeat + GrpListItem, + 0, // slice + 0, // assign item + 0 // assign slice +}; + +static const char *grouplist_doc = + "A GroupList is an internally used structure to represent\n" + "the 'groups' attribute of apt_pkg.Cache objects in a more\n" + "efficient manner by creating Group objects only when they\n" + "are accessed."; + +PyTypeObject PyGroupList_Type = +{ + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "apt_pkg.GroupList", // tp_name + sizeof(CppPyObject), // tp_basicsize + 0, // tp_itemsize + // Methods + CppDealloc, // tp_dealloc + 0, // tp_print + 0, // tp_getattr + 0, // tp_setattr + 0, // tp_compare + 0, // tp_repr + 0, // tp_as_number + &GrpListSeq, // tp_as_sequence + 0, // tp_as_mapping + 0, // tp_hash + 0, // tp_call + 0, // tp_str + 0, // tp_getattro + 0, // tp_setattro + 0, // tp_as_buffer + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags + grouplist_doc, // tp_doc + CppTraverse, // tp_traverse + CppClear, // tp_clear +}; + + #define Owner (GetOwner(Self)) #define MkGet(PyFunc,Ret) static PyObject *PyFunc(PyObject *Self,void*) \ { \ @@ -514,10 +637,10 @@ MkGet(PackageGetSection,Safe_FromString(Pkg.Section())) MkGet(PackageGetRevDependsList,CppPyObject_NEW(Owner, &PyDependencyList_Type, Pkg.RevDependsList())) MkGet(PackageGetProvidesList,CreateProvides(Owner,Pkg.ProvidesList())) -MkGet(PackageGetSelectedState,Py_BuildValue("i",Pkg->SelectedState)) -MkGet(PackageGetInstState,Py_BuildValue("i",Pkg->InstState)) -MkGet(PackageGetCurrentState,Py_BuildValue("i",Pkg->CurrentState)) -MkGet(PackageGetID,Py_BuildValue("i",Pkg->ID)) +MkGet(PackageGetSelectedState,MkPyNumber(Pkg->SelectedState)) +MkGet(PackageGetInstState,MkPyNumber(Pkg->InstState)) +MkGet(PackageGetCurrentState,MkPyNumber(Pkg->CurrentState)) +MkGet(PackageGetID,MkPyNumber(Pkg->ID)) # MkGet(PackageGetAuto,PyBool_FromLong((Pkg->Flags & pkgCache::Flag::Auto) != 0)) MkGet(PackageGetEssential,PyBool_FromLong((Pkg->Flags & pkgCache::Flag::Essential) != 0)) @@ -714,7 +837,7 @@ static PyObject *DescriptionGetFileList(PyObject *Self,void*) PyObject *DescFile; PyObject *Obj; DescFile = CppPyObject_NEW(Owner,&PyPackageFile_Type,I.File()); - Obj = Py_BuildValue("Nl",DescFile,I.Index()); + Obj = Py_BuildValue("NN",DescFile,MkPyNumber(I.Index())); PyList_Append(List,Obj); Py_DECREF(Obj); } @@ -869,7 +992,7 @@ static PyObject *VersionGetFileList(PyObject *Self, void*) { PyObject *PkgFile; PyObject *Obj; PkgFile = CppPyObject_NEW(Owner,&PyPackageFile_Type,I.File()); - Obj = Py_BuildValue("Nl",PkgFile,I.Index()); + Obj = Py_BuildValue("NN",PkgFile,MkPyNumber(I.Index())); PyList_Append(List,Obj); Py_DECREF(Obj); } @@ -896,19 +1019,19 @@ static PyObject *VersionGetProvidesList(PyObject *Self, void*) { return CreateProvides(Owner,Version_GetVer(Self).ProvidesList()); } static PyObject *VersionGetSize(PyObject *Self, void*) { - return Py_BuildValue("i", Version_GetVer(Self)->Size); + return MkPyNumber(Version_GetVer(Self)->Size); } static PyObject *VersionGetInstalledSize(PyObject *Self, void*) { - return Py_BuildValue("i", Version_GetVer(Self)->InstalledSize); + return MkPyNumber(Version_GetVer(Self)->InstalledSize); } static PyObject *VersionGetHash(PyObject *Self, void*) { - return Py_BuildValue("i", Version_GetVer(Self)->Hash); + return MkPyNumber(Version_GetVer(Self)->Hash); } static PyObject *VersionGetID(PyObject *Self, void*) { - return Py_BuildValue("i", Version_GetVer(Self)->ID); + return MkPyNumber(Version_GetVer(Self)->ID); } static PyObject *VersionGetPriority(PyObject *Self, void*) { - return Py_BuildValue("i",Version_GetVer(Self)->Priority); + return MkPyNumber(Version_GetVer(Self)->Priority); } static PyObject *VersionGetPriorityStr(PyObject *Self, void*) { return Safe_FromString(Version_GetVer(Self).PriorityType()); @@ -924,6 +1047,11 @@ static PyObject *VersionGetTranslatedDescription(PyObject *Self, void*) { Ver.TranslatedDescription()); } +static PyObject *VersionGetMultiArch(PyObject *Self, void*) +{ + return MkPyNumber(Version_GetVer(Self)->MultiArch); +} + #if 0 // FIXME: enable once pkgSourceList is stored somewhere static PyObject *VersionGetIsTrusted(PyObject *Self, void*) { else if (strcmp("IsTrusted", Name) == 0) @@ -999,6 +1127,9 @@ static PyGetSetDef VersionGetSet[] = { "The numeric ID of the package."}, {"installed_size",VersionGetInstalledSize,0, "The installed size of this package version."}, + {"multi_arch",VersionGetMultiArch,0, + "Multi-arch state of this package, as an integer. See\n" + "the various MULTI_ARCH_* members."}, {"parent_pkg",VersionGetParentPkg,0, "The parent package of this version."}, {"priority",VersionGetPriority,0, @@ -1118,7 +1249,7 @@ static PyObject *PackageFile_GetIndexType(PyObject *Self,void*) static PyObject *PackageFile_GetSize(PyObject *Self,void*) { pkgCache::PkgFileIterator &File = GetCpp(Self); - return Py_BuildValue("i",File->Size); + return MkPyNumber(File->Size); } static PyObject *PackageFile_GetNotSource(PyObject *Self,void*) @@ -1135,7 +1266,7 @@ static PyObject *PackageFile_GetNotAutomatic(PyObject *Self,void*) static PyObject *PackageFile_GetID(PyObject *Self,void*) { pkgCache::PkgFileIterator &File = GetCpp(Self); - return Py_BuildValue("i",File->ID); + return MkPyNumber(File->ID); } #define S(s) (s == NULL ? "" : s) @@ -1344,13 +1475,13 @@ static PyObject *DependencyGetDepTypeUntranslated(PyObject *Self,void*) static PyObject *DependencyGetDepTypeEnum(PyObject *Self,void*) { pkgCache::DepIterator &Dep = GetCpp(Self); - return Py_BuildValue("i", Dep->Type); + return MkPyNumber(Dep->Type); } static PyObject *DependencyGetID(PyObject *Self,void*) { pkgCache::DepIterator &Dep = GetCpp(Self); - return Py_BuildValue("i",Dep->ID); + return MkPyNumber(Dep->ID); } static PyGetSetDef DependencyGetSet[] = { diff --git a/python/cachegroup.cc b/python/cachegroup.cc new file mode 100644 index 00000000..4fc6c378 --- /dev/null +++ b/python/cachegroup.cc @@ -0,0 +1,188 @@ +/* + * cachegroup.cc - Wrapper around pkgCache::GrpIterator + * + * Copyright 2011 Julian Andres Klode + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +#include +#include "apt_pkgmodule.h" +#include "generic.h" +#include + +struct PyGroup : CppPyObject { + pkgCache::PkgIterator current; + int nextIndex; +}; + +static PyObject *group_new(PyTypeObject *type,PyObject *args, + PyObject *kwds) +{ + PyObject *pyCache; + char *name; + char *kwlist[] = {"cache", "name", NULL}; + if (PyArg_ParseTupleAndKeywords(args, kwds, "O!s", kwlist, + &PyCache_Type, &pyCache, + &name) == 0) + return 0; + + pkgCache *cache = GetCpp(pyCache); + + pkgCache::GrpIterator grp = cache->FindGrp(name); + + if (!grp.end()) { + return PyGroup_FromCpp(grp, true, pyCache); + } else { + PyErr_SetString(PyExc_KeyError, name); + return NULL; + } +} + +static const char group_find_package_doc[] = + "find_package(architecture: str) -> Package\n\n" + "Return a package for the given architecture, or None if none exists"; +static PyObject *group_find_package(PyObject *self,PyObject *args) +{ + pkgCache::GrpIterator grp = GetCpp(self); + PyObject *owner = GetOwner(self); + + char *architecture; + if (PyArg_ParseTuple(args, "s", &architecture) == 0) + return 0; + + pkgCache::PkgIterator pkg = grp.FindPkg(architecture); + + if (pkg.end()) { + Py_RETURN_NONE; + } else { + return PyPackage_FromCpp(pkg, true, owner ? owner : self); + } +} + +static const char group_find_preferred_package_doc[] = + "find_preferred_package(prefer_non_virtual: bool = True) -> Package\n\n" + "Return a package for the best architecture, either the native one\n" + "or the first found one. If none exists, return None. If non_virtual\n" + "is True, prefer non-virtual packages over virtual ones."; +static PyObject *group_find_preferred_package(PyObject *self,PyObject *args, + PyObject *kwds) +{ + pkgCache::GrpIterator grp = GetCpp(self); + PyObject *owner = GetOwner(self); + char nonvirtual = 1; + char *kwlist[] = {"prefer_non_virtual", NULL}; + if (PyArg_ParseTupleAndKeywords(args, kwds, "|b", kwlist, &nonvirtual) == 0) + return 0; + pkgCache::PkgIterator pkg = grp.FindPreferredPkg(nonvirtual); + + if (pkg.end()) { + Py_RETURN_NONE; + } else { + return PyPackage_FromCpp(pkg, true, owner); + } +} + +static PyMethodDef group_methods[] = { + {"find_package",group_find_package,METH_VARARGS,group_find_package_doc}, + {"find_preferred_package",(PyCFunction) group_find_preferred_package, + METH_VARARGS|METH_KEYWORDS,group_find_preferred_package_doc}, + {} +}; + +static PyObject *group_seq_item(PyObject *pySelf,Py_ssize_t index) +{ + PyGroup *self = static_cast(pySelf); + pkgCache::GrpIterator grp = GetCpp(self); + PyObject *owner = GetOwner(self); + + if (self->nextIndex > index || self->nextIndex == 0) { + self->nextIndex = 1; + new (&self->current) pkgCache::PkgIterator(grp.PackageList()); + } + + if (self->nextIndex != index + 1) { + while (self->nextIndex <= index && !self->current.end()) { + self->current = grp.NextPkg(self->current); + self->nextIndex++; + } + } + + if (self->current.end()) + return PyErr_Format(PyExc_IndexError, "Out of range: %zd", index); + + return PyPackage_FromCpp(self->current, true, owner); +} + + +static PySequenceMethods group_as_sequence = +{ + 0, + 0, // concat + 0, // repeat + group_seq_item, + 0, // slice + 0, // assign item + 0 // assign slice +}; + + +static const char group_doc[] = "Group(cache, name)\n\n" + "Group of packages with the same name.\n\n" + "Provides access to all packages sharing a name. Can be used this\n" + "like a list, or by using the special find_*() methods. If you use\n" + "it as a sequence, make sure to access it linearly, as this uses a\n" + "linked list internally."; +PyTypeObject PyGroup_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "apt_pkg.Group", // tp_name + sizeof(PyGroup), // tp_basicsize + 0, // tp_itemsize + // Methods + CppDealloc, // tp_dealloc + 0, // tp_print + 0, // tp_getattr + 0, // tp_setattr + 0, // tp_compare + 0, // tp_repr + 0, // tp_as_number + &group_as_sequence, // tp_as_sequence + 0, // tp_as_mapping + 0, // tp_hash + 0, // tp_call + 0, // tp_str + 0, // tp_getattro + 0, // tp_setattro + 0, // tp_as_buffer + Py_TPFLAGS_DEFAULT, // tp_flags + group_doc, // tp_doc + 0, // tp_traverse + 0, // tp_clear + 0, // tp_richcompare + 0, // tp_weaklistoffset + 0, // tp_iter + 0, // tp_iternext + group_methods, // tp_methods + 0, // tp_members + 0, // tp_getset + 0, // tp_base + 0, // tp_dict + 0, // tp_descr_get + 0, // tp_descr_set + 0, // tp_dictoffset + 0, // tp_init + 0, // tp_alloc + group_new, // tp_new +}; diff --git a/python/configuration.cc b/python/configuration.cc index 93e92efa..9000f71f 100644 --- a/python/configuration.cc +++ b/python/configuration.cc @@ -92,7 +92,7 @@ static PyObject *CnfFindI(PyObject *Self,PyObject *Args) int Default = 0; if (PyArg_ParseTuple(Args,"s|i",&Name,&Default) == 0) return 0; - return Py_BuildValue("i",GetSelf(Self).FindI(Name,Default)); + return MkPyNumber(GetSelf(Self).FindI(Name,Default)); } static const char *doc_FindB = @@ -438,6 +438,10 @@ PyObject *ParseCommandLine(PyObject *Self,PyObject *Args) return 0; } + if (PySequence_Length(Pargv) < 1) { + PyErr_SetString(PyExc_ValueError,"argv is an empty sequence"); + return 0; + } // Convert the option list int Length = PySequence_Length(POList); CommandLine::Args *OList = new CommandLine::Args[Length+1]; diff --git a/python/depcache.cc b/python/depcache.cc index 12c13a73..e6113429 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -668,22 +668,22 @@ static PyMethodDef PkgDepCacheMethods[] = #define depcache (GetCpp(Self)) static PyObject *PkgDepCacheGetKeepCount(PyObject *Self,void*) { - return Py_BuildValue("l", depcache->KeepCount()); + return MkPyNumber(depcache->KeepCount()); } static PyObject *PkgDepCacheGetInstCount(PyObject *Self,void*) { - return Py_BuildValue("l", depcache->InstCount()); + return MkPyNumber(depcache->InstCount()); } static PyObject *PkgDepCacheGetDelCount(PyObject *Self,void*) { - return Py_BuildValue("l", depcache->DelCount()); + return MkPyNumber(depcache->DelCount()); } static PyObject *PkgDepCacheGetBrokenCount(PyObject *Self,void*) { - return Py_BuildValue("l", depcache->BrokenCount()); + return MkPyNumber(depcache->BrokenCount()); } static PyObject *PkgDepCacheGetUsrSize(PyObject *Self,void*) { - return Py_BuildValue("L", depcache->UsrSize()); + return MkPyNumber(depcache->UsrSize()); } static PyObject *PkgDepCacheGetDebSize(PyObject *Self,void*) { - return Py_BuildValue("L", depcache->DebSize()); + return MkPyNumber(depcache->DebSize()); } #undef depcache diff --git a/python/generic.h b/python/generic.h index ce9e5091..f9680ca5 100644 --- a/python/generic.h +++ b/python/generic.h @@ -57,6 +57,7 @@ typedef int Py_ssize_t; #define PyString_Type PyUnicode_Type #define PyInt_Check PyLong_Check #define PyInt_AsLong PyLong_AsLong +#define PyInt_FromLong PyLong_FromLong // Force 0.7 compatibility to be off in Python 3 builds #undef COMPAT_0_7 #else @@ -231,6 +232,21 @@ PyObject *HandleErrors(PyObject *Res = 0); const char **ListToCharChar(PyObject *List,bool NullTerm = false); PyObject *CharCharToList(const char **List,unsigned long Size = 0); +/* Happy number conversion, thanks to overloading */ +inline PyObject *MkPyNumber(unsigned long long o) { return PyLong_FromUnsignedLongLong(o); } +inline PyObject *MkPyNumber(unsigned long o) { return PyLong_FromUnsignedLong(o); } +inline PyObject *MkPyNumber(unsigned int o) { return PyLong_FromUnsignedLong(o); } +inline PyObject *MkPyNumber(unsigned short o) { return PyInt_FromLong(o); } +inline PyObject *MkPyNumber(unsigned char o) { return PyInt_FromLong(o); } + +inline PyObject *MkPyNumber(long long o) { return PyLong_FromLongLong(o); } +inline PyObject *MkPyNumber(long o) { return PyInt_FromLong(o); } +inline PyObject *MkPyNumber(int o) { return PyInt_FromLong(o); } +inline PyObject *MkPyNumber(short o) { return PyInt_FromLong(o); } +inline PyObject *MkPyNumber(char o) { return PyInt_FromLong(o); } + +inline PyObject *MkPyNumber(double o) { return PyFloat_FromDouble(o); } + # ifdef COMPAT_0_7 PyObject *_PyAptObject_getattro(PyObject *self, PyObject *attr); # else diff --git a/python/indexfile.cc b/python/indexfile.cc index 037be210..bf0df516 100644 --- a/python/indexfile.cc +++ b/python/indexfile.cc @@ -47,7 +47,7 @@ static PyObject *IndexFileGetHasPackages(PyObject *Self,void*) { return PyBool_FromLong((File->HasPackages())); } static PyObject *IndexFileGetSize(PyObject *Self,void*) { - return Py_BuildValue("i",(File->Size())); + return MkPyNumber((File->Size())); } static PyObject *IndexFileGetIsTrusted(PyObject *Self,void*) { return PyBool_FromLong((File->IsTrusted())); diff --git a/python/indexrecords.cc b/python/indexrecords.cc index d6a3263c..c7623cfd 100644 --- a/python/indexrecords.cc +++ b/python/indexrecords.cc @@ -63,7 +63,7 @@ static PyObject *indexrecords_lookup(PyObject *self,PyObject *args) // Copy the HashString(), to prevent crashes and to not require the // indexRecords object to exist. PyObject *py_hash = PyHashString_FromCpp(new HashString(result->Hash), true, NULL); - PyObject *value = Py_BuildValue("(Oi)",py_hash,result->Size); + PyObject *value = Py_BuildValue("(ON)",py_hash,MkPyNumber(result->Size)); Py_DECREF(py_hash); return value; } diff --git a/python/orderlist.cc b/python/orderlist.cc new file mode 100644 index 00000000..9fbed5f2 --- /dev/null +++ b/python/orderlist.cc @@ -0,0 +1,317 @@ +/* + * orderlist.cc - Wrapper around pkgOrderList + * + * Copyright 2011 Julian Andres Klode + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#include +#include "apt_pkgmodule.h" +#include "generic.h" +#include + +struct PyOrderList : CppPyObject { + pkgCache::PkgIterator current; + int nextIndex; +}; + +static PyObject *order_list_new(PyTypeObject *type,PyObject *args, + PyObject *kwds) +{ + PyObject *pyDepCache = NULL; + char *kwlist[] = {"depcache", NULL}; + if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", kwlist, + &PyDepCache_Type, &pyDepCache) + == 0) + return 0; + + pkgDepCache *depCache = PyDepCache_ToCpp(pyDepCache); + return PyOrderList_FromCpp(new pkgOrderList(depCache), true, + pyDepCache); +} + +static const char order_list_append_doc[] = + "append(pkg: Package)\n\n" + "Append a package to the end of the list."; +static PyObject *order_list_append(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + PyObject *pyPackage = NULL; + if (PyArg_ParseTuple(args, "O!", &PyPackage_Type, &pyPackage) == 0) + return 0; + + list->push_back(PyPackage_ToCpp(pyPackage)); + Py_RETURN_NONE; +} + +static const char order_list_score_doc[] = + "score(pkg: Package) -> int\n\n" + "Return the score of the package."; +static PyObject *order_list_score(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + PyObject *pyPackage = NULL; + if (PyArg_ParseTuple(args, "O!", &PyPackage_Type, &pyPackage) == 0) + return 0; + + return MkPyNumber(list->Score(PyPackage_ToCpp(pyPackage))); +} + +static const char order_list_order_critical_doc[] = + "order_critical()\n\n" + "Order by PreDepends only (critical unpack order)."; +static PyObject *order_list_order_critical(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + if (PyArg_ParseTuple(args, "") == 0) + return 0; + + list->OrderCritical(); + + Py_INCREF(Py_None); + return HandleErrors(Py_None); +} + +static const char order_list_order_unpack_doc[] = + "order_unpack()\n\n" + "Order the packages for unpacking (see Debian Policy)."; +static PyObject *order_list_order_unpack(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + if (PyArg_ParseTuple(args, "") == 0) + return 0; + + list->OrderUnpack(); + Py_INCREF(Py_None); + return HandleErrors(Py_None); +} + +static const char order_list_order_configure_doc[] = + "order_configure()\n\n" + "Order the packages for configuration (see Debian Policy)."; +static PyObject *order_list_order_configure(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + if (PyArg_ParseTuple(args, "") == 0) + return 0; + + list->OrderConfigure(); + + Py_INCREF(Py_None); + return HandleErrors(Py_None); +} + +static bool valid_flags(unsigned int flags) { + return (flags & ~pkgOrderList::Added + & ~pkgOrderList::AddPending + & ~pkgOrderList::Immediate + & ~pkgOrderList::Loop + & ~pkgOrderList::UnPacked + & ~pkgOrderList::Configured + & ~pkgOrderList::Removed + & ~pkgOrderList::InList + & ~pkgOrderList::After + & ~pkgOrderList::States) == 0; +} + +static const char order_list_flag_doc[] = + "flag(pkg: Package, flag: int[, unset_flags: int])\n\n" + "Flag the package, set flags in 'flag' and remove flags in\n" + "'unset_flags'."; +static PyObject *order_list_flag(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + + PyObject *pyPkg = NULL; + unsigned int flags = 0; + unsigned int unset_flags = 0; + if (PyArg_ParseTuple(args, "O!I|I", &PyPackage_Type, &pyPkg, + &flags, &unset_flags) == 0) + return 0; + + if (!valid_flags(flags)) + return PyErr_Format(PyExc_ValueError, "flags (%u) is" + " not a valid combination of flags.", + flags); + if (!valid_flags(unset_flags)) + return PyErr_Format(PyExc_ValueError, "unset_flags (%u) is" + " not a valid combination of flags.", + unset_flags); + + list->Flag(PyPackage_ToCpp(pyPkg), flags, unset_flags); + + Py_RETURN_NONE; +} + +static const char order_list_is_flag_doc[] = + "is_flag(pkg: Package, flag: int)\n\n" + "Check if the flag(s) are set."; +static PyObject *order_list_is_flag(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + PyObject *pyPkg = NULL; + unsigned int flags = 0; + if (PyArg_ParseTuple(args, "O!I", &PyPackage_Type, &pyPkg, + &flags) == 0) + return 0; + + if (!valid_flags(flags)) + return PyErr_Format(PyExc_ValueError, "flags (%u) is" + " not a valid combination of flags.", + flags); + + return PyBool_FromLong(list->IsFlag(PyPackage_ToCpp(pyPkg), flags)); +} + +static const char order_list_wipe_flags_doc[] = + "wipe_flags(flags: int)\n\n" + "Remove the flags in 'flags' from all packages in this list"; +static PyObject *order_list_wipe_flags(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + unsigned int flags = 0; + if (PyArg_ParseTuple(args, "I", &flags) == 0) + return 0; + + if (!valid_flags(flags)) + return PyErr_Format(PyExc_ValueError, "flags (%u) is" + " not a valid combination of flags.", + flags); + + list->WipeFlags(flags); + Py_RETURN_NONE; +} + +static const char order_list_is_now_doc[] = + "is_now(pkg: Package)\n\n" + "Check if the package is flagged for any state but removal."; +static PyObject *order_list_is_now(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + PyObject *pyPkg = NULL; + if (PyArg_ParseTuple(args, "O!", &PyPackage_Type, &pyPkg) == 0) + return 0; + + return PyBool_FromLong(list->IsNow(PyPackage_ToCpp(pyPkg))); +} + +static const char order_list_is_missing_doc[] = + "is_now(pkg: Package)\n\n" + "Check if the package is marked for install."; +static PyObject *order_list_is_missing(PyObject *self,PyObject *args) +{ + pkgOrderList *list = GetCpp(self); + PyObject *pyPkg = NULL; + if (PyArg_ParseTuple(args, "O!", &PyPackage_Type, &pyPkg) == 0) + return 0; + + return PyBool_FromLong(list->IsMissing(PyPackage_ToCpp(pyPkg))); +} + + +#define METHOD(name) {#name, order_list_##name, METH_VARARGS,\ + order_list_##name##_doc} + +static PyMethodDef order_list_methods[] = { + METHOD(append), + METHOD(score), + METHOD(order_critical), + METHOD(order_unpack), + METHOD(order_configure), + METHOD(flag), + METHOD(is_flag), + METHOD(is_now), + METHOD(is_missing), + METHOD(wipe_flags), + {} +}; + +static PyObject *order_list_seq_item(PyObject *self,Py_ssize_t index) +{ + pkgOrderList *list = GetCpp(self); + PyObject *owner = GetOwner(self); + PyObject *pycache = GetOwner(owner); + pkgCache *cache = PyCache_ToCpp(pycache); + + if (index < 0 || index >= list->size()) + return PyErr_Format(PyExc_IndexError, "Out of range: %zd", index); + + return PyPackage_FromCpp(pkgCache::PkgIterator(*cache, + *(list->begin() + index)), + true, owner); +} + +Py_ssize_t order_list_seq_length(PyObject *self) +{ + return GetCpp(self)->size(); +} + +static PySequenceMethods order_list_as_sequence = +{ + order_list_seq_length, // sq_length + 0, // sq_concat + 0, // sq_repeat + order_list_seq_item, // sq_item + 0, // sq_ass_item + 0, // sq_contains + 0, // sq_inplace_concat + 0 // sq_inplace_repeat +}; + +static const char order_list_doc[] = "OrderList(depcache: DepCache)\n\n" + "Sequence type for packages with special ordering methods."; +PyTypeObject PyOrderList_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "apt_pkg.OrderList", // tp_name + sizeof(CppPyObject), // tp_basicsize + 0, // tp_itemsize + // Methods + CppDeallocPtr, // tp_dealloc + 0, // tp_print + 0, // tp_getattr + 0, // tp_setattr + 0, // tp_compare + 0, // tp_repr + 0, // tp_as_number + &order_list_as_sequence, // tp_as_sequence + 0, // tp_as_mapping + 0, // tp_hash + 0, // tp_call + 0, // tp_str + 0, // tp_getattro + 0, // tp_setattro + 0, // tp_as_buffer + Py_TPFLAGS_DEFAULT, // tp_flags + order_list_doc, // tp_doc + 0, // tp_traverse + 0, // tp_clear + 0, // tp_richcompare + 0, // tp_weaklistoffset + 0, // tp_iter + 0, // tp_iternext + order_list_methods, // tp_methods + 0, // tp_members + 0, // tp_getset + 0, // tp_base + 0, // tp_dict + 0, // tp_descr_get + 0, // tp_descr_set + 0, // tp_dictoffset + 0, // tp_init + 0, // tp_alloc + order_list_new, // tp_new +}; diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc index 95e8c27e..b7bed658 100644 --- a/python/pkgmanager.cc +++ b/python/pkgmanager.cc @@ -17,36 +17,10 @@ #include #include #include +#include #include -static PyObject *PkgManagerNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) -{ - PyObject *Owner; - char *kwlist[] = {"depcache",0}; - if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyDepCache_Type, - &Owner) == 0) - return 0; - - pkgPackageManager *pm = _system->CreatePM(GetCpp(Owner)); - - CppPyObject *PkgManagerObj = - CppPyObject_NEW(NULL, type,pm); - - return PkgManagerObj; -} - -#ifdef COMPAT_0_7 -PyObject *GetPkgManager(PyObject *Self,PyObject *Args) -{ - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is " - "deprecated. Please see apt_pkg.PackageManager() for the " - "replacement.", 1); - return PkgManagerNew(&PyPackageManager_Type,Args,0); -} -#endif - - static PyObject *PkgManagerGetArchives(PyObject *Self,PyObject *Args) { pkgPackageManager *pm = GetCpp(Self); @@ -79,7 +53,7 @@ static PyObject *PkgManagerDoInstall(PyObject *Self,PyObject *Args) pkgPackageManager::OrderResult res = pm->DoInstall(status_fd); - return HandleErrors(Py_BuildValue("i",res)); + return HandleErrors(MkPyNumber(res)); } static PyObject *PkgManagerFixMissing(PyObject *Self,PyObject *Args) @@ -114,17 +88,16 @@ static PyMethodDef PkgManagerMethods[] = {} }; - static const char *packagemanager_doc = - "PackageManager(depcache: apt_pkg.DepCache)\n\n" - "PackageManager objects allow the fetching of packages marked for\n" - "installation and the installation of those packages. The parameter\n" - "'depcache' specifies an apt_pkg.DepCache object where information\n" - "about the package selections is retrieved from."; + "_PackageManager objects allow the fetching of packages marked for\n" + "installation and the installation of those packages.\n" + "This is an abstract base class that cannot be subclassed\n" + "in Python. The only subclass is apt_pkg.PackageManager. This\n" + "class is an implementation-detail and not part of the API."; PyTypeObject PyPackageManager_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "apt_pkg.PackageManager", // tp_name + "apt_pkg._PackageManager", // tp_name sizeof(CppPyObject), // tp_basicsize 0, // tp_itemsize // Methods @@ -143,8 +116,7 @@ PyTypeObject PyPackageManager_Type = _PyAptObject_getattro, // tp_getattro 0, // tp_setattro 0, // tp_as_buffer - (Py_TPFLAGS_DEFAULT | // tp_flags - Py_TPFLAGS_BASETYPE), + Py_TPFLAGS_DEFAULT, // tp_flag, packagemanager_doc, // tp_doc 0, // tp_traverse 0, // tp_clear @@ -162,9 +134,240 @@ PyTypeObject PyPackageManager_Type = 0, // tp_dictoffset 0, // tp_init 0, // tp_alloc - PkgManagerNew, // tp_new + 0, // tp_new +}; + + +struct CppPyRef { + PyObject *o; + CppPyRef(const CppPyRef &o) { Py_XINCREF(o); this->o = o; } + CppPyRef(PyObject *o) : o(o) {} + ~CppPyRef() { Py_XDECREF(o); } + operator PyObject *() const { return o; } + PyObject *operator->() const { return o; } }; +class PyPkgManager : public pkgDPkgPM { + bool res(CppPyRef result) { + if (result == NULL) { + std::cerr << "Error in function: " << std::endl; + PyErr_Print(); + PyErr_Clear(); + return false; + } + return (result != NULL && + (result == Py_None || PyObject_IsTrue(result) == 1)); + } + + + PyObject *GetPyPkg(const PkgIterator &Pkg) { + PyObject *depcache = NULL; + PyObject *cache = NULL; + + depcache = GetOwner(pyinst); + if (depcache != NULL && PyDepCache_Check(depcache)) + cache = GetOwner(depcache); + + return PyPackage_FromCpp(Pkg, true, cache); + } + + /* Call through to Python */ + virtual bool Install(PkgIterator Pkg,string File) { + return res(PyObject_CallMethod(pyinst, "install", "(NN)", + GetPyPkg(Pkg), + CppPyString(File))); + } + virtual bool Configure(PkgIterator Pkg) { + return res(PyObject_CallMethod(pyinst, "configure", "(N)", + GetPyPkg(Pkg))); + } + virtual bool Remove(PkgIterator Pkg,bool Purge = false) { + return res(PyObject_CallMethod(pyinst, "remove", "(NN)", + GetPyPkg(Pkg), + PyBool_FromLong(Purge))); + } + virtual bool Go(int StatusFd=-1) { + return res(PyObject_CallMethod(pyinst, "go", "(i)", + StatusFd)); + } + virtual void Reset() { + CppPyRef(PyObject_CallMethod(pyinst, "reset", NULL)); + } + +public: + /* Those call the protected functions from the parent class */ + bool callInstall(PkgIterator Pkg,string File) { return pkgDPkgPM::Install(Pkg, File); } + bool callRemove(PkgIterator Pkg, bool Purge) { return pkgDPkgPM::Remove(Pkg, Purge); } + bool callGo(int StatusFd=-1) { return pkgDPkgPM::Go(StatusFd); } + void callReset() { return pkgDPkgPM::Reset(); } + bool callConfigure(PkgIterator Pkg) { return pkgDPkgPM::Configure(Pkg); } + pkgOrderList *getOrderList() { return pkgPackageManager::List; } + + PyPkgManager(pkgDepCache *Cache) : pkgDPkgPM(Cache) {}; + PyObject *pyinst; +}; + +static PyObject *PkgManagerNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) +{ + PyObject *Owner; + char *kwlist[] = {"depcache",0}; + if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyDepCache_Type, + &Owner) == 0) + return 0; + + PyPkgManager *pm = new PyPkgManager(GetCpp(Owner)); + + CppPyObject *PkgManagerObj = + CppPyObject_NEW(NULL, type,pm); + + pm->pyinst = PkgManagerObj; + + return PkgManagerObj; +} + +#ifdef COMPAT_0_7 +PyObject *GetPkgManager(PyObject *Self,PyObject *Args) +{ + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is " + "deprecated. Please see apt_pkg.PackageManager() for the " + "replacement.", 1); + return PkgManagerNew(&PyPackageManager2_Type,Args,0); +} +#endif + +static PyObject *PkgManagerInstall(PyObject *Self,PyObject *Args) +{ + PyPkgManager *pm = GetCpp(Self); + PyObject *pkg; + const char *file; + + if (PyArg_ParseTuple(Args, "O!s", &PyPackage_Type,&pkg, &file) == 0) + return 0; + + return HandleErrors(PyBool_FromLong(pm->callInstall(PyPackage_ToCpp(pkg), file))); +} + + +static PyObject *PkgManagerConfigure(PyObject *Self,PyObject *Args) +{ + PyPkgManager *pm = GetCpp(Self); + PyObject *pkg; + + if (PyArg_ParseTuple(Args, "O!", &PyPackage_Type,&pkg) == 0) + return 0; + + return HandleErrors(PyBool_FromLong(pm->callConfigure(PyPackage_ToCpp(pkg)))); +} + +static PyObject *PkgManagerRemove(PyObject *Self,PyObject *Args) +{ + PyPkgManager *pm = GetCpp(Self); + PyObject *pkg; + char purge; + + if (PyArg_ParseTuple(Args, "O!b", &PyPackage_Type,&pkg, &purge) == 0) + return 0; + + return HandleErrors(PyBool_FromLong(pm->callRemove(PyPackage_ToCpp(pkg), purge))); +} + +static PyObject *PkgManagerGo(PyObject *Self,PyObject *Args) +{ + PyPkgManager *pm = GetCpp(Self); + int fd; + + if (PyArg_ParseTuple(Args, "i", &fd) == 0) + return 0; + + return HandleErrors(PyBool_FromLong(pm->callGo(fd))); +} + +static PyObject *PkgManagerReset(PyObject *Self,PyObject *Args) +{ + PyPkgManager *pm = GetCpp(Self); + + pm->callReset(); + Py_INCREF(Py_None); + return HandleErrors(Py_None); +} + +static PyMethodDef PkgManager2Methods[] = +{ + {"install",PkgManagerInstall,METH_VARARGS, + "install(pkg: Package, filename: str) -> bool \n\n" + "Add a install action. Can be overriden in subclasses.\n\n" + "New in version 0.8.0."}, + {"configure",PkgManagerConfigure,METH_VARARGS, + "configure(pkg: Package) -> bool \n\n" + "Add a configure action. Can be overriden in subclasses.\n\n" + "New in version 0.8.0."}, + {"remove",PkgManagerRemove,METH_VARARGS, + "remove(pkg: Package, purge: bool) -> bool \n\n" + "Add a removal action. Can be overriden in subclasses.\n\n" + "New in version 0.8.0."}, + {"go",PkgManagerGo,METH_VARARGS, + "go(status_fd: int) -> bool \n\n" + "Start dpkg. Can be overriden in subclasses.\n\n" + "New in version 0.8.0."}, + {"reset",PkgManagerReset,METH_VARARGS, + "reset()\n\n" + "Reset the package manager for a new round.\n" + "Can be overriden in subclasses.\n\n" + "New in version 0.8.0."}, + {} +}; + +static const char *packagemanager2_doc = + "PackageManager(depcache: apt_pkg.DepCache)\n\n" + "PackageManager objects allow the fetching of packages marked for\n" + "installation and the installation of those packages. The parameter\n" + "'depcache' specifies an apt_pkg.DepCache object where information\n" + "about the package selections is retrieved from.\n\n" + "Methods in this class can be overriden in sub classes\n" + "to implement behavior different from APT's dpkg implementation."; +PyTypeObject PyPackageManager2_Type = +{ + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "apt_pkg.PackageManager", // tp_name + sizeof(CppPyObject), // tp_basicsize + 0, // tp_itemsize + // Methods + CppDeallocPtr, // tp_dealloc + 0, // tp_print + 0, // tp_getattr + 0, // tp_setattr + 0, // tp_compare + 0, // tp_repr + 0, // tp_as_number + 0, // tp_as_sequence + 0, // tp_as_mapping + 0, // tp_hash + 0, // tp_call + 0, // tp_str + 0, // tp_getattro + 0, // tp_setattro + 0, // tp_as_buffer + (Py_TPFLAGS_DEFAULT | // tp_flags + Py_TPFLAGS_BASETYPE), + packagemanager2_doc, // tp_doc + 0, // tp_traverse + 0, // tp_clear + 0, // tp_richcompare + 0, // tp_weaklistoffset + 0, // tp_iter + 0, // tp_iternext + PkgManager2Methods, // tp_methods + 0, // tp_members + 0, // tp_getset + &PyPackageManager_Type, // tp_base + 0, // tp_dict + 0, // tp_descr_get + 0, // tp_descr_set + 0, // tp_dictoffset + 0, // tp_init + 0, // tp_alloc + PkgManagerNew, // tp_new +}; /*}}}*/ diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc index aad3ef7e..4c889129 100644 --- a/python/pkgsrcrecords.cc +++ b/python/pkgsrcrecords.cc @@ -147,9 +147,9 @@ static PyObject *PkgSrcRecordsGetFiles(PyObject *Self,void*) { PyObject *v; for(unsigned int i=0;i(self); if (PyObject_TypeCheck(arg, &PyPackage_Type)) { pkgCache::PkgIterator pkg = GetCpp(arg); - return Py_BuildValue("i", policy->GetPriority(pkg)); + return MkPyNumber(policy->GetPriority(pkg)); } else { PyErr_SetString(PyExc_TypeError,"Argument must be of Package()."); return 0; diff --git a/python/progress.cc b/python/progress.cc index 5700a1b6..bd3c2ad6 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -92,12 +92,12 @@ void PyOpProgress::Update() setattr(callbackInst, "op", "s", Op.c_str()); setattr(callbackInst, "subop", "s", SubOp.c_str()); setattr(callbackInst, "major_change", "b", MajorChange); - setattr(callbackInst, "percent", "f", Percent); + setattr(callbackInst, "percent", "N", MkPyNumber(Percent)); #ifdef COMPAT_0_7 setattr(callbackInst, "Op", "s", Op.c_str()); setattr(callbackInst, "subOp", "s", SubOp.c_str()); setattr(callbackInst, "majorChange", "b", MajorChange); - PyObject *arglist = Py_BuildValue("(f)", Percent); + PyObject *arglist = Py_BuildValue("(N)", MkPyNumber(Percent)); RunSimpleCallback("update", arglist); #else RunSimpleCallback("update"); @@ -156,19 +156,19 @@ void PyFetchProgress::UpdateStatus(pkgAcquire::ItemDesc &Itm, int status) // Added object file size and object partial size to // parameters that are passed to updateStatus. // -- Stephan - PyObject *arglist = Py_BuildValue("(sssikk)", Itm.URI.c_str(), + PyObject *arglist = Py_BuildValue("(sssNNN)", Itm.URI.c_str(), Itm.Description.c_str(), Itm.ShortDesc.c_str(), - status, - Itm.Owner->FileSize, - Itm.Owner->PartialSize); + MkPyNumber(status), + MkPyNumber(Itm.Owner->FileSize), + MkPyNumber(Itm.Owner->PartialSize)); RunSimpleCallback("update_status_full", arglist); // legacy version of the interface - arglist = Py_BuildValue("(sssi)", Itm.URI.c_str(), Itm.Description.c_str(), - Itm.ShortDesc.c_str(), status); + arglist = Py_BuildValue("(sssN)", Itm.URI.c_str(), Itm.Description.c_str(), + Itm.ShortDesc.c_str(), MkPyNumber(status)); if(PyObject_HasAttrString(callbackInst, "updateStatus")) RunSimpleCallback("updateStatus", arglist); @@ -240,11 +240,11 @@ void PyFetchProgress::Start() pkgAcquireStatus::Start(); #ifdef COMPAT_0_7 - setattr(callbackInst, "currentCPS", "d", 0); - setattr(callbackInst, "currentBytes", "d", 0); - setattr(callbackInst, "currentItems", "k", 0); - setattr(callbackInst, "totalItems", "k", 0); - setattr(callbackInst, "totalBytes", "d", 0); + setattr(callbackInst, "currentCPS", "N", MkPyNumber(0)); + setattr(callbackInst, "currentBytes", "N", MkPyNumber(0)); + setattr(callbackInst, "currentItems", "N", MkPyNumber(0)); + setattr(callbackInst, "totalItems", "N", MkPyNumber(0)); + setattr(callbackInst, "totalBytes", "N", MkPyNumber(0)); #endif RunSimpleCallback("start"); @@ -280,14 +280,14 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner) return false; } - setattr(callbackInst, "last_bytes", "d", LastBytes); - setattr(callbackInst, "current_cps", "d", CurrentCPS); - setattr(callbackInst, "current_bytes", "d", CurrentBytes); - setattr(callbackInst, "total_bytes", "d", TotalBytes); - setattr(callbackInst, "fetched_bytes", "d", FetchedBytes); - setattr(callbackInst, "elapsed_time", "k", ElapsedTime); - setattr(callbackInst, "current_items", "k", CurrentItems); - setattr(callbackInst, "total_items", "k", TotalItems); + setattr(callbackInst, "last_bytes", "N", MkPyNumber(LastBytes)); + setattr(callbackInst, "current_cps", "N", MkPyNumber(CurrentCPS)); + setattr(callbackInst, "current_bytes", "N", MkPyNumber(CurrentBytes)); + setattr(callbackInst, "total_bytes", "N", MkPyNumber(TotalBytes)); + setattr(callbackInst, "fetched_bytes", "N", MkPyNumber(FetchedBytes)); + setattr(callbackInst, "elapsed_time", "N", MkPyNumber(ElapsedTime)); + setattr(callbackInst, "current_items", "N", MkPyNumber(CurrentItems)); + setattr(callbackInst, "total_items", "N", MkPyNumber(TotalItems)); // New style if (!PyObject_HasAttrString(callbackInst, "updateStatus")) { @@ -313,12 +313,12 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner) return true; } #ifdef COMPAT_0_7 - setattr(callbackInst, "currentCPS", "d", CurrentCPS); - setattr(callbackInst, "currentBytes", "d", CurrentBytes); - setattr(callbackInst, "totalBytes", "d", TotalBytes); - setattr(callbackInst, "fetchedBytes", "d", FetchedBytes); - setattr(callbackInst, "currentItems", "k", CurrentItems); - setattr(callbackInst, "totalItems", "k", TotalItems); + setattr(callbackInst, "currentCPS", "N", MkPyNumber(CurrentCPS)); + setattr(callbackInst, "currentBytes", "N", MkPyNumber(CurrentBytes)); + setattr(callbackInst, "totalBytes", "N", MkPyNumber(TotalBytes)); + setattr(callbackInst, "fetchedBytes", "N", MkPyNumber(FetchedBytes)); + setattr(callbackInst, "currentItems", "N", MkPyNumber(CurrentItems)); + setattr(callbackInst, "totalItems", "N", MkPyNumber(TotalItems)); // Go through the list of items and add active items to the // activeItems vector. map activeItemMap; @@ -351,11 +351,11 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner) pkgAcquire::Worker *worker = iter->first; pkgAcquire::ItemDesc *itm = iter->second; - PyObject *itmTuple = Py_BuildValue("(ssskk)", itm->URI.c_str(), + PyObject *itmTuple = Py_BuildValue("(sssNN)", itm->URI.c_str(), itm->Description.c_str(), itm->ShortDesc.c_str(), - worker->TotalSize, - worker->CurrentSize); + MkPyNumber(worker->TotalSize), + MkPyNumber(worker->CurrentSize)); PyTuple_SetItem(itemsTuple, tuplePos, itmTuple); } diff --git a/python/python-apt-helpers.cc b/python/python-apt-helpers.cc index 7a0f20c4..079b93cf 100644 --- a/python/python-apt-helpers.cc +++ b/python/python-apt-helpers.cc @@ -52,7 +52,9 @@ NEW_FROM(PyHashString_FromCpp,&PyHashString_Type,HashString*) NEW_FROM(PyIndexRecords_FromCpp,&PyIndexRecords_Type,indexRecords*) NEW_FROM(PyMetaIndex_FromCpp,&PyMetaIndex_Type,metaIndex*) NEW_FROM(PyPackage_FromCpp,&PyPackage_Type,pkgCache::PkgIterator) +NEW_FROM(PyGroup_FromCpp,&PyGroup_Type,pkgCache::GrpIterator) NEW_FROM(PyIndexFile_FromCpp,&PyIndexFile_Type,pkgIndexFile*) +NEW_FROM(PyOrderList_FromCpp,&PyOrderList_Type,pkgOrderList*) NEW_FROM(PyPackageFile_FromCpp,&PyPackageFile_Type,pkgCache::PkgFileIterator) //NEW_FROM(PyPackageList_FromCpp,&PyPackageList_Type,PkgListStruct) NEW_FROM(PyPackageManager_FromCpp,&PyPackageManager_Type,pkgPackageManager*) diff --git a/python/python-apt.h b/python/python-apt.h index b9fc9212..6f2a02df 100644 --- a/python/python-apt.h +++ b/python/python-apt.h @@ -167,6 +167,13 @@ struct _PyAptPkgAPIStruct { PyObject* (*version_fromcpp)(pkgCache::VerIterator const &obj, bool Delete, PyObject *Owner); pkgCache::VerIterator& (*version_tocpp)(PyObject *self); + PyTypeObject *group_type; + PyObject* (*group_fromcpp)(pkgCache::GrpIterator const &obj, bool Delete, PyObject *Owner); + pkgCache::GrpIterator& (*group_tocpp)(PyObject *self); + + PyTypeObject *orderlist_type; + PyObject* (*orderlist_fromcpp)(pkgOrderList* const &obj, bool Delete, PyObject *Owner); + pkgOrderList*& (*orderlist_tocpp)(PyObject *self); }; // Checking macros. @@ -184,6 +191,7 @@ struct _PyAptPkgAPIStruct { # define PyDependency_Check(op) PyObject_TypeCheck(op, &PyDependency_Type) # define PyDependencyList_Check(op) PyObject_TypeCheck(op, &PyDependencyList_Type) # define PyDescription_Check(op) PyObject_TypeCheck(op, &PyDescription_Type) +# define PyGroup_Check(op) PyObject_TypeCheck(op, &PyGroup_Type) # define PyHashes_Check(op) PyObject_TypeCheck(op, &PyHashes_Type) # define PyHashString_Check(op) PyObject_TypeCheck(op, &PyHashString_Type) # define PyIndexRecords_Check(op) PyObject_TypeCheck(op, &PyIndexRecords_Type) @@ -217,12 +225,14 @@ struct _PyAptPkgAPIStruct { # define PyDependencyList_CheckExact(op) (op->op_type == &PyDependencyList_Type) # define PyDescription_CheckExact(op) (op->op_type == &PyDescription_Type) # define PyHashes_CheckExact(op) (op->op_type == &PyHashes_Type) +# define PyGroup_CheckExact(op) (op->op_type == &PyGroup_Type) # define PyHashString_CheckExact(op) (op->op_type == &PyHashString_Type) # define PyIndexRecords_CheckExact(op) (op->op_type == &PyIndexRecords_Type) # define PyMetaIndex_CheckExact(op) (op->op_type == &PyMetaIndex_Type) # define PyPackage_CheckExact(op) (op->op_type == &PyPackage_Type) # define PyPackageFile_CheckExact(op) (op->op_type == &PyPackageFile_Type) # define PyIndexFile_CheckExact(op) (op->op_type == &PyIndexFile_Type) +# define PyOrderList_CheckExact(op) (op->op_type == &PyOrderList_Type) # define PyPackageList_CheckExact(op) (op->op_type == &PyPackageList_Type) # define PyPackageManager_CheckExact(op) (op->op_type == &PyPackageManager_Type) # define PyPackageRecords_CheckExact(op) (op->op_type == &PyPackageRecords_Type) @@ -260,6 +270,7 @@ static int import_apt_pkg(void) { # define PyDependency_Type *(_PyAptPkg_API->dependency_type) # define PyDependencyList_Type *(_PyAptPkg_API->dependencylist_type) # define PyDescription_Type *(_PyAptPkg_API->description_type) +# define PyGroup_Type *(_PyAptPkg_API->group_type) # define PyHashes_Type *(_PyAptPkg_API->hashes_type) # define PyHashString_Type *(_PyAptPkg_API->hashstring_type) # define PyIndexRecords_Type *(_PyAptPkg_API->indexrecords_type) @@ -267,6 +278,7 @@ static int import_apt_pkg(void) { # define PyPackage_Type *(_PyAptPkg_API->package_type) # define PyPackageFile_Type *(_PyAptPkg_API->packagefile_type) # define PyIndexFile_Type *(_PyAptPkg_API->packageindexfile_type) +# define PyOrderList_Type *(_PyAptPkg_API->orderlist_type) # define PyPackageList_Type *(_PyAptPkg_API->packagelist_type) # define PyPackageManager_Type *(_PyAptPkg_API->packagemanager_type) # define PyPackageRecords_Type *(_PyAptPkg_API->packagerecords_type) @@ -292,6 +304,7 @@ static int import_apt_pkg(void) { # define PyDependency_ToCpp _PyAptPkg_API->dependency_tocpp # define PyDependencyList_ToCpp _PyAptPkg_API->dependencylist_tocpp // NULL # define PyDescription_ToCpp _PyAptPkg_API->description_tocpp +# define PyGroup_ToCpp _PyAptPkg_API->group_tocpp # define PyHashes_ToCpp _PyAptPkg_API->hashes_tocpp # define PyHashString_ToCpp _PyAptPkg_API->hashstring_tocpp # define PyIndexRecords_ToCpp _PyAptPkg_API->indexrecords_tocpp @@ -299,6 +312,7 @@ static int import_apt_pkg(void) { # define PyPackage_ToCpp _PyAptPkg_API->package_tocpp # define PyPackageFile_ToCpp _PyAptPkg_API->packagefile_tocpp # define PyIndexFile_ToCpp _PyAptPkg_API->packageindexfile_tocpp +# define PyOrderList_ToCpp _PyAptPkg_API->orderlist_tocpp // NULL # define PyPackageList_ToCpp _PyAptPkg_API->packagelist_tocpp // NULL # define PyPackageManager_ToCpp _PyAptPkg_API->packagemanager_tocpp # define PyPackageRecords_ToCpp _PyAptPkg_API->packagerecords_tocpp @@ -324,6 +338,7 @@ static int import_apt_pkg(void) { # define PyDependency_FromCpp _PyAptPkg_API->dependency_fromcpp # define PyDependencyList_FromCpp _PyAptPkg_API->dependencylist_fromcpp // NULL # define PyDescription_FromCpp _PyAptPkg_API->description_fromcpp +# define PyGroup_FromCpp _PyAptPkg_API->group_fromcpp # define PyHashes_FromCpp _PyAptPkg_API->hashes_fromcpp # define PyHashString_FromCpp _PyAptPkg_API->hashstring_fromcpp # define PyIndexRecords_FromCpp _PyAptPkg_API->indexrecords_fromcpp @@ -331,6 +346,7 @@ static int import_apt_pkg(void) { # define PyPackage_FromCpp _PyAptPkg_API->package_fromcpp # define PyPackageFile_FromCpp _PyAptPkg_API->packagefile_fromcpp # define PyIndexFile_FromCpp _PyAptPkg_API->packageindexfile_fromcpp +# define PyOrderList_FromCpp _PyAptPkg_API->orderlist_fromcpp // NULL # define PyPackageList_FromCpp _PyAptPkg_API->packagelist_fromcpp // NULL # define PyPackageManager_FromCpp _PyAptPkg_API->packagemanager_fromcpp # define PyPackageRecords_FromCpp _PyAptPkg_API->packagerecords_fromcpp diff --git a/python/string.cc b/python/string.cc index 6a1ce4e2..7abe2d17 100644 --- a/python/string.cc +++ b/python/string.cc @@ -28,11 +28,11 @@ PyObject *Python(PyObject *Self,PyObject *Args) \ return CppPyString(CFunc(Str)); \ } -#define MkInt(Python,CFunc) \ +#define MkInt(Python,CFunc, ctype, pytype) \ PyObject *Python(PyObject *Self,PyObject *Args) \ { \ - int Val = 0; \ - if (PyArg_ParseTuple(Args,"i",&Val) == 0) \ + ctype Val = 0; \ + if (PyArg_ParseTuple(Args,pytype,&Val) == 0) \ return 0; \ return CppPyString(CFunc(Val)); \ } @@ -56,8 +56,8 @@ PyObject *StrBase64Encode(PyObject *Self,PyObject *Args) { MkStr(StrURItoFileName,URItoFileName); //MkFloat(StrSizeToStr,SizeToStr); -MkInt(StrTimeToStr,TimeToStr); -MkInt(StrTimeRFC1123,TimeRFC1123); +MkInt(StrTimeToStr,TimeToStr, unsigned long, "k"); +MkInt(StrTimeRFC1123,TimeRFC1123, long long, "L"); /*}}}*/ // Other String functions /*{{{*/ @@ -91,7 +91,7 @@ PyObject *StrStringToBool(PyObject *Self,PyObject *Args) char *Str = 0; if (PyArg_ParseTuple(Args,"s",&Str) == 0) return 0; - return Py_BuildValue("i",StringToBool(Str)); + return MkPyNumber(StringToBool(Str)); } PyObject *StrStrToTime(PyObject *Self,PyObject *Args) @@ -107,7 +107,7 @@ PyObject *StrStrToTime(PyObject *Self,PyObject *Args) return Py_None; } - return Py_BuildValue("i",Result); + return MkPyNumber(Result); } PyObject *StrCheckDomainList(PyObject *Self,PyObject *Args) diff --git a/python/tag.cc b/python/tag.cc index 44cd06af..94554400 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -247,7 +247,7 @@ static PyObject *TagSecBytes(PyObject *Self,PyObject *Args) if (PyArg_ParseTuple(Args,"") == 0) return 0; - return Py_BuildValue("i",GetCpp(Self).size()); + return MkPyNumber(GetCpp(Self).size()); } static PyObject *TagSecStr(PyObject *Self) @@ -319,7 +319,8 @@ static PyObject *TagFileOffset(PyObject *Self,PyObject *Args) { if (PyArg_ParseTuple(Args,"") == 0) return 0; - return Py_BuildValue("i",((TagFileData *)Self)->Object.Offset()); + return MkPyNumber(((TagFileData *)Self)->Object.Offset()); + } static char *doc_Jump = diff --git a/python/tarfile.cc b/python/tarfile.cc index 215d3a8c..cdfe0a7c 100644 --- a/python/tarfile.cc +++ b/python/tarfile.cc @@ -189,35 +189,35 @@ static PyObject *tarmember_get_linkname(PyObject *self, void *closure) static PyObject *tarmember_get_mode(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self).Mode); + return MkPyNumber(GetCpp(self).Mode); } static PyObject *tarmember_get_uid(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self).UID); + return MkPyNumber(GetCpp(self).UID); } static PyObject *tarmember_get_gid(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self).GID); + return MkPyNumber(GetCpp(self).GID); } static PyObject *tarmember_get_size(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self).Size); + return MkPyNumber(GetCpp(self).Size); } static PyObject *tarmember_get_mtime(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self).MTime); + return MkPyNumber(GetCpp(self).MTime); } static PyObject *tarmember_get_major(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self).Major); + return MkPyNumber(GetCpp(self).Major); } static PyObject *tarmember_get_minor(PyObject *self, void *closure) { - return Py_BuildValue("k", GetCpp(self).Minor); + return MkPyNumber(GetCpp(self).Minor); } static PyObject *tarmember_repr(PyObject *self) diff --git a/setup.py b/setup.py index 9c6eda60..eff78379 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,8 @@ files = ['apt_pkgmodule.cc', 'acquire.cc', 'cache.cc', 'cdrom.cc', 'hashstring.cc', 'indexfile.cc', 'indexrecords.cc', 'metaindex.cc', 'pkgmanager.cc', 'pkgrecords.cc', 'pkgsrcrecords.cc', 'policy.cc', 'progress.cc', 'sourcelist.cc', 'string.cc', 'tag.cc', - 'lock.cc', 'acquire-item.cc', 'python-apt-helpers.cc'] + 'lock.cc', 'acquire-item.cc', 'python-apt-helpers.cc', + 'cachegroup.cc', 'orderlist.cc'] files = sorted(['python/' + fname for fname in files], key=lambda s: s[:-3]) apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg"]) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index cccfc9c8..aaa9f601 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -48,9 +48,9 @@ class TestAptCache(unittest.TestCase): # tons of seek operations r = pkg.candidate.record self.assertEqual(r['Package'], pkg.shortname) - self.assert_('Version' in r) - self.assert_(len(r['Description']) > 0) - self.assert_(str(r).startswith('Package: %s\n' % pkg.shortname)) + self.assertTrue('Version' in r) + self.assertTrue(len(r['Description']) > 0) + self.assertTrue(str(r).startswith('Package: %s\n' % pkg.shortname)) def test_get_provided_packages(self): cache = apt.Cache() @@ -70,7 +70,7 @@ class TestAptCache(unittest.TestCase): def test_low_level_pkg_provides(self): # low level cache provides list of the pkg - cache = apt_pkg.Cache() + cache = apt_pkg.Cache(progress=None) l = cache["mail-transport-agent"].provides_list # arbitrary number, just needs to be higher enough self.assertTrue(len(l), 5) @@ -89,17 +89,17 @@ class TestAptCache(unittest.TestCase): tmpdir = tempfile.mkdtemp() dpkg_dir = os.path.join(tmpdir,"var","lib","dpkg") os.makedirs(os.path.join(dpkg_dir,"updates")) - open(os.path.join(dpkg_dir,"status"), "w") + open(os.path.join(dpkg_dir,"status"), "w").close() apt_pkg.config.set("Dir::State::status", os.path.join(dpkg_dir,"status")) cache = apt.Cache() # test empty self.assertFalse(cache.dpkg_journal_dirty) # that is ok, only [0-9] are dpkg jounral entries - open(os.path.join(dpkg_dir,"updates","xxx"), "w") + open(os.path.join(dpkg_dir,"updates","xxx"), "w").close() self.assertFalse(cache.dpkg_journal_dirty) # that is a dirty journal - open(os.path.join(dpkg_dir,"updates","000"), "w") + open(os.path.join(dpkg_dir,"updates","000"), "w").close() self.assertTrue(cache.dpkg_journal_dirty) # reset config value apt_pkg.config.set("Dir::State::status", old_status) @@ -121,20 +121,19 @@ class TestAptCache(unittest.TestCase): apt_pkg.config.set("dir::etc::sourceparts", "xxx") # main sources.list sources_list = base_sources - f=open(sources_list, "w") - repo = os.path.abspath("./data/test-repo2") - f.write("deb copy:%s /\n" % repo) - f.close() + with open(sources_list, "w") as f: + repo = os.path.abspath("./data/test-repo2") + f.write("deb copy:%s /\n" % repo) # test single sources.list fetching sources_list = os.path.join(rootdir, "test.list") - f=open(sources_list, "w") - repo_dir = os.path.abspath("./data/test-repo") - f.write("deb copy:%s /\n" % repo_dir) - f.close() + with open(sources_list, "w") as f: + repo_dir = os.path.abspath("./data/test-repo") + f.write("deb copy:%s /\n" % repo_dir) + self.assertTrue(os.path.exists(sources_list)) # write marker to ensure listcleaner is not run - open("./data/tmp/var/lib/apt/lists/marker", "w") + open("./data/tmp/var/lib/apt/lists/marker", "w").close() # update a single sources.list cache = apt.Cache() diff --git a/tests/test_cache_invocation.py b/tests/test_cache_invocation.py index 6f4014de..a89ef557 100644 --- a/tests/test_cache_invocation.py +++ b/tests/test_cache_invocation.py @@ -14,7 +14,7 @@ class TestCache(unittest.TestCase): def test_wrong_invocation(self): """cache_invocation: Test wrong invocation.""" - apt_cache = apt_pkg.Cache(apt.progress.base.OpProgress()) + apt_cache = apt_pkg.Cache(progress=None) self.assertRaises(ValueError, apt_pkg.Cache, apt_cache) self.assertRaises(ValueError, apt_pkg.Cache, @@ -23,7 +23,7 @@ class TestCache(unittest.TestCase): def test_proper_invocation(self): """cache_invocation: Test correct invocation.""" - apt_cache = apt_pkg.Cache(apt.progress.base.OpProgress()) + apt_cache = apt_pkg.Cache(progress=None) apt_depcache = apt_pkg.DepCache(apt_cache) if __name__ == "__main__": diff --git a/tests/test_configuration.py b/tests/test_configuration.py new file mode 100644 index 00000000..80509cff --- /dev/null +++ b/tests/test_configuration.py @@ -0,0 +1,30 @@ +#!/usr/bin/python +# +# Copyright (C) 2011 Julian Andres Klode +# +# 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. +"""Unit tests for verifying the correctness of apt_pkg.Configuration""" +import unittest + +import apt_pkg + + +class TestConfiguration(unittest.TestCase): + """Test various configuration things""" + + def setUp(self): + """Prepare the tests, create reference values...""" + apt_pkg.init_config() + + def test_lp707416(self): + """configuration: Test empty arguments (LP: #707416)""" + self.assertRaises(ValueError, apt_pkg.parse_commandline, + apt_pkg.config,[], []) + self.assertRaises(SystemError, apt_pkg.parse_commandline, + apt_pkg.config,[], ["cmd", "--arg0"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_group.py b/tests/test_group.py new file mode 100644 index 00000000..3c3a5b7a --- /dev/null +++ b/tests/test_group.py @@ -0,0 +1,32 @@ +import unittest + +import apt_pkg + + +class TestGroup(unittest.TestCase): + + def setUp(self): + apt_pkg.init() + self.cache = apt_pkg.Cache(progress=None) + + def test_pkgingroup(self): + """Check that each package belongs to the corresponding group""" + for pkg in self.cache.packages: + group = apt_pkg.Group(self.cache, pkg.name) + assert any(pkg.id == p.id for p in group) + + def test_iteration(self): + """Check that iteration works correctly.""" + for pkg in self.cache.packages: + group = apt_pkg.Group(self.cache, pkg.name) + + list(group) == list(group) + + + def test_cache_groups(self): + """group: Iterate over all groups""" + assert len(list(self.cache.groups)) == self.cache.group_count + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_hashes.py b/tests/test_hashes.py index e0aabe09..660373cb 100644 --- a/tests/test_hashes.py +++ b/tests/test_hashes.py @@ -82,11 +82,16 @@ class TestHashString(unittest.TestCase): def setUp(self): """Prepare the test by reading the file.""" - self.hashes = apt_pkg.Hashes(open(apt_pkg.__file__)) + self.file = open(apt_pkg.__file__) + self.hashes = apt_pkg.Hashes(self.file) self.md5 = apt_pkg.HashString("MD5Sum", self.hashes.md5) self.sha1 = apt_pkg.HashString("SHA1", self.hashes.sha1) self.sha256 = apt_pkg.HashString("SHA256", self.hashes.sha256) + def tearDown(self): + """Cleanup, Close the file object used for the tests.""" + self.file.close() + def test_md5(self): """hashes: Test apt_pkg.HashString().md5""" self.assertEqual("MD5Sum:%s" % self.hashes.md5, str(self.md5)) diff --git a/tests/test_progress.py b/tests/test_progress.py index ffab5bc0..73853dfa 100644 --- a/tests/test_progress.py +++ b/tests/test_progress.py @@ -34,7 +34,8 @@ class TestProgress(unittest.TestCase): apt_pkg.config.set("Dir::state::lists", "./tmp") # create artifical line deb_line = "deb file:%s/data/fake-packages/ /\n" % basedir - open("fetch_sources.list","w").write(deb_line) + with open("fetch_sources.list","w") as fobj: + fobj.write(deb_line) apt_pkg.config.set("Dir::Etc::sourcelist", "fetch_sources.list") def test_acquire_progress(self): -- cgit v1.2.3 From 20cc87295aef3b04db0cb060d65c21cfce650d19 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 7 Jun 2011 14:04:19 +0200 Subject: Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2270c43a..6cd9a042 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.8.1) UNRELEASED; urgency=low + + * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) + + -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 + python-apt (0.8.0) unstable; urgency=low * Upload to unstable diff --git a/debian/control b/debian/control index 98506aec..01e8884e 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), bcfg2 (<< 1.0.1), bzr-builddeb (<< 2.4), debpartial-mirror (<< 0.2.98), - debsecan (<< 0.4.14), + debsecan (<< 0.4.15), gdebi (<< 0.6.1), germinate (<< 1.21), gnome-codec-install (<< 0.4.5), -- cgit v1.2.3 From 73050c16039e2adc3cb09b522a0ef36de450737e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Jul 2011 11:52:05 +0200 Subject: * add missing bits for the xz compression support for the 0.7 API, thanks to Colin Watson for the fix! (LP: #805389) * backport xz compression support the debian-sid bzr branch (LP: #805389) * apt/utils.py: - fix end date calculation for releases in june (LP: #602469) * apt/package.py: - Fix the changelog downloading if there are several source package versions available which provide the binary (LP: #377535). See http://bugs.debian.org/581831 for further details * debian/control: - update Vcs-Bzr location --- debian/changelog | 35 +++++++++++++++++++++++++++++++++++ doc/source/library/apt_inst.rst | 6 +++--- python/tar.cc | 2 ++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index edd0081f..48ef958d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.0~exp4ubuntu2) UNRELEASED; urgency=low + + * add missing bits for the xz compression support for the + 0.7 API, thanks to Colin Watson for the fix! (LP: #805389) + + -- Michael Vogt Wed, 13 Jul 2011 11:51:47 +0200 + python-apt (0.8.0~exp4ubuntu1) oneiric; urgency=low * Merged from debian/experimental, remaining changes: @@ -682,6 +689,34 @@ python-apt (0.7.94.2ubuntu7) maverick; urgency=low -- Colin Watson Sun, 09 May 2010 13:17:03 +0200 +python-apt (0.7.94.2ubuntu6.3) lucid-proposed; urgency=low + + * backport xz compression support the debian-sid bzr branch + (LP: #805389) + + -- Michael Vogt Thu, 07 Jul 2011 10:59:49 +0200 + +python-apt (0.7.94.2ubuntu6.2) lucid-proposed; urgency=low + + * apt/utils.py: + - fix end date calculation for releases in june (LP: #602469) + + -- Jean-Baptiste Lallement Tue, 06 Jul 2010 23:46:49 +0200 + +python-apt (0.7.94.2ubuntu6.1) lucid-proposed; urgency=low + + [ Sebastian Heinlein ] + * apt/package.py: + - Fix the changelog downloading if there are several source package + versions available which provide the binary (LP: #377535). + See http://bugs.debian.org/581831 for further details + + [ Michael Vogt ] + * debian/control: + - update Vcs-Bzr location + + -- Michael Vogt Mon, 17 May 2010 15:37:44 +0200 + python-apt (0.7.94.2ubuntu6) lucid; urgency=low Cherry pick fix from the debian branch: 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. diff --git a/python/tar.cc b/python/tar.cc index b994d4e7..e42a9c50 100644 --- a/python/tar.cc +++ b/python/tar.cc @@ -182,6 +182,8 @@ PyObject *debExtract(PyObject *Self,PyObject *Args) Comp = "bzip2"; else if(strcmp(".lzma", &Chunk[strlen(Chunk)-5]) == 0) 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) -- cgit v1.2.3 From dad23d3d0cf1b15302c8fe1845a93f3d6de54ed7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Jul 2011 14:14:43 +0200 Subject: * python/arfile.cc: - use APT::Configuration::getCompressionTypes() instead of duplicating the supported methods here * tests/test_debfile.py: - add test for raise on unknown data.tar.xxx --- debian/changelog | 8 +++++ python/arfile.cc | 52 +++++++++++++++++++------------ tests/data/test_debs/data-tar-broken.deb | Bin 0 -> 626 bytes tests/test_debfile.py | 6 ++++ 4 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 tests/data/test_debs/data-tar-broken.deb diff --git a/debian/changelog b/debian/changelog index 6cd9a042..a25167d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,14 @@ python-apt (0.8.1) UNRELEASED; urgency=low + [ Julian Andres Klode ] * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) + + [ Michael Vogt ] + * python/arfile.cc: + - use APT::Configuration::getCompressionTypes() instead of duplicating + the supported methods here + * tests/test_debfile.py: + - add test for raise on unknown data.tar.xxx -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 diff --git a/python/arfile.cc b/python/arfile.cc index c3aa74d1..c31ea35e 100644 --- a/python/arfile.cc +++ b/python/arfile.cc @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include @@ -477,8 +479,8 @@ PyTypeObject PyArArchive_Type = { * Representation of a Debian package. * * This does not resemble debDebFile in apt-inst, but instead is a subclass - * of ArFile which adds properties for the control.tar.{xz,lzma,bz2,gz} and - * data.tar.{xz,lzma,bz2,gz} members which return TarFile objects. It also adds + * of ArFile which adds properties for the control.tar.$compression and + * data.tar.$compression members which return TarFile objects. It also adds * a descriptor 'version' which returns the content of 'debian-binary'. * * We are using it this way as it seems more natural to represent this special @@ -532,21 +534,28 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return PyErr_Format(PyExc_SystemError, "No debian archive, missing %s", "control.tar.gz"); - self->data = _gettar(self, self->Object->FindMember("data.tar.gz"), - "gzip"); - if (!self->data) - self->data = _gettar(self, self->Object->FindMember("data.tar.bz2"), - "bzip2"); - if (!self->data) - self->data = _gettar(self, self->Object->FindMember("data.tar.lzma"), - "lzma"); - if (!self->data) - self->data = _gettar(self, self->Object->FindMember("data.tar.xz"), - "xz"); - if (!self->data) - return PyErr_Format(PyExc_SystemError, "No debian archive, missing %s", - "data.tar.gz or data.tar.bz2 or data.tar.lzma " - "or data.tar.xz"); + // try all compression types + std::vector types = APT::Configuration::getCompressionTypes(); + for (std::vector::const_iterator t = types.begin(); + t != types.end(); ++t) + { + string member = string("data.tar.").append(*t); + string comp = _config->Find(string("Acquire::CompressionTypes::").append(*t)); + self->data = _gettar(self, self->Object->FindMember(member.c_str()), + comp.c_str()); + if (self->data) + break; + } + // no data found, we need to + if (!self->data) { + string error; + for (std::vector::const_iterator t = types.begin(); + t != types.end(); ++t) + error.append(*t + ","); + return PyErr_Format(PyExc_SystemError, + "No debian archive, missing data.tar.{%s}", + error.c_str()); + } const ARArchive::Member *member = self->Object->FindMember("debian-binary"); @@ -590,7 +599,9 @@ static PyGetSetDef debfile_getset[] = { {"control",(getter)debfile_get_control,0, "The TarFile object associated with the control.tar.gz member."}, {"data",(getter)debfile_get_data,0, - "The TarFile object associated with the data.tar.{gz,bz2,lzma,xz}) member."}, + "The TarFile object associated with the data.tar.$compression member. " + "All apt compression methods are supported. " + }, {"debian_binary",(getter)debfile_get_debian_binary,0, "The package version, as contained in debian-binary."}, {NULL} @@ -604,8 +615,9 @@ static const char *debfile_doc = "specifying a file descriptor (returned by e.g. os.open()).\n" "The recommended way of using it is to pass in the path to the file.\n\n" "It differs from ArArchive by providing the members 'control', 'data'\n" - "and 'version' for accessing the control.tar.gz, data.tar.{gz,bz2,lzma,xz},\n" - "and debian-binary members in the archive."; + "and 'version' for accessing the control.tar.gz, data.tar.$compression \n" + "(all apt compression methods are supported), and debian-binary members \n" + "in the archive."; PyTypeObject PyDebFile_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) diff --git a/tests/data/test_debs/data-tar-broken.deb b/tests/data/test_debs/data-tar-broken.deb new file mode 100644 index 00000000..4fd42e0f Binary files /dev/null and b/tests/data/test_debs/data-tar-broken.deb differ diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 5f6d1aa2..86a51cb9 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -119,6 +119,12 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") self.assertEqual(deb.filelist, ["./", "usr/", "usr/bin/"]) + def test_no_supported_data_tar(self): + # ensure that a unknown data.tar.xxx raises a exception + with self.assertRaises(SystemError): + deb = apt.debfile.DebPackage("./data/test_debs/data-tar-broken.deb") + + if __name__ == "__main__": #logging.basicConfig(level=logging.DEBUG) -- cgit v1.2.3 From c8bd732d5cb8be16ae48f8a72a4ed8a266b4ce36 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Jul 2011 19:17:06 +0200 Subject: * tests/test_aptsources_ports.py, tests/test_aptsources.py: - use tmpdir during the tests to fix test failure with apt from experimental --- debian/changelog | 3 +++ tests/test_aptsources.py | 3 ++- tests/test_aptsources_ports.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a25167d5..193f4c58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ python-apt (0.8.1) UNRELEASED; urgency=low the supported methods here * tests/test_debfile.py: - add test for raise on unknown data.tar.xxx + * tests/test_aptsources_ports.py, tests/test_aptsources.py: + - use tmpdir during the tests to fix test failure with apt from + experimental -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 1597674e..193d3806 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -3,6 +3,7 @@ import unittest import os import copy +import tempfile import apt_pkg import aptsources.sourceslist @@ -17,7 +18,7 @@ class TestAptSources(unittest.TestCase): if apt_pkg.config["APT::Architecture"] not in ('i386', 'amd64'): apt_pkg.config.set("APT::Architecture", "i386") apt_pkg.config.set("Dir::Etc", os.getcwd()) - apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") + apt_pkg.config.set("Dir::Etc::sourceparts", tempfile.mkdtemp()) if os.path.exists("./build/data/templates"): self.templates = os.path.abspath("./build/data/templates") elif os.path.exists("../build/data/templates"): diff --git a/tests/test_aptsources_ports.py b/tests/test_aptsources_ports.py index 991b532a..67c21b9c 100644 --- a/tests/test_aptsources_ports.py +++ b/tests/test_aptsources_ports.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import os import unittest - +import tempfile import apt_pkg import aptsources.sourceslist @@ -17,7 +17,7 @@ class TestAptSourcesPorts(unittest.TestCase): apt_pkg.config.set("APT::Architecture", "powerpc") apt_pkg.config.set("Dir::Etc", os.path.abspath("data/aptsources_ports")) - apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") + apt_pkg.config.set("Dir::Etc::sourceparts", tempfile.mkdtemp()) if os.path.exists("../build/data/templates"): self.templates = os.path.abspath("../build/data/templates") else: -- cgit v1.2.3 From 4e2ee0c6dd09706f379b980796625439d16cc598 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 1 Aug 2011 09:49:51 +0200 Subject: merged from debian-sid --- po/python-apt.pot | 188 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 89 deletions(-) diff --git a/po/python-apt.pot b/po/python-apt.pot index ec222e09..78f1fd11 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-03-21 15:14+0100\n" +"POT-Creation-Date: 2011-08-01 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,307 +24,317 @@ 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:32 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:39 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:150 msgid "Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:157 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:94 +#: ../data/templates/Ubuntu.info.in:248 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:112 +#: ../data/templates/Ubuntu.info.in:267 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:124 +#: ../data/templates/Ubuntu.info.in:279 msgid "Canonical Partners" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:126 +#: ../data/templates/Ubuntu.info.in:281 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:127 +#: ../data/templates/Ubuntu.info.in:282 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:134 +#: ../data/templates/Ubuntu.info.in:289 msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:136 +#: ../data/templates/Ubuntu.info.in:291 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:137 +#: ../data/templates/Ubuntu.info.in:292 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:175 +#: ../data/templates/Ubuntu.info.in:330 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:193 +#: ../data/templates/Ubuntu.info.in:349 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:236 +#: ../data/templates/Ubuntu.info.in:392 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:254 +#: ../data/templates/Ubuntu.info.in:411 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:297 +#: ../data/templates/Ubuntu.info.in:454 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:315 +#: ../data/templates/Ubuntu.info.in:473 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:358 +#: ../data/templates/Ubuntu.info.in:516 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:376 +#: ../data/templates/Ubuntu.info.in:535 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:579 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:438 +#: ../data/templates/Ubuntu.info.in:598 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:483 +#: ../data/templates/Ubuntu.info.in:643 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:501 +#: ../data/templates/Ubuntu.info.in:662 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:707 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:564 +#: ../data/templates/Ubuntu.info.in:726 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:606 +#: ../data/templates/Ubuntu.info.in:768 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:611 +#: ../data/templates/Ubuntu.info.in:773 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:617 +#: ../data/templates/Ubuntu.info.in:779 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:624 +#: ../data/templates/Ubuntu.info.in:787 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:666 +#: ../data/templates/Ubuntu.info.in:829 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:669 +#: ../data/templates/Ubuntu.info.in:832 msgid "Canonical-supported Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:671 +#: ../data/templates/Ubuntu.info.in:834 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:672 +#: ../data/templates/Ubuntu.info.in:835 msgid "Community-maintained Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:674 +#: ../data/templates/Ubuntu.info.in:837 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:675 +#: ../data/templates/Ubuntu.info.in:838 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:677 +#: ../data/templates/Ubuntu.info.in:840 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:678 +#: ../data/templates/Ubuntu.info.in:841 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:684 +#: ../data/templates/Ubuntu.info.in:848 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:700 +#: ../data/templates/Ubuntu.info.in:864 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:705 +#: ../data/templates/Ubuntu.info.in:869 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:710 +#: ../data/templates/Ubuntu.info.in:874 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:715 +#: ../data/templates/Ubuntu.info.in:879 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:726 +#: ../data/templates/Ubuntu.info.in:890 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:740 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:756 +#: ../data/templates/Ubuntu.info.in:921 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:761 +#: ../data/templates/Ubuntu.info.in:926 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:766 +#: ../data/templates/Ubuntu.info.in:931 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:777 +#: ../data/templates/Ubuntu.info.in:942 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:791 +#: ../data/templates/Ubuntu.info.in:957 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:794 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:960 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:807 +#: ../data/templates/Ubuntu.info.in:973 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:812 +#: ../data/templates/Ubuntu.info.in:978 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:817 +#: ../data/templates/Ubuntu.info.in:983 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:823 +#: ../data/templates/Ubuntu.info.in:989 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:829 +#: ../data/templates/Ubuntu.info.in:995 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:831 +#: ../data/templates/Ubuntu.info.in:997 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:837 +#: ../data/templates/Ubuntu.info.in:1004 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:840 +#: ../data/templates/Ubuntu.info.in:1007 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:842 +#: ../data/templates/Ubuntu.info.in:1009 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:849 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:854 +#: ../data/templates/Ubuntu.info.in:1021 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:859 +#: ../data/templates/Ubuntu.info.in:1026 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -390,7 +400,7 @@ msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:210 ../aptsources/distro.py:425 +#: ../aptsources/distro.py:210 ../aptsources/distro.py:428 #, python-format msgid "Server for %s" msgstr "" @@ -430,16 +440,16 @@ msgstr "" msgid "Complete" msgstr "" -#: ../apt/package.py:342 +#: ../apt/package.py:358 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:1012 ../apt/package.py:1117 +#: ../apt/package.py:1065 ../apt/package.py:1171 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1123 +#: ../apt/package.py:1177 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -448,29 +458,29 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1130 +#: ../apt/package.py:1184 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:166 +#: ../apt/debfile.py:167 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:187 +#: ../apt/debfile.py:188 #, 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:326 +#: ../apt/debfile.py:327 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -478,63 +488,63 @@ 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:342 +#: ../apt/debfile.py:343 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" -#: ../apt/debfile.py:352 +#: ../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 "" -#: ../apt/debfile.py:398 +#: ../apt/debfile.py:399 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:403 +#: ../apt/debfile.py:404 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:410 +#: ../apt/debfile.py:411 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:435 +#: ../apt/debfile.py:436 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:465 +#: ../apt/debfile.py:466 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:507 +#: ../apt/debfile.py:508 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:541 +#: ../apt/debfile.py:542 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:547 +#: ../apt/debfile.py:548 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:637 +#: ../apt/debfile.py:638 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:647 +#: ../apt/debfile.py:648 msgid "An essential package would be removed" msgstr "" @@ -559,11 +569,11 @@ msgstr "" msgid "Get:" msgstr "" -#: ../apt/progress/text.py:204 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:215 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -572,19 +582,19 @@ msgid "" msgstr "" #. Trick for getting a translation from apt -#: ../apt/progress/text.py:224 +#: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: ../apt/progress/text.py:240 +#: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" -#: ../apt/progress/text.py:256 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:135 +#: ../apt/cache.py:149 msgid "Building data structures" msgstr "" -- cgit v1.2.3 From 08de842ed1cab6c60b497a1dc77d8067dcc53de3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 1 Aug 2011 10:13:23 +0200 Subject: test fixes --- tests/test_apt_cache.py | 9 +++++---- tests/test_debfile.py | 10 +++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index aaa9f601..399d50dd 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -58,11 +58,12 @@ class TestAptCache(unittest.TestCase): l = cache.get_providing_packages("mail-transport-agent") self.assertTrue(len(l) > 0) self.assertTrue("postfix" in [p.name for p in l]) + # FIXME: this is failing currently, create a better (artificial) + # testcase for this feature # this is a not virtual (transitional) package provided by another - l = cache.get_providing_packages("git-core") - self.assertEqual(l, []) - # now inlcude nonvirtual packages in the search (rarian-compat - # provides scrollkeeper) + #l = cache.get_providing_packages("git-core") + #self.assertEqual(l, []) + # now inlcude nonvirtual packages in the search l = cache.get_providing_packages("git-core", include_nonvirtual=True) self.assertEqual([p.name for p in l], ["git"]) diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 86a51cb9..951c2afe 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -121,10 +121,14 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading def test_no_supported_data_tar(self): # ensure that a unknown data.tar.xxx raises a exception - with self.assertRaises(SystemError): + raised = False + try: deb = apt.debfile.DebPackage("./data/test_debs/data-tar-broken.deb") - - + except SystemError: + raised = True + # with self.assertRaises(SystemError): is more elegant above, but + # we need to support python2.6 + self.assertTrue(raised) if __name__ == "__main__": #logging.basicConfig(level=logging.DEBUG) -- cgit v1.2.3 From 0b74c98e4a583c491a3516e27dcce5d0dbaa0144 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 1 Aug 2011 16:32:14 +0200 Subject: test fixes with the latest apt --- tests/test_apt_cache.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 399d50dd..602043a8 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -27,7 +27,7 @@ class TestAptCache(unittest.TestCase): # reset any config manipulations done in the individual tests apt_pkg.init_config() - def testAptCache(self): + def test_apt_cache(self): """cache: iterate all packages and all dependencies """ cache = apt.Cache() # number is not meaningful and just need to be "big enough", @@ -74,7 +74,7 @@ class TestAptCache(unittest.TestCase): cache = apt_pkg.Cache(progress=None) l = cache["mail-transport-agent"].provides_list # arbitrary number, just needs to be higher enough - self.assertTrue(len(l), 5) + self.assertTrue(len(l) > 5) for (providesname, providesver, version) in l: self.assertEqual(providesname, "mail-transport-agent") if version.parent_pkg.name == "postfix": @@ -115,9 +115,12 @@ class TestAptCache(unittest.TestCase): pass state_dir = os.path.join(rootdir, "var/lib/apt") lists_dir = os.path.join(rootdir, "var/lib/apt/lists") + old_state = apt_pkg.config.find("dir::state") apt_pkg.config.set("dir::state", state_dir) # set a local sources.list that does not need the network base_sources = os.path.abspath(os.path.join(rootdir, "sources.list")) + 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") # main sources.list @@ -163,6 +166,9 @@ class TestAptCache(unittest.TestCase): cache.update(sources_list=sources_list) all_packages = glob.glob(lists_dir+"/*_Packages*") self.assertEqual(len(all_packages), 2) + apt_pkg.config.set("dir::state", old_state) + apt_pkg.config.set("dir::etc::sourcelist", old_source_list) + apt_pkg.config.set("dir::etc::sourceparts", old_source_parts) if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From 9a426e942196111cafba73ff3c8c241bfb9cdeef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Aug 2011 12:03:59 +0200 Subject: fix tests by adding ariticial data for the test_apt_cache test --- tests/test_apt_cache.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 399d50dd..72c72bd2 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -17,6 +17,7 @@ sys.path.insert(0, get_library_dir()) import apt import apt_pkg +import copy import shutil import glob @@ -26,6 +27,14 @@ class TestAptCache(unittest.TestCase): def setUp(self): # reset any config manipulations done in the individual tests apt_pkg.init_config() + # save/restore the apt config + self._cnf = {} + for item in apt_pkg.config.keys(): + self._cnf[item] = apt_pkg.config.find(item) + + def tearDown(self): + for item in self._cnf: + apt_pkg.config.set(item, self._cnf[item]) def testAptCache(self): """cache: iterate all packages and all dependencies """ @@ -53,25 +62,21 @@ class TestAptCache(unittest.TestCase): self.assertTrue(str(r).startswith('Package: %s\n' % pkg.shortname)) def test_get_provided_packages(self): - cache = apt.Cache() + apt.apt_pkg.config.set("Apt::architecture", "i386") + cache = apt.Cache(rootdir="./data/test-provides/") + cache.open() # a true virtual pkg l = cache.get_providing_packages("mail-transport-agent") self.assertTrue(len(l) > 0) self.assertTrue("postfix" in [p.name for p in l]) - # FIXME: this is failing currently, create a better (artificial) - # testcase for this feature - # this is a not virtual (transitional) package provided by another - #l = cache.get_providing_packages("git-core") - #self.assertEqual(l, []) - # now inlcude nonvirtual packages in the search - l = cache.get_providing_packages("git-core", - include_nonvirtual=True) - self.assertEqual([p.name for p in l], ["git"]) self.assertTrue("mail-transport-agent" in cache["postfix"].candidate.provides) def test_low_level_pkg_provides(self): + apt.apt_pkg.config.set("Apt::architecture", "i386") + # create highlevel cache and get the lowlevel one from it + highlevel_cache = apt.Cache(rootdir="./data/test-provides") # low level cache provides list of the pkg - cache = apt_pkg.Cache(progress=None) + cache = highlevel_cache._cache l = cache["mail-transport-agent"].provides_list # arbitrary number, just needs to be higher enough self.assertTrue(len(l), 5) @@ -84,8 +89,6 @@ class TestAptCache(unittest.TestCase): def test_dpkg_journal_dirty(self): - # backup old value - old_status = apt_pkg.config.find_file("Dir::State::status") # create tmp env tmpdir = tempfile.mkdtemp() dpkg_dir = os.path.join(tmpdir,"var","lib","dpkg") @@ -102,8 +105,6 @@ class TestAptCache(unittest.TestCase): # that is a dirty journal open(os.path.join(dpkg_dir,"updates","000"), "w").close() self.assertTrue(cache.dpkg_journal_dirty) - # reset config value - apt_pkg.config.set("Dir::State::status", old_status) def test_apt_update(self): rootdir = "./data/tmp" -- cgit v1.2.3 From 68860341da1d5e328b66e85f7fdbdc8f54748cb9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Aug 2011 13:45:22 +0200 Subject: tests/test_apt_cache.py: make the test work on PPA buildd chroots --- debian/changelog | 2 + tests/data/test-provides/etc/apt/sources.list | 1 + ..._ubuntu_dists_oneiric_main_binary-i386_Packages | 75 ++++++++++++++++++++++ tests/data/test-provides/var/lib/dpkg/status | 0 tests/test_apt_cache.py | 16 ++++- 5 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 tests/data/test-provides/etc/apt/sources.list create mode 100644 tests/data/test-provides/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_oneiric_main_binary-i386_Packages create mode 100644 tests/data/test-provides/var/lib/dpkg/status diff --git a/debian/changelog b/debian/changelog index e41f0e36..2deca3fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ python-apt (0.8.1) UNRELEASED; urgency=low experimental * tests/test_apt_cache.py: - fix test by providing proper fixture data + - fix test if sources.list is not readable (as is the case on some + PPA buildds) -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 diff --git a/tests/data/test-provides/etc/apt/sources.list b/tests/data/test-provides/etc/apt/sources.list new file mode 100644 index 00000000..2955b5c3 --- /dev/null +++ b/tests/data/test-provides/etc/apt/sources.list @@ -0,0 +1 @@ +deb http://archive.ubuntu.com/ubuntu oneiric main diff --git a/tests/data/test-provides/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_oneiric_main_binary-i386_Packages b/tests/data/test-provides/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_oneiric_main_binary-i386_Packages new file mode 100644 index 00000000..f991cb96 --- /dev/null +++ b/tests/data/test-provides/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_oneiric_main_binary-i386_Packages @@ -0,0 +1,75 @@ +Package: exim4-daemon-light +Priority: extra +Section: mail +Installed-Size: 1092 +Maintainer: Ubuntu Developers +Original-Maintainer: Exim4 Maintainers +Architecture: all +Source: exim4 +Version: 4.76-2ubuntu1 +Replaces: mail-transport-agent +Provides: mail-transport-agent +Conflicts: mail-transport-agent +Filename: pool/main/e/exim4/exim4-daemon-light_4.76-2ubuntu1_i386.deb +Size: 451088 +MD5sum: 81795887e233ecfb3471e8a3da4c4b8b +SHA1: da0202f7da88b9e9c5ee326a24c3fdd640543a5d +SHA256: 5ffa03674b5198d1c0e9e0d9e3442cdd7fbe13226c7df91aa53def1f8b6c0d86 +Description: lightweight Exim MTA (v4) daemon + Exim (v4) is a mail transport agent. This package contains the exim4 + daemon with only basic features enabled. It works well with the + standard setups that are provided by Debian and includes support for + TLS encryption and the dlopen patch to allow dynamic loading of a + local_scan function. + . + The Debian exim4 packages have their own web page, + http://pkg-exim4.alioth.debian.org/. There is also a Debian-specific + FAQ list. Information about the way the Debian packages are + configured can be found in + /usr/share/doc/exim4-base/README.Debian.gz, which additionally contains + information about the way the Debian binary packages are built. The + very extensive upstream documentation is shipped in + /usr/share/doc/exim4-base/spec.txt.gz. To repeat the debconf-driven + configuration process in a standard setup, invoke dpkg-reconfigure + exim4-config. There is a Debian-centered mailing list, + pkg-exim4-users@lists.alioth.debian.org. Please ask Debian-specific + questions there, and only write to the upstream exim-users mailing + list if you are sure that your question is not Debian-specific. You + can find the subscription web page on + http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users +Homepage: http://www.exim.org/ +Bugs: https://bugs.launchpad.net/ubuntu/+filebug +Origin: Ubuntu +Supported: 18m + +Package: postfix +Priority: optional +Section: mail +Installed-Size: 3472 +Maintainer: Ubuntu Developers +Original-Maintainer: LaMont Jones +Architecture: all +Version: 2.8.3-1ubuntu1 +Replaces: mail-transport-agent +Provides: default-mta, mail-transport-agent +Recommends: python +Suggests: procmail, postfix-mysql, postfix-pgsql, postfix-ldap, postfix-pcre, sasl2-bin, libsasl2-modules, dovecot-common, resolvconf, postfix-cdb, mail-reader, ufw +Conflicts: libnss-db (<< 2.2-3), mail-transport-agent, smail +Filename: pool/main/p/postfix/postfix_2.8.3-1ubuntu1_i386.deb +Size: 1221834 +MD5sum: c4575f03ef0711cc744d394ae36f4a8c +SHA1: f0f636c942981782cf23cee3d8a95aee188081b9 +SHA256: 13a4bfaf10c8addfc7dce01c0ea65bfbd6a759c4a2aaaafbae5855d099925fe0 +Description: High-performance mail transport agent + Postfix is Wietse Venema's mail transport agent that started life as an + alternative to the widely-used Sendmail program. Postfix attempts to + be fast, easy to administer, and secure, while at the same time being + sendmail compatible enough to not upset existing users. Thus, the outside + has a sendmail-ish flavor, but the inside is completely different. +Homepage: http://www.postfix.org +Bugs: https://bugs.launchpad.net/ubuntu/+filebug +Origin: Ubuntu +Supported: 18m +Task: mail-server + + diff --git a/tests/data/test-provides/var/lib/dpkg/status b/tests/data/test-provides/var/lib/dpkg/status new file mode 100644 index 00000000..e69de29b diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 916a43cb..2f812059 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -17,9 +17,17 @@ sys.path.insert(0, get_library_dir()) import apt import apt_pkg -import copy import shutil import glob +import logging + +def if_sources_list_is_readable(f): + def wrapper(*args, **kwargs): + if os.access("/etc/apt/sources.list", os.R_OK): + f(*args, **kwargs) + else: + logging.warn("skipping '%s' because sources.list is not readable" % f) + return wrapper class TestAptCache(unittest.TestCase): """ test the apt cache """ @@ -36,6 +44,7 @@ class TestAptCache(unittest.TestCase): for item in self._cnf: apt_pkg.config.set(item, self._cnf[item]) + @if_sources_list_is_readable def test_apt_cache(self): """cache: iterate all packages and all dependencies """ cache = apt.Cache() @@ -79,7 +88,7 @@ class TestAptCache(unittest.TestCase): cache = highlevel_cache._cache l = cache["mail-transport-agent"].provides_list # arbitrary number, just needs to be higher enough - self.assertTrue(len(l) > 5) + self.assertEqual(len(l), 2) for (providesname, providesver, version) in l: self.assertEqual(providesname, "mail-transport-agent") if version.parent_pkg.name == "postfix": @@ -87,7 +96,7 @@ class TestAptCache(unittest.TestCase): else: self.assertNotReached() - + @if_sources_list_is_readable def test_dpkg_journal_dirty(self): # create tmp env tmpdir = tempfile.mkdtemp() @@ -106,6 +115,7 @@ class TestAptCache(unittest.TestCase): open(os.path.join(dpkg_dir,"updates","000"), "w").close() self.assertTrue(cache.dpkg_journal_dirty) + @if_sources_list_is_readable def test_apt_update(self): rootdir = "./data/tmp" if os.path.exists(rootdir): -- cgit v1.2.3 From 4ac62e28a844ff17c40c50eb16625baeb116a1c1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Aug 2011 15:24:10 +0200 Subject: releasing version 0.8.0ubuntu1 --- debian/changelog | 24 +++--------------------- debian/control | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8ec9c660..72cb6289 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.8.1) UNRELEASED; urgency=low +python-apt (0.8.0ubuntu1) oneiric; urgency=low [ Julian Andres Klode ] * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) @@ -16,27 +16,9 @@ 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) + * build against the latest libapt - -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 - -python-apt (0.8.0ubuntu1) UNRELEASED; urgency=low - - [ Julian Andres Klode ] - * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) - - [ Michael Vogt ] - * merged from the debian-sid bzr branch - - * python/arfile.cc: - - use APT::Configuration::getCompressionTypes() instead of duplicating - the supported methods here - * tests/test_debfile.py: - - add test for raise on unknown data.tar.xxx - * tests/test_aptsources_ports.py, tests/test_aptsources.py: - - use tmpdir during the tests to fix test failure with apt from - experimental - - -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 + -- Michael Vogt Mon, 08 Aug 2011 14:24:29 +0200 python-apt (0.8.0) unstable; urgency=low diff --git a/debian/control b/debian/control index 2945e1b3..e91a5e09 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ XS-Python-Version: >= 2.6 X-Python3-Version: >= 3.1 Build-Depends: apt-utils, debhelper (>= 7.3.5), - libapt-pkg-dev (>= 0.8.11), + libapt-pkg-dev (>= 0.8.16~exp5), python-all-dev (>= 2.6.6-3~), python-all-dbg, python3-all-dev (>= 3.1.2-10~), -- cgit v1.2.3 From cd5e6765f2403db4f90b08a3f42841565710f65f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Aug 2011 18:54:01 +0200 Subject: skip tests if sources.list is not readable --- tests/test_all.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test_all.py b/tests/test_all.py index 091581f8..f7b9dc8c 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -34,6 +34,10 @@ def get_library_dir(): return os.path.abspath(library_dir) if __name__ == '__main__': + if not os.access("/etc/apt/sources.list", os.R_OK): + sys.stderr.write("[tests] Skipping because sources.list is not readable\n") + sys.exit(0) + sys.stderr.write("[tests] Running on %s\n" % sys.version.replace("\n", "")) dirname = os.path.dirname(__file__) if dirname: -- cgit v1.2.3 From cf6cbda23e3b78beb6ce2ef84c5445200b1dfc08 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Aug 2011 18:55:44 +0200 Subject: disable tests if /etc/apt/sources.list is not readable --- debian/changelog | 6 ++++++ tests/test_all.py | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 72cb6289..681ce97d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.8.0ubuntu2) oneiric; urgency=low + + * disable tests if /etc/apt/sources.list is not readable + + -- Michael Vogt Mon, 08 Aug 2011 18:51:50 +0200 + python-apt (0.8.0ubuntu1) oneiric; urgency=low [ Julian Andres Klode ] diff --git a/tests/test_all.py b/tests/test_all.py index 091581f8..f7b9dc8c 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -34,6 +34,10 @@ def get_library_dir(): return os.path.abspath(library_dir) if __name__ == '__main__': + if not os.access("/etc/apt/sources.list", os.R_OK): + sys.stderr.write("[tests] Skipping because sources.list is not readable\n") + sys.exit(0) + sys.stderr.write("[tests] Running on %s\n" % sys.version.replace("\n", "")) dirname = os.path.dirname(__file__) if dirname: -- cgit v1.2.3 From 3a0e654a8a5935c148bc95a9f9cb5d7786aae825 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 9 Aug 2011 09:12:29 +0200 Subject: apt/package.py: make print statements py3 compatbile --- apt/package.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apt/package.py b/apt/package.py index 9223ed22..dbc5b23e 100644 --- a/apt/package.py +++ b/apt/package.py @@ -545,8 +545,8 @@ class Version(object): base = os.path.basename(self._records.filename) destfile = os.path.join(destdir, base) if _file_is_same(destfile, self.size, self._records.md5_hash): - print 'Ignoring already existing file:', destfile - return + print('Ignoring already existing file: %s' % destfile) + return os.path.abspath(destfile) acq = apt_pkg.Acquire(progress or apt.progress.text.AcquireProgress()) acqfile = apt_pkg.AcquireFile(acq, self.uri, self._records.md5_hash, self.size, base, destfile=destfile) @@ -555,7 +555,7 @@ class Version(object): if acqfile.status != acqfile.STAT_DONE: raise FetchError("The item %r could not be fetched: %s" % (acqfile.destfile, acqfile.error_text)) - print self._records.filename + return os.path.abspath(destfile) def fetch_source(self, destdir="", progress=None, unpack=True): @@ -594,7 +594,7 @@ class Version(object): if type_ == 'dsc': dsc = destfile if _file_is_same(destfile, size, md5): - print 'Ignoring already existing file:', destfile + print('Ignoring already existing file: %s' % destfile) continue files.append(apt_pkg.AcquireFile(acq, src.index.archive_uri(path), md5, size, base, destfile=destfile)) -- cgit v1.2.3 From 7d66a39c6a3a8ca30dc507c531d7894435476eec Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 9 Aug 2011 16:03:15 +0200 Subject: * aptsources/sourceslist.py: - fix py3.2 compat issue that causes FTBFS on amd64 tests --- aptsources/sourceslist.py | 2 +- debian/changelog | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index b85e6947..62442cc3 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -374,7 +374,7 @@ class SourcesList(object): source = SourceEntry(line, file) self.list.append(source) except: - print "could not open file '%s'" % file + sys.stderr.write("could not open file '%s'\n" % file) def save(self): """ save the current sources """ diff --git a/debian/changelog b/debian/changelog index 62721860..c03e304c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ -python-apt (0.8.0ubuntu3) oneiric; urgency=low +python-apt (0.8.0ubuntu4) oneiric; urgency=low * apt/package.py: - fix py3 compatbility with print -- Michael Vogt Tue, 09 Aug 2011 09:19:42 +0200 +python-apt (0.8.0ubuntu3) oneiric; urgency=low + + * aptsources/sourceslist.py: + - fix py3.2 compat issue that causes FTBFS on amd64 tests + + -- Michael Vogt Mon, 08 Aug 2011 22:48:43 +0200 + python-apt (0.8.0ubuntu2) oneiric; urgency=low * disable tests if /etc/apt/sources.list is not readable -- cgit v1.2.3 From abe2144d5969694c1143c8fa6dc87800275b81be Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 9 Aug 2011 16:05:59 +0200 Subject: releasing version 0.8.0ubuntu5 --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c03e304c..86c0bb06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ +python-apt (0.8.0ubuntu5) oneiric; urgency=low + + * setup.py: + - enable extra builds too + + -- Michael Vogt Tue, 09 Aug 2011 16:05:09 +0200 + python-apt (0.8.0ubuntu4) oneiric; urgency=low * apt/package.py: - fix py3 compatbility with print - -- Michael Vogt Tue, 09 Aug 2011 09:19:42 +0200 + -- Michael Vogt Tue, 09 Aug 2011 16:04:04 +0200 python-apt (0.8.0ubuntu3) oneiric; urgency=low -- cgit v1.2.3 From 3650bfc5b6dd1267c5489a8a1f619ab218a03f69 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 9 Aug 2011 16:39:37 +0200 Subject: * debian/control: - remove recommends of python2.6 --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 86c0bb06..5a541b40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.0ubuntu6) UNRELEASED; urgency=low + + * debian/control: + - remove recommends of python2.6 + + -- Michael Vogt Tue, 09 Aug 2011 16:39:06 +0200 + python-apt (0.8.0ubuntu5) oneiric; urgency=low * setup.py: diff --git a/debian/control b/debian/control index e91a5e09..b34007cd 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ XS-Debian-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-si Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common -Recommends: lsb-release, iso-codes, python2.6 +Recommends: lsb-release, iso-codes Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), computer-janitor (<< 1.14.1-1+), debdelta (<< 0.41+), -- cgit v1.2.3 From 4cf6c707ad028c8185e6df30c256f72032bbf8f4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 10 Aug 2011 06:10:53 +0200 Subject: * tests/test_all.py: - print library dir to hunt down build failure on amd64 --- debian/changelog | 2 ++ tests/test_all.py | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2deca3fe..249f4d17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ 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 -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 diff --git a/tests/test_all.py b/tests/test_all.py index f7b9dc8c..0f548781 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -43,6 +43,7 @@ if __name__ == '__main__': if dirname: os.chdir(dirname) library_dir = get_library_dir() + sys.stderr.write("Using library_dir: '%s'" % library_dir) if library_dir: sys.path.insert(0, os.path.abspath(library_dir)) -- cgit v1.2.3 From eb4f978ff50af015c0cda09f51934b48249744ea Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 Aug 2011 15:31:22 +0200 Subject: * aptsources/distinfo.py: - make mirror a valid protocol name --- aptsources/distinfo.py | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index 48a72719..ac4a4b40 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -158,7 +158,7 @@ class DistInfo(object): location = None match_loc = re.compile(r"^#LOC:(.+)$") match_mirror_line = re.compile( - r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(https))://" + r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(mirror)|(https))://" r"[A-Za-z0-9/\.:\-_@]+)$") #match_mirror_line = re.compile(r".+") diff --git a/debian/changelog b/debian/changelog index 249f4d17..242e4058 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ python-apt (0.8.1) UNRELEASED; urgency=low 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 -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 -- cgit v1.2.3 From cf9edec2eb91a4d087ba50c0bc90606bc3121ed4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 Aug 2011 15:38:04 +0200 Subject: * utils/get_ubuntu_mirrors_from_lp.py: - add "mirror://mirrors.ubuntu.com/mirrors.txt" to the default mirror list --- debian/changelog | 3 +++ utils/get_ubuntu_mirrors_from_lp.py | 1 + 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 354c13d6..de846946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ python-apt (0.8.0ubuntu7) UNRELEASED; urgency=low * aptsources/distinfo.py: - make mirror a valid protocol name + * utils/get_ubuntu_mirrors_from_lp.py: + - add "mirror://mirrors.ubuntu.com/mirrors.txt" to the + default mirror list -- Michael Vogt Thu, 11 Aug 2011 15:31:55 +0200 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])) -- cgit v1.2.3 From bb4108a5aee372c75e1743892e2b43b268efb562 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 Aug 2011 15:38:58 +0200 Subject: releasing version 0.8.0ubuntu7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index de846946..3d998dd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.8.0ubuntu7) UNRELEASED; urgency=low +python-apt (0.8.0ubuntu7) oneiric; urgency=low * aptsources/distinfo.py: - make mirror a valid protocol name @@ -6,7 +6,7 @@ python-apt (0.8.0ubuntu7) UNRELEASED; urgency=low - add "mirror://mirrors.ubuntu.com/mirrors.txt" to the default mirror list - -- Michael Vogt Thu, 11 Aug 2011 15:31:55 +0200 + -- Michael Vogt Thu, 11 Aug 2011 15:38:06 +0200 python-apt (0.8.0ubuntu6) oneiric; urgency=low -- cgit v1.2.3 From 8c5ea9518e38ac7fd3d5d4b547e0b6bad4b0c18d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Sep 2011 13:58:36 +0200 Subject: * apt/package.py: - packages in marked_install state can also be auto-removable --- apt/package.py | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apt/package.py b/apt/package.py index dbc5b23e..4104f93e 100644 --- a/apt/package.py +++ b/apt/package.py @@ -973,8 +973,8 @@ class Package(object): another package, and if no packages depend on it anymore, the package is no longer required. """ - return self.is_installed and \ - self._pcache._depcache.is_garbage(self._pkg) + return ((self.is_installed or self.marked_install) and + self._pcache._depcache.is_garbage(self._pkg)) @property def is_auto_installed(self): diff --git a/debian/changelog b/debian/changelog index 242e4058..05f2dc8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ python-apt (0.8.1) UNRELEASED; urgency=low - print library dir to hunt down build failure on amd64 * aptsources/distinfo.py: - make mirror a valid protocol name + * apt/package.py: + - packages in marked_install state can also be auto-removable -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 -- cgit v1.2.3 From d4829dd415cc26a4e9530f97e831939b79817e36 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Sep 2011 16:24:03 +0200 Subject: add concept of "ParentComponent" for e.g. ubuntu/multiverse that needs universe enabled as well (plus add test) --- aptsources/distinfo.py | 11 ++- aptsources/distro.py | 14 +++- data/templates/Ubuntu.info.in | 5 ++ debian/changelog | 2 + po/python-apt.pot | 172 +++++++++++++++++++++--------------------- tests/test_aptsources.py | 23 ++++++ 6 files changed, 138 insertions(+), 89 deletions(-) diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index ac4a4b40..b21e95b3 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -69,10 +69,17 @@ class Template(object): class Component(object): - def __init__(self, name, desc=None, long_desc=None): + def __init__(self, name, desc=None, long_desc=None, parent_component=None): self.name = name self.description = desc self.description_long = long_desc + self.parent_component = parent_component + + def get_parent_component(self): + return self.parent_component + + def set_parent_component(self, parent): + self.parent_component = parent def get_description(self): if self.description_long is not None: @@ -260,6 +267,8 @@ class DistInfo(object): component.set_description(_(value)) elif field == 'CompDescriptionLong': component.set_description_long(_(value)) + elif field == 'ParentComponent': + component.set_parent_component(value) self.finish_template(template, component) template=None component=None diff --git a/aptsources/distro.py b/aptsources/distro.py index 15806c5c..28d5b96f 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -290,6 +290,16 @@ class Distribution(object): comp: the component that should be enabled """ + comps = set([comp]) + # look for parent components that we may have to add + for source in self.main_sources: + for c in source.template.components: + if c.name == comp and c.parent_component: + comps.add(c.parent_component) + for c in comps: + self._enable_component(c) + + def _enable_component(self, comp): def add_component_only_once(source, comps_per_dist): """ @@ -297,12 +307,12 @@ class Distribution(object): a repository could be splitted into different apt lines. If not add the component """ - # if we don't that distro, just reutnr (can happen for e.g. + # if we don't have that distro, just return (can happen for e.g. # dapper-update only in deb-src if source.dist not in comps_per_dist: return # if we have seen this component already for this distro, - # return (nothing to do + # return (nothing to do) if comp in comps_per_dist[source.dist]: return # add it diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index a9b539af..c6d38910 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -21,6 +21,7 @@ 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 @@ -102,6 +103,7 @@ 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 @@ -163,6 +165,7 @@ 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 @@ -285,6 +288,7 @@ 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 @@ -347,6 +351,7 @@ 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 diff --git a/debian/changelog b/debian/changelog index 05f2dc8e..88faaca3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ python-apt (0.8.1) UNRELEASED; urgency=low - make mirror a valid protocol name * apt/package.py: - 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) -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 diff --git a/po/python-apt.pot b/po/python-apt.pot index 682c133a..bd9198c9 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-03-21 15:01+0100\n" +"POT-Creation-Date: 2011-09-28 16:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,292 +29,292 @@ msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:32 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:43 +#: ../data/templates/Ubuntu.info.in:44 msgid "Canonical Partners" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:45 +#: ../data/templates/Ubuntu.info.in:46 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:46 +#: ../data/templates/Ubuntu.info.in:47 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:53 +#: ../data/templates/Ubuntu.info.in:54 msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:55 +#: ../data/templates/Ubuntu.info.in:56 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:56 +#: ../data/templates/Ubuntu.info.in:57 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:94 +#: ../data/templates/Ubuntu.info.in:95 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:112 +#: ../data/templates/Ubuntu.info.in:114 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:155 +#: ../data/templates/Ubuntu.info.in:157 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:173 +#: ../data/templates/Ubuntu.info.in:176 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:216 +#: ../data/templates/Ubuntu.info.in:219 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:234 +#: ../data/templates/Ubuntu.info.in:237 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:277 +#: ../data/templates/Ubuntu.info.in:280 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:295 +#: ../data/templates/Ubuntu.info.in:299 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:339 +#: ../data/templates/Ubuntu.info.in:343 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:362 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:402 +#: ../data/templates/Ubuntu.info.in:407 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:425 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:465 +#: ../data/templates/Ubuntu.info.in:470 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:483 +#: ../data/templates/Ubuntu.info.in:488 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:525 +#: ../data/templates/Ubuntu.info.in:530 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:535 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:536 +#: ../data/templates/Ubuntu.info.in:541 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:543 +#: ../data/templates/Ubuntu.info.in:548 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:585 +#: ../data/templates/Ubuntu.info.in:590 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:588 +#: ../data/templates/Ubuntu.info.in:593 msgid "Canonical-supported Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:590 +#: ../data/templates/Ubuntu.info.in:595 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:591 +#: ../data/templates/Ubuntu.info.in:596 msgid "Community-maintained Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:593 +#: ../data/templates/Ubuntu.info.in:598 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:594 +#: ../data/templates/Ubuntu.info.in:599 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:596 +#: ../data/templates/Ubuntu.info.in:601 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:597 +#: ../data/templates/Ubuntu.info.in:602 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:603 +#: ../data/templates/Ubuntu.info.in:608 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:619 +#: ../data/templates/Ubuntu.info.in:624 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:624 +#: ../data/templates/Ubuntu.info.in:629 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:629 +#: ../data/templates/Ubuntu.info.in:634 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:634 +#: ../data/templates/Ubuntu.info.in:639 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:645 +#: ../data/templates/Ubuntu.info.in:650 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:659 +#: ../data/templates/Ubuntu.info.in:664 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:675 +#: ../data/templates/Ubuntu.info.in:680 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:680 +#: ../data/templates/Ubuntu.info.in:685 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:685 +#: ../data/templates/Ubuntu.info.in:690 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:696 +#: ../data/templates/Ubuntu.info.in:701 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:710 +#: ../data/templates/Ubuntu.info.in:715 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:713 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:718 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:726 +#: ../data/templates/Ubuntu.info.in:731 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:731 +#: ../data/templates/Ubuntu.info.in:736 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:736 +#: ../data/templates/Ubuntu.info.in:741 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:742 +#: ../data/templates/Ubuntu.info.in:747 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:748 +#: ../data/templates/Ubuntu.info.in:753 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:750 +#: ../data/templates/Ubuntu.info.in:755 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:756 +#: ../data/templates/Ubuntu.info.in:761 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:759 +#: ../data/templates/Ubuntu.info.in:764 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:761 +#: ../data/templates/Ubuntu.info.in:766 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:768 +#: ../data/templates/Ubuntu.info.in:773 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:773 +#: ../data/templates/Ubuntu.info.in:778 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:778 +#: ../data/templates/Ubuntu.info.in:783 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -380,7 +380,7 @@ msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:209 ../aptsources/distro.py:424 +#: ../aptsources/distro.py:209 ../aptsources/distro.py:437 #, python-format msgid "Server for %s" msgstr "" @@ -420,16 +420,16 @@ msgstr "" msgid "Complete" msgstr "" -#: ../apt/package.py:342 +#: ../apt/package.py:358 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:1012 ../apt/package.py:1117 +#: ../apt/package.py:1065 ../apt/package.py:1171 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1123 +#: ../apt/package.py:1177 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -438,29 +438,29 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1130 +#: ../apt/package.py:1184 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:166 +#: ../apt/debfile.py:167 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:187 +#: ../apt/debfile.py:188 #, 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:326 +#: ../apt/debfile.py:327 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -468,63 +468,63 @@ 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:342 +#: ../apt/debfile.py:343 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" -#: ../apt/debfile.py:352 +#: ../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 "" -#: ../apt/debfile.py:398 +#: ../apt/debfile.py:399 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:403 +#: ../apt/debfile.py:404 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:410 +#: ../apt/debfile.py:411 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:435 +#: ../apt/debfile.py:436 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:465 +#: ../apt/debfile.py:466 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:507 +#: ../apt/debfile.py:508 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:541 +#: ../apt/debfile.py:542 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:547 +#: ../apt/debfile.py:548 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:637 +#: ../apt/debfile.py:638 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:647 +#: ../apt/debfile.py:648 msgid "An essential package would be removed" msgstr "" @@ -549,11 +549,11 @@ msgstr "" msgid "Get:" msgstr "" -#: ../apt/progress/text.py:204 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:215 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -562,19 +562,19 @@ msgid "" msgstr "" #. Trick for getting a translation from apt -#: ../apt/progress/text.py:224 +#: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: ../apt/progress/text.py:240 +#: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" -#: ../apt/progress/text.py:256 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:135 +#: ../apt/cache.py:149 msgid "Building data structures" msgstr "" diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 193d3806..dcfb0682 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -160,6 +160,29 @@ class TestAptSources(unittest.TestCase): assert sources.list[8].comps == ["main"] assert sources.list[8].line.strip() == str(sources.list[8]) + def test_enable_component(self): + from subprocess import Popen, PIPE + target = "./data/aptsources/sources.list.enable_comps" + line = "deb http://archive.ubuntu.com/ubuntu lucid main\n" + open(target, "w").write(line) + apt_pkg.config.set("Dir::Etc::sourcelist", target) + sources = aptsources.sourceslist.SourcesList(True, self.templates) + distro = aptsources.distro.get_distro(id="Ubuntu") + # make sure we are using the right distro + distro.codename = "lucid" + distro.id = "Ubuntu" + distro.release = "10.04" + # and get the sources + distro.get_sources(sources) + # test enable_component + comp = "multiverse" + distro.enable_component(comp) + comps = set() + for entry in sources: + comps = comps.union(set(entry.comps)) + self.assertTrue("multiverse" in comps) + self.assertTrue("universe" in comps) + def testDistribution(self): """aptsources: Test distribution detection.""" apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/" -- cgit v1.2.3 From bbe36232eb04a191d8fefee5bc65710e4347c0dd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Sep 2011 16:25:09 +0200 Subject: add concept of "ParentComponent" for e.g. ubuntu/multiverse that needs universe enabled as well (plus add test) LP: #829284 --- aptsources/distinfo.py | 11 ++++++++++- aptsources/distro.py | 14 ++++++++++++-- data/templates/Ubuntu.info.in | 4 ++++ debian/changelog | 8 ++++++++ tests/test_aptsources.py | 23 +++++++++++++++++++++++ 5 files changed, 57 insertions(+), 3 deletions(-) diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index dbd28939..c8ec5c46 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -69,10 +69,17 @@ class Template(object): class Component(object): - def __init__(self, name, desc=None, long_desc=None): + def __init__(self, name, desc=None, long_desc=None, parent_component=None): self.name = name self.description = desc self.description_long = long_desc + self.parent_component = parent_component + + def get_parent_component(self): + return self.parent_component + + def set_parent_component(self, parent): + self.parent_component = parent def get_description(self): if self.description_long is not None: @@ -257,6 +264,8 @@ class DistInfo(object): component.set_description(_(value)) elif field == 'CompDescriptionLong': component.set_description_long(_(value)) + elif field == 'ParentComponent': + component.set_parent_component(value) self.finish_template(template, component) template=None component=None diff --git a/aptsources/distro.py b/aptsources/distro.py index 41c86981..f777a4ea 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -291,6 +291,16 @@ class Distribution(object): comp: the component that should be enabled """ + comps = set([comp]) + # look for parent components that we may have to add + for source in self.main_sources: + for c in source.template.components: + if c.name == comp and c.parent_component: + comps.add(c.parent_component) + for c in comps: + self._enable_component(c) + + def _enable_component(self, comp): def add_component_only_once(source, comps_per_dist): """ @@ -298,12 +308,12 @@ class Distribution(object): a repository could be splitted into different apt lines. If not add the component """ - # if we don't that distro, just reutnr (can happen for e.g. + # if we don't have that distro, just return (can happen for e.g. # dapper-update only in deb-src if source.dist not in comps_per_dist: return # if we have seen this component already for this distro, - # return (nothing to do + # return (nothing to do) if comp in comps_per_dist[source.dist]: return # add it diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 39d9256e..e8afe443 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -21,6 +21,7 @@ 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 @@ -139,6 +140,7 @@ 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 @@ -256,6 +258,7 @@ 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 @@ -338,6 +341,7 @@ 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 diff --git a/debian/changelog b/debian/changelog index 3d998dd4..47ff5efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.8.0ubuntu8) UNRELEASEDoneiric; urgency=low + + * add concept of "ParentComponent" for e.g. ubuntu/multiverse + that needs universe enabled as well (plus add test) + LP: #829284 + + -- Michael Vogt Wed, 28 Sep 2011 15:48:23 +0200 + python-apt (0.8.0ubuntu7) oneiric; urgency=low * aptsources/distinfo.py: diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 193d3806..dcfb0682 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -160,6 +160,29 @@ class TestAptSources(unittest.TestCase): assert sources.list[8].comps == ["main"] assert sources.list[8].line.strip() == str(sources.list[8]) + def test_enable_component(self): + from subprocess import Popen, PIPE + target = "./data/aptsources/sources.list.enable_comps" + line = "deb http://archive.ubuntu.com/ubuntu lucid main\n" + open(target, "w").write(line) + apt_pkg.config.set("Dir::Etc::sourcelist", target) + sources = aptsources.sourceslist.SourcesList(True, self.templates) + distro = aptsources.distro.get_distro(id="Ubuntu") + # make sure we are using the right distro + distro.codename = "lucid" + distro.id = "Ubuntu" + distro.release = "10.04" + # and get the sources + distro.get_sources(sources) + # test enable_component + comp = "multiverse" + distro.enable_component(comp) + comps = set() + for entry in sources: + comps = comps.union(set(entry.comps)) + self.assertTrue("multiverse" in comps) + self.assertTrue("universe" in comps) + def testDistribution(self): """aptsources: Test distribution detection.""" apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/" -- cgit v1.2.3 From b00b27a414421e8965f95af421ce5675133c1884 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Sep 2011 16:40:42 +0200 Subject: releasing version 0.8.0ubuntu8 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 47ff5efd..906f86df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -python-apt (0.8.0ubuntu8) UNRELEASEDoneiric; urgency=low +python-apt (0.8.0ubuntu8) oneiric; urgency=low * add concept of "ParentComponent" for e.g. ubuntu/multiverse that needs universe enabled as well (plus add test) LP: #829284 - -- Michael Vogt Wed, 28 Sep 2011 15:48:23 +0200 + -- Michael Vogt Wed, 28 Sep 2011 16:27:20 +0200 python-apt (0.8.0ubuntu7) oneiric; urgency=low -- cgit v1.2.3 From a2363f7e30c93599af6366413bad965846a12d83 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Oct 2011 16:34:56 +0200 Subject: * apt/progress/gtk2.py: - update to the latest vte API for child-exited (LP: #865388) --- apt/progress/gtk2.py | 9 +++++---- debian/changelog | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apt/progress/gtk2.py b/apt/progress/gtk2.py index 9137ef76..b5794e92 100644 --- a/apt/progress/gtk2.py +++ b/apt/progress/gtk2.py @@ -34,6 +34,7 @@ except ImportError: import gobject as glib import gobject import pango +import time import vte import apt_pkg @@ -127,16 +128,15 @@ class GInstallProgress(gobject.GObject, base.InstallProgress): self.apt_status = -1 self.time_last_update = time.time() self.term = term - reaper = vte.reaper_get() - reaper.connect("child-exited", self.child_exited) + self.term.connect("child-exited", self.child_exited) self.env = ["VTE_PTY_KEEP_FD=%s" % self.writefd, "DEBIAN_FRONTEND=gnome", "APT_LISTCHANGES_FRONTEND=gtk"] self._context = glib.main_context_default() - def child_exited(self, term, pid, status): + def child_exited(self, term): """Called when a child process exits""" - self.apt_status = os.WEXITSTATUS(status) + self.apt_status = term.get_child_exit_status() self.finished = True def error(self, pkg, errormsg): @@ -204,6 +204,7 @@ class GInstallProgress(gobject.GObject, base.InstallProgress): """Wait for the child process to exit.""" while not self.finished: self.update_interface() + time.sleep(0.02) return self.apt_status if apt_pkg._COMPAT_0_7: diff --git a/debian/changelog b/debian/changelog index 88faaca3..0864d725 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ python-apt (0.8.1) UNRELEASED; urgency=low - 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) + * apt/progress/gtk2.py: + - update to the latest vte API for child-exited (LP: #865388) -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 -- cgit v1.2.3 From 53aea1b695035db409775f9f1fbfadabbbf4d593 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Oct 2011 16:36:48 +0200 Subject: * apt/progress/gtk2.py: - update to the latest vte API for child-exited (LP: #865388) --- apt/progress/gtk2.py | 9 +++++---- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apt/progress/gtk2.py b/apt/progress/gtk2.py index 9137ef76..b5794e92 100644 --- a/apt/progress/gtk2.py +++ b/apt/progress/gtk2.py @@ -34,6 +34,7 @@ except ImportError: import gobject as glib import gobject import pango +import time import vte import apt_pkg @@ -127,16 +128,15 @@ class GInstallProgress(gobject.GObject, base.InstallProgress): self.apt_status = -1 self.time_last_update = time.time() self.term = term - reaper = vte.reaper_get() - reaper.connect("child-exited", self.child_exited) + self.term.connect("child-exited", self.child_exited) self.env = ["VTE_PTY_KEEP_FD=%s" % self.writefd, "DEBIAN_FRONTEND=gnome", "APT_LISTCHANGES_FRONTEND=gtk"] self._context = glib.main_context_default() - def child_exited(self, term, pid, status): + def child_exited(self, term): """Called when a child process exits""" - self.apt_status = os.WEXITSTATUS(status) + self.apt_status = term.get_child_exit_status() self.finished = True def error(self, pkg, errormsg): @@ -204,6 +204,7 @@ class GInstallProgress(gobject.GObject, base.InstallProgress): """Wait for the child process to exit.""" while not self.finished: self.update_interface() + time.sleep(0.02) return self.apt_status if apt_pkg._COMPAT_0_7: diff --git a/debian/changelog b/debian/changelog index 906f86df..d7a4d46f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.0ubuntu9) oneiric; urgency=low + + * apt/progress/gtk2.py: + - update to the latest vte API for child-exited (LP: #865388) + + -- Michael Vogt Tue, 04 Oct 2011 16:35:52 +0200 + python-apt (0.8.0ubuntu8) oneiric; urgency=low * add concept of "ParentComponent" for e.g. ubuntu/multiverse -- cgit v1.2.3 From f17fc818cca41668bb6358e490ff3278e64fa493 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 5 Oct 2011 10:32:04 +0200 Subject: * tests/test_apt_cache.py: - add __cmp__ to apt.Package so that sort() sorts by name on list of package objects --- apt/package.py | 3 +++ debian/changelog | 3 +++ tests/test_apt_cache.py | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/apt/package.py b/apt/package.py index 4104f93e..cb373c2e 100644 --- a/apt/package.py +++ b/apt/package.py @@ -707,6 +707,9 @@ class Package(object): return '' % (self._pkg.name, self._pkg.architecture, self._pkg.id) + def __cmp__(self, other): + return cmp(self.name, other.name) + def candidate(self): """Return the candidate version of the package. diff --git a/debian/changelog b/debian/changelog index 0864d725..b7876e51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ python-apt (0.8.1) UNRELEASED; urgency=low that needs universe enabled as well (plus add test) * apt/progress/gtk2.py: - update to the latest vte API for child-exited (LP: #865388) + * tests/test_apt_cache.py: + - add __cmp__ to apt.Package so that sort() sorts by name + on list of package objects -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 2f812059..9c1f549f 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -181,5 +181,16 @@ class TestAptCache(unittest.TestCase): apt_pkg.config.set("dir::etc::sourcelist", old_source_list) apt_pkg.config.set("dir::etc::sourceparts", old_source_parts) + def test_package_cmp(self): + cache = apt.Cache() + l = [] + l.append(cache["libc6"]) + l.append(cache["xterm"]) + l.append(cache["apt"]) + l.sort() + self.assertEqual([p.name for p in l], + ["apt", "libc6", "xterm"]) + + if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From 71a4595542ccb37fa6a781826984af77d294646c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 10 Oct 2011 11:19:46 +0200 Subject: * aptsources/sourceslist.py: - import distinfo from the same dir (LP: #871007) --- aptsources/sourceslist.py | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 62442cc3..208b0175 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -33,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 diff --git a/debian/changelog b/debian/changelog index d7a4d46f..246391b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.0ubuntu10) UNRELEASEDoneiric-updates; urgency=low + + * aptsources/sourceslist.py: + - import distinfo from the same dir (LP: #871007) + + -- Michael Vogt Mon, 10 Oct 2011 11:13:20 +0200 + python-apt (0.8.0ubuntu9) oneiric; urgency=low * apt/progress/gtk2.py: -- cgit v1.2.3 From 3c35eb3da332cf30781dba78ed777b26934136ac Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 17:23:43 +0200 Subject: releasing version 0.8.1 --- debian/changelog | 4 ++-- po/python-apt.pot | 12 ++++++------ tests/test_apt_cache.py | 2 +- tests/test_progress.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 39876538..1193e157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.8.1) UNRELEASED; urgency=low +python-apt (0.8.1) unstable; urgency=low [ Julian Andres Klode ] * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) @@ -27,7 +27,7 @@ python-apt (0.8.1) UNRELEASED; urgency=low * apt/progress/gtk2.py: - update to the latest vte API for child-exited (LP: #865388) - -- Michael Vogt Tue, 09 Aug 2011 09:16:40 +0200 + -- Michael Vogt Wed, 19 Oct 2011 16:39:13 +0200 python-apt (0.8.0) unstable; urgency=low diff --git a/po/python-apt.pot b/po/python-apt.pot index bd9198c9..6d069eea 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 16:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -397,26 +397,26 @@ msgstr "" 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 "" diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 2f812059..db68ec63 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") -- cgit v1.2.3 From 8c24ad05afb705f7842cb2bc7e08450acbe49653 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 17:38:57 +0200 Subject: * data/templates/Ubuntu.info.in: - add precise --- data/templates/Ubuntu.info.in | 121 ++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 + 2 files changed, 123 insertions(+) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index e8afe443..9e62c0fa 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,123 @@ _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/ @@ -404,6 +522,7 @@ 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 @@ -528,6 +647,7 @@ 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 @@ -591,6 +711,7 @@ 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 diff --git a/debian/changelog b/debian/changelog index 246391b9..7c76edb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ python-apt (0.8.0ubuntu10) UNRELEASEDoneiric-updates; urgency=low * aptsources/sourceslist.py: - import distinfo from the same dir (LP: #871007) + * data/templates/Ubuntu.info.in: + - add precise -- Michael Vogt Mon, 10 Oct 2011 11:13:20 +0200 -- cgit v1.2.3 From b0995cca556668a4eced03e40e3edbc7362c2a10 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 17:52:31 +0200 Subject: releasing version 0.8.1ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c6a29ed1..f5a2beae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -python-apt (0.8.1ubuntu1) UNRELEASEDprecise; urgency=low +python-apt (0.8.1ubuntu1) precise; urgency=low * aptsources/sourceslist.py: - import distinfo from the same dir (LP: #871007) * data/templates/Ubuntu.info.in: - add precise - -- Michael Vogt Mon, 10 Oct 2011 11:13:20 +0200 + -- Michael Vogt Wed, 19 Oct 2011 17:46:18 +0200 python-apt (0.8.1) unstable; urgency=low -- cgit v1.2.3 From 605d4d8661aae031482fb3a93e94cf9b62e29452 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 18:08:23 +0200 Subject: * po/python-apt.pot: - refreshed --- debian/changelog | 2 + po/python-apt.pot | 150 +++++++++++++++++++++++++++++------------------------- 2 files changed, 82 insertions(+), 70 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1a3393a..c5d21936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-apt (0.8.2) UNRELEASED; urgency=low - use logging instead of print - update distro template Ubuntu.info.in - add xz compression support + * po/python-apt.pot: + - refreshed -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 diff --git a/po/python-apt.pot b/po/python-apt.pot index 78f1fd11..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-08-01 09:30+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 \n" "Language-Team: LANGUAGE \n" @@ -24,317 +24,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:32 +#: ../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:39 +#: ../data/templates/Ubuntu.info.in:158 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:150 +#: ../data/templates/Ubuntu.info.in:270 msgid "Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:157 +#: ../data/templates/Ubuntu.info.in:277 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:248 +#: ../data/templates/Ubuntu.info.in:368 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:267 +#: ../data/templates/Ubuntu.info.in:388 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:279 +#: ../data/templates/Ubuntu.info.in:400 msgid "Canonical Partners" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:281 +#: ../data/templates/Ubuntu.info.in:402 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:282 +#: ../data/templates/Ubuntu.info.in:403 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:289 +#: ../data/templates/Ubuntu.info.in:410 msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:291 +#: ../data/templates/Ubuntu.info.in:412 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:292 +#: ../data/templates/Ubuntu.info.in:413 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:330 +#: ../data/templates/Ubuntu.info.in:451 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:349 +#: ../data/templates/Ubuntu.info.in:471 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:392 +#: ../data/templates/Ubuntu.info.in:514 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:411 +#: ../data/templates/Ubuntu.info.in:534 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:577 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:473 +#: ../data/templates/Ubuntu.info.in:596 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:516 +#: ../data/templates/Ubuntu.info.in:639 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:659 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:579 +#: ../data/templates/Ubuntu.info.in:703 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:598 +#: ../data/templates/Ubuntu.info.in:723 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:643 +#: ../data/templates/Ubuntu.info.in:768 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:662 +#: ../data/templates/Ubuntu.info.in:787 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:707 +#: ../data/templates/Ubuntu.info.in:832 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:726 +#: ../data/templates/Ubuntu.info.in:851 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:768 +#: ../data/templates/Ubuntu.info.in:893 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:773 +#: ../data/templates/Ubuntu.info.in:898 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:779 +#: ../data/templates/Ubuntu.info.in:904 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:787 +#: ../data/templates/Ubuntu.info.in:912 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:829 +#: ../data/templates/Ubuntu.info.in:954 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:832 +#: ../data/templates/Ubuntu.info.in:957 msgid "Canonical-supported Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:834 +#: ../data/templates/Ubuntu.info.in:959 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:835 +#: ../data/templates/Ubuntu.info.in:960 msgid "Community-maintained Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:837 +#: ../data/templates/Ubuntu.info.in:962 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:838 +#: ../data/templates/Ubuntu.info.in:963 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:840 +#: ../data/templates/Ubuntu.info.in:965 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:841 +#: ../data/templates/Ubuntu.info.in:966 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:848 +#: ../data/templates/Ubuntu.info.in:973 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:864 +#: ../data/templates/Ubuntu.info.in:989 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:869 +#: ../data/templates/Ubuntu.info.in:994 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:874 +#: ../data/templates/Ubuntu.info.in:999 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:879 +#: ../data/templates/Ubuntu.info.in:1004 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:890 +#: ../data/templates/Ubuntu.info.in:1015 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:905 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:921 +#: ../data/templates/Ubuntu.info.in:1046 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:926 +#: ../data/templates/Ubuntu.info.in:1051 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:931 +#: ../data/templates/Ubuntu.info.in:1056 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:942 +#: ../data/templates/Ubuntu.info.in:1067 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:957 +#: ../data/templates/Ubuntu.info.in:1082 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:960 ../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:973 +#: ../data/templates/Ubuntu.info.in:1098 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:978 +#: ../data/templates/Ubuntu.info.in:1103 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:983 +#: ../data/templates/Ubuntu.info.in:1108 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:989 +#: ../data/templates/Ubuntu.info.in:1114 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:995 +#: ../data/templates/Ubuntu.info.in:1120 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:997 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1004 +#: ../data/templates/Ubuntu.info.in:1129 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1007 +#: ../data/templates/Ubuntu.info.in:1132 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1009 +#: ../data/templates/Ubuntu.info.in:1134 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1016 +#: ../data/templates/Ubuntu.info.in:1141 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1021 +#: ../data/templates/Ubuntu.info.in:1146 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1026 +#: ../data/templates/Ubuntu.info.in:1151 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -400,7 +410,7 @@ msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:210 ../aptsources/distro.py:428 +#: ../aptsources/distro.py:210 ../aptsources/distro.py:438 #, python-format msgid "Server for %s" msgstr "" @@ -417,26 +427,26 @@ msgstr "" 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 "" -- cgit v1.2.3 From 419d72ccfb1fab414d0bf34f943c4e42a7720d9d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 18:15:30 +0200 Subject: * po/pt_BR.po: - updated, thanks to Sergio Cipolla (closes: #628398) --- debian/changelog | 4 +- po/pt_BR.po | 310 ++++++++++++++++++++++++++++++++++++------------------- 2 files changed, 207 insertions(+), 107 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5d21936..ede99382 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,10 @@ python-apt (0.8.2) UNRELEASED; urgency=low - add xz compression support * po/python-apt.pot: - refreshed + * po/pt_BR.po: + - updated, thanks to Sergio Cipolla (closes: #628398) - -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 + -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 python-apt (0.8.1) unstable; urgency=low 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 , 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 \n" -"Language-Team: Ubuntu-BR \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" -- cgit v1.2.3 From 4afbecfe93e5666bd4970948c66b09dbca762d4b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 18:16:24 +0200 Subject: * po/da.po: - updated, thanks to Joe Dalton (closes: #631309) --- debian/changelog | 2 + po/da.po | 152 +++++++++++++++++++++++++------------------------------ 2 files changed, 70 insertions(+), 84 deletions(-) diff --git a/debian/changelog b/debian/changelog index ede99382..758c49b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ python-apt (0.8.2) UNRELEASED; urgency=low - refreshed * po/pt_BR.po: - updated, thanks to Sergio Cipolla (closes: #628398) + * po/da.po: + - updated, thanks to Joe Dalton (closes: #631309) -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 diff --git a/po/da.po b/po/da.po index 8e361052..5195389c 100644 --- a/po/da.po +++ b/po/da.po @@ -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 , 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 , 2009. +# AJenbo , 2011. +# Ask, 2011. +# Joe Hansen , 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 \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2011-06-22 14:44+0200\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \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" + + -- cgit v1.2.3 From e99da71e5f242787ec39714e55b5fa08bfe071eb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 18:24:24 +0200 Subject: rm usage of camelcase in cache.py doc (closes: #626617) --- apt/cache.py | 4 ++-- debian/changelog | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apt/cache.py b/apt/cache.py index be137b76..49097dd2 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -507,7 +507,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 +520,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/debian/changelog b/debian/changelog index 758c49b9..7fa0f624 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ python-apt (0.8.2) UNRELEASED; urgency=low + [ Michael Vogt ] * merged from ubuntu: - use logging instead of print - update distro template Ubuntu.info.in @@ -10,6 +11,9 @@ python-apt (0.8.2) UNRELEASED; urgency=low - updated, thanks to Sergio Cipolla (closes: #628398) * po/da.po: - updated, thanks to Joe Dalton (closes: #631309) + + [ Tshepang Lekhonkhobe ] + * rm usage of camelcase in cache.py doc (closes: #626617) -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 -- cgit v1.2.3 From 2089dda15fd6dd2734c395a9840c06e467c76325 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 18:25:43 +0200 Subject: grammar fix in the cache.py doc (closes: #626610) --- apt/cache.py | 3 +-- debian/changelog | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apt/cache.py b/apt/cache.py index 49097dd2..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 diff --git a/debian/changelog b/debian/changelog index 7fa0f624..15562c04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ python-apt (0.8.2) UNRELEASED; urgency=low [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) + * grammar fix in the cache.py doc (closes: #626610) -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 -- cgit v1.2.3 From cc6c62f5bd954d11ec0b0a1d90a190463d36b0e6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 18:26:57 +0200 Subject: apt/debfile.py: Remove the need to explcitly call check() in order to get output from require_changes and missing_deps (closes: #624379) --- apt/debfile.py | 4 +++- debian/changelog | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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/debian/changelog b/debian/changelog index 15562c04..50d3c80f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ python-apt (0.8.2) UNRELEASED; urgency=low [ 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 Wed, 19 Oct 2011 18:03:42 +0200 -- cgit v1.2.3 From 52097d7edaa97379a4a604be4feb24e5e9c3bd73 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 18:29:46 +0200 Subject: * po/sr.po: - updated, thanks to Nikola Nenadic (closes: #638308) --- debian/changelog | 2 + po/sr.po | 198 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 105 insertions(+), 95 deletions(-) diff --git a/debian/changelog b/debian/changelog index 50d3c80f..84a01e27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ python-apt (0.8.2) UNRELEASED; urgency=low - 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) diff --git a/po/sr.po b/po/sr.po index 905c0041..c99341a4 100644 --- a/po/sr.po +++ b/po/sr.po @@ -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 \n" +"Last-Translator: Nikola Nenadic \n" "Language-Team: Serbian \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 "Изградња структуре података" -- cgit v1.2.3 From 50756e0efb5081d3379fa874ca41ab57bdf2798d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 09:10:46 +0200 Subject: * tests/test_aptsources.py: - use unlzma from xz-utils instead of lzma to follow what dpkg is using (LP: #868188) * debian/control: - add recommends to xz-lzma to ensure we have the unlzma command --- debian/changelog | 5 +++++ debian/control | 2 +- python/tar.cc | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7876e51..33b0d6e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,11 @@ python-apt (0.8.1) UNRELEASED; urgency=low * tests/test_apt_cache.py: - add __cmp__ to apt.Package so that sort() sorts by name on list of package objects + * tests/test_aptsources.py: + - use unlzma from xz-utils instead of lzma to follow what dpkg + is using (LP: #868188) + * debian/control: + - add recommends to xz-lzma to ensure we have the unlzma command -- Julian Andres Klode Tue, 07 Jun 2011 14:00:22 +0200 diff --git a/debian/control b/debian/control index 01e8884e..541e4c36 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common -Recommends: lsb-release, iso-codes, python2.6 +Recommends: lsb-release, iso-codes, python2.6, xz-lzma Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), computer-janitor (<< 1.14.1-1+), debdelta (<< 0.41+), diff --git a/python/tar.cc b/python/tar.cc index b994d4e7..4109776c 100644 --- a/python/tar.cc +++ b/python/tar.cc @@ -181,7 +181,7 @@ 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 = "lzma"; + Comp = "unlzma"; ExtractTar Tar(Deb.GetFile(),Member->Size,Comp); ProcessTar Proc(Function); if (Tar.Go(Proc) == false) -- cgit v1.2.3 From b7ce3c2b47e1234631e00cb0ba8a86fa0aa9c8d8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 10:08:44 +0200 Subject: * python/apt_pkgmodule.cc: - add apt_pkg.get_architectures() call --- debian/changelog | 2 ++ po/python-apt.pot | 20 ++++++++++---------- python/apt_pkgmodule.cc | 27 +++++++++++++++++++++++++++ tests/test_apt_cache.py | 5 +++++ 4 files changed, 44 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 39c506e6..6fbc5241 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.8.2) UNRELEASED; urgency=low - updated, thanks to Joe Dalton (closes: #631309) * po/sr.po: - updated, thanks to Nikola Nenadic (closes: #638308) + * python/apt_pkgmodule.cc: + - add apt_pkg.get_architectures() call [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) diff --git a/po/python-apt.pot b/po/python-apt.pot index 70c68099..48b4fb18 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-10-19 18:07+0200\n" +"POT-Creation-Date: 2011-10-21 10:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -455,11 +455,11 @@ msgstr "" msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:1065 ../apt/package.py:1171 +#: ../apt/package.py:1068 ../apt/package.py:1174 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1177 +#: ../apt/package.py:1180 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -468,7 +468,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1184 +#: ../apt/package.py:1187 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -535,26 +535,26 @@ msgstr "" msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:508 +#: ../apt/debfile.py:510 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:542 +#: ../apt/debfile.py:544 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:548 +#: ../apt/debfile.py:550 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:638 +#: ../apt/debfile.py:640 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:648 +#: ../apt/debfile.py:650 msgid "An essential package would be removed" msgstr "" @@ -605,6 +605,6 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:149 +#: ../apt/cache.py:148 msgid "Building data structures" msgstr "" diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index e8490b4e..03c88e9a 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -393,6 +394,29 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args) return 0; } /*}}}*/ +// get_architectures - return the list of architectures /*{{{*/ +// --------------------------------------------------------------------- +static const char *doc_GetArchitectures = + "get_architectures() -> list\n\n" + "Return the list of supported architectures on this system. On a \n" + "multiarch system this can be more than one.";; +static PyObject *GetArchitectures(PyObject *Self,PyObject *Args) +{ + PyObject *Obj; + if (PyArg_ParseTuple(Args,"",&Obj) == 0) + return 0; + + PyObject *List = PyList_New(0); + vector arches = APT::Configuration::getArchitectures(); + vector::const_iterator I; + for (I = arches.begin(); I != arches.end(); I++) + { + PyList_Append(List, CppPyString(*I)); + } + + return List; +} + /*}}}*/ // init - 3 init functions /*{{{*/ // --------------------------------------------------------------------- static char *doc_Init = @@ -539,6 +563,9 @@ static PyMethodDef methods[] = {"sha1sum",sha1sum,METH_VARARGS,doc_sha1sum}, {"sha256sum",sha256sum,METH_VARARGS,doc_sha256sum}, + // multiarch + {"get_architectures", GetArchitectures, METH_VARARGS, doc_GetArchitectures}, + // Strings {"check_domain_list",StrCheckDomainList,METH_VARARGS, "check_domain_list(host: str, domains: str) -> bool\n\n" diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 2b742dfa..0d80f617 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -191,6 +191,11 @@ class TestAptCache(unittest.TestCase): self.assertEqual([p.name for p in l], ["apt", "libc6", "xterm"]) + def test_get_architectures(self): + main_arch = apt.apt_pkg.config.get("APT::Architecture") + arches = apt_pkg.get_architectures() + self.assertTrue(main_arch in arches) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From d7c8f470a236d70fa6ce8eb0e522702fee64ff5e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 10:11:02 +0200 Subject: python/apt_pkgmodule.cc: improve docstring --- po/python-apt.pot | 2 +- python/apt_pkgmodule.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/po/python-apt.pot b/po/python-apt.pot index 48b4fb18..d19871d0 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-10-21 10:05+0200\n" +"POT-Creation-Date: 2011-10-21 10:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index 03c88e9a..8532b1e3 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -399,7 +399,8 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args) static const char *doc_GetArchitectures = "get_architectures() -> list\n\n" "Return the list of supported architectures on this system. On a \n" - "multiarch system this can be more than one.";; + "multiarch system this can be more than one. The main architectures\n" + "is the first item in the list.";; static PyObject *GetArchitectures(PyObject *Self,PyObject *Args) { PyObject *Obj; -- cgit v1.2.3 From cf026ec1840a0d858b48e35fa98b248323ab9d90 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 11:07:53 +0200 Subject: first cut of multiarch support, tests still fail though --- apt/debfile.py | 34 ++++++++++++++++--- tests/data/test_debs/multiarch-test1_i386.deb | Bin 0 -> 978 bytes tests/test_debfile.py | 8 +++-- tests/test_debfile_multiarch.py | 46 ++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 tests/data/test_debs/multiarch-test1_i386.deb create mode 100644 tests/test_debfile_multiarch.py diff --git a/apt/debfile.py b/apt/debfile.py index 104b0814..1a9b471a 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -54,6 +54,7 @@ class DebPackage(object): self._sections = {} self._need_pkgs = [] self._failure_string = "" + self._multiarch = None if filename: self.open(filename) @@ -83,6 +84,14 @@ class DebPackage(object): self.filename)] return files + # helper that will return a pkgname with a multiarch suffix if needed + def _maybe_append_multiarch_suffix(self, pkgname): + if (self._multiarch and + not self._cache.is_virtual_package(pkgname) and + self._cache[pkgname].candidate.architecture != "all"): + return "%s:%s" % (pkgname, self._multiarch) + return pkgname + def _is_or_group_satisfied(self, or_group): """Return True if at least one dependency of the or-group is satisfied. @@ -96,6 +105,9 @@ class DebPackage(object): ver = dep[1] oper = dep[2] + # multiarch + depname = self._maybe_append_multiarch_suffix(depname) + # check for virtual pkgs if not depname in self._cache: if self._cache.is_virtual_package(depname): @@ -131,6 +143,9 @@ class DebPackage(object): for dep in or_group: depname, ver, oper = dep + # multiarch + depname = self._maybe_append_multiarch_suffix(depname) + # if we don't have it in the cache, it may be virtual if not depname in self._cache: if not self._cache.is_virtual_package(depname): @@ -203,6 +218,10 @@ class DebPackage(object): ver = dep[1] oper = dep[2] + # FIXME: is this good enough? i.e. will apt always populate + # the cache with conflicting pkgnames for our arch? + depname = self._maybe_append_multiarch_suffix(depname) + # check conflicts with virtual pkgs if not depname in self._cache: # FIXME: we have to check for virtual replaces here as @@ -400,9 +419,14 @@ class DebPackage(object): return False arch = self._sections["Architecture"] if arch != "all" and arch != apt_pkg.config.find("APT::Architecture"): - self._dbg(1, "ERROR: Wrong architecture dude!") - self._failure_string = _("Wrong architecture '%s'") % arch - return False + if arch in apt_pkg.get_architectures(): + self._multiarch = arch + self.pkgname = "%s:%s" % (self.pkgname, self._multiarch) + self._dbg(1, "Found multiarch arch: '%s'" % arch) + else: + self._dbg(1, "ERROR: Wrong architecture dude!") + self._failure_string = _("Wrong architecture '%s'") % arch + return False # check version if self.compare_to_version_in_cache() == self.VERSION_OUTDATED: @@ -656,7 +680,7 @@ class DscSrcPackage(DebPackage): def _test(): """Test function""" from apt.cache import Cache - from apt.progress import DpkgInstallProgress + from apt.progress.base import InstallProgress cache = Cache() @@ -678,7 +702,7 @@ def _test(): print d.filelist print "Installing ..." - ret = d.install(DpkgInstallProgress()) + ret = d.install(InstallProgress()) print ret #s = DscSrcPackage(cache, "../tests/3ddesktop_0.2.9-6.dsc") diff --git a/tests/data/test_debs/multiarch-test1_i386.deb b/tests/data/test_debs/multiarch-test1_i386.deb new file mode 100644 index 00000000..439a9f46 Binary files /dev/null and b/tests/data/test_debs/multiarch-test1_i386.deb differ diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 951c2afe..72d5e0b0 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -17,8 +17,8 @@ sys.path.insert(0, get_library_dir()) import apt_pkg import apt.debfile -class TestDebfilee(unittest.TestCase): - """ test the apt cache """ +class TestDebfile(unittest.TestCase): + """ test the debfile """ TEST_DEBS = [ # conflicts with apt @@ -87,7 +87,7 @@ class TestDebfilee(unittest.TestCase): self.assertEqual(deb["Maintainer"], "Samuel Lidén Borell ") - def testContent(self): + def test_content(self): # no python-debian for python3 yet, so fail gracefully try: import debian @@ -130,6 +130,8 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading # we need to support python2.6 self.assertTrue(raised) + + if __name__ == "__main__": #logging.basicConfig(level=logging.DEBUG) unittest.main() diff --git a/tests/test_debfile_multiarch.py b/tests/test_debfile_multiarch.py new file mode 100644 index 00000000..1b468a45 --- /dev/null +++ b/tests/test_debfile_multiarch.py @@ -0,0 +1,46 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2010 Michael Vogt +# +# 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. +"""Unit tests for verifying the correctness of DebPackage in apt.debfile.""" +import os +import logging +import unittest + +from test_all import get_library_dir +import sys +sys.path.insert(0, get_library_dir()) +import apt +import apt_pkg +import apt.debfile + +class TestDebfileMultiarch(unittest.TestCase): + """ test the multiarch debfile """ + + def test_multiarch_deb(self): + if apt_pkg.get_architectures() != ["amd64", "i386"]: + logging.warn("skipping test because running on a non-multiarch system") + return + deb = apt.debfile.DebPackage( + "./data/test_debs/multiarch-test1_i386.deb") + missing = deb.missing_deps + print missing + self.assertFalse("dpkg:i386" in missing) + + def test_multiarch_conflicts(self): + cache = apt.Cache() + # WARNING: this assumes that lib3ds-1-3 is a non-multiarch lib + # use "lib3ds-1-3" as a test to see if non-multiach lib conflicts work + cache["lib3ds-1-3"].mark_install() + deb = apt.debfile.DebPackage( + "./data/test_debs/multiarch-test1_i386.deb", cache=cache) + # this deb should now not be installable + self.assertFalse(deb.check()) + + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From c96acf6d26beb8c2c2e6eb9a868a4ea6b053a9d4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 11:47:03 +0200 Subject: make the tests pass --- apt/debfile.py | 36 +++++++++++++++++++++++++++++------- tests/test_debfile_multiarch.py | 11 ++++++++--- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/apt/debfile.py b/apt/debfile.py index 1a9b471a..0e8bfcad 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -85,12 +85,33 @@ class DebPackage(object): return files # helper that will return a pkgname with a multiarch suffix if needed - def _maybe_append_multiarch_suffix(self, pkgname): - if (self._multiarch and - not self._cache.is_virtual_package(pkgname) and - self._cache[pkgname].candidate.architecture != "all"): - return "%s:%s" % (pkgname, self._multiarch) - return pkgname + def _maybe_append_multiarch_suffix(self, pkgname, + in_conflict_checking=False): + # trivial cases + if not self._multiarch: + return pkgname + elif self._cache.is_virtual_package(pkgname): + return pkgname + elif self._cache[pkgname].candidate == "all": + return pkgname + # now do the real multiarch checking + multiarch_pkgname = "%s:%s" % (pkgname, self._multiarch) + # the upper layers will handle this + if not multiarch_pkgname in self._cache: + return multiarch_pkgname + # now check the multiarch state + cand = self._cache[multiarch_pkgname].candidate._cand + #print pkgname, multiarch_pkgname, cand.multi_arch + # the default is to add the suffix, unless its a pkg that can satify + # foreign dependencies + if cand.multi_arch & cand.MULTI_ARCH_FOREIGN: + return pkgname + # for conflicts we need a special case here, any not multiarch enabled + # package has a implicit conflict + if (in_conflict_checking and + not (cand.multi_arch & cand.MULTI_ARCH_SAME)): + return pkgname + return multiarch_pkgname def _is_or_group_satisfied(self, or_group): """Return True if at least one dependency of the or-group is satisfied. @@ -220,7 +241,8 @@ class DebPackage(object): # FIXME: is this good enough? i.e. will apt always populate # the cache with conflicting pkgnames for our arch? - depname = self._maybe_append_multiarch_suffix(depname) + depname = self._maybe_append_multiarch_suffix( + depname, in_conflict_checking=True) # check conflicts with virtual pkgs if not depname in self._cache: diff --git a/tests/test_debfile_multiarch.py b/tests/test_debfile_multiarch.py index 1b468a45..db777692 100644 --- a/tests/test_debfile_multiarch.py +++ b/tests/test_debfile_multiarch.py @@ -21,14 +21,14 @@ import apt.debfile class TestDebfileMultiarch(unittest.TestCase): """ test the multiarch debfile """ - def test_multiarch_deb(self): + def test_multiarch_deb_check(self): if apt_pkg.get_architectures() != ["amd64", "i386"]: logging.warn("skipping test because running on a non-multiarch system") return deb = apt.debfile.DebPackage( "./data/test_debs/multiarch-test1_i386.deb") missing = deb.missing_deps - print missing + #print missing self.assertFalse("dpkg:i386" in missing) def test_multiarch_conflicts(self): @@ -39,7 +39,12 @@ class TestDebfileMultiarch(unittest.TestCase): deb = apt.debfile.DebPackage( "./data/test_debs/multiarch-test1_i386.deb", cache=cache) # this deb should now not be installable - self.assertFalse(deb.check()) + installable = deb.check() + #print deb._failure_string + self.assertFalse(installable) + self.assertEqual(deb._failure_string, + "Conflicts with the installed package 'lib3ds-1-3'") + if __name__ == "__main__": -- cgit v1.2.3 From cccf74c205b05cf81bade4269ea7df99c5dcbea7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 11:57:10 +0200 Subject: tests/test_debfile_multiarch.py: skip test if e.g. unvierse is not enabled --- tests/test_debfile_multiarch.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_debfile_multiarch.py b/tests/test_debfile_multiarch.py index db777692..7c02a32a 100644 --- a/tests/test_debfile_multiarch.py +++ b/tests/test_debfile_multiarch.py @@ -35,7 +35,11 @@ class TestDebfileMultiarch(unittest.TestCase): cache = apt.Cache() # WARNING: this assumes that lib3ds-1-3 is a non-multiarch lib # use "lib3ds-1-3" as a test to see if non-multiach lib conflicts work - cache["lib3ds-1-3"].mark_install() + canary = "lib3ds-1-3" + if not canary in cache: + logging.warn("skipping test because %s is missing" % canary) + return + cache[canary].mark_install() deb = apt.debfile.DebPackage( "./data/test_debs/multiarch-test1_i386.deb", cache=cache) # this deb should now not be installable -- cgit v1.2.3 From 5416003d5acd3630bff5b48f69277b5e1d917f20 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 12:14:29 +0200 Subject: apt/debfile.py: really check against architecture --- apt/debfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt/debfile.py b/apt/debfile.py index 0e8bfcad..1d7a4a16 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -92,7 +92,7 @@ class DebPackage(object): return pkgname elif self._cache.is_virtual_package(pkgname): return pkgname - elif self._cache[pkgname].candidate == "all": + elif self._cache[pkgname].candidate.architecture == "all": return pkgname # now do the real multiarch checking multiarch_pkgname = "%s:%s" % (pkgname, self._multiarch) -- cgit v1.2.3 From 1948d5d03887eb81ea7797c0f23049ef6c3895ce Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Nov 2011 10:05:55 +0100 Subject: * apt/cache.py: - remove "print" when creating dirs in apt.Cache(rootdir=dir), thanks to Martin Pitt --- apt/cache.py | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt/cache.py b/apt/cache.py index bab5c277..a4585277 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -111,7 +111,7 @@ class Cache(object): ] for d in dirs: if not os.path.exists(rootdir + d): - print "creating: ", rootdir + d + #print "creating: ", rootdir + d os.makedirs(rootdir + d) for f in files: if not os.path.exists(rootdir + f): diff --git a/debian/changelog b/debian/changelog index 6fbc5241..f5ae2b79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ python-apt (0.8.2) UNRELEASED; urgency=low - updated, thanks to Nikola Nenadic (closes: #638308) * python/apt_pkgmodule.cc: - add apt_pkg.get_architectures() call + * apt/cache.py: + - remove "print" when creating dirs in apt.Cache(rootdir=dir), + thanks to Martin Pitt [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) -- cgit v1.2.3 From 628d7caf9ca6ee819398a4b88c23e42094fe2c10 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Nov 2011 17:20:58 +0100 Subject: fix build against apt in experimental --- debian/changelog | 1 + po/python-apt.pot | 2 +- python/apt_pkgmodule.cc | 11 ++++++----- python/apt_pkgmodule.h | 1 + python/arfile.cc | 8 ++++---- python/cdrom.cc | 4 ++-- python/configuration.cc | 2 +- python/depcache.cc | 1 + python/lock.cc | 2 ++ python/metaindex.cc | 4 ++-- python/progress.cc | 14 +++++++------- python/progress.h | 6 +++--- python/tag.cc | 1 + python/tarfile.cc | 2 +- tests/test_debfile.py | 13 ++++++++++++- 15 files changed, 45 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5ae2b79..58326dc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ python-apt (0.8.2) UNRELEASED; urgency=low * apt/cache.py: - remove "print" when creating dirs in apt.Cache(rootdir=dir), thanks to Martin Pitt + * fix build against apt in experimental [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) diff --git a/po/python-apt.pot b/po/python-apt.pot index d19871d0..046f5779 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-10-21 10:10+0200\n" +"POT-Creation-Date: 2011-11-10 17:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index 8532b1e3..acfdf019 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -185,11 +186,11 @@ static const char *parse_src_depends_doc = "only contains those dependencies for the architecture set in the\n" "configuration variable APT::Architecture"; static PyObject *RealParseDepends(PyObject *Self,PyObject *Args, - bool ParseArchFlags, string name, + bool ParseArchFlags, std::string name, bool debStyle=false) { - string Package; - string Version; + std::string Package; + std::string Version; unsigned int Op; bool StripMultiArch=true; @@ -408,8 +409,8 @@ static PyObject *GetArchitectures(PyObject *Self,PyObject *Args) return 0; PyObject *List = PyList_New(0); - vector arches = APT::Configuration::getArchitectures(); - vector::const_iterator I; + std::vector arches = APT::Configuration::getArchitectures(); + std::vector::const_iterator I; for (I = arches.begin(); I != arches.end(); I++) { PyList_Append(List, CppPyString(*I)); diff --git a/python/apt_pkgmodule.h b/python/apt_pkgmodule.h index b3534a30..85c34130 100644 --- a/python/apt_pkgmodule.h +++ b/python/apt_pkgmodule.h @@ -24,6 +24,7 @@ #include #include #include +#include #include "generic.h" // Configuration Stuff diff --git a/python/arfile.cc b/python/arfile.cc index c31ea35e..44cd3c82 100644 --- a/python/arfile.cc +++ b/python/arfile.cc @@ -204,7 +204,7 @@ static PyObject *_extract(FileFd &Fd, const ARArchive::Member *member, if (!Fd.Seek(member->Start)) return HandleErrors(); - string outfile_str = flCombine(dir,member->Name); + std::string outfile_str = flCombine(dir,member->Name); char *outfile = (char*)outfile_str.c_str(); // We are not using FileFd here, because we want to raise OSErrror with @@ -539,8 +539,8 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds) for (std::vector::const_iterator t = types.begin(); t != types.end(); ++t) { - string member = string("data.tar.").append(*t); - string comp = _config->Find(string("Acquire::CompressionTypes::").append(*t)); + std::string member = std::string("data.tar.").append(*t); + std::string comp = _config->Find(std::string("Acquire::CompressionTypes::").append(*t)); self->data = _gettar(self, self->Object->FindMember(member.c_str()), comp.c_str()); if (self->data) @@ -548,7 +548,7 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } // no data found, we need to if (!self->data) { - string error; + std::string error; for (std::vector::const_iterator t = types.begin(); t != types.end(); ++t) error.append(*t + ","); diff --git a/python/cdrom.cc b/python/cdrom.cc index 6ac16d59..46bb769c 100644 --- a/python/cdrom.cc +++ b/python/cdrom.cc @@ -67,7 +67,7 @@ static PyObject *cdrom_ident(PyObject *Self,PyObject *Args) PyCdromProgress progress; progress.setCallbackInst(pyCdromProgressInst); - string ident; + std::string ident; bool res = Cdrom.Ident(ident, &progress); if (res) @@ -94,7 +94,7 @@ static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args) PyCdromProgress progress; progress.setCallbackInst(pyCdromProgressInst); - string ident; + std::string ident; bool res = Cdrom.Ident(ident, &progress); PyObject *boolres = PyBool_FromLong(res); diff --git a/python/configuration.cc b/python/configuration.cc index 9000f71f..3e634901 100644 --- a/python/configuration.cc +++ b/python/configuration.cc @@ -262,7 +262,7 @@ static PyObject *CnfDump(PyObject *Self,PyObject *Args) if (PyArg_ParseTuple(Args,"") == 0) return 0; - stringstream ss; + std::stringstream ss; GetSelf(Self).Dump(ss); return CppPyString(ss.str()); } diff --git a/python/depcache.cc b/python/depcache.cc index e6113429..73993c82 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/python/lock.cc b/python/lock.cc index 2c957df1..38a2bc74 100644 --- a/python/lock.cc +++ b/python/lock.cc @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include "generic.h" static PyObject *systemlock_exit(PyObject *self, PyObject *args) diff --git a/python/metaindex.cc b/python/metaindex.cc index a00cf04e..9e330d3d 100644 --- a/python/metaindex.cc +++ b/python/metaindex.cc @@ -33,8 +33,8 @@ static PyObject *MetaIndexGetIsTrusted(PyObject *Self,void*) { static PyObject *MetaIndexGetIndexFiles(PyObject *Self,void*) { metaIndex *meta = GetCpp(Self); PyObject *List = PyList_New(0); - vector *indexFiles = meta->GetIndexFiles(); - for (vector::const_iterator I = indexFiles->begin(); + std::vector *indexFiles = meta->GetIndexFiles(); + for (std::vector::const_iterator I = indexFiles->begin(); I != indexFiles->end(); I++) { CppPyObject *Obj; diff --git a/python/progress.cc b/python/progress.cc index bd3c2ad6..a7fd7ae1 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -127,7 +127,7 @@ PyObject *PyFetchProgress::GetDesc(pkgAcquire::ItemDesc *item) { return pyDesc; } -bool PyFetchProgress::MediaChange(string Media, string Drive) +bool PyFetchProgress::MediaChange(std::string Media, std::string Drive) { PyCbObj_END_ALLOW_THREADS //std::cout << "MediaChange" << std::endl; @@ -485,7 +485,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) PyObject *v = PyObject_GetAttrString(callbackInst, "writefd"); if(v) { int fd = PyObject_AsFileDescriptor(v); - cout << "got fd: " << fd << endl; + std::cout << "got fd: " << fd << std::endl; res = pm->DoInstall(fd); } else { res = pm->DoInstall(); @@ -542,7 +542,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) //----------------------------------------------------------------------------- // apt-cdrom interface -void PyCdromProgress::Update(string text, int current) +void PyCdromProgress::Update(std::string text, int current) { PyObject *arglist = Py_BuildValue("(si)", text.c_str(), current); setattr(callbackInst, "total_steps", "i", totalSteps); @@ -569,7 +569,7 @@ bool PyCdromProgress::ChangeCdrom() } -bool PyCdromProgress::AskCdromName(string &Name) +bool PyCdromProgress::AskCdromName(std::string &Name) { PyObject *arglist = Py_BuildValue("()"); const char *new_name; @@ -582,7 +582,7 @@ bool PyCdromProgress::AskCdromName(string &Name) if(!PyArg_Parse(result, "(bs)", &res, &new_name)) std::cerr << "AskCdromName: result could not be parsed" << std::endl; // set the new name - Name = string(new_name); + Name =std:: string(new_name); return res; } // New style: String on success, None on failure. @@ -593,7 +593,7 @@ bool PyCdromProgress::AskCdromName(string &Name) if(!PyArg_Parse(result, "s", &new_name)) std::cerr << "ask_cdrom_name: result could not be parsed" << std::endl; else - Name = string(new_name); - return true; + Name = std::string(new_name); + return true; } } diff --git a/python/progress.h b/python/progress.h index 4e66c771..af8e3acc 100644 --- a/python/progress.h +++ b/python/progress.h @@ -72,7 +72,7 @@ struct PyFetchProgress : public pkgAcquireStatus, public PyCallbackObj void UpdateStatus(pkgAcquire::ItemDesc & Itm, int status); - virtual bool MediaChange(string Media, string Drive); + virtual bool MediaChange(std::string Media, std::string Drive); void setPyAcquire(PyObject *o) { Py_CLEAR(pyAcquire); @@ -107,11 +107,11 @@ struct PyInstallProgress : public PyCallbackObj struct PyCdromProgress : public pkgCdromStatus, public PyCallbackObj { // update steps, will be called regularly as a "pulse" - virtual void Update(string text="", int current=0); + virtual void Update(std::string text="", int current=0); // ask for cdrom insert virtual bool ChangeCdrom(); // ask for cdrom name - virtual bool AskCdromName(string &Name); + virtual bool AskCdromName(std::string &Name); PyCdromProgress() : PyCallbackObj() {}; }; diff --git a/python/tag.cc b/python/tag.cc index 94554400..3996af8e 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -26,6 +26,7 @@ #include "apt_pkgmodule.h" #include +#include #include #include diff --git a/python/tarfile.cc b/python/tarfile.cc index cdfe0a7c..bd903b57 100644 --- a/python/tarfile.cc +++ b/python/tarfile.cc @@ -348,7 +348,7 @@ static const char *tarfile_extractall_doc = "can be used to change the target directory."; static PyObject *tarfile_extractall(PyObject *self, PyObject *args) { - string cwd = SafeGetCWD(); + std::string cwd = SafeGetCWD(); char *rootdir = 0; if (PyArg_ParseTuple(args,"|s:extractall",&rootdir) == 0) return 0; diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 951c2afe..501b8f61 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -87,7 +87,7 @@ class TestDebfilee(unittest.TestCase): self.assertEqual(deb["Maintainer"], "Samuel Lidén Borell ") - def testContent(self): + def test_content(self): # no python-debian for python3 yet, so fail gracefully try: import debian @@ -130,6 +130,17 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading # we need to support python2.6 self.assertTrue(raised) + def test_multiarch_deb(self): + print apt_pkg.get_architectures() + if apt_pkg.get_architectures() != ["amd64", "i386"]: + logging.warn("skipping test because running on a non-multiarch system") + return + deb = apt.debfile.DebPackage("./data/test_debs/multiarch-test1_i386.deb") + print deb.missing_deps() + + + + if __name__ == "__main__": #logging.basicConfig(level=logging.DEBUG) unittest.main() -- cgit v1.2.3 From fcd268692450231c98bfb6ac2e573ce466e014c7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Nov 2011 14:07:38 +0100 Subject: * apt/cache.py: - set Dir::bin::dpkg if a alternate rootdir is given (LP: #885895) --- apt/cache.py | 4 ++++ debian/changelog | 3 +++ 2 files changed, 7 insertions(+) diff --git a/apt/cache.py b/apt/cache.py index a4585277..8a456715 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -83,6 +83,10 @@ class Cache(object): apt_pkg.config.set("Dir", rootdir) apt_pkg.config.set("Dir::State::status", rootdir + "/var/lib/dpkg/status") + # also set dpkg to the rootdir path so that its called for the + # --print-foreign-architectures call + apt_pkg.config.set("Dir::bin::dpkg", + os.path.join(rootdir, "usr", "bin", "dpkg")) # create required dirs/files when run with special rootdir # automatically self._check_and_create_required_dirs(rootdir) diff --git a/debian/changelog b/debian/changelog index 58326dc2..14ee705e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ python-apt (0.8.2) UNRELEASED; urgency=low - remove "print" when creating dirs in apt.Cache(rootdir=dir), thanks to Martin Pitt * fix build against apt in experimental + * apt/cache.py: + - set Dir::bin::dpkg if a alternate rootdir is given + (LP: #885895) [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) -- cgit v1.2.3 From f2cd844828de310dc510505612395ef60ded8731 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 17 Nov 2011 16:46:53 +0100 Subject: * apt/package.py: - add new "suggests" property, thanks to Christop Groth --- apt/package.py | 5 +++++ debian/changelog | 2 ++ 2 files changed, 7 insertions(+) diff --git a/apt/package.py b/apt/package.py index cb373c2e..e09acca4 100644 --- a/apt/package.py +++ b/apt/package.py @@ -454,6 +454,11 @@ class Version(object): """Return the recommends of the package version.""" return self.get_dependencies("Recommends") + @property + def suggests(self): + """Return the suggests of the package version.""" + return self.get_dependencies("Suggests") + @property def origins(self): """Return a list of origins for the package version.""" diff --git a/debian/changelog b/debian/changelog index 14ee705e..afffdf12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ python-apt (0.8.2) UNRELEASED; urgency=low * apt/cache.py: - set Dir::bin::dpkg if a alternate rootdir is given (LP: #885895) + * apt/package.py: + - add new "suggests" property, thanks to Christop Groth [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) -- cgit v1.2.3 From add08632b8a66c7ba5de7ab44d8a10ec9462692e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 17 Nov 2011 17:57:34 +0100 Subject: allow Dependency object to be iteratable, this allows to write code like: for or_dep_group in pkg.candidate.dependencies: for dep in or_dep_group: do_something() --- apt/package.py | 3 +++ debian/changelog | 4 ++++ tests/test_apt_cache.py | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apt/package.py b/apt/package.py index e09acca4..ab692788 100644 --- a/apt/package.py +++ b/apt/package.py @@ -107,6 +107,9 @@ class Dependency(object): def __repr__(self): return repr(self.or_dependencies) + def __iter__(self): + return self.or_dependencies.__iter__() + class DeprecatedProperty(property): """A property which gives DeprecationWarning on access. diff --git a/debian/changelog b/debian/changelog index afffdf12..7d939702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,10 @@ python-apt (0.8.2) UNRELEASED; urgency=low (LP: #885895) * apt/package.py: - add new "suggests" property, thanks to Christop Groth + - allow Dependency object to be iteratable, this allows to write + code like: + for or_dep_group in pkg.candidate.dependencies: + for dep in or_dep_group: do_something() [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 0d80f617..7784a25f 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -55,8 +55,8 @@ class TestAptCache(unittest.TestCase): # that is possible and does not crash for pkg in cache: if pkg.candidate: - for or_dep in pkg.candidate.dependencies: - for dep in or_dep.or_dependencies: + for or_deps in pkg.candidate.dependencies: + for dep in or_deps: self.assertTrue(dep.name) self.assertTrue(isinstance(dep.relation, str)) self.assertTrue(dep.pre_depend in (True, False)) -- cgit v1.2.3 From a01e314df3ceaf0cc99102beb511a2ecbd973057 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 17 Nov 2011 20:28:10 +0100 Subject: make Dependency a list (it should probably also renamed to DependencyOrGroup or something), thanks to Christop Groth --- apt/package.py | 14 ++++++-------- debian/changelog | 4 +++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apt/package.py b/apt/package.py index ab692788..8b79c420 100644 --- a/apt/package.py +++ b/apt/package.py @@ -94,7 +94,7 @@ class BaseDependency(object): preDepend = AttributeDeprecatedBy('pre_depend') -class Dependency(object): +class Dependency(list): """Represent an Or-group of dependencies. Attributes defined here: @@ -102,14 +102,12 @@ class Dependency(object): """ def __init__(self, alternatives): - self.or_dependencies = alternatives - - def __repr__(self): - return repr(self.or_dependencies) - - def __iter__(self): - return self.or_dependencies.__iter__() + super(Dependency, self).__init__() + self.extend(alternatives) + @property + def or_dependencies(self): + return self class DeprecatedProperty(property): """A property which gives DeprecationWarning on access. diff --git a/debian/changelog b/debian/changelog index 7d939702..6e750980 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,9 @@ python-apt (0.8.2) UNRELEASED; urgency=low - allow Dependency object to be iteratable, this allows to write code like: for or_dep_group in pkg.candidate.dependencies: - for dep in or_dep_group: do_something() + for dep in or_dep_group: + do_something() + (thanks to Christop Groth) [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) -- cgit v1.2.3 From b7b608bf2c66e7466313ea02568348aea9cc29ba Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:01:26 +0100 Subject: cleanup based on feedback from juliank --- apt/cache.py | 10 ++++++++-- apt/debfile.py | 19 +++++++++++++------ debian/changelog | 6 +++--- tests/test_debfile.py | 12 +++++++----- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/apt/cache.py b/apt/cache.py index 8a456715..b4d67fa5 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -46,7 +46,13 @@ class LockFailedException(IOError): class Cache(object): """Dictionary-like package cache. - The dictionary of this class contains all available packages. + The APT cache file contains a hash table mapping names of binary + packages to their metadata. A Cache object is the in-core + representation of the same. It provides access to APTs idea of the + list of available packages. + + The cache can be used like a mapping from package names to Package + objects (although only getting items is supported). Keyword arguments: progress -- a OpProgress object @@ -510,7 +516,7 @@ class Cache(object): self._callbacks[name].append(callback) def actiongroup(self): - """Return an action group object for the current cache. + """Return an `ActionGroup` 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 diff --git a/apt/debfile.py b/apt/debfile.py index 104b0814..5b9274b2 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -53,6 +53,7 @@ class DebPackage(object): self.pkgname = "" self._sections = {} self._need_pkgs = [] + self._check_was_run = False self._failure_string = "" if filename: self.open(filename) @@ -68,7 +69,8 @@ class DebPackage(object): control = self._debfile.control.extractdata("control") self._sections = apt_pkg.TagSection(control) self.pkgname = self._sections["Package"] - + self._check_was_run = False + def __getitem__(self, key): return self._sections[key] @@ -393,6 +395,8 @@ class DebPackage(object): """Check if the package is installable.""" self._dbg(3, "check") + self._check_was_run = True + # check arch if not "Architecture" in self._sections: self._dbg(1, "ERROR: no architecture field") @@ -472,8 +476,8 @@ class DebPackage(object): def missing_deps(self): """Return missing dependencies.""" self._dbg(1, "Installing: %s" % self._need_pkgs) - if not self._need_pkgs: - self.check() + if not self._check_was_run: + raise ValueError("property only available after check() was run") return self._need_pkgs @property @@ -485,8 +489,8 @@ class DebPackage(object): install = [] remove = [] unauthenticated = [] - if not self._cache: - self.check() + if not self._check_was_run: + raise ValueError("property only available after check() was run") for pkg in self._cache: if pkg.marked_install or pkg.marked_upgrade: install.append(pkg.name) @@ -641,7 +645,8 @@ class DscSrcPackage(DebPackage): "source package '%s' that builds %s\n") % (self.pkgname, " ".join(self.binaries)) self._sections["Description"] = s - + self._check_was_run = False + def check(self): """Check if the package is installable..""" if not self.check_conflicts(): @@ -649,6 +654,8 @@ class DscSrcPackage(DebPackage): if self._cache[pkgname]._pkg.essential: raise Exception(_("An essential package would be removed")) self._cache[pkgname].mark_delete() + # properties are ok now + self._check_was_run = True # FIXME: a additional run of the check_conflicts() # after _satisfy_depends() should probably be done return self._satisfy_depends(self.depends) diff --git a/debian/changelog b/debian/changelog index 27eb8e97..cc922735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,13 +26,13 @@ python-apt (0.8.2) UNRELEASED; urgency=low - set Dir::bin::dpkg if a alternate rootdir is given (LP: #885895) * build fixes for the apt in experimental + * apt/debfile.py: raise error when accessing require_changes and + missing_deps without calling check() before, thanks to + Tshepang Lekhonkhobe (closes: #624379) [ 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 Wed, 19 Oct 2011 18:03:42 +0200 diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 501b8f61..e6c475d3 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -88,11 +88,6 @@ class TestDebfilee(unittest.TestCase): "Samuel Lidén Borell ") def test_content(self): - # no python-debian for python3 yet, so fail gracefully - try: - import debian - except ImportError: - return # normal deb = apt.debfile.DebPackage(cache=self.cache) deb.open(os.path.join("data", "test_debs", "gdebi-test11.deb")) @@ -119,6 +114,13 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") self.assertEqual(deb.filelist, ["./", "usr/", "usr/bin/"]) + def test_check_exception(self): + deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") + with self.assertRaises(ValueError): + deb.missing_deps + deb.check() + deb.missing_deps + def test_no_supported_data_tar(self): # ensure that a unknown data.tar.xxx raises a exception raised = False -- cgit v1.2.3 From 0af443d9a182b0fec5f9963edef3c1f1908e831f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:06:30 +0100 Subject: cleanup --- apt/cache.py | 14 +++++++------- apt/debfile.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apt/cache.py b/apt/cache.py index b4d67fa5..96b38a57 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -46,13 +46,13 @@ class LockFailedException(IOError): class Cache(object): """Dictionary-like package cache. - The APT cache file contains a hash table mapping names of binary - packages to their metadata. A Cache object is the in-core - representation of the same. It provides access to APTs idea of the - list of available packages. - - The cache can be used like a mapping from package names to Package - objects (although only getting items is supported). + The APT cache file contains a hash table mapping names of binary + packages to their metadata. A Cache object is the in-core + representation of the same. It provides access to APTs idea of the + list of available packages. + + The cache can be used like a mapping from package names to Package + objects (although only getting items is supported). Keyword arguments: progress -- a OpProgress object diff --git a/apt/debfile.py b/apt/debfile.py index 5b9274b2..277262d7 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -477,7 +477,7 @@ class DebPackage(object): """Return missing dependencies.""" self._dbg(1, "Installing: %s" % self._need_pkgs) if not self._check_was_run: - raise ValueError("property only available after check() was run") + raise AttributeError("property only available after check() was run") return self._need_pkgs @property @@ -490,7 +490,7 @@ class DebPackage(object): remove = [] unauthenticated = [] if not self._check_was_run: - raise ValueError("property only available after check() was run") + raise AttributeError("property only available after check() was run") for pkg in self._cache: if pkg.marked_install or pkg.marked_upgrade: install.append(pkg.name) -- cgit v1.2.3 From b1c645c534e14bc21da638aefd54d2c59085f3ec Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:09:44 +0100 Subject: tests/test_debfile.py: fix test after previous exception change --- tests/test_debfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_debfile.py b/tests/test_debfile.py index e6c475d3..89f50d2a 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -116,7 +116,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading def test_check_exception(self): deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") - with self.assertRaises(ValueError): + with self.assertRaises(AttributeError): deb.missing_deps deb.check() deb.missing_deps -- cgit v1.2.3 From ff886d6a8c468a31433013250aed337dfe0770cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:32:56 +0100 Subject: tests/test_debfile.py: remove debug print --- tests/test_debfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 89f50d2a..7619f33d 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -133,7 +133,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading self.assertTrue(raised) def test_multiarch_deb(self): - print apt_pkg.get_architectures() + #print apt_pkg.get_architectures() if apt_pkg.get_architectures() != ["amd64", "i386"]: logging.warn("skipping test because running on a non-multiarch system") return -- cgit v1.2.3 From fb4ef05de0a64f75f2896d9e74c88a3bb3db00c7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:36:46 +0100 Subject: apt/package.py: use lt() instead of cmp() --- apt/package.py | 4 ++-- debian/changelog | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt/package.py b/apt/package.py index cb373c2e..45d6044b 100644 --- a/apt/package.py +++ b/apt/package.py @@ -707,8 +707,8 @@ class Package(object): return '' % (self._pkg.name, self._pkg.architecture, self._pkg.id) - def __cmp__(self, other): - return cmp(self.name, other.name) + def __lt__(self, other): + return self.name < other.name def candidate(self): """Return the candidate version of the package. diff --git a/debian/changelog b/debian/changelog index cc922735..fece12fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,7 @@ python-apt (0.8.2) UNRELEASED; urgency=low * apt/cache.py: - remove "print" when creating dirs in apt.Cache(rootdir=dir), thanks to Martin Pitt - - add __cmp__ to apt.Package so that sort() sorts by name + - add __lt__ to apt.Package so that sort() sorts by name on list of package objects * debian/control: - add recommends to xz-lzma to ensure we have the unlzma command -- cgit v1.2.3 From bdf3dfdca30b0d822d267b8453dd1101e864d276 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:45:23 +0100 Subject: tests/test_apt_cache.py: fix test failure by explicitely setting rootdir --- tests/test_apt_cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 0d80f617..74d94ed8 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -182,7 +182,7 @@ class TestAptCache(unittest.TestCase): apt_pkg.config.set("dir::etc::sourceparts", old_source_parts) def test_package_cmp(self): - cache = apt.Cache() + cache = apt.Cache(rootdir="/") l = [] l.append(cache["libc6"]) l.append(cache["xterm"]) -- cgit v1.2.3 From ea348ef49c34f22c8f06cdbcbcae3c2fbc7652fd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:51:57 +0100 Subject: tests/test_debfile.py: fix test on python2.6 --- tests/test_debfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 7619f33d..30a2be0a 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -116,8 +116,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading def test_check_exception(self): deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") - with self.assertRaises(AttributeError): - deb.missing_deps + self.assertRaises(AttributeError, lambda: deb.missing_deps) deb.check() deb.missing_deps -- cgit v1.2.3 From d76a13a50fda292fe011a86f2b761d5753dc1470 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:58:06 +0100 Subject: tests/test_debfile.py: remove unneeded debug print --- tests/test_debfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 30a2be0a..d7c38b3d 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -137,7 +137,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading logging.warn("skipping test because running on a non-multiarch system") return deb = apt.debfile.DebPackage("./data/test_debs/multiarch-test1_i386.deb") - print deb.missing_deps() + #print deb.missing_deps() -- cgit v1.2.3 From 4600b96f047154b4adadfc8f862c0f6201d21bdc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Nov 2011 16:36:48 +0100 Subject: fixed a typo, changed "Open Source software" to "free and open-source software" (LP: #500940) --- data/templates/Ubuntu.info.in | 52 +++++++++++++++++++++---------------------- debian/changelog | 4 ++++ 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 9e62c0fa..3a9562f4 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -13,10 +13,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 12.04 'Precise Pangolin' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -131,10 +131,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 11.10 'Oneiric Ocelot' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -250,10 +250,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 11.04 'Natty Narwhal' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -368,10 +368,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 10.10 'Maverick Meerkat' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -451,10 +451,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 10.04 'Lucid Lynx' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -514,10 +514,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.10 'Karmic Koala' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -577,10 +577,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.04 'Jaunty Jackalope' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -639,10 +639,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.10 'Intrepid Ibex' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -703,10 +703,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -768,10 +768,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 7.10 'Gutsy Gibbon' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -832,10 +832,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 7.04 'Feisty Fawn' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -893,10 +893,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 6.10 'Edgy Eft' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -954,10 +954,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained (universe) -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices diff --git a/debian/changelog b/debian/changelog index 6e750980..7150adf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ python-apt (0.8.2) UNRELEASED; urgency=low to get output from require_changes and missing_deps (closes: #624379) + [ Nikola Pavlović ] + * fixed a typo, changed "Open Source software" to + "free and open-source software" (LP: #500940) + -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 python-apt (0.8.1) unstable; urgency=low -- cgit v1.2.3 From c4c1197922edb4f82390f7e0f125be34863d24d3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 1 Dec 2011 12:03:16 +0100 Subject: * apt/progress/base.py: - write exception text to stderr to avoid hidding exceptions like "pre-configure failed" from libapt (thanks to Jean-Baptiste Lallement) --- apt/progress/base.py | 4 +++- debian/changelog | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apt/progress/base.py b/apt/progress/base.py index 97375431..4943978c 100644 --- a/apt/progress/base.py +++ b/apt/progress/base.py @@ -27,6 +27,7 @@ import fcntl import os import re import select +import sys import apt_pkg @@ -196,7 +197,8 @@ class InstallProgress(object): os._exit(os.spawnlp(os.P_WAIT, "dpkg", "dpkg", "--status-fd", str(self.write_stream.fileno()), "-i", obj)) - except Exception: + except Exception as e: + sys.stderr.write("%s\n" % e) os._exit(apt_pkg.PackageManager.RESULT_FAILED) self.child_pid = pid diff --git a/debian/changelog b/debian/changelog index 7150adf7..569c335d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,10 @@ python-apt (0.8.2) UNRELEASED; urgency=low for dep in or_dep_group: do_something() (thanks to Christop Groth) + * apt/progress/base.py: + - write exception text to stderr to avoid hidding exceptions + like "pre-configure failed" from libapt (thanks to Jean-Baptiste + Lallement) [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) -- cgit v1.2.3 From c8bfdda85fbd2df250fbc6d3faeb2bd5875a77d6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 1 Dec 2011 13:32:42 +0100 Subject: py3 fixes/clean --- apt/progress/base.py | 2 ++ tests/test_debfile.py | 4 ++-- tests/test_utils.py | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apt/progress/base.py b/apt/progress/base.py index 4943978c..c2a9a9c8 100644 --- a/apt/progress/base.py +++ b/apt/progress/base.py @@ -192,12 +192,14 @@ class InstallProgress(object): # and the execution continues in the # parent code leading to very confusing bugs try: + raise Exception("foo") os._exit(obj.do_install(self.write_stream.fileno())) except AttributeError: os._exit(os.spawnlp(os.P_WAIT, "dpkg", "dpkg", "--status-fd", str(self.write_stream.fileno()), "-i", obj)) except Exception as e: + os.write(self.writefd, "pmerror:::%s" % e) sys.stderr.write("%s\n" % e) os._exit(apt_pkg.PackageManager.RESULT_FAILED) diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 501b8f61..56410153 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -131,12 +131,12 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading self.assertTrue(raised) def test_multiarch_deb(self): - print apt_pkg.get_architectures() if apt_pkg.get_architectures() != ["amd64", "i386"]: logging.warn("skipping test because running on a non-multiarch system") return deb = apt.debfile.DebPackage("./data/test_debs/multiarch-test1_i386.deb") - print deb.missing_deps() + res = deb.check() + # FIXME: do something sensible with the multiarch test diff --git a/tests/test_utils.py b/tests/test_utils.py index 23511f32..26ee0bff 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -7,7 +7,6 @@ # notice and this notice are preserved. import sys -sys.path.insert(0, "..") import apt_pkg import apt.utils import datetime -- cgit v1.2.3 From fb595849bc7149619b3e47b65f145a1f66fc7dbe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 1 Dec 2011 13:45:58 +0100 Subject: fix debfile binary test for py3 --- apt/debfile.py | 11 +++++++++-- tests/test_debfile.py | 5 ----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apt/debfile.py b/apt/debfile.py index 104b0814..4a82842a 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -525,12 +525,19 @@ class DebPackage(object): @staticmethod def to_strish(in_data): + # helper for py3 compat, in_data is str in py2 and bytes in py3 + def my_ord(c): + if type(c) == int: + return c + else: + return ord(c) + # convert s = "" for c in in_data: - if ord(c) < 10 or ord(c) > 127: + if my_ord(c) < 10 or my_ord(c) > 127: s += " " else: - s += c + s += chr(c) return s def _get_content(self, part, name, auto_decompress=True, auto_hex=True): diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 56410153..70979689 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -88,11 +88,6 @@ class TestDebfilee(unittest.TestCase): "Samuel Lidén Borell ") def test_content(self): - # no python-debian for python3 yet, so fail gracefully - try: - import debian - except ImportError: - return # normal deb = apt.debfile.DebPackage(cache=self.cache) deb.open(os.path.join("data", "test_debs", "gdebi-test11.deb")) -- cgit v1.2.3 From 1c6b01aa63e440444f00ec9e3f527e1c65a63787 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 1 Dec 2011 13:55:04 +0100 Subject: apt/progress/base.py: fix silly leftover from last commit --- apt/progress/base.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/apt/progress/base.py b/apt/progress/base.py index c2a9a9c8..4943978c 100644 --- a/apt/progress/base.py +++ b/apt/progress/base.py @@ -192,14 +192,12 @@ class InstallProgress(object): # and the execution continues in the # parent code leading to very confusing bugs try: - raise Exception("foo") os._exit(obj.do_install(self.write_stream.fileno())) except AttributeError: os._exit(os.spawnlp(os.P_WAIT, "dpkg", "dpkg", "--status-fd", str(self.write_stream.fileno()), "-i", obj)) except Exception as e: - os.write(self.writefd, "pmerror:::%s" % e) sys.stderr.write("%s\n" % e) os._exit(apt_pkg.PackageManager.RESULT_FAILED) -- cgit v1.2.3 From d236f527f85b185144875e0e7ad9102c4c2dabd0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 1 Dec 2011 13:55:28 +0100 Subject: apt/debfile.py: add py3 compat for to_strish() --- apt/debfile.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/apt/debfile.py b/apt/debfile.py index 4a82842a..a7202eba 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -525,19 +525,21 @@ class DebPackage(object): @staticmethod def to_strish(in_data): - # helper for py3 compat, in_data is str in py2 and bytes in py3 - def my_ord(c): - if type(c) == int: - return c - else: - return ord(c) - # convert s = "" - for c in in_data: - if my_ord(c) < 10 or my_ord(c) > 127: - s += " " - else: - s += chr(c) + # py2 compat, in_data is type string + if type(in_data) == str: + for c in in_data: + if ord(c) < 10 or ord(c) > 127: + s += " " + else: + s += c + # py3 compat, in_data is type bytes + else: + for b in in_data: + if b < 10 or b > 127: + s += " " + else: + s += chr(b) return s def _get_content(self, part, name, auto_decompress=True, auto_hex=True): -- cgit v1.2.3 From d686a36d94e909eefc13403391ee60938f54df5c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 1 Dec 2011 14:30:13 +0100 Subject: releasing version 0.8.2 --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4cde2d21..4a90e907 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.8.2) UNRELEASED; urgency=low +python-apt (0.8.2) unstable; urgency=low [ Michael Vogt ] * merged from ubuntu: @@ -51,7 +51,7 @@ python-apt (0.8.2) UNRELEASED; urgency=low * fixed a typo, changed "Open Source software" to "free and open-source software" (LP: #500940) - -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 + -- Michael Vogt Thu, 01 Dec 2011 14:14:42 +0100 python-apt (0.8.1) unstable; urgency=low @@ -81,7 +81,6 @@ python-apt (0.8.1) unstable; urgency=low that needs universe enabled as well (plus add test) * apt/progress/gtk2.py: - update to the latest vte API for child-exited (LP: #865388) - * tests/test_apt_cache.py: -- Michael Vogt Wed, 19 Oct 2011 16:39:13 +0200 -- cgit v1.2.3 From 350bb4a03d6562ddba12fbb0a34610aac7706b3c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Dec 2011 17:26:57 +0100 Subject: handle architecture-specific conflicts correctly (LP: #829138) --- apt/debfile.py | 3 ++- debian/changelog | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apt/debfile.py b/apt/debfile.py index c91ce349..17f1dbd9 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -310,6 +310,7 @@ class DebPackage(object): size = float(len(self._cache)) steps = max(int(size/50), 1) debver = self._sections["Version"] + debarch = self._sections["Architecture"] # store what we provide so that we can later check against that provides = [ x[0][0] for x in self.provides] for (i, pkg) in enumerate(self._cache): @@ -338,7 +339,7 @@ class DebPackage(object): if "Conflicts" in ver.depends_list: for conflicts_ver_list in ver.depends_list["Conflicts"]: for c_or in conflicts_ver_list: - if c_or.target_pkg.name == self.pkgname: + if c_or.target_pkg.name == self.pkgname and c_or.target_pkg.architecture == debarch: if apt_pkg.check_dep(debver, c_or.comp_type, c_or.target_ver): self._dbg(2, "would break (conflicts) %s" % pkg.name) # 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 diff --git a/debian/changelog b/debian/changelog index 4a90e907..d5b68082 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.3) UNRELEASED; urgency=low + + [ Alexey Feldgendler ] + * handle architecture-specific conflicts correctly (LP: #829138) + + -- Michael Vogt Thu, 08 Dec 2011 17:26:37 +0100 + python-apt (0.8.2) unstable; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 33c83f032fa17f0068a3a1b5486a3cfcfeabd66d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Dec 2011 20:15:58 +0100 Subject: tests/test_apt_cache.py: change test to test for python3 instead of xterm to fix test failure on certain buildds --- tests/test_apt_cache.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 6ec04ed5..e62507ed 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -185,11 +185,11 @@ class TestAptCache(unittest.TestCase): cache = apt.Cache(rootdir="/") l = [] l.append(cache["libc6"]) - l.append(cache["xterm"]) + l.append(cache["python3"]) l.append(cache["apt"]) l.sort() self.assertEqual([p.name for p in l], - ["apt", "libc6", "xterm"]) + ["apt", "libc6", "python3"]) def test_get_architectures(self): main_arch = apt.apt_pkg.config.get("APT::Architecture") -- cgit v1.2.3 From a84352261cd34aaa34b3c4507d9d8e6216170050 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Dec 2011 20:31:15 +0100 Subject: * tests/test_apt_cache.py: - add additional check if provides test can actually be run --- debian/changelog | 2 ++ tests/test_apt_cache.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2b16a2bd..46a94688 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ python-apt (0.8.3) UNRELEASED; urgency=low [ Michael Vogt ] * lp:~mvo/python-apt/debfile-multiarch: - add multiarch support to the debfile.py code + * tests/test_apt_cache.py: + - add additional check if provides test can actually be run -- Michael Vogt Thu, 08 Dec 2011 17:26:37 +0100 diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index e62507ed..2bc19353 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -74,6 +74,9 @@ class TestAptCache(unittest.TestCase): apt.apt_pkg.config.set("Apt::architecture", "i386") cache = apt.Cache(rootdir="./data/test-provides/") cache.open() + if len(cache) == 0: + logging.warn("skipping test_get_provided_packages, cache empty?!?") + return # a true virtual pkg l = cache.get_providing_packages("mail-transport-agent") self.assertTrue(len(l) > 0) @@ -84,6 +87,9 @@ class TestAptCache(unittest.TestCase): apt.apt_pkg.config.set("Apt::architecture", "i386") # create highlevel cache and get the lowlevel one from it highlevel_cache = apt.Cache(rootdir="./data/test-provides") + if len(highlevel_cache) == 0: + logging.warn("skipping test_log_level_pkg_provides, cache empty?!?") + return # low level cache provides list of the pkg cache = highlevel_cache._cache l = cache["mail-transport-agent"].provides_list -- cgit v1.2.3 From f841101c94f1b5892f042ecab2c0c74e9b947c8c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Dec 2011 09:16:08 +0100 Subject: tests/test_apt_cache.py: use intltool instead of libc6 as the later is not available on ia64 or kfreebsd --- tests/test_apt_cache.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 2bc19353..448aed75 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -190,12 +190,12 @@ class TestAptCache(unittest.TestCase): def test_package_cmp(self): cache = apt.Cache(rootdir="/") l = [] - l.append(cache["libc6"]) + l.append(cache["intltool"]) l.append(cache["python3"]) l.append(cache["apt"]) l.sort() self.assertEqual([p.name for p in l], - ["apt", "libc6", "python3"]) + ["apt", "intltool", "python3"]) def test_get_architectures(self): main_arch = apt.apt_pkg.config.get("APT::Architecture") -- cgit v1.2.3 From 10ec8cd5b5614606b3db9fdc3d6e248984048f0e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 19 Dec 2011 12:06:06 +0100 Subject: * apt/debfile.py: - fix crash in dep multiarch handling --- apt/debfile.py | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt/debfile.py b/apt/debfile.py index 160a4a72..cd027c71 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -94,7 +94,8 @@ class DebPackage(object): return pkgname elif self._cache.is_virtual_package(pkgname): return pkgname - elif self._cache[pkgname].candidate.architecture == "all": + elif (pkgname in self._cache and + self._cache[pkgname].candidate.architecture == "all"): return pkgname # now do the real multiarch checking multiarch_pkgname = "%s:%s" % (pkgname, self._multiarch) diff --git a/debian/changelog b/debian/changelog index fcf8ff98..df486b60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ python-apt (0.8.3) unstable; urgency=low - add multiarch support to the debfile.py code * tests/test_apt_cache.py: - add additional check if provides test can actually be run + * apt/debfile.py: + - fix crash in dep multiarch handling -- Michael Vogt Thu, 08 Dec 2011 20:31:52 +0100 -- cgit v1.2.3 From 375920c5172a5f60acba02b73c3b32ffbccc8ab2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 19 Dec 2011 13:35:59 +0100 Subject: pyflakes cleanup, use apt_pkg.gettext in aptsources too --- apt/debfile.py | 12 ++---------- apt/progress/gtk2.py | 3 --- aptsources/distinfo.py | 6 +----- aptsources/distro.py | 4 +--- aptsources/sourceslist.py | 3 +-- 5 files changed, 5 insertions(+), 23 deletions(-) diff --git a/apt/debfile.py b/apt/debfile.py index cd027c71..ab24c50b 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -160,10 +160,6 @@ class DebPackage(object): def _satisfy_or_group(self, or_group): """Try to satisfy the or_group.""" - - or_found = False - virtual_pkg = None - for dep in or_group: depname, ver, oper = dep @@ -233,10 +229,6 @@ class DebPackage(object): def _check_conflicts_or_group(self, or_group): """Check the or-group for conflicts with installed pkgs.""" self._dbg(2, "_check_conflicts_or_group(): %s " % (or_group)) - - or_found = False - virtual_pkg = None - for dep in or_group: depname = dep[0] ver = dep[1] @@ -514,7 +506,7 @@ class DebPackage(object): for pkg in self._need_pkgs: try: self._cache[pkg].mark_install(from_user=False) - except SystemError as e: + except SystemError: self._failure_string = _("Cannot install '%s'") % pkg self._cache.clear() return False @@ -607,7 +599,7 @@ class DebPackage(object): # auto-convert to hex try: data = unicode(data, "utf-8") - except Exception as e: + except Exception: new_data = _("Automatically converted to printable ascii:\n") new_data += self.to_strish(data) return new_data diff --git a/apt/progress/gtk2.py b/apt/progress/gtk2.py index b5794e92..c2635ca0 100644 --- a/apt/progress/gtk2.py +++ b/apt/progress/gtk2.py @@ -22,9 +22,6 @@ # USA """GObject-powered progress classes and a GTK+ status widget.""" -import os -import time - import pygtk pygtk.require('2.0') import gtk diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index c8ec5c46..ec162c2d 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -24,17 +24,13 @@ import errno import logging import os -import gettext from os import getenv from subprocess import Popen, PIPE import re import apt_pkg - -def _(s): - return gettext.dgettext("python-apt", s) - +from apt_pkg import gettext as _ class Template(object): diff --git a/aptsources/distro.py b/aptsources/distro.py index f777a4ea..b4056b27 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -30,9 +30,7 @@ import sys from xml.etree.ElementTree import ElementTree import gettext - -def _(s): - return gettext.dgettext("python-apt", s) +from apt_pkg import gettext as _ class NoDistroTemplateException(Exception): diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 40a0379b..e3b8c9be 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -import gettext import glob import logging import os.path @@ -35,6 +34,7 @@ import time import apt_pkg from distinfo import DistInfo from apt.deprecation import function_deprecated_by +from apt_pkg import gettext as _ # some global helpers @@ -446,7 +446,6 @@ class SourceEntryMatcher(object): def match(self, source): """Add a matching template to the source""" - _ = gettext.gettext found = False for template in self.templates: if (re.search(template.match_uri, source.uri) and -- cgit v1.2.3 From 1fc5fddddd6041eb17331d9943f7f489bd53314a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Jan 2012 14:20:55 +0100 Subject: * doc/examples/build-deps.py: - update the build-deps.py example to use the apt API more --- debian/changelog | 7 ++++ doc/examples/build-deps-old.py | 73 ++++++++++++++++++++++++++++++++++++++++++ doc/examples/build-deps.py | 55 +++++++++++-------------------- 3 files changed, 99 insertions(+), 36 deletions(-) create mode 100755 doc/examples/build-deps-old.py diff --git a/debian/changelog b/debian/changelog index df486b60..7f582bff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.4) UNRELEASED; urgency=low + + * doc/examples/build-deps.py: + - update the build-deps.py example to use the apt API more + + -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 + python-apt (0.8.3) unstable; urgency=low [ Alexey Feldgendler ] diff --git a/doc/examples/build-deps-old.py b/doc/examples/build-deps-old.py new file mode 100755 index 00000000..656f1361 --- /dev/null +++ b/doc/examples/build-deps-old.py @@ -0,0 +1,73 @@ +#!/usr/bin/python +# this is a example how to access the build dependencies of a package + +import apt_pkg +import sys + + +def get_source_pkg(pkg, records, depcache): + """ get the source package name of a given package """ + version = depcache.GetCandidateVer(pkg) + if not version: + return None + file, index = version.FileList.pop(0) + records.Lookup((file, index)) + if records.SourcePkg != "": + srcpkg = records.SourcePkg + else: + srcpkg = pkg.Name + return srcpkg + + +# main +apt_pkg.init() +cache = apt_pkg.Cache() +depcache = apt_pkg.DepCache(cache) +depcache.Init() +records = apt_pkg.PackageRecords(cache) +srcrecords = apt_pkg.SourceRecords() + +# base package that we use for build-depends calculation +if len(sys.argv) < 2: + print "need a package name as argument" + sys.exit(1) +try: + pkg = base = cache[sys.argv[1]] +except KeyError: + print "No package %s found" % sys.argv[1] + sys.exit(1) +all_build_depends = set() + +# get the build depdends for the package itself +srcpkg_name = get_source_pkg(base, records, depcache) +print "srcpkg_name: %s " % srcpkg_name +if not srcpkg_name: + print "Can't find source package for '%s'" % pkg.Name +srcrec = srcrecords.Lookup(srcpkg_name) +if srcrec: + print "Files:" + print srcrecords.Files + bd = srcrecords.BuildDepends + print "build-depends of the package: %s " % bd + for b in bd: + all_build_depends.add(b[0]) + +# calculate the build depends for all dependencies +depends = depcache.GetCandidateVer(base).DependsList +for dep in depends["Depends"]: # FIXME: do we need to consider PreDepends? + pkg = dep[0].TargetPkg + srcpkg_name = get_source_pkg(pkg, records, depcache) + if not srcpkg_name: + print "Can't find source package for '%s'" % pkg.Name + continue + srcrec = srcrecords.Lookup(srcpkg_name) + if srcrec: + #print srcrecords.Package + #print srcrecords.Binaries + bd = srcrecords.BuildDepends + #print "%s: %s " % (srcpkg_name, bd) + for b in bd: + all_build_depends.add(b[0]) + + +print "\n".join(all_build_depends) diff --git a/doc/examples/build-deps.py b/doc/examples/build-deps.py index 656f1361..5d243943 100755 --- a/doc/examples/build-deps.py +++ b/doc/examples/build-deps.py @@ -1,30 +1,12 @@ #!/usr/bin/python # this is a example how to access the build dependencies of a package +import apt import apt_pkg import sys - -def get_source_pkg(pkg, records, depcache): - """ get the source package name of a given package """ - version = depcache.GetCandidateVer(pkg) - if not version: - return None - file, index = version.FileList.pop(0) - records.Lookup((file, index)) - if records.SourcePkg != "": - srcpkg = records.SourcePkg - else: - srcpkg = pkg.Name - return srcpkg - - # main -apt_pkg.init() -cache = apt_pkg.Cache() -depcache = apt_pkg.DepCache(cache) -depcache.Init() -records = apt_pkg.PackageRecords(cache) +cache = apt.Cache() srcrecords = apt_pkg.SourceRecords() # base package that we use for build-depends calculation @@ -39,7 +21,7 @@ except KeyError: all_build_depends = set() # get the build depdends for the package itself -srcpkg_name = get_source_pkg(base, records, depcache) +srcpkg_name = base.candidate.source_name print "srcpkg_name: %s " % srcpkg_name if not srcpkg_name: print "Can't find source package for '%s'" % pkg.Name @@ -53,21 +35,22 @@ if srcrec: all_build_depends.add(b[0]) # calculate the build depends for all dependencies -depends = depcache.GetCandidateVer(base).DependsList -for dep in depends["Depends"]: # FIXME: do we need to consider PreDepends? - pkg = dep[0].TargetPkg - srcpkg_name = get_source_pkg(pkg, records, depcache) - if not srcpkg_name: - print "Can't find source package for '%s'" % pkg.Name - continue - srcrec = srcrecords.Lookup(srcpkg_name) - if srcrec: - #print srcrecords.Package - #print srcrecords.Binaries - bd = srcrecords.BuildDepends - #print "%s: %s " % (srcpkg_name, bd) - for b in bd: - all_build_depends.add(b[0]) +depends = base.candidate.dependencies +for or_dep in depends: + for dep in or_dep.or_dependencies: + pkg = cache[dep.name] + srcpkg_name = pkg.candidate.source_name + if not srcpkg_name: + print "Can't find source package for '%s'" % pkg.Name + continue + srcrec = srcrecords.Lookup(srcpkg_name) + if srcrec: + #print srcrecords.Package + #print srcrecords.Binaries + bd = srcrecords.BuildDepends + #print "%s: %s " % (srcpkg_name, bd) + for b in bd: + all_build_depends.add(b[0]) print "\n".join(all_build_depends) -- cgit v1.2.3 From 6c8269fc130c66d4a450a004af4e120e074808ce Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Jan 2012 11:07:12 +0100 Subject: pyflakes fixes --- aptsources/distinfo.py | 1 - aptsources/distro.py | 4 +--- aptsources/sourceslist.py | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index ec162c2d..ddaeb218 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -24,7 +24,6 @@ import errno import logging import os -from os import getenv from subprocess import Popen, PIPE import re diff --git a/aptsources/distro.py b/aptsources/distro.py index b4056b27..27d7f859 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -25,10 +25,8 @@ import gettext import logging import re import os -import sys from xml.etree.ElementTree import ElementTree -import gettext from apt_pkg import gettext as _ @@ -94,7 +92,7 @@ class Distribution(object): comps = [] cdrom_comps = [] enabled_comps = [] - source_code = [] + #source_code = [] for source in self.sourceslist.list: if (source.invalid == False and self.is_codename(source.dist) and diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index e3b8c9be..03377258 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -28,13 +28,12 @@ import logging import os.path import re import shutil -import sys import time import apt_pkg from distinfo import DistInfo from apt.deprecation import function_deprecated_by -from apt_pkg import gettext as _ +#from apt_pkg import gettext as _ # some global helpers -- cgit v1.2.3 From 2021c1b4973c3201b1e4580d00b7351c23a831c4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jan 2012 15:25:37 +0100 Subject: RED: policy should support verfile --- po/python-apt.pot | 50 +++++++++++++++++++++++++------------------------- python/cache.cc | 7 +++++++ tests/test_policy.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 tests/test_policy.py diff --git a/po/python-apt.pot b/po/python-apt.pot index f1aecc59..a7cf0a8d 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-12-08 20:01+0100\n" +"POT-Creation-Date: 2012-01-30 15:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -410,7 +410,7 @@ msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:210 ../aptsources/distro.py:438 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:434 #, python-format msgid "Server for %s" msgstr "" @@ -418,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:228 ../aptsources/distro.py:234 -#: ../aptsources/distro.py:250 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:254 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:267 ../apt/progress/gtk2.py:323 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:343 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:431 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:437 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" @@ -479,18 +479,18 @@ msgstr "" msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:205 +#: ../apt/debfile.py:202 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:226 +#: ../apt/debfile.py:223 #, 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:371 +#: ../apt/debfile.py:364 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -498,63 +498,63 @@ 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:387 +#: ../apt/debfile.py:380 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" -#: ../apt/debfile.py:397 +#: ../apt/debfile.py:390 #, 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:445 +#: ../apt/debfile.py:438 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:455 +#: ../apt/debfile.py:448 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:462 +#: ../apt/debfile.py:455 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:487 +#: ../apt/debfile.py:480 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:517 +#: ../apt/debfile.py:510 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:561 +#: ../apt/debfile.py:554 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:604 +#: ../apt/debfile.py:597 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:610 +#: ../apt/debfile.py:603 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:700 +#: ../apt/debfile.py:693 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:711 +#: ../apt/debfile.py:704 msgid "An essential package would be removed" msgstr "" diff --git a/python/cache.cc b/python/cache.cc index b263d320..191e2204 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -229,6 +229,12 @@ static PyObject *PkgCacheGetGroups(PyObject *Self, void*) { return CppPyObject_NEW(Self,&PyGroupList_Type,Cache->GrpBegin()); } +static PyObject *PkgCacheGetPolicy(PyObject *Self, void*) { + pkgCacheFile *CacheFile = GetCpp(Self); + std::cerr << "policy: " << CacheFile->Policy << std::endl; + return CppPyObject_NEW(Self,&PyPolicy_Type,CacheFile->Policy); +} + static PyObject *PkgCacheGetPackages(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); return CppPyObject_NEW(Self,&PyPackageList_Type,Cache->PkgBegin()); @@ -289,6 +295,7 @@ static PyGetSetDef PkgCacheGetSet[] = { {"group_count",PkgCacheGetGroupCount,0, "The number of apt_pkg.Group objects stored in the cache."}, {"groups", PkgCacheGetGroups, 0, "A list of Group objects in the cache"}, + {"policy", PkgCacheGetPolicy, 0, "The PkgPolicy for the cache"}, {"is_multi_arch", PkgCacheGetIsMultiArch, 0, "Whether the cache supports multi-arch."}, {"package_count",PkgCacheGetPackageCount,0, diff --git a/tests/test_policy.py b/tests/test_policy.py new file mode 100644 index 00000000..2d261f5f --- /dev/null +++ b/tests/test_policy.py @@ -0,0 +1,31 @@ +#!/usr/bin/python +# +# Copyright (C) 2012 Michael Vogt +# +# 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 apt +import unittest + +class TestAptPolicy(unittest.TestCase): + + def test_apt_policy(self): + # get a policy + cache = apt.Cache() + policy = cache._depcache.policy + self.assertNotEqual(policy, None) + # basic tests + pkg = cache["apt"] + self.assertEqual(policy.get_priority(pkg._pkg), 0) + # get verfile + ver = pkg.candidate._cand + verfile_list = ver.file_list + for verfile in verfile_list: + print verfile + self.assertEqual(policy.get_priority(verfile), 500) + + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From 00ce4d227aef4ccde15f8cfa5b1a5582195eb639 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jan 2012 15:33:24 +0100 Subject: GREEN: policy should suppors PkgVerFile now --- po/python-apt.pot | 2 +- python/policy.cc | 3 +++ tests/test_policy.py | 13 +++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/po/python-apt.pot b/po/python-apt.pot index a7cf0a8d..b99c36e1 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-01-30 15:16+0100\n" +"POT-Creation-Date: 2012-01-30 15:32+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/python/policy.cc b/python/policy.cc index b11e4dde..b7e648b5 100644 --- a/python/policy.cc +++ b/python/policy.cc @@ -46,6 +46,9 @@ PyObject *policy_get_priority(PyObject *self, PyObject *arg) { if (PyObject_TypeCheck(arg, &PyPackage_Type)) { pkgCache::PkgIterator pkg = GetCpp(arg); return MkPyNumber(policy->GetPriority(pkg)); + } else if (PyObject_TypeCheck(arg, &PyPackageFile_Type)) { + pkgCache::PkgFileIterator pkgfile = GetCpp(arg); + return MkPyNumber(policy->GetPriority(pkgfile)); } else { PyErr_SetString(PyExc_TypeError,"Argument must be of Package()."); return 0; diff --git a/tests/test_policy.py b/tests/test_policy.py index 2d261f5f..2aab6722 100644 --- a/tests/test_policy.py +++ b/tests/test_policy.py @@ -19,12 +19,13 @@ class TestAptPolicy(unittest.TestCase): # basic tests pkg = cache["apt"] self.assertEqual(policy.get_priority(pkg._pkg), 0) - # get verfile - ver = pkg.candidate._cand - verfile_list = ver.file_list - for verfile in verfile_list: - print verfile - self.assertEqual(policy.get_priority(verfile), 500) + # get priority for all pkgfiles + for ver in pkg.versions: + lowlevel_ver = ver._cand + for pkgfile, i in lowlevel_ver.file_list: + #print verfile, i, policy.get_priority(pkgfile) + self.assertTrue(policy.get_priority(pkgfile) > 1) + self.assertTrue(policy.get_priority(pkgfile) < 1001) if __name__ == "__main__": -- cgit v1.2.3 From 38165cbeb26313bb468dcf527a843ba55571a8f2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jan 2012 15:39:42 +0100 Subject: REFACTOR: python/policy.cc update error to include PackageFile() too --- python/policy.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/policy.cc b/python/policy.cc index b7e648b5..96b83abd 100644 --- a/python/policy.cc +++ b/python/policy.cc @@ -50,7 +50,7 @@ PyObject *policy_get_priority(PyObject *self, PyObject *arg) { pkgCache::PkgFileIterator pkgfile = GetCpp(arg); return MkPyNumber(policy->GetPriority(pkgfile)); } else { - PyErr_SetString(PyExc_TypeError,"Argument must be of Package()."); + PyErr_SetString(PyExc_TypeError,"Argument must be of Package() or PackageFile()."); return 0; } } -- cgit v1.2.3 From 055dc32f4025f081293cee32cde935100532c651 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jan 2012 15:40:50 +0100 Subject: RED: apt.Version should have "policy_priority" property --- debian/changelog | 1 + po/python-apt.pot | 2 +- tests/test_policy.py | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f582bff..1e400dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-apt (0.8.4) UNRELEASED; urgency=low * doc/examples/build-deps.py: - update the build-deps.py example to use the apt API more + * add support for apt_pkg.Policy.get_priority(PkgFileIterator) -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 diff --git a/po/python-apt.pot b/po/python-apt.pot index b99c36e1..58877b55 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-01-30 15:32+0100\n" +"POT-Creation-Date: 2012-01-30 15:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tests/test_policy.py b/tests/test_policy.py index 2aab6722..449c3961 100644 --- a/tests/test_policy.py +++ b/tests/test_policy.py @@ -11,7 +11,7 @@ import unittest class TestAptPolicy(unittest.TestCase): - def test_apt_policy(self): + def test_apt_policy_lowlevel(self): # get a policy cache = apt.Cache() policy = cache._depcache.policy @@ -23,10 +23,16 @@ class TestAptPolicy(unittest.TestCase): for ver in pkg.versions: lowlevel_ver = ver._cand for pkgfile, i in lowlevel_ver.file_list: - #print verfile, i, policy.get_priority(pkgfile) + print pkgfile, i, policy.get_priority(pkgfile) self.assertTrue(policy.get_priority(pkgfile) > 1) self.assertTrue(policy.get_priority(pkgfile) < 1001) + def test_apt_policy_highlevel(self): + cache = apt.Cache() + pkg = cache["apt"] + self.assertTrue(pkg.candidate.policy_priority > 1 and + pkg.candidate.policy_priority < 1001) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From accf60bda95e6a1bad53f26412b12a32f136d54d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 31 Jan 2012 14:52:42 +0100 Subject: * apt/debfile.py: - use apt_inst for reading the control_filelist * debian/control: - remove no longer needed dependency on python-debian --- apt/debfile.py | 37 ++++++++++++++++++++----------------- debian/changelog | 4 ++++ debian/control | 1 - 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/apt/debfile.py b/apt/debfile.py index ab24c50b..6a189502 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -40,8 +40,12 @@ class DebPackage(object): VERSION_SAME, VERSION_NEWER) = range(4) - _supported_data_members = ("data.tar.gz", "data.tar.bz2", "data.tar.lzma", - "data.tar.xz") + _supported_data_members = ( + "data.tar.gz", + "data.tar.bz2", + "data.tar.lzma", + "data.tar.xz", + ) debug = 0 @@ -82,10 +86,22 @@ class DebPackage(object): try: self._debfile.data.go(lambda item, data: files.append(item.name)) except SystemError: - return [_("List of files for '%s' could not be read" % - self.filename)] + return [_("List of files for '%s' could not be read") % + self.filename] return files + @property + def control_filelist(self): + """ return the list of files in control.tar.gt """ + control = [] + try: + self._debfile.control.go(lambda item, data: control.append(item.name)) + except SystemError: + return [_("List of control files for '%s' could not be read") % + self.filename] + return sorted(control) + + # helper that will return a pkgname with a multiarch suffix if needed def _maybe_append_multiarch_suffix(self, pkgname, in_conflict_checking=False): @@ -545,19 +561,6 @@ class DebPackage(object): remove.append(pkg.name) return (install, remove, unauthenticated) - @property - def control_filelist(self): - """ return the list of files in control.tar.gt """ - try: - from debian.debfile import DebFile - except: - raise Exception(_("Python-debian module not available")) - content = [] - for name in DebFile(self.filename).control: - if name and name != ".": - content.append(name) - return sorted(content) - @staticmethod def to_hex(in_data): hex = "" diff --git a/debian/changelog b/debian/changelog index 1e400dfb..17fe379e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ python-apt (0.8.4) UNRELEASED; urgency=low * doc/examples/build-deps.py: - update the build-deps.py example to use the apt API more * add support for apt_pkg.Policy.get_priority(PkgFileIterator) + * apt/debfile.py: + - use apt_inst for reading the control_filelist + * debian/control: + - remove no longer needed dependency on python-debian -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 diff --git a/debian/control b/debian/control index 541e4c36..29392858 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,6 @@ Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), computer-janitor (<< 1.14.1-1+), debdelta (<< 0.41+), python-dogtail (<< 0.6.1-3.1+), - python-debian (<< 0.1.18+), python-software-properties (<< 0.70.debian-1+), aptdaemon (<< 0.11+bzr343-1~), apt-forktracer (<< 0.3), -- cgit v1.2.3 From 6f538d96ec35e80e19f1b33cad86b9ae45da54f5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 31 Jan 2012 14:58:14 +0100 Subject: apt/debfile.py: kill _supported_data_members its actually not used anymore and instead done dynamically in arfile.cc using the APT::Configuration::getCompressionTypes() call (yeah!) --- apt/debfile.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/apt/debfile.py b/apt/debfile.py index 6a189502..2eb807b8 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -40,13 +40,6 @@ class DebPackage(object): VERSION_SAME, VERSION_NEWER) = range(4) - _supported_data_members = ( - "data.tar.gz", - "data.tar.bz2", - "data.tar.lzma", - "data.tar.xz", - ) - debug = 0 def __init__(self, filename=None, cache=None): -- cgit v1.2.3 From d3ea76a031fd9cb804741ec9955eccbbdb5f16f7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Feb 2012 10:55:20 +0100 Subject: * tests/test_tagfile.py: - add test for apt_pkg.TagFile() both for compressed/uncompressed files --- debian/changelog | 3 +++ tests/data/tagfile/history.1.log.gz | Bin 0 -> 270 bytes tests/data/tagfile/history.log | 15 +++++++++++++++ tests/test_tagfile.py | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 tests/data/tagfile/history.1.log.gz create mode 100644 tests/data/tagfile/history.log create mode 100644 tests/test_tagfile.py diff --git a/debian/changelog b/debian/changelog index 17fe379e..89c07119 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ python-apt (0.8.4) UNRELEASED; urgency=low - use apt_inst for reading the control_filelist * debian/control: - remove no longer needed dependency on python-debian + * tests/test_tagfile.py: + - add test for apt_pkg.TagFile() both for compressed/uncompressed + files -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 diff --git a/tests/data/tagfile/history.1.log.gz b/tests/data/tagfile/history.1.log.gz new file mode 100644 index 00000000..4174e02b Binary files /dev/null and b/tests/data/tagfile/history.1.log.gz differ diff --git a/tests/data/tagfile/history.log b/tests/data/tagfile/history.log new file mode 100644 index 00000000..f1d72665 --- /dev/null +++ b/tests/data/tagfile/history.log @@ -0,0 +1,15 @@ + +Start-Date: 2012-02-01 13:54:52 +Commandline: apt-get install chromium-browser +Install: chromium-browser:amd64 (16.0.912.77~r118311-0ubuntu1), chromium-browser-l10n:amd64 (16.0.912.77~r118311-0ubuntu1, automatic), chromium-codecs-ffmpeg:amd64 (16.0.912.77~r118311-0ubuntu1, automatic) +End-Date: 2012-02-01 13:55:01 + +Start-Date: 2012-02-02 10:39:04 +Commandline: apt-get install python-geoclue +Install: python-geoclue:amd64 (0.1.0-4build1) +End-Date: 2012-02-02 10:39:08 + +Start-Date: 2012-02-03 10:20:50 +Commandline: apt-get install python-qt4 +Install: python-qt4:amd64 (4.9-3ubuntu1) +End-Date: 2012-02-03 10:20:55 diff --git a/tests/test_tagfile.py b/tests/test_tagfile.py new file mode 100644 index 00000000..b0b5cbdc --- /dev/null +++ b/tests/test_tagfile.py @@ -0,0 +1,35 @@ +#!/usr/bin/python +# +# Copyright (C) 2010 Michael Vogt +# +# 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. +"""Unit tests for verifying the correctness of apt_pkg.TagFile""" + +import unittest + +from test_all import get_library_dir +import sys +sys.path.insert(0, get_library_dir()) + +import apt_pkg + +class TestTagFile(unittest.TestCase): + """ test the apt_pkg.TagFile """ + + def test_tag_file(self): + tagfile = apt_pkg.TagFile(open("./data/tagfile/history.log")) + for i, stanza in enumerate(tagfile): + pass + self.assertEqual(i, 2) + + def test_tag_file_compressed(self): + tagfile = apt_pkg.TagFile(open("./data/tagfile/history.1.log.gz")) + for i, stanza in enumerate(tagfile): + #print stanza + pass + self.assertEqual(i, 2) + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From 70e5581fa92082cc47ebadd0ae5e2cbcf928853d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Feb 2012 10:58:04 +0100 Subject: tests/test_tagfile.py: fix data loading when not in tests dir --- tests/test_tagfile.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/test_tagfile.py b/tests/test_tagfile.py index b0b5cbdc..b14dd9b4 100644 --- a/tests/test_tagfile.py +++ b/tests/test_tagfile.py @@ -7,6 +7,7 @@ # notice and this notice are preserved. """Unit tests for verifying the correctness of apt_pkg.TagFile""" +import os import unittest from test_all import get_library_dir @@ -19,13 +20,19 @@ class TestTagFile(unittest.TestCase): """ test the apt_pkg.TagFile """ def test_tag_file(self): - tagfile = apt_pkg.TagFile(open("./data/tagfile/history.log")) + basepath = os.path.dirname(__file__) + tagfilepath = os.path.join( + basepath, "./data/tagfile/history.log") + tagfile = apt_pkg.TagFile(open(tagfilepath)) for i, stanza in enumerate(tagfile): pass self.assertEqual(i, 2) def test_tag_file_compressed(self): - tagfile = apt_pkg.TagFile(open("./data/tagfile/history.1.log.gz")) + basepath = os.path.dirname(__file__) + tagfilepath = os.path.join( + basepath, "./data/tagfile/history.1.log.gz") + tagfile = apt_pkg.TagFile(open(tagfilepath)) for i, stanza in enumerate(tagfile): #print stanza pass -- cgit v1.2.3 From 7e0a6a8421d0b1de85a69fad80c24b494385a1bf Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Feb 2012 13:46:08 +0100 Subject: * python/tag.cc, tests/test_tagfile.py: - add support a filename argument in apt_pkg.TagFile() (in addition to the file object currently supported) --- debian/changelog | 3 +++ python/tag.cc | 44 +++++++++++++++++++++++++++++++++++--------- tests/test_tagfile.py | 30 +++++++++++++++--------------- 3 files changed, 53 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89c07119..5813656a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ python-apt (0.8.4) UNRELEASED; urgency=low * tests/test_tagfile.py: - add test for apt_pkg.TagFile() both for compressed/uncompressed files + * python/tag.cc, tests/test_tagfile.py: + - add support a filename argument in apt_pkg.TagFile() (in addition + to the file object currently supported) -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 diff --git a/python/tag.cc b/python/tag.cc index 3996af8e..b680dc02 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -390,24 +390,50 @@ PyObject *ParseSection(PyObject *self,PyObject *Args) static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) { + TagFileData *New; PyObject *File; + char *kwlist[] = {"file", 0}; if (PyArg_ParseTupleAndKeywords(Args,kwds,"O",kwlist,&File) == 0) return 0; - int fileno = PyObject_AsFileDescriptor(File); - if (fileno == -1) + + // check if we got a filename or a file object + int fileno = -1; + const char *filename = NULL; + if (PyString_Check(File)) + filename = PyObject_AsString(File); + else + fileno = PyObject_AsFileDescriptor(File); + + // handle invalid arguments + if (fileno == -1 && filename == NULL) + { + PyErr_SetString(PyExc_TypeError, + "Argument must be string, fd or have a fileno() method"); return 0; + } - TagFileData *New = (TagFileData*)type->tp_alloc(type, 0); + if (fileno > 0) + { + New = (TagFileData*)type->tp_alloc(type, 0); #ifdef APT_HAS_GZIP - new (&New->Fd) FileFd(); - New->Fd.OpenDescriptor(fileno, FileFd::ReadOnlyGzip, false); + new (&New->Fd) FileFd(); + New->Fd.OpenDescriptor(fileno, FileFd::ReadOnlyGzip, false); #else - new (&New->Fd) FileFd(fileno,false); + new (&New->Fd) FileFd(fileno,false); #endif - New->Owner = File; - Py_INCREF(New->Owner); - new (&New->Object) pkgTagFile(&New->Fd); + New->Owner = File; + Py_INCREF(New->Owner); + new (&New->Object) pkgTagFile(&New->Fd); + } + else + { + New = (TagFileData*)type->tp_alloc(type, 0); + new (&New->Fd) FileFd(filename, FileFd::ReadOnly, FileFd::Extension, false); + New->Owner = File; + Py_INCREF(New->Owner); + new (&New->Object) pkgTagFile(&New->Fd); + } // Create the section New->Section = (TagSecData*)(&PyTagSection_Type)->tp_alloc(&PyTagSection_Type, 0); diff --git a/tests/test_tagfile.py b/tests/test_tagfile.py index b14dd9b4..371cc6ee 100644 --- a/tests/test_tagfile.py +++ b/tests/test_tagfile.py @@ -7,6 +7,7 @@ # notice and this notice are preserved. """Unit tests for verifying the correctness of apt_pkg.TagFile""" +import glob import os import unittest @@ -21,22 +22,21 @@ class TestTagFile(unittest.TestCase): def test_tag_file(self): basepath = os.path.dirname(__file__) - tagfilepath = os.path.join( - basepath, "./data/tagfile/history.log") - tagfile = apt_pkg.TagFile(open(tagfilepath)) - for i, stanza in enumerate(tagfile): - pass - self.assertEqual(i, 2) + tagfilepath = os.path.join(basepath, "./data/tagfile/*") + # test once for compressed and uncompressed + for testfile in glob.glob(tagfilepath): + # test once using the open() method and once using the path + for f in [testfile, open(testfile)]: + tagfile = apt_pkg.TagFile(f) + for i, stanza in enumerate(tagfile): + pass + self.assertEqual(i, 2) - def test_tag_file_compressed(self): - basepath = os.path.dirname(__file__) - tagfilepath = os.path.join( - basepath, "./data/tagfile/history.1.log.gz") - tagfile = apt_pkg.TagFile(open(tagfilepath)) - for i, stanza in enumerate(tagfile): - #print stanza - pass - self.assertEqual(i, 2) + def test_errors(self): + # Raises SystemError via lbiapt + self.assertRaises(SystemError, apt_pkg.TagFile, "not-there-no-no") + # Raises Type error + self.assertRaises(TypeError, apt_pkg.TagFile, object()) if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From e93ad4643202b6227ea9e4ab765cbb272c9d2413 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 6 Feb 2012 14:48:51 +0100 Subject: python/tag.cc: cleanup --- python/tag.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/python/tag.cc b/python/tag.cc index b680dc02..88a48df9 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -413,27 +413,23 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) return 0; } + New = (TagFileData*)type->tp_alloc(type, 0); if (fileno > 0) { - New = (TagFileData*)type->tp_alloc(type, 0); #ifdef APT_HAS_GZIP new (&New->Fd) FileFd(); New->Fd.OpenDescriptor(fileno, FileFd::ReadOnlyGzip, false); #else new (&New->Fd) FileFd(fileno,false); #endif - New->Owner = File; - Py_INCREF(New->Owner); - new (&New->Object) pkgTagFile(&New->Fd); } else { - New = (TagFileData*)type->tp_alloc(type, 0); new (&New->Fd) FileFd(filename, FileFd::ReadOnly, FileFd::Extension, false); - New->Owner = File; - Py_INCREF(New->Owner); - new (&New->Object) pkgTagFile(&New->Fd); } + New->Owner = File; + Py_INCREF(New->Owner); + new (&New->Object) pkgTagFile(&New->Fd); // Create the section New->Section = (TagSecData*)(&PyTagSection_Type)->tp_alloc(&PyTagSection_Type, 0); -- cgit v1.2.3 From 3514672ed2a333eb6791d425ebe59b883cf8d349 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 6 Feb 2012 14:55:25 +0100 Subject: python/tag.cc: make it build with older apt versions too --- python/tag.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python/tag.cc b/python/tag.cc index 88a48df9..49f53c31 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -425,7 +425,12 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) } else { + // FileFd::Extension got added in this revision +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 12) new (&New->Fd) FileFd(filename, FileFd::ReadOnly, FileFd::Extension, false); +#else + new (&New->Fd) FileFd(filename, FileFd::ReadOnly, false); +#endif } New->Owner = File; Py_INCREF(New->Owner); -- cgit v1.2.3 From d37863d6d08a02b484577f7a6a67f163cc2f2902 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 5 Mar 2012 13:05:39 +0100 Subject: python/apt_pkgmodule.cc: Fix apt_pkg.Dependency.TYPE_RECOMMENDS, had Suggests value previously --- debian/changelog | 5 +++++ python/apt_pkgmodule.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a585bbb4..b193ed71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ python-apt (0.8.4) UNRELEASED; urgency=low + [ Michael Vogt ] * doc/examples/build-deps.py: - update the build-deps.py example to use the apt API more * add support for apt_pkg.Policy.get_priority(PkgFileIterator) @@ -14,6 +15,10 @@ python-apt (0.8.4) UNRELEASED; urgency=low - add support a filename argument in apt_pkg.TagFile() (in addition to the file object currently supported) + [Julian Andres Klode ] + * python/apt_pkgmodule.cc: + - Fix apt_pkg.Dependency.TYPE_RECOMMENDS, had Suggests value previously + -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 python-apt (0.8.3.1) UNRELEASED; urgency=low diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index acfdf019..7704aa01 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -920,7 +920,7 @@ extern "C" void initapt_pkg() PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_SUGGESTS", MkPyNumber(pkgCache::Dep::Suggests)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_RECOMMENDS", - MkPyNumber(pkgCache::Dep::Suggests)); + MkPyNumber(pkgCache::Dep::Recommends)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_CONFLICTS", MkPyNumber(pkgCache::Dep::Conflicts)); PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_REPLACES", -- cgit v1.2.3 From da171aa93337802c19d8caa99a4ab8516bdbc5bd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 27 Mar 2012 11:21:20 +0200 Subject: * apt/package.py: - if there is no Version.uri return None --- apt/package.py | 5 ++++- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apt/package.py b/apt/package.py index 73f68c87..29eec909 100644 --- a/apt/package.py +++ b/apt/package.py @@ -545,7 +545,10 @@ class Version(object): .. versionadded:: 0.7.10 """ - return iter(self._uris()).next() + try: + return iter(self._uris()).next() + except StopIteration: + return None def fetch_binary(self, destdir='', progress=None): """Fetch the binary version of the package. diff --git a/debian/changelog b/debian/changelog index 5813656a..b1bf28d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.8.4) UNRELEASED; urgency=low * python/tag.cc, tests/test_tagfile.py: - add support a filename argument in apt_pkg.TagFile() (in addition to the file object currently supported) + * apt/package.py: + - if there is no Version.uri return None -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 -- cgit v1.2.3 From 23d4a5fc9ca8dc7a35fd96a48dcb261ac0daf46b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Mar 2012 10:19:51 +0200 Subject: * apt/cache.py: - fix _have_multi_arch flag (thanks to Sebastian Heinlein) --- apt/cache.py | 3 +-- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apt/cache.py b/apt/cache.py index 96b38a57..86a788bb 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -152,8 +152,7 @@ class Cache(object): self._sorted_set = None self._weakref.clear() - self._have_multi_arch = bool(apt_pkg.config.value_list("APT::" + - "Architectures")) + self._have_multi_arch = len(apt_pkg.get_architectures()) > 1 progress.op = _("Building data structures") i = last = 0 diff --git a/debian/changelog b/debian/changelog index b1bf28d6..a163f03a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ python-apt (0.8.4) UNRELEASED; urgency=low to the file object currently supported) * apt/package.py: - if there is no Version.uri return None + * apt/cache.py: + - fix _have_multi_arch flag (thanks to Sebastian Heinlein) -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 -- cgit v1.2.3 From c1625b7a05d3eae75e234cb721eb3d41d854cef2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 16 Apr 2012 19:06:21 +0200 Subject: commit experimental upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d74763c8..fff4b849 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,14 +25,14 @@ python-apt (0.8.4) UNRELEASED; urgency=low -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 -python-apt (0.8.3.1) UNRELEASED; urgency=low +python-apt (0.8.4~exp1) experimental; urgency=low * tests/test_apt_cache.py: - fix tests on kfreebsd/ia64 * apt/debfile.py: - fix crash in dep multiarch handling - -- Michael Vogt Fri, 09 Dec 2011 09:23:16 +0100 + -- Michael Vogt Tue, 24 Jan 2012 14:02:46 +0100 python-apt (0.8.3) unstable; urgency=low -- cgit v1.2.3 From b0940220822459891fcc593f77171e7ee2a6cf12 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Mon, 16 Apr 2012 19:09:34 +0200 Subject: Fix: Initialize the depcache on apt.cache.Cache.open() (fixes LP: #659438) If there are packages in the reqreinst state cache operations won't fail anymore with the "cannot locate file for package x" error message. During the 0.8 API rewrite of apt_pkg.GetDepCache() this functionality was lost. --- apt/cache.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apt/cache.py b/apt/cache.py index 86a788bb..aaa6595a 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -144,6 +144,7 @@ class Cache(object): self._cache = apt_pkg.Cache(progress) self._depcache = apt_pkg.DepCache(self._cache) + self._depcache.init(progress) self._records = apt_pkg.PackageRecords(self._cache) self._list = apt_pkg.SourceList() self._list.read_main_list() -- cgit v1.2.3 From ef6911924b5e1647dd2c57649478ebc7501f4682 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Mon, 16 Apr 2012 19:11:11 +0200 Subject: Fix apt_pkg.DepCache.init() documentation which still states that the method would be called automatically on construction --- python/depcache.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/depcache.cc b/python/depcache.cc index 73993c82..d19ec856 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -568,8 +568,7 @@ static PyMethodDef PkgDepCacheMethods[] = { {"init",PkgDepCacheInit,METH_VARARGS, "init(progress: apt.progress.base.OpProgress)\n\n" - "Initialize the depcache (done automatically when constructing\n" - "the object)."}, + "Initialize the depcache."}, {"get_candidate_ver",PkgDepCacheGetCandidateVer,METH_VARARGS, "get_candidate_ver(pkg: apt_pkg.Package) -> apt_pkg.Version\n\n" "Return the candidate version for the package, normally the version\n" -- cgit v1.2.3 From 6419136fa129baa308471db3958920617451b277 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 16 Apr 2012 19:24:52 +0200 Subject: tests/test_policy.py: fix test to include priority of 1 too --- tests/test_policy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_policy.py b/tests/test_policy.py index d77fb27e..f7d41152 100644 --- a/tests/test_policy.py +++ b/tests/test_policy.py @@ -24,7 +24,7 @@ class TestAptPolicy(unittest.TestCase): lowlevel_ver = ver._cand for pkgfile, i in lowlevel_ver.file_list: #print pkgfile, i, policy.get_priority(pkgfile) - self.assertTrue(policy.get_priority(pkgfile) > 1) + self.assertTrue(policy.get_priority(pkgfile) >= 1) self.assertTrue(policy.get_priority(pkgfile) < 1001) def test_apt_policy_highlevel(self): -- cgit v1.2.3 From 0165191e08c650bb81c06660845114cec3738dce Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 16 Apr 2012 19:25:18 +0200 Subject: releasing version 0.8.4 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fff4b849..c1b12cc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.8.4) UNRELEASED; urgency=low +python-apt (0.8.4) unstable; urgency=low [ Michael Vogt ] * doc/examples/build-deps.py: @@ -18,12 +18,13 @@ python-apt (0.8.4) UNRELEASED; urgency=low - if there is no Version.uri return None * apt/cache.py: - fix _have_multi_arch flag (thanks to Sebastian Heinlein) + * build against apt 0.9.0 [Julian Andres Klode ] * python/apt_pkgmodule.cc: - Fix apt_pkg.Dependency.TYPE_RECOMMENDS, had Suggests value previously - -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 + -- Michael Vogt Mon, 16 Apr 2012 19:06:48 +0200 python-apt (0.8.4~exp1) experimental; urgency=low -- cgit v1.2.3 From 72b1f8e86e203df1d8bfef41c71d228ee21e9d99 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 17 Apr 2012 14:10:22 +0200 Subject: * python/cache.cc: - ensure that pkgApplyStatus is called when the cache is opened (thanks to Sebastian Heinlein for finding this bug), LP: #659438 --- debian/changelog | 8 ++++++++ python/cache.cc | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c1b12cc8..63f72fa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.8.5) UNRELEASED; urgency=low + + * python/cache.cc: + - ensure that pkgApplyStatus is called when the cache is opened + (thanks to Sebastian Heinlein for finding this bug), LP: #659438 + + -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 + python-apt (0.8.4) unstable; urgency=low [ Michael Vogt ] diff --git a/python/cache.cc b/python/cache.cc index 191e2204..52ce32e3 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -197,12 +197,14 @@ static PyObject *PkgCacheOpen(PyObject *Self,PyObject *Args) return HandleErrors(); } + // ensure that the states are correct (LP: #659438) + pkgApplyStatus(*Cache); + //std::cout << "new cache is " << (pkgCache*)(*Cache) << std::endl; // update the cache pointer after the cache was rebuild ((CppPyObject *)Self)->Object = (pkgCache*)(*Cache); - Py_INCREF(Py_None); return HandleErrors(Py_None); } -- cgit v1.2.3 From 89e3cd4d1141fea8ecb5b8828cde622c9bf12649 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 17 Apr 2012 20:36:02 +0200 Subject: Add a regression test --- tests/test_lp659438.py | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 tests/test_lp659438.py diff --git a/tests/test_lp659438.py b/tests/test_lp659438.py new file mode 100644 index 00000000..25a6278f --- /dev/null +++ b/tests/test_lp659438.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +"""Regression test for LP: #981896, LP: #659438""" +# Copyright (C) 2012 Sebastian Heinlein +# +# Licensed under the GNU General Public License Version 2 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Licensed under the GNU General Public License Version 2 + +__author__ = "Sebastian Heinlein " + +import os +import shutil +import tempfile +import unittest + +import apt_pkg +import apt + + +class RegressionTestCase(unittest.TestCase): + + """Test suite for LP: #981896, LP: #659438 + 'Cannot locate a file for package X' + """ + + def setUp(self): + apt_pkg.init_config() + chroot_path = tempfile.mkdtemp() + self.addCleanup(lambda: shutil.rmtree(chroot_path)) + # Create a damaged status file + self.cache = apt.cache.Cache(rootdir=chroot_path) + with open(apt_pkg.config.find_file("Dir::State::status"), + "a") as status: + status.write("""Package: abrowser +Status: install reinstreq half-installed +Priority: optional +Section: admin +Version: 3.6.9+build1+nobinonly-0ubuntu1""") + sources_list_path = apt_pkg.config.find_file("Dir::Etc::sourcelist") + repo_path = os.path.abspath("./data/test-repo") + with open(sources_list_path, "w") as sources_list: + sources_list.write("deb copy:%s /\n" % repo_path) + # os.makedirs(os.path.join(chroot_path, "etc/apt/sources.list.d/")) + self.cache.update(sources_list=sources_list_path) + self.cache.open() + + def test_survive_reqreinst(self): + """Test that we survive a package in require reinstallation state""" + self.assertEqual(self.cache.required_download, 82324L) + +if __name__ == "__main__": + unittest.main() + +# vim: ts=4 et sts=4 -- cgit v1.2.3 From 16635641b3492e236f50d1a795fceeec2b620890 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 18 Apr 2012 10:13:10 +0200 Subject: tests/test_lp659438.py: ensure apt_pkg.config is reset for later tests via workaround --- tests/test_lp659438.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_lp659438.py b/tests/test_lp659438.py index 25a6278f..47123a03 100644 --- a/tests/test_lp659438.py +++ b/tests/test_lp659438.py @@ -58,6 +58,11 @@ Version: 3.6.9+build1+nobinonly-0ubuntu1""") self.cache.update(sources_list=sources_list_path) self.cache.open() + def tearDown(self): + # this resets the rootdir apt_pkg.config to ensure it does not + # "pollute" the later tests + cache = apt.cache.Cache(rootdir="/") + def test_survive_reqreinst(self): """Test that we survive a package in require reinstallation state""" self.assertEqual(self.cache.required_download, 82324L) -- cgit v1.2.3 From 8c17defbb7ef82f5791cf37973c9b26a367359ea Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 18 Apr 2012 10:20:32 +0200 Subject: tests/test_lp659438.py: fix test for py3.2 --- tests/test_lp659438.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_lp659438.py b/tests/test_lp659438.py index 47123a03..01edf3bd 100644 --- a/tests/test_lp659438.py +++ b/tests/test_lp659438.py @@ -65,7 +65,8 @@ Version: 3.6.9+build1+nobinonly-0ubuntu1""") def test_survive_reqreinst(self): """Test that we survive a package in require reinstallation state""" - self.assertEqual(self.cache.required_download, 82324L) + # this should be 82324L but python3.2 gets unhappy about the "L" + self.assertEqual(self.cache.required_download, 82324) if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From e65c125fb031c219317c77724a6b4213cb3c695b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 4 May 2012 10:26:26 -0700 Subject: merge from ubuntu --- data/templates/Ubuntu.info.in | 118 ++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 ++- 2 files changed, 124 insertions(+), 1 deletion(-) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 3a9562f4..2aba269e 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,123 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: quantal +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 free and open-source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained free and 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: quantal +ParentSuite: quantal +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: quantal +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: quantal +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: quantal +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: quantal-security +ParentSuite: quantal +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: quantal-security +ParentSuite: quantal +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: quantal-updates +ParentSuite: quantal +RepositoryType: deb +_Description: Recommended updates + +Suite: quantal-updates +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + +Suite: quantal-proposed +ParentSuite: quantal +RepositoryType: deb +_Description: Pre-released updates + +Suite: quantal-proposed +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + +Suite: quantal-backports +ParentSuite: quantal +RepositoryType: deb +_Description: Unsupported updates + +Suite: quantal-backports +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + Suite: precise RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ diff --git a/debian/changelog b/debian/changelog index 63f72fa5..d786c3c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ python-apt (0.8.5) UNRELEASED; urgency=low + [ Michael Vogt ] * python/cache.cc: - ensure that pkgApplyStatus is called when the cache is opened (thanks to Sebastian Heinlein for finding this bug), LP: #659438 - -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 + [ Stéphane Graber ] + * data/templates/Ubuntu.info.in: + - add quantal + + -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 python-apt (0.8.4) unstable; urgency=low -- cgit v1.2.3 From 8ab2e648e11c321c31d88e4c135066bf85816160 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 30 May 2012 10:15:35 +0200 Subject: Import AptAuth.py from software-properites as auth.py --- apt/auth.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 apt/auth.py diff --git a/apt/auth.py b/apt/auth.py new file mode 100644 index 00000000..04ee8b76 --- /dev/null +++ b/apt/auth.py @@ -0,0 +1,98 @@ +# dialog_apt_key.py.in - edit the apt keys +# +# Copyright (c) 2004 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import atexit +import gettext +import os +import shutil +import subprocess +import tempfile + +from subprocess import PIPE + +# gettext convenient +_ = gettext.gettext +def dummy(e): return e +N_ = dummy + +# some known keys +N_("Ubuntu Archive Automatic Signing Key ") +N_("Ubuntu CD Image Automatic Signing Key ") + +class AptAuth: + def __init__(self, rootdir="/"): + self.gpg = ["/usr/bin/gpg"] + self.base_opt = self.gpg + [ + "--no-options", + "--no-default-keyring", + "--no-auto-check-trustdb", + "--trust-model", "always", + "--keyring", os.path.join(rootdir, "etc/apt/trusted.gpg"), + ] + self.tmpdir = tempfile.mkdtemp() + self.base_opt += ["--secret-keyring", + os.path.join(self.tmpdir, "secring.gpg")] + self.base_opt += ["--trustdb-name", + os.path.join(self.tmpdir, "trustdb.gpg")] + self.list_opt = self.base_opt + ["--with-colons", + "--batch", + "--list-keys"] + self.rm_opt = self.base_opt + ["--quiet", + "--batch", + "--delete-key", + "--yes"] + self.add_opt = self.base_opt + ["--quiet", + "--batch", + "--import"] + atexit.register(self._cleanup_tmpdir) + + def _cleanup_tmpdir(self): + shutil.rmtree(self.tmpdir) + + def list(self): + res = [] + #print self.list_opt + p = subprocess.Popen(self.list_opt,stdout=PIPE).stdout + for line in p.readlines(): + fields = line.split(":") + if fields[0] == "pub": + name = fields[9] + res.append("%s %s\n%s" %((fields[4])[-8:],fields[5], _(name))) + return res + + def add(self, filename): + #print "request to add " + filename + cmd = self.add_opt[:] + cmd.append(filename) + p = subprocess.Popen(cmd) + return (p.wait() == 0) + + def update(self): + cmd = ["/usr/bin/apt-key", "update"] + p = subprocess.Popen(cmd) + return (p.wait() == 0) + + def rm(self, key): + #print "request to remove " + key + cmd = self.rm_opt[:] + cmd.append(key) + p = subprocess.Popen(cmd) + return (p.wait() == 0) -- cgit v1.2.3 From 2fa1eb3cfd05e981e1ab6daf2589f8d6e92c4bf6 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 31 May 2012 08:45:24 +0200 Subject: A lot of refactoring --- apt/auth.py | 262 ++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 186 insertions(+), 76 deletions(-) diff --git a/apt/auth.py b/apt/auth.py index 04ee8b76..97f9d578 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -1,9 +1,12 @@ -# dialog_apt_key.py.in - edit the apt keys -# +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# auth - authentication key management +# # Copyright (c) 2004 Canonical -# +# # Author: Michael Vogt -# +# Sebastian Heinlein +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the @@ -13,86 +16,193 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA +"""Handle GnuPG keys used to trust signed repositories.""" import atexit -import gettext +import glob import os +import os.path import shutil import subprocess import tempfile -from subprocess import PIPE - -# gettext convenient -_ = gettext.gettext -def dummy(e): return e -N_ = dummy - -# some known keys -N_("Ubuntu Archive Automatic Signing Key ") -N_("Ubuntu CD Image Automatic Signing Key ") - -class AptAuth: - def __init__(self, rootdir="/"): - self.gpg = ["/usr/bin/gpg"] - self.base_opt = self.gpg + [ - "--no-options", - "--no-default-keyring", - "--no-auto-check-trustdb", - "--trust-model", "always", - "--keyring", os.path.join(rootdir, "etc/apt/trusted.gpg"), - ] - self.tmpdir = tempfile.mkdtemp() - self.base_opt += ["--secret-keyring", - os.path.join(self.tmpdir, "secring.gpg")] - self.base_opt += ["--trustdb-name", - os.path.join(self.tmpdir, "trustdb.gpg")] - self.list_opt = self.base_opt + ["--with-colons", - "--batch", - "--list-keys"] - self.rm_opt = self.base_opt + ["--quiet", - "--batch", - "--delete-key", - "--yes"] - self.add_opt = self.base_opt + ["--quiet", - "--batch", - "--import"] - atexit.register(self._cleanup_tmpdir) - - def _cleanup_tmpdir(self): - shutil.rmtree(self.tmpdir) - - def list(self): - res = [] - #print self.list_opt - p = subprocess.Popen(self.list_opt,stdout=PIPE).stdout - for line in p.readlines(): - fields = line.split(":") - if fields[0] == "pub": - name = fields[9] - res.append("%s %s\n%s" %((fields[4])[-8:],fields[5], _(name))) - return res - - def add(self, filename): - #print "request to add " + filename - cmd = self.add_opt[:] - cmd.append(filename) - p = subprocess.Popen(cmd) - return (p.wait() == 0) - - def update(self): - cmd = ["/usr/bin/apt-key", "update"] - p = subprocess.Popen(cmd) - return (p.wait() == 0) - - def rm(self, key): - #print "request to remove " + key - cmd = self.rm_opt[:] - cmd.append(key) - p = subprocess.Popen(cmd) - return (p.wait() == 0) +import apt_pkg +from apt_pkg import gettext as _ + +# Create a temporary dir to store secret keying and trust database. +# APT doesn't use a secrect key ring but GnuPG fails without it. +_TMPDIR = tempfile.mkdtemp() +atexit.register(shutil.rmtree, _TMPDIR) + + +class TrustedKey(object): + + """Represents a trusted key.""" + + def __init__(self, name, keyid, date): + self.raw_name = name + # Allow to translated some known keys + self.name = _(name) + self.keyid = keyid + self.date = date + + def __str__(self): + return "%s\n%s %s" % (self.name, self.keyid, self.date) + + +def _get_gpg_command(keyring=None): + """Return the gpg command""" + cmd = [apt_pkg.config.find_file("Dir::Bin::Gpg", "/usr/bin/gpg"), + "--ignore-time-conflict", + "--no-default-keyring", + "--trust-model", "always", + "--no-options", + "--secret-keyring", os.path.join(_TMPDIR, "secring.gpg")] + if keyring is None: + # Add the public keyring + cmd.extend(["--keyring", + apt_pkg.config.find_file("Dir::Etc::Trusted"), + "--primary-keyring", + apt_pkg.config.find_file("Dir::Etc::Trusted")]) + # Add the public keyring parts + trusted_parts_dir = apt_pkg.config.find_dir("Dir::Etc::TrustedParts") + for part_name in glob.glob(os.path.join(trusted_parts_dir, "*.gpg")): + part_path = os.path.join(trusted_parts_dir, part_name) + if os.access(part_path, os.R_OK): + cmd.extend(["--keyring", part_path]) + # TrustDB + trustdb_path = os.path.join(apt_pkg.config.find_dir("Dir::Etc"), + "trustdb.gpg") + cmd.extend(["--trustdb-name", trustdb_path]) + else: + cmd.extend(["--keyring", os.path.abspath(keyring), + "--primary-keyring", os.path.abspath(keyring), + "--trustdb-name", os.path.join(_TMPDIR, "trustdb.gpg")]) + return cmd + +def _wait_and_raise(proc): + """Wait until the given subprocess is completed and raise a + SystemError if it failed. + """ + if proc.wait() != 0: + output = proc.stdout.read() + raise SystemError("GnuPG command failed: %s" % output) + +def add_key_from_file(filename, wait=True): + """Import a GnuPG key file to trust repositores signed by it. + + Keyword arguments: + filename -- the absolute path to the public GnuPG key file + wait -- if the system should be blocked until the internal GnuPG call is + completed. Otherwise the subprocess.Popen() instance will be + returned. By default the call will be blocking. + """ + if not os.path.abspath(filename): + raise SystemError("An absolute path is required: %s" % filename) + if not os.access(os.R_OK): + raise SystemError("Key file cannot be accessed: %s" % filename) + cmd = _get_gpg_command() + cmd.extend(["--quiet", "--batch", "--import", filename]) + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True) + if wait: + _wait_and_raise(proc) + else: + return proc + +def add_key_from_keyserver(keyid, keyserver, wait=True): + """Import a GnuPG key file to trust repositores signed by it. + + Keyword arguments: + keyid -- the identifier of the key, e.g. 0x0EB12DSA + keyserver -- the URL or hostname of the key server + wait -- if the system should be blocked until the internal GnuPG call is + completed. Otherwise the subprocess.Popen() instance will be + returned. By default the call will be blocking. + """ + cmd = _get_gpg_command() + cmd.extend(["--quiet", "--batch", + "--keyserver", keyserver, + "--recv", keyid]) + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True) + if wait: + _wait_and_raise(proc) + else: + return proc + +def add_key(content, wait=True): + """Import a GnuPG key to trust repositores signed by it. + + Keyword arguments: + content -- the content of the GnuPG public key + wait -- if the system should be blocked until the internal GnuPG call is + completed. Otherwise the subprocess.Popen() instance will be + returned. By default the call will be blocking. + """ + cmd = _get_gpg_command() + cmd.extend(["--quiet", "--batch", "--import", "-"]) + proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True) + proc = subprocess.Popen(cmd) + proc.stdin.write(content) + if wait: + _wait_and_raise(proc) + else: + return proc + +def remove_key(fingerprint, wait=True): + """Remove a GnuPG key to no longer trust repositores signed by it. + + Keyword arguments: + fingerprint -- the fingerprint identifying the key + wait -- if the system should be blocked until the internal GnuPG is + completed. Otherwise the subprocess.Popen() instance will be + returned. By default the call will be blocking. + """ + cmd = _get_gpg_command() + cmd.extend(["--quiet", "--batch", "--delete-key", "--yes", fingerprint]) + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True) + if wait: + _wait_and_raise(proc) + else: + return proc + +def list_keys(): + """Returns a list of TrustedKey instances for each key which is + used to trust repositories. + """ + cmd = _get_gpg_command() + cmd.extend(["--with-colons", "--batch", "--list-keys"]) + res = [] + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True) + _wait_and_raise(proc) + for line in proc.stdout.readlines(): + fields = line.split(":") + if fields[0] == "pub": + key = TrustedKey(fields[9], fields[4][-8:], fields[5]) + res.append(key) + return res + +if __name__ == "__main__": + # Add some known keys we would like to see translated so that they get + # picked up by gettext + lambda: _("Ubuntu Archive Automatic Signing Key ") + lambda: _("Ubuntu CD Image Automatic Signing Key ") + + apt_pkg.init() + for trusted_key in list_keys(): + print(trusted_key) -- cgit v1.2.3 From 1b18197f00a0f8b230c11dd90b6f9799ac114d55 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 31 May 2012 19:18:46 +0200 Subject: Don't overwrite proc twice --- apt/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt/auth.py b/apt/auth.py index 97f9d578..d6b1d97f 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -153,8 +153,8 @@ def add_key(content, wait=True): stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) - proc = subprocess.Popen(cmd) proc.stdin.write(content) + proc.stdin.close() if wait: _wait_and_raise(proc) else: -- cgit v1.2.3 From fdae874a77c122a72d283fc13c5494b0359f6b67 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 1 Jun 2012 06:37:51 +0200 Subject: Add an export_key method --- apt/auth.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/apt/auth.py b/apt/auth.py index d6b1d97f..3b15b256 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -179,6 +179,26 @@ def remove_key(fingerprint, wait=True): else: return proc +def export_key(fingerprint, wait=True): + """Return the GnuPG key in text format. + + Keyword arguments: + fingerprint -- the fingerprint identifying the key + wait -- if the system should be blocked until the internal GnuPG is + completed. Otherwise the subprocess.Popen() instance will be + returned. By default the call will be blocking. + """ + cmd = _get_gpg_command() + cmd.extend(["--armor", "--export", fingerprint]) + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True) + if wait: + _wait_and_raise(proc) + return proc.stdout.read() + else: + return proc + def list_keys(): """Returns a list of TrustedKey instances for each key which is used to trust repositories. -- cgit v1.2.3 From 207b245b2ce5a9a04b187f5001b99093c660701d Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 1 Jun 2012 06:38:33 +0200 Subject: Don't set the trust model to always --- apt/auth.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apt/auth.py b/apt/auth.py index 3b15b256..1d018f8b 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -60,7 +60,6 @@ def _get_gpg_command(keyring=None): cmd = [apt_pkg.config.find_file("Dir::Bin::Gpg", "/usr/bin/gpg"), "--ignore-time-conflict", "--no-default-keyring", - "--trust-model", "always", "--no-options", "--secret-keyring", os.path.join(_TMPDIR, "secring.gpg")] if keyring is None: -- cgit v1.2.3 From f968fba66c7b540bb34417e9675299e283b926d1 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 1 Jun 2012 07:23:30 +0200 Subject: Strip exported key --- apt/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt/auth.py b/apt/auth.py index 1d018f8b..8663a043 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -194,7 +194,7 @@ def export_key(fingerprint, wait=True): universal_newlines=True) if wait: _wait_and_raise(proc) - return proc.stdout.read() + return proc.stdout.read().strip() else: return proc -- cgit v1.2.3 From 002bfd6cfe5ff869a264e35a97f73b36840d901f Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 1 Jun 2012 07:48:11 +0200 Subject: Add test cases --- tests/test_auth.py | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 tests/test_auth.py diff --git a/tests/test_auth.py b/tests/test_auth.py new file mode 100644 index 00000000..f63d57f3 --- /dev/null +++ b/tests/test_auth.py @@ -0,0 +1,210 @@ +#!/usr/bin/env python + +import os +import shutil +import sys +import tempfile +import time +import unittest + +if sys.version_info.major > 2: + from http.server import HTTPServer + from http.server import SimpleHTTPRequestHandler as HTTPRequestHandler +else: + from SimpleHTTPServer import BaseHTTPServer as HTTPServer + from SimpleHTTPServer import SimpleHTTPRequestHandler as HTTPRequestHandler + +from test_all import get_library_dir +sys.path.insert(0, get_library_dir()) + +import apt_pkg +import apt.auth + +WHEEZY_KEY = """-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQINBE+a7rUBEADQiEKtLOgqiq8YY/p7IFODMqGPR+o1vtXaksie8iTOh3Vxab38 +cA3kK1iB5XYElbZ5b/x3vWiufHK2semOpn5MG2GRJUwmKxZbt3HLZiHtAadkby2l +rnMxeIzfxcTxloxsQ02TMRalq89Xvy6P7lgedcW5ujcMR6JbE6uL1c/jNlkIPNuN +9paZsNJWXnZ03R+NrAJLjOPUZKZRPYgIwEci2sVNA/autsJL+HuW6X8PfldvMe5h +SdWelOoXMsZMX04JP8Efq8a09yIgKBfuXjoHJbtK0rTr9tjFKt/VM6MejLdJf4Dl +r6Zhx2ygmjcvj+FlWFoxDlPHdqfZ6mGsKR4eWDRu3bZtalDNvhZKvecwf0KaAWVU +M+GxkR+Ol3TsQ0tLbjbwZhWMioipR8Lsp6kZ1tLUjM0aOR3Mw/csyFJYKFiCo3GR +QSGY0++cDrfhQRwOJ9s2eeGGS1/I95vJZA5zZnx1ksnO0W2fHVBavICR821EBAEZ +slLzr+IOrbB16YE/aN2iA9nTcQVk69XeEh5gaeiCZ7JhA2nkAg8a/H1r4BVBC/cL +egzhUvP90kk94MmL1D2gY6UlyK4yTnHgVfjsQw6u2sPDlramyXBZehnKabIndM1P +368IbW8GTNo0gNwg/oC/vENwYnAuX+S96/O/1XfQoBNr+epTVdS4VQHICQARAQAB +tEhEZWJpYW4gQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDcuMC93aGVl +enkpIDxmdHBtYXN0ZXJAZGViaWFuLm9yZz6JAj4EEwEIACgFAk+a7rUCGwMFCQ8J +nAAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEItIrWJGklVTdQEQAMLCmMQr +7SxFULYgprbr5eO6uAs/8nkIBhJBzUnenOUnwsOR3Io9/sHc8Cq/xv1DTsY5G5Qj +ojywslbeF44TxBZ0j3UwPU437bfNs7yTRkgPVhHK/rZ9ApbnZdCmud+BUkDOChLV +8fzCZ17Pa5eMr5E4WI0bLM5AA3vVFLBgHFqJUgE7mSn95vA1S881/xOQ4lT1WHfa +O9K96X6ekn2zpPu/G8aq+oDyVGfo1AKQCPBJ3OCX0WB3GNWbcCb850gy9vtKlWDu +yAh1a9Cl5OPHlYqz8q+Hqj4ZeRgJiDgCgm8YAlKEooEG/vJzswaY+C3nz6uNfBeq +60QhPfgaO8qGlriChGAFqzD68ZQ53NApJw/OuwV2p5CgnkyGAVGZ1WuYcXz/wHyU +awnXq3Bf69RJssbab6SqptJyYuiY8T/2vWRgQxej18KAZ0v1Vr/MC1azp6TWgfSl +s2fvGvPf9vEbKyBR3YFa5msRKGpRauv4wWmcLfZ+jMLbSAWBfILPK+fGLtRGz4AX +hRht9rX7c4neQvlBNDDgR3tuaE3s0B1B6gTcvq7EhuuP4pAzkBLhpuzolvw+ZFOV +5mElfScYi8QbQgT9t2XjUDU1oz1ewviNhynpsxh51t5qxP5ETDGKvEx7RMv4S08p +5VGG4Y+kjcsQWfAdVAGuLqWOI0sGzUzKYZppiEYEExECAAYFAk+a8vAACgkQcV7W +oH57isk7FACcCIOIMr39LUSv16Ec9V102uheqlsAnRqdAADYF7iJIrfqyb72s/54 +3JFaiQJGBBMBCAAwBQJPmvMiBxpzdHJpbmchGmh0dHA6Ly9ncGcuZ2FubmVmZi5k +ZS9wb2xpY3kudHh0AAoJENsWz1uxJSXEhEYP/in+rib86H2vPG+ALZ35o4eh1+9P +KLtUwgHB3Wr/rmPuPY5uB02H/p3PxgJHXUXUPAleN6uajZvReO1wWLTYspPAK8ZF +6p52vuyHgOZl+VmGkLgYKOG/cckqQqTTaHwQj0O8pllJjOJYVdt5iWAHkf1N1UAA +nXC2GdxV+ZVGvZjjCDL8WFWCfoY4HznslcEHQKxg7vzZvVMTjY6L+8NmWkVoD4JL +kYtQOrId1wWYInJiQRtilyn7n9mJ+rTBSETB9Evs3x+zmNa3ntY1/U8XINgxVA5U +GYyUfUug2DjZ90LfXyZUOXVLE5yM1x7oOpyg/1mMtl5xkmuqJHOTeVEjQBYfMRHi +sS4ainR5AoD1Z5KV4S0opt198LDMXGLNjUdJEG24QEK5tfgTFRgFRJYiufxDelI3 +Aq5uGVRrBJygjwaQiJLUVlMqBGHJi++zeWr767pHVWB1XqdmPRvvOqH2v/ez4bSW +zIkUDTr947qmjyAqNNmCv/jgV5viqbj5LNslBkFg8OS+6O7na2gU5ldXfBoC0nso +3pdsCuOYUIrHyP/GjT1gvG0m+jZ/15bvoWvUv4Buh+3gYVyLwrgbq7UISRfwQEah +yzIrO5MvgS0MTIlOgO7Lxog2XMEkQ1ZCbLu5Rvm/8LC0UlSxW9aOIKBSC3hi7U8E +BuA24Mv5Iz7QvO+giQEcBBABAgAGBQJPmwDBAAoJEF7K+wCjrkSkkq8H/3M/M+Xb +vI0cY3MOkFMtyG7xmxPcny1/arnQDvjvpv1BhRBnVTstMxHWzAFQf3M8KttARWo4 +C6U5Cbc0Jx6avqXZwop91a8tQORErC9Kcrr27FJfNAOP5AVzXAofpZyXvouFYBig +ikHdRJlFrn9rydvK9Z5vg63ZzsRB7hTtHi/j1o7d0IpVmR2iTnbWGiUxpnRdLhEF +AnUU+TDFVg6EoJ6aeKsLa43UPHizq12WZPd72cJNSLMk/u+UZvg4sa7pOrkJNYN1 +jL7BSphwKCuA8vBc2lLO14uYDO8LHjd4opatMWCEEvnJQS98JytIkYcwJhJ/IgCz +tqAUo44SUcOodNGJAhwEEAECAAYFAk+bA/IACgkQvDciUsoc+WRWgA/9FYi1aqas +fJyRV4pfe90KhJ4uOO17ivnjULIDU4QFSdJpkCPznxadlDeyRbX/FhVu3RMzldIu +ZVly+VPqWwubudj9SVnqJxGkua2kEz8u3X96zif+nSB4wQuWLi4GOG9AYTnuNnZI +hO4RctYpEi9duBsPeewNi2zjUe8akhJacMhJflbW/XGsRf4goeL3WrB+k5DiDphm +nw2dge96uhZhM+Ih4hSoD9d+YLZbTqXX4L93jELE72UF4qnrZjYJtx8TSto9W2bj +sGFmpUB41viFtdnABLv5MhMsvlM37w8HTbKzzCYImgzBJNZ8Wr+VAeeQ/uB+izVv +Ls6aVKcwH2r8D+MMvh5d160lAJSUDXvZ0kdzawtBMzaNOIEYuQqoQxQGXvSAMRDV +2xFEn/XRT4iRl1stLvX86SMpLksbBfxZnrV9Q+OfTpar5O21sb1dpkgfWoF6W0kc +rjuAAsI3EbMuX3eK8r5SjWCLfIaU9ton+CdeJjJipEsEox7Rlq075t+6S4LL4wqq +dJPX4Rcuwx4LPXi9NKZAuQHisp1nuVV4luXttMdYfFq5QtokhjUaedAOORDy4gsC +mAMyLWgU/2r0grK7+AVLfn1p9wFb9FoBGFILcjVMAiY3OE5tNVPay9wGoD6n/h0O +cteh2rBrB7kEpXjRqasNfRl8vvlz7nWhTIKJAhwEEAEIAAYFAk+bAq8ACgkQEbTl +/xWw/YKuew/9Fub3t/nejgJ5KkjhfFppQQkE1yg2VJP3cbnrrhrAYZX6E6jN7dAI +MlpKqm4YR6FFe5bkra61TeXd2CI5E/MDdW4Q+AD66tA0xKRm5RzVuPvWoR9vyCx/ +fPlRuVZptwczeV5bKTFyflICV3Z/R5llq2aT6M+MZdBL4AHs5yuspkYa5f8EESi6 +pTJW0sXacjRSZyznQOZ2fMKn0LZnefSWjWoAB252hS27WW9kwpniJhUOzrrLuAWF +wnv6jfahNH14BCbNB7Q0DhcCeYnFocRv/NH8oipTrwfJ+IIMDDOcJvCbgv23w9DJ +Ynv2BaaJrbk04jux71vhaZUC0xTkE/b+rNZGnPaFnjqWBGN3s+RVZ0SHMQUzdl73 +dH3lL98mULzmf1uD7fPIrF/EYrSvFcsV7mnpFmHOd3ApY6QugmakQOLVaIpi18N4 +hJoEPBwSQ91eriieobRhjGs7LRnfmvkuQIlsQx82eycd1IV6Gp2cqzAb1qPzcaYh +TskU93Mj9OwmlqETB9FH7w7OvumQUjhHQCASeCGDeFJacZkwohWcxWkB0DUPWGgh +jnsiInTBzE/+nFsUthVlkh0Bki0BLy3gOUAgldvq3apw73OCsxjd2ORdGpFvvU2v +Xzogb+aanfTVniIfYDaJ3KHq+rF5WiVogJrK3TxsyuTAh3jFjEKNjVqJAhwEEAEI +AAYFAk+bo7wACgkQwktlomcsixJuOg/+PZqllY05fJhC5F8UzGpHDIsrokHNAc4L +xMgcudYoMwsK3NDxfXdKhfBgQqAsToSNpSYE4eNFcUF8yetdJbgoCWJOBIP1LCiy +dKXpH5mKy1PCQ+2FBb1mtKiGl1nIu1hgOx29R2ATGGSpGwbgm1Q8+cpM/nRVv7Hl +5e6uPZWkAu0MBUL9RbVSMQRpK6DUCKhLX4Loc3OS4rNjQkGnWyPtqlmU4bmRZ3R2 +INaONb4tnLkjdBhAqhgaMneEGt07nI2GBaVhdTKoI2/aDBADhuSkHomD/euiDLAF +/gqvG6ir6akBaKiaZlDyFSAdI62gQ4DZqZF0ddGcyUfyWCgAIWxBLf6RX7yDsu5L +uCT7ppkogHYpxjGdRlUhu9tBukZNqN1BEDbywUu2oHus+XjCr+AKThY2eglRTiVw +SUo6KX8xBmRoo1W32pk5t9I8uMWMVc3cVh4QhqlKmcjtTJkRIVCNCXZl5JN2Uw8q +uP6thFNCsJx6g8UwaHRXJZNKyANfe8CFGuNO0/9i8sMP/lRxmhxb5+CgZQKmCBjq +eL/TOavRJVXbilVsU4j9OFlqx9ptGHfPlfjnIq2Bf9VWJQyS6E64ecqaqc+yqaVf +hd0FMz9hq067VITuG50JeVnmSJK/EVjSgMvxWlSNinMgUjNetrkQTO9OQ0caAGFq +DHcut3Yey8o= +=id4q +-----END PGP PUBLIC KEY BLOCK-----""" + + +class TestAuthKeys(unittest.TestCase): + + """Test handling of keys for signed repositories.""" + + def setUp(self): + self.tmpdir = tempfile.mkdtemp() + apt_pkg.init() + apt_pkg.config.set("Dir", self.tmpdir) + apt_pkg.config.set("Dir::Etc", "etc/apt/") + trustedparts_dir = apt_pkg.config.find_dir("Dir::Etc::Trustedparts") + self.assertTrue(trustedparts_dir.startswith(self.tmpdir)) + os.makedirs(trustedparts_dir) + + def cleanUp(self): + shutil.rmtree(self.tmpdir) + + def testAddAndExportKey(self): + """Add an example key.""" + apt.auth.add_key(WHEEZY_KEY) + self.assertEqual(apt.auth.export_key("46925553"), + WHEEZY_KEY) + + def testAddAndListKey(self): + """Add an example key and test if it is correctly returned by + list_keys() + """ + apt.auth.add_key(WHEEZY_KEY) + ret = apt.auth.list_keys() + self.assertEqual(len(ret), 1) + key = ret[0] + self.assertEqual(key.name, + "Debian Archive Automatic Signing Key (7.0/wheezy) " + "") + self.assertEqual(key.keyid, "46925553") + self.assertEqual(key.date, "2012-04-27") + + def testAddKeyFromFile(self): + """Test adding a key from file.""" + keyfd, keyname = tempfile.mkstemp() + self.addCleanup(os.close, keyfd) + os.write(keyfd, WHEEZY_KEY) + + apt.auth.add_key_from_file(keyname) + + ret = apt.auth.list_keys() + self.assertEqual(len(ret), 1) + key = ret[0] + self.assertEqual(key.name, + "Debian Archive Automatic Signing Key (7.0/wheezy) " + "") + self.assertEqual(key.keyid, "46925553") + self.assertEqual(key.date, "2012-04-27") + + def testAddKeyFromServer(self): + """Install a GnuPG key from a remote server.""" + self._start_keyserver() + self.addCleanup(self._stop_keyserver) + + apt.auth.add_key_from_keyserver("46925553", "hkp://localhost:19191") + + ret = apt.auth.list_keys() + self.assertEqual(len(ret), 1) + key = ret[0] + self.assertEqual(key.name, + "Debian Archive Automatic Signing Key (7.0/wheezy) " + "") + self.assertEqual(key.keyid, "46925553") + self.assertEqual(key.date, "2012-04-27") + + def _start_keyserver(self): + """Start a fake keyserver on http://localhost:19191 + Thanks pitti. + """ + dir = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, dir) + os.mkdir(os.path.join(dir, "pks")) + with open(os.path.join(dir, "pks", "lookup"), "w") as key_file: + key_file.write(WHEEZY_KEY) + + self.keyserver_pid = os.fork() + if self.keyserver_pid == 0: + # quiesce server log + os.dup2(os.open('/dev/null', os.O_WRONLY), sys.stderr.fileno()) + os.chdir(dir) + httpd = HTTPServer.HTTPServer(('localhost', 19191), + HTTPRequestHandler) + httpd.serve_forever() + os._exit(0) + + # wait a bit until server is ready + time.sleep(0.5) + + def _stop_keyserver(self): + '''Stop fake keyserver''' + assert self.keyserver_pid + + os.kill(self.keyserver_pid, 15) + os.wait() + + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From cc9c9e8e252b311439cec84a99d84707b84e619f Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 1 Jun 2012 08:15:34 +0200 Subject: Python3 fixes and restore apt configuration afterwards --- tests/test_auth.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/test_auth.py b/tests/test_auth.py index f63d57f3..4c71d413 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -11,7 +11,7 @@ if sys.version_info.major > 2: from http.server import HTTPServer from http.server import SimpleHTTPRequestHandler as HTTPRequestHandler else: - from SimpleHTTPServer import BaseHTTPServer as HTTPServer + from BaseHTTPServer import HTTPServer from SimpleHTTPServer import SimpleHTTPRequestHandler as HTTPRequestHandler from test_all import get_library_dir @@ -111,16 +111,26 @@ class TestAuthKeys(unittest.TestCase): """Test handling of keys for signed repositories.""" def setUp(self): + # reset any config manipulations done in the individual tests + apt_pkg.init_config() + # save the apt config to restore later + cnf = {} + for item in apt_pkg.config.keys(): + cnf[item] = apt_pkg.config.find(item) + self.addCleanup(self._restore_apt_config, cnf) + self.tmpdir = tempfile.mkdtemp() - apt_pkg.init() + self.addCleanup(shutil.rmtree, self.tmpdir) apt_pkg.config.set("Dir", self.tmpdir) apt_pkg.config.set("Dir::Etc", "etc/apt/") trustedparts_dir = apt_pkg.config.find_dir("Dir::Etc::Trustedparts") self.assertTrue(trustedparts_dir.startswith(self.tmpdir)) os.makedirs(trustedparts_dir) - def cleanUp(self): - shutil.rmtree(self.tmpdir) + def _restore_apt_config(self, cnf): + """Restore previous apt configuration.""" + for item in cnf: + apt_pkg.config.set(item, cnf[item]) def testAddAndExportKey(self): """Add an example key.""" @@ -146,7 +156,7 @@ class TestAuthKeys(unittest.TestCase): """Test adding a key from file.""" keyfd, keyname = tempfile.mkstemp() self.addCleanup(os.close, keyfd) - os.write(keyfd, WHEEZY_KEY) + os.write(keyfd, WHEEZY_KEY.encode("UTF-8")) apt.auth.add_key_from_file(keyname) @@ -190,8 +200,7 @@ class TestAuthKeys(unittest.TestCase): # quiesce server log os.dup2(os.open('/dev/null', os.O_WRONLY), sys.stderr.fileno()) os.chdir(dir) - httpd = HTTPServer.HTTPServer(('localhost', 19191), - HTTPRequestHandler) + httpd = HTTPServer(('localhost', 19191), HTTPRequestHandler) httpd.serve_forever() os._exit(0) -- cgit v1.2.3 From 18fa7a01ebb31f5bfa465bf191989eb060713248 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 1 Jun 2012 08:18:24 +0200 Subject: Small fix --- apt/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt/auth.py b/apt/auth.py index 8663a043..024f01da 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -103,7 +103,7 @@ def add_key_from_file(filename, wait=True): """ if not os.path.abspath(filename): raise SystemError("An absolute path is required: %s" % filename) - if not os.access(os.R_OK): + if not os.access(filename, os.R_OK): raise SystemError("Key file cannot be accessed: %s" % filename) cmd = _get_gpg_command() cmd.extend(["--quiet", "--batch", "--import", filename]) -- cgit v1.2.3 From 56be4293b0e639b58904d1d86dd46f8767d36728 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 1 Jun 2012 08:26:30 +0200 Subject: Remove importing of the library dir. This is handled by test_all --- tests/test_auth.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/test_auth.py b/tests/test_auth.py index 4c71d413..e9906f56 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -14,9 +14,6 @@ else: from BaseHTTPServer import HTTPServer from SimpleHTTPServer import SimpleHTTPRequestHandler as HTTPRequestHandler -from test_all import get_library_dir -sys.path.insert(0, get_library_dir()) - import apt_pkg import apt.auth -- cgit v1.2.3 From 621372f543a4d0547f3637889da11665b628df14 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Jun 2012 11:39:40 +0200 Subject: pep8 fixes --- apt/auth.py | 14 +++++++++++--- tests/test_auth.py | 6 +++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/apt/auth.py b/apt/auth.py index 024f01da..04aae908 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -7,11 +7,11 @@ # Author: Michael Vogt # Sebastian Heinlein # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -84,6 +84,7 @@ def _get_gpg_command(keyring=None): "--trustdb-name", os.path.join(_TMPDIR, "trustdb.gpg")]) return cmd + def _wait_and_raise(proc): """Wait until the given subprocess is completed and raise a SystemError if it failed. @@ -92,6 +93,7 @@ def _wait_and_raise(proc): output = proc.stdout.read() raise SystemError("GnuPG command failed: %s" % output) + def add_key_from_file(filename, wait=True): """Import a GnuPG key file to trust repositores signed by it. @@ -115,6 +117,7 @@ def add_key_from_file(filename, wait=True): else: return proc + def add_key_from_keyserver(keyid, keyserver, wait=True): """Import a GnuPG key file to trust repositores signed by it. @@ -137,6 +140,7 @@ def add_key_from_keyserver(keyid, keyserver, wait=True): else: return proc + def add_key(content, wait=True): """Import a GnuPG key to trust repositores signed by it. @@ -159,6 +163,7 @@ def add_key(content, wait=True): else: return proc + def remove_key(fingerprint, wait=True): """Remove a GnuPG key to no longer trust repositores signed by it. @@ -178,6 +183,7 @@ def remove_key(fingerprint, wait=True): else: return proc + def export_key(fingerprint, wait=True): """Return the GnuPG key in text format. @@ -198,6 +204,7 @@ def export_key(fingerprint, wait=True): else: return proc + def list_keys(): """Returns a list of TrustedKey instances for each key which is used to trust repositories. @@ -216,6 +223,7 @@ def list_keys(): res.append(key) return res + if __name__ == "__main__": # Add some known keys we would like to see translated so that they get # picked up by gettext diff --git a/tests/test_auth.py b/tests/test_auth.py index e9906f56..7ecebb7b 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -125,9 +125,9 @@ class TestAuthKeys(unittest.TestCase): os.makedirs(trustedparts_dir) def _restore_apt_config(self, cnf): - """Restore previous apt configuration.""" - for item in cnf: - apt_pkg.config.set(item, cnf[item]) + """Restore previous apt configuration.""" + for item in cnf: + apt_pkg.config.set(item, cnf[item]) def testAddAndExportKey(self): """Add an example key.""" -- cgit v1.2.3 From a8ec7c4c6430e69953ea8f8f3925d1b0fb4ac63a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Jun 2012 11:43:43 +0200 Subject: apt/auth.py: create _TMPDIR on demand --- apt/auth.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apt/auth.py b/apt/auth.py index 04aae908..d8c602fa 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -36,8 +36,7 @@ from apt_pkg import gettext as _ # Create a temporary dir to store secret keying and trust database. # APT doesn't use a secrect key ring but GnuPG fails without it. -_TMPDIR = tempfile.mkdtemp() -atexit.register(shutil.rmtree, _TMPDIR) +_TMPDIR = None class TrustedKey(object): @@ -57,6 +56,10 @@ class TrustedKey(object): def _get_gpg_command(keyring=None): """Return the gpg command""" + global _TMPDIR + if _TMPDIR is None: + _TMPDIR = tempfile.mkdtemp() + atexit.register(shutil.rmtree, _TMPDIR) cmd = [apt_pkg.config.find_file("Dir::Bin::Gpg", "/usr/bin/gpg"), "--ignore-time-conflict", "--no-default-keyring", -- cgit v1.2.3 From b6dbdb941109b5bbfbb5042ad49e1353602240d2 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 6 Jun 2012 12:18:16 +0200 Subject: Call apt-key instead of gnupg --- apt/auth.py | 160 ++++++++++++++++++------------------------------------------ 1 file changed, 48 insertions(+), 112 deletions(-) diff --git a/apt/auth.py b/apt/auth.py index d8c602fa..3a1d132e 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -24,20 +24,14 @@ """Handle GnuPG keys used to trust signed repositories.""" import atexit -import glob import os import os.path -import shutil import subprocess import tempfile import apt_pkg from apt_pkg import gettext as _ -# Create a temporary dir to store secret keying and trust database. -# APT doesn't use a secrect key ring but GnuPG fails without it. -_TMPDIR = None - class TrustedKey(object): @@ -54,48 +48,42 @@ class TrustedKey(object): return "%s\n%s %s" % (self.name, self.keyid, self.date) -def _get_gpg_command(keyring=None): - """Return the gpg command""" - global _TMPDIR - if _TMPDIR is None: - _TMPDIR = tempfile.mkdtemp() - atexit.register(shutil.rmtree, _TMPDIR) - cmd = [apt_pkg.config.find_file("Dir::Bin::Gpg", "/usr/bin/gpg"), - "--ignore-time-conflict", - "--no-default-keyring", - "--no-options", - "--secret-keyring", os.path.join(_TMPDIR, "secring.gpg")] - if keyring is None: - # Add the public keyring - cmd.extend(["--keyring", - apt_pkg.config.find_file("Dir::Etc::Trusted"), - "--primary-keyring", - apt_pkg.config.find_file("Dir::Etc::Trusted")]) - # Add the public keyring parts - trusted_parts_dir = apt_pkg.config.find_dir("Dir::Etc::TrustedParts") - for part_name in glob.glob(os.path.join(trusted_parts_dir, "*.gpg")): - part_path = os.path.join(trusted_parts_dir, part_name) - if os.access(part_path, os.R_OK): - cmd.extend(["--keyring", part_path]) - # TrustDB - trustdb_path = os.path.join(apt_pkg.config.find_dir("Dir::Etc"), - "trustdb.gpg") - cmd.extend(["--trustdb-name", trustdb_path]) - else: - cmd.extend(["--keyring", os.path.abspath(keyring), - "--primary-keyring", os.path.abspath(keyring), - "--trustdb-name", os.path.join(_TMPDIR, "trustdb.gpg")]) - return cmd - - -def _wait_and_raise(proc): - """Wait until the given subprocess is completed and raise a - SystemError if it failed. - """ - if proc.wait() != 0: - output = proc.stdout.read() - raise SystemError("GnuPG command failed: %s" % output) - +def _call_apt_key_script(*args, **kwargs): + """Run the apt-key script with the given arguments.""" + cmd = [apt_pkg.config.find_file("Dir::Bin::Apt-Key", "/usr/bin/apt-key")] + cmd.extend(args) + if os.getuid() != 0: + cmd.insert(0, "fakeroot") + env = os.environ.copy() + env["LANG"] = "C" + if apt_pkg.config.find_dir("Dir") != "/": + # If the key is to be installed into a chroot we have to export the + # configuration from the chroot to the apt-key script by using + # a temporary APT_CONFIG file. The apt-key script uses apt-config shell + # internally + conf_fd, conf_name = tempfile.mkstemp(prefix="apt-key", suffix="conf") + atexit.register(os.remove, conf_name) + try: + os.write(conf_fd, apt_pkg.config.dump().encode("UTF-8")) + finally: + os.close(conf_fd) + env["APT_CONFIG"] = conf_name + proc = subprocess.Popen(cmd, env=env, universal_newlines=True, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + try: + proc.stdin.write(kwargs["stdin"]) + except KeyError: + pass + finally: + proc.stdin.close() + return_code = proc.wait() + output = proc.stdout.read() + if return_code: + raise SystemError("The apt-key script failed with return code %s:\n" + "%s\n%s" % (return_code, " ".join(cmd), output)) + return output.strip() def add_key_from_file(filename, wait=True): """Import a GnuPG key file to trust repositores signed by it. @@ -110,16 +98,7 @@ def add_key_from_file(filename, wait=True): raise SystemError("An absolute path is required: %s" % filename) if not os.access(filename, os.R_OK): raise SystemError("Key file cannot be accessed: %s" % filename) - cmd = _get_gpg_command() - cmd.extend(["--quiet", "--batch", "--import", filename]) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - if wait: - _wait_and_raise(proc) - else: - return proc - + _call_apt_key_script("add", filename) def add_key_from_keyserver(keyid, keyserver, wait=True): """Import a GnuPG key file to trust repositores signed by it. @@ -131,18 +110,8 @@ def add_key_from_keyserver(keyid, keyserver, wait=True): completed. Otherwise the subprocess.Popen() instance will be returned. By default the call will be blocking. """ - cmd = _get_gpg_command() - cmd.extend(["--quiet", "--batch", - "--keyserver", keyserver, - "--recv", keyid]) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - if wait: - _wait_and_raise(proc) - else: - return proc - + _call_apt_key_script("adv", "--quiet", "--keyserver", keyserver, + "--recv", keyid) def add_key(content, wait=True): """Import a GnuPG key to trust repositores signed by it. @@ -153,19 +122,8 @@ def add_key(content, wait=True): completed. Otherwise the subprocess.Popen() instance will be returned. By default the call will be blocking. """ - cmd = _get_gpg_command() - cmd.extend(["--quiet", "--batch", "--import", "-"]) - proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - proc.stdin.write(content) - proc.stdin.close() - if wait: - _wait_and_raise(proc) - else: - return proc - + _call_apt_key_script("adv", "--quiet", "--batch", + "--import", "-", stdin=content) def remove_key(fingerprint, wait=True): """Remove a GnuPG key to no longer trust repositores signed by it. @@ -176,16 +134,7 @@ def remove_key(fingerprint, wait=True): completed. Otherwise the subprocess.Popen() instance will be returned. By default the call will be blocking. """ - cmd = _get_gpg_command() - cmd.extend(["--quiet", "--batch", "--delete-key", "--yes", fingerprint]) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - if wait: - _wait_and_raise(proc) - else: - return proc - + _call_apt_key_script("rm", fingerprint) def export_key(fingerprint, wait=True): """Return the GnuPG key in text format. @@ -196,37 +145,24 @@ def export_key(fingerprint, wait=True): completed. Otherwise the subprocess.Popen() instance will be returned. By default the call will be blocking. """ - cmd = _get_gpg_command() - cmd.extend(["--armor", "--export", fingerprint]) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - if wait: - _wait_and_raise(proc) - return proc.stdout.read().strip() - else: - return proc - + return _call_apt_key_script("export", fingerprint) def list_keys(): """Returns a list of TrustedKey instances for each key which is used to trust repositories. """ - cmd = _get_gpg_command() - cmd.extend(["--with-colons", "--batch", "--list-keys"]) + # The output of `apt-key list` is difficult to parse since the + # --with-colons parameter isn't user + output = _call_apt_key_script("adv", "--with-colons", "--batch", + "--list-keys") res = [] - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - _wait_and_raise(proc) - for line in proc.stdout.readlines(): + for line in output.split("\n"): fields = line.split(":") if fields[0] == "pub": key = TrustedKey(fields[9], fields[4][-8:], fields[5]) res.append(key) return res - if __name__ == "__main__": # Add some known keys we would like to see translated so that they get # picked up by gettext -- cgit v1.2.3 From 01e32f901a8125d840cbf501ee935f0bba483234 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 6 Jun 2012 12:18:46 +0200 Subject: Create the config dir in the tests --- tests/test_auth.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_auth.py b/tests/test_auth.py index 7ecebb7b..6965dfed 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -121,8 +121,10 @@ class TestAuthKeys(unittest.TestCase): apt_pkg.config.set("Dir", self.tmpdir) apt_pkg.config.set("Dir::Etc", "etc/apt/") trustedparts_dir = apt_pkg.config.find_dir("Dir::Etc::Trustedparts") + confparts_dir = apt_pkg.config.find_dir("Dir::Etc::parts") self.assertTrue(trustedparts_dir.startswith(self.tmpdir)) os.makedirs(trustedparts_dir) + os.makedirs(confparts_dir) def _restore_apt_config(self, cnf): """Restore previous apt configuration.""" -- cgit v1.2.3 From 1b765003316443169b626874c50b98e0f91efb88 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 6 Jun 2012 12:19:45 +0200 Subject: Remove the wait statement to get a cleaner API --- apt/auth.py | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/apt/auth.py b/apt/auth.py index 3a1d132e..27365678 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -85,14 +85,11 @@ def _call_apt_key_script(*args, **kwargs): "%s\n%s" % (return_code, " ".join(cmd), output)) return output.strip() -def add_key_from_file(filename, wait=True): +def add_key_from_file(filename): """Import a GnuPG key file to trust repositores signed by it. Keyword arguments: filename -- the absolute path to the public GnuPG key file - wait -- if the system should be blocked until the internal GnuPG call is - completed. Otherwise the subprocess.Popen() instance will be - returned. By default the call will be blocking. """ if not os.path.abspath(filename): raise SystemError("An absolute path is required: %s" % filename) @@ -100,50 +97,38 @@ def add_key_from_file(filename, wait=True): raise SystemError("Key file cannot be accessed: %s" % filename) _call_apt_key_script("add", filename) -def add_key_from_keyserver(keyid, keyserver, wait=True): +def add_key_from_keyserver(keyid, keyserver): """Import a GnuPG key file to trust repositores signed by it. Keyword arguments: keyid -- the identifier of the key, e.g. 0x0EB12DSA keyserver -- the URL or hostname of the key server - wait -- if the system should be blocked until the internal GnuPG call is - completed. Otherwise the subprocess.Popen() instance will be - returned. By default the call will be blocking. """ _call_apt_key_script("adv", "--quiet", "--keyserver", keyserver, "--recv", keyid) -def add_key(content, wait=True): +def add_key(content): """Import a GnuPG key to trust repositores signed by it. Keyword arguments: content -- the content of the GnuPG public key - wait -- if the system should be blocked until the internal GnuPG call is - completed. Otherwise the subprocess.Popen() instance will be - returned. By default the call will be blocking. """ _call_apt_key_script("adv", "--quiet", "--batch", "--import", "-", stdin=content) -def remove_key(fingerprint, wait=True): +def remove_key(fingerprint): """Remove a GnuPG key to no longer trust repositores signed by it. Keyword arguments: fingerprint -- the fingerprint identifying the key - wait -- if the system should be blocked until the internal GnuPG is - completed. Otherwise the subprocess.Popen() instance will be - returned. By default the call will be blocking. """ _call_apt_key_script("rm", fingerprint) -def export_key(fingerprint, wait=True): +def export_key(fingerprint): """Return the GnuPG key in text format. Keyword arguments: fingerprint -- the fingerprint identifying the key - wait -- if the system should be blocked until the internal GnuPG is - completed. Otherwise the subprocess.Popen() instance will be - returned. By default the call will be blocking. """ return _call_apt_key_script("export", fingerprint) -- cgit v1.2.3 From c1abd02805bf19dab6183b1f22900877fd62f1e8 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 6 Jun 2012 12:20:33 +0200 Subject: Don't call fakeroot by default - this should be done by an alternate Dir::Bin::Apt-key script --- apt/auth.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/apt/auth.py b/apt/auth.py index 27365678..255d7fd4 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -52,8 +52,6 @@ def _call_apt_key_script(*args, **kwargs): """Run the apt-key script with the given arguments.""" cmd = [apt_pkg.config.find_file("Dir::Bin::Apt-Key", "/usr/bin/apt-key")] cmd.extend(args) - if os.getuid() != 0: - cmd.insert(0, "fakeroot") env = os.environ.copy() env["LANG"] = "C" if apt_pkg.config.find_dir("Dir") != "/": -- cgit v1.2.3 From 8d592cbbc8cab3407aa628579ed002ef8d7b8c4a Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 6 Jun 2012 12:26:44 +0200 Subject: Add support for update and net-update --- apt/auth.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/apt/auth.py b/apt/auth.py index 255d7fd4..a999a7cf 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -130,6 +130,24 @@ def export_key(fingerprint): """ return _call_apt_key_script("export", fingerprint) +def update(): + """Update the local keyring with the archive keyring and remove from + the local keyring the archive keys which are no longer valid. The + archive keyring is shipped in the archive-keyring package of your + distribution, e.g. the debian-archive-keyring package in Debian. + """ + return _call_apt_key_script("update") + +def net_update(): + """Work similar to the update command above, but get the archive + keyring from an URI instead and validate it against a master key. + This requires an installed wget(1) and an APT build configured to + have a server to fetch from and a master keyring to validate. APT + in Debian does not support this command and relies on update + instead, but Ubuntu's APT does. + """ + return _call_apt_key_script("net-update") + def list_keys(): """Returns a list of TrustedKey instances for each key which is used to trust repositories. -- cgit v1.2.3 From b1d3ecfe422383a641512779fdb0084b397fd7e6 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 6 Jun 2012 12:27:18 +0200 Subject: Add to copyright --- apt/auth.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apt/auth.py b/apt/auth.py index a999a7cf..38c4bdc6 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -3,6 +3,7 @@ # auth - authentication key management # # Copyright (c) 2004 Canonical +# Copyright (c) 2012 Sebastian Heinlein # # Author: Michael Vogt # Sebastian Heinlein -- cgit v1.2.3 From 6f8b10fe939609a1afc8de057813e1d43bc47558 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 6 Jun 2012 12:53:44 +0200 Subject: Add a fakeroot wrapper for apt-key --- tests/fakeroot-apt-key | 2 ++ tests/test_auth.py | 2 ++ 2 files changed, 4 insertions(+) create mode 100755 tests/fakeroot-apt-key diff --git a/tests/fakeroot-apt-key b/tests/fakeroot-apt-key new file mode 100755 index 00000000..7be99711 --- /dev/null +++ b/tests/fakeroot-apt-key @@ -0,0 +1,2 @@ +#!/bin/sh +fakeroot /usr/bin/apt-key $* diff --git a/tests/test_auth.py b/tests/test_auth.py index 6965dfed..fc37830d 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -119,12 +119,14 @@ class TestAuthKeys(unittest.TestCase): self.tmpdir = tempfile.mkdtemp() self.addCleanup(shutil.rmtree, self.tmpdir) apt_pkg.config.set("Dir", self.tmpdir) + apt_pkg.config.set("Dir::Bin::Apt-key", "fakeroot-apt-key") apt_pkg.config.set("Dir::Etc", "etc/apt/") trustedparts_dir = apt_pkg.config.find_dir("Dir::Etc::Trustedparts") confparts_dir = apt_pkg.config.find_dir("Dir::Etc::parts") self.assertTrue(trustedparts_dir.startswith(self.tmpdir)) os.makedirs(trustedparts_dir) os.makedirs(confparts_dir) + shutil.copy("fakeroot-apt-key", self.tmpdir) def _restore_apt_config(self, cnf): """Restore previous apt configuration.""" -- cgit v1.2.3 From 5d16e033da495dd835d9a870b82f77a6486b4f14 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 6 Jun 2012 12:58:43 +0200 Subject: Don't compare the headers in the export test --- tests/test_auth.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/test_auth.py b/tests/test_auth.py index fc37830d..f975c670 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -136,8 +136,11 @@ class TestAuthKeys(unittest.TestCase): def testAddAndExportKey(self): """Add an example key.""" apt.auth.add_key(WHEEZY_KEY) - self.assertEqual(apt.auth.export_key("46925553"), - WHEEZY_KEY) + # Strip the headers from the keys to avoid test errors because + # the exported key used a differenct GnuPG version than the + # original example key + self.assertEqual(apt.auth.export_key("46925553").split("\n")[2:], + WHEEZY_KEY.split("\n")[2:]) def testAddAndListKey(self): """Add an example key and test if it is correctly returned by -- cgit v1.2.3 From 9ff1b964d3b4ccb041eddfda9ad930db736769a1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Jun 2012 09:23:45 +0200 Subject: add test for utils.get_release_date_from_release_file and update code for more py3 friendliness --- apt/utils.py | 2 +- tests/data/misc/foo_Release | 492 ++++++++++++++++++++++++++++++++++++++++++++ tests/test_utils.py | 10 +- 3 files changed, 502 insertions(+), 2 deletions(-) create mode 100644 tests/data/misc/foo_Release diff --git a/apt/utils.py b/apt/utils.py index 49e8bed5..08140258 100644 --- a/apt/utils.py +++ b/apt/utils.py @@ -48,7 +48,7 @@ def get_release_date_from_release_file(path): if not path or not os.path.exists(path): return None tag = apt_pkg.TagFile(open(path)) - section = tag.next() + section = next(tag) if not "Date" in section: return None date = section["Date"] diff --git a/tests/data/misc/foo_Release b/tests/data/misc/foo_Release new file mode 100644 index 00000000..0f42220c --- /dev/null +++ b/tests/data/misc/foo_Release @@ -0,0 +1,492 @@ +Origin: Ubuntu +Label: Ubuntu +Suite: precise +Version: 12.04 +Codename: precise +Date: Wed, 25 Apr 2012 22:49:23 UTC +Architectures: amd64 armel armhf i386 powerpc +Components: main restricted universe multiverse +Description: Ubuntu Precise 12.04 +MD5Sum: + 6a815674c5b3178152d449a9396cb2e5 1640344 main/binary-amd64/Packages.gz + 98140fa3444c9e945f6944acbb9ddcff 7818931 main/binary-amd64/Packages + 846e0e856bcbf9b64d9119c8727cda8c 97 main/binary-amd64/Release + cfd5f57de107941bbe661ffada4dce88 1272844 main/binary-amd64/Packages.bz2 + 5b220aea8056a900c8eaf28e79cdd64a 97 main/binary-armel/Release + 92e3160bbb664f8b5d7d4f2d161dd81c 1619078 main/binary-armel/Packages.gz + 28fbf69ee965639c92c8a54256cd6ba1 1257389 main/binary-armel/Packages.bz2 + 4e3ba67129f73f8afe28186b31eb3112 7743353 main/binary-armel/Packages + 81cfd32bf54d2b007542e14e09953bae 97 main/binary-armhf/Release + ed404b1123d1497cb09aceae8850fc06 7620333 main/binary-armhf/Packages + 64156d29df19fdaa36fa4eafd4c17dc1 1257653 main/binary-armhf/Packages.bz2 + 3d3238bd89cb1e8e23a1a4a5bf574739 1617483 main/binary-armhf/Packages.gz + dc2fe62f05e29f36ffe4e58499796ae6 1273857 main/binary-i386/Packages.bz2 + 7c678c50ce682e9f5cc5ba8f8eb2d6ad 1641082 main/binary-i386/Packages.gz + b6aa9a96c765bbd4202dae7dbaf18cc2 96 main/binary-i386/Release + eb3b4870b877863fecf1d3307c3beb54 7816415 main/binary-i386/Packages + 54658d89b612a38592431fe6b8a780a1 1627734 main/binary-powerpc/Packages.gz + 4185aca6984f00fd65aa0c0de12367d4 99 main/binary-powerpc/Release + fc9bf1959082733fc42c682285bf46e7 1263942 main/binary-powerpc/Packages.bz2 + c32afd79c9163cffe013f98669deb727 7661552 main/binary-powerpc/Packages + ff5434612595a569236f7ba4990a3b63 62166 main/debian-installer/binary-amd64/Packages.gz + 7dd470290bacbacc7bec24830100aade 234592 main/debian-installer/binary-amd64/Packages + 013d9839e9c8f8c102daf6eb77841bf7 48784 main/debian-installer/binary-amd64/Packages.bz2 + 08608ef832f2410970d07fdd802fc4e4 47964 main/debian-installer/binary-armel/Packages.bz2 + 0a0a559023aac4096a38e2fb51870ddf 230310 main/debian-installer/binary-armel/Packages + f79f29b841a05b971ac318a9e0a396e0 61118 main/debian-installer/binary-armel/Packages.gz + 20a72276b6607fa58f52fcc5b7742ff4 62777 main/debian-installer/binary-armhf/Packages.gz + 8da4a15400cec4b06e2aa1bba6cfc2c3 49051 main/debian-installer/binary-armhf/Packages.bz2 + 49f9f82a7c7e9e13c399d15df43148f1 238862 main/debian-installer/binary-armhf/Packages + 3dd181be504206f7abb41039dc508ed9 52279 main/debian-installer/binary-i386/Packages.bz2 + 5c2c6ca586bb6ffb2de414e2cd063c70 259996 main/debian-installer/binary-i386/Packages + ca1b7db323ebef593617ef0a7c833dfb 67180 main/debian-installer/binary-i386/Packages.gz + 876f115ee26518319458fc26ec785485 246636 main/debian-installer/binary-powerpc/Packages + 49402b5b12b10804abfae14629d23f1c 50309 main/debian-installer/binary-powerpc/Packages.bz2 + 29010a7ba3ac1e60a0efaef04f6f2e42 64468 main/debian-installer/binary-powerpc/Packages.gz + adf74189a01512a8f68d4bfc411dc692 3706 main/i18n/Index + 2f2ddab9be4ecc2c9e190bb639304943 4356187 main/source/Sources + 5c2893c352ebbf3ee380ebdab6b5e487 933770 main/source/Sources.bz2 + 323e5ca1ba86c7a503c4c7b0772749b1 1174967 main/source/Sources.gz + 3c3104465b2c7e54f4b8f566ac825339 98 main/source/Release + f75f8a98e9e952194046da388a11c42a 119109 multiverse/binary-amd64/Packages.bz2 + c2df9a9ff319486e3d6f46d9c35a8530 151924 multiverse/binary-amd64/Packages.gz + ece719c6a770134150f158cdb65ca6fc 581550 multiverse/binary-amd64/Packages + d3f34ec2fc86c95e4d3bc4606d751c66 103 multiverse/binary-amd64/Release + f296954282382f88b12dd8c64d813f5c 136295 multiverse/binary-armel/Packages.gz + d0da88f8a408fba12d44d5b6e107cfc0 519605 multiverse/binary-armel/Packages + 6d0c32b1cae4bdcfd6f18fd2d6fbf31f 103 multiverse/binary-armel/Release + 6744aaa8a3457d139348ea18379781ce 106873 multiverse/binary-armel/Packages.bz2 + 1cc2613becf46fd578aa6d52ab12db94 104529 multiverse/binary-armhf/Packages.bz2 + b0f8df0c9d700a1f7d295be4d4c03788 505901 multiverse/binary-armhf/Packages + 73cb5bc3d0c5021e5a4a413a73bcefce 103 multiverse/binary-armhf/Release + 00c07f1601226b8387fe4c9afaf2b044 133117 multiverse/binary-armhf/Packages.gz + bf0237c8c5d06a6df172db28710b8a36 121196 multiverse/binary-i386/Packages.bz2 + cf110f58668bf5731e593ed78af54c27 591662 multiverse/binary-i386/Packages + 8a915986a504c0f3eb95b61ae909c9a4 102 multiverse/binary-i386/Release + c6d89a2752d1154a219c295e6d70b697 154762 multiverse/binary-i386/Packages.gz + ae93681c6b316c95207091b3c91042a7 105 multiverse/binary-powerpc/Release + ec463c2070c515de099f8baa3a4b5993 107209 multiverse/binary-powerpc/Packages.bz2 + 675204a2b4aabeb9e99e406070b2af9b 520882 multiverse/binary-powerpc/Packages + c806ea7584c782d57363df12ddb28839 136930 multiverse/binary-powerpc/Packages.gz + d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-amd64/Packages + 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-amd64/Packages.gz + 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-amd64/Packages.bz2 + 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-armel/Packages.bz2 + d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-armel/Packages + 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-armel/Packages.gz + 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-armhf/Packages.gz + d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-armhf/Packages + 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-armhf/Packages.bz2 + 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-i386/Packages.bz2 + 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-i386/Packages.gz + d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-i386/Packages + 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-powerpc/Packages.gz + d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-powerpc/Packages + 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 + a2bcfa86da39328db94629011506a877 2676 multiverse/i18n/Index + c2ffda2a848000b71573dbc3dc7d4402 154990 multiverse/source/Sources.bz2 + f1d64bb88933686a71108de73b1f2262 628753 multiverse/source/Sources + 3d35747578528fa13640b98184120e51 188325 multiverse/source/Sources.gz + c9828946b46ac900fec682369c52bfa7 104 multiverse/source/Release + 5644835af0d1ed82cc7c14e34c2a543f 9098 restricted/binary-amd64/Packages.gz + d3058923c862e74c2c08b9a4ad7ec51e 134705 restricted/binary-amd64/Packages + 97ecff09a695f1460177843ff5d2b3e6 103 restricted/binary-amd64/Release + f8ed966e5400930411a32a7183357810 8452 restricted/binary-amd64/Packages.bz2 + 60e74c701a6e40b7f869dd83b335ec5c 103 restricted/binary-armel/Release + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/binary-armel/Packages.gz + 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/binary-armel/Packages.bz2 + d41d8cd98f00b204e9800998ecf8427e 0 restricted/binary-armel/Packages + 55c08a48fc4b3370acc95a391bde1189 103 restricted/binary-armhf/Release + ce2da4621bbbaf55d858ae4243e17715 1103 restricted/binary-armhf/Packages.bz2 + b26814493282faf0c5b269c44b799653 2477 restricted/binary-armhf/Packages + 784050b4fd16ea71e10cf130e47132d9 941 restricted/binary-armhf/Packages.gz + c4280a67444afbb8e2564d6f2249d397 9108 restricted/binary-i386/Packages.gz + 6dfd90555b37a912f82894b4ec3b63a0 8431 restricted/binary-i386/Packages.bz2 + 48d3e36bf54be9b3fc7576cfcd0aac79 134582 restricted/binary-i386/Packages + e49b38cbf4dc409e8c25f6ab4b32fbe4 102 restricted/binary-i386/Release + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/binary-powerpc/Packages.gz + 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/binary-powerpc/Packages.bz2 + d41d8cd98f00b204e9800998ecf8427e 0 restricted/binary-powerpc/Packages + edb68a453747a9faa9e98389787fb79d 105 restricted/binary-powerpc/Release + d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-amd64/Packages + 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-amd64/Packages.bz2 + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-amd64/Packages.gz + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-armel/Packages.gz + 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-armel/Packages.bz2 + d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-armel/Packages + 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-armhf/Packages.bz2 + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-armhf/Packages.gz + d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-armhf/Packages + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-i386/Packages.gz + 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-i386/Packages.bz2 + d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-i386/Packages + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-powerpc/Packages.gz + 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-powerpc/Packages.bz2 + d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-powerpc/Packages + 39ef6c1d54f83252b07406f9cc3e9204 2596 restricted/i18n/Index + a76089a7a653d4f2196c38093058d1aa 19001 restricted/source/Sources + 3990b36e6ef2846251b58a58cde3768d 5470 restricted/source/Sources.bz2 + f0a32107aaf12daf3e64b4dc3ee11321 5306 restricted/source/Sources.gz + 7871a3f6f83e033ab93c06bf886e305d 104 restricted/source/Release + 3464b1b15950e714151f8bb43982951e 25546870 universe/binary-amd64/Packages + 9340d5c4051da92820bb5bd5ba05f7a7 4785960 universe/binary-amd64/Packages.bz2 + 1f6974aea9904921afdb4d1c5d0e8578 6166988 universe/binary-amd64/Packages.gz + 75ea366982b4862a41d9640687778dd2 101 universe/binary-amd64/Release + 5492f7f7183461d52f8d58871026c3e8 101 universe/binary-armel/Release + 420abe7ca02b5cb2abcd1b273efcfea9 4667308 universe/binary-armel/Packages.bz2 + 4da3448f54e710222b26646b0bee14e8 6009219 universe/binary-armel/Packages.gz + e99405db74ba425a3f898fdda0a42113 24901082 universe/binary-armel/Packages + d0545845bbcff572a5c852b80582b269 5948128 universe/binary-armhf/Packages.gz + 8f0d262f1eb03fc3523cd80b3112a7e0 101 universe/binary-armhf/Release + a10169d0cc23f526bcee5769d27778b0 4618508 universe/binary-armhf/Packages.bz2 + 952259d2cdb2c85df177702ac92075a0 24642528 universe/binary-armhf/Packages + df43c3b4ec37e79a00023475a09e2bfa 6179579 universe/binary-i386/Packages.gz + cc44a3e2ad759febb38ef2bec15ab29e 25568759 universe/binary-i386/Packages + 826b1d8609f0944a6d2ae95617e4d05a 100 universe/binary-i386/Release + 50690005918dd03ad9b71ffffa678d6f 4795820 universe/binary-i386/Packages.bz2 + 8a1f21204f4178574251a2238c00f317 25188905 universe/binary-powerpc/Packages + 7409876b9e1238d5a147720b41233a26 6080488 universe/binary-powerpc/Packages.gz + 9bcc15c59aa3fbbd15f0d187fe90b353 4716652 universe/binary-powerpc/Packages.bz2 + c3bdb05d2be1efa2dca9d2bac4e85b13 103 universe/binary-powerpc/Release + f8259410f0e1ad66324dbce895fdde2d 15255 universe/debian-installer/binary-amd64/Packages.bz2 + ce60affbf23a069735c29951bfb0b818 17243 universe/debian-installer/binary-amd64/Packages.gz + 13ce59ecd4540ddef3670dbbed73cdbc 61801 universe/debian-installer/binary-amd64/Packages + 988da583db40ce21d400926641fe6ed8 113584 universe/debian-installer/binary-armel/Packages + 75381e3ed15a3a2fa1480fdea72cfd24 23193 universe/debian-installer/binary-armel/Packages.bz2 + 4a8e6a98277f254660e8690fd050b232 27397 universe/debian-installer/binary-armel/Packages.gz + 02e7128ef42cd61e66c768520961fb11 20065 universe/debian-installer/binary-armhf/Packages.gz + 851afb686177a6819b291a714fa15813 17619 universe/debian-installer/binary-armhf/Packages.bz2 + ce3b6645e37226c4047546a40675ecdd 76034 universe/debian-installer/binary-armhf/Packages + 229235ad9979a343e3bea9aedb5af8da 17260 universe/debian-installer/binary-i386/Packages.gz + 8065c9994844e578af00ef8794709b18 15272 universe/debian-installer/binary-i386/Packages.bz2 + f28d6328611ab1e382fb0d0e798aca97 61718 universe/debian-installer/binary-i386/Packages + 60f54adbd38213dbbfe5d638f98a17e9 61121 universe/debian-installer/binary-powerpc/Packages + 1d48a07b3f4214200ff3eb1c5894e4a1 15024 universe/debian-installer/binary-powerpc/Packages.bz2 + 51eb13c4b9baf089e4e8b0e85556b90e 16860 universe/debian-installer/binary-powerpc/Packages.gz + 155e0b646671f37a7fe235c4579e59f2 2922 universe/i18n/Index + 2ef7ccbe106edb394dc69d8511775122 21256524 universe/source/Sources + e52b7cb491cc6a950cd11fa6263d7330 5019105 universe/source/Sources.bz2 + c722166709cfe9c398643b9c1a443610 102 universe/source/Release + 5ddd8bd0dda063b203d1a1da150983a0 6238766 universe/source/Sources.gz +SHA1: + 0b326daa3b2ac8748ca10942aaec15ebdcc78b36 1640344 main/binary-amd64/Packages.gz + 8a6068a75feb86e12b088dad2478600f6670f2d7 7818931 main/binary-amd64/Packages + 19655f20d48d9819ad95f2c9ecc59e5b1d94c3d0 97 main/binary-amd64/Release + f9761ecf8536859ef38b670a7f17d83febec4a37 1272844 main/binary-amd64/Packages.bz2 + a3a5faadbdf0a49d1587f07181b9eca870cb24ce 97 main/binary-armel/Release + 3c5d8f3a401427110adfd7f7d65513bfa47b933a 1619078 main/binary-armel/Packages.gz + 4d54e387978fdf829b4ff7336ed4d02e61c54d6a 1257389 main/binary-armel/Packages.bz2 + 969dfd243cc3f514eea9914de571db28621cd9bd 7743353 main/binary-armel/Packages + f8f33265eab2ff9fd8a6353e014e36a9d318a54d 97 main/binary-armhf/Release + 1d210f8ad3547b771bc8c8d2a9eb5ee99d437d81 7620333 main/binary-armhf/Packages + 5057a8b2d11d2325bb2546ad6613517b208fff18 1257653 main/binary-armhf/Packages.bz2 + 25fc010c2789028727308fbf6132a8da387423b8 1617483 main/binary-armhf/Packages.gz + 79369a31bc481f7f9f71f666906c3bdb356c44d8 1273857 main/binary-i386/Packages.bz2 + aaadaa6eaf0b7e73b0d371cdebae573f28833a43 1641082 main/binary-i386/Packages.gz + 6f8e5e9dd04a2379a7c6d8dc23b4ff8df5584741 96 main/binary-i386/Release + 8509eead0c5e9410e23d4226ee5d190220db1275 7816415 main/binary-i386/Packages + 7da3fd8ad7102912a4cc9882c66fbb1b65edd4c0 1627734 main/binary-powerpc/Packages.gz + 8a0c3b7757b738a89644e8c5a3b9afed806d2f83 99 main/binary-powerpc/Release + 4063338a28f6504f7bc2f9c00fc34ac26fc5a1fa 1263942 main/binary-powerpc/Packages.bz2 + 81844e44aaf0ed255ca200e7316bc9279ef238b6 7661552 main/binary-powerpc/Packages + d17439034551742aaa4762b4c174c1d72881f49f 62166 main/debian-installer/binary-amd64/Packages.gz + 05e024776b06a40253b9e252caad6dc4a13a90b9 234592 main/debian-installer/binary-amd64/Packages + fa692a307ecab69c106a5253107f980527cf58a9 48784 main/debian-installer/binary-amd64/Packages.bz2 + fb8be98ef08265d2f101cf265b9bf37654d750ac 47964 main/debian-installer/binary-armel/Packages.bz2 + 8953964fd2b54539e8276237cd5e4e2d4f9dc2ab 230310 main/debian-installer/binary-armel/Packages + cfdde60bbcbfb25c66fa474d28217e03a4c06789 61118 main/debian-installer/binary-armel/Packages.gz + 468306dc06acc828c50196427ba324c8ce225c79 62777 main/debian-installer/binary-armhf/Packages.gz + 17e7331a837675de31c365529ea9454cc48baf98 49051 main/debian-installer/binary-armhf/Packages.bz2 + 3404140163a5acece9a054912abf72d11a5591d0 238862 main/debian-installer/binary-armhf/Packages + 2bb7e052999eadc333a9f6481bdc20acb238d4c1 52279 main/debian-installer/binary-i386/Packages.bz2 + b2ad69cd6759724461c3566d91c1c5ec209eba07 259996 main/debian-installer/binary-i386/Packages + ebd0ab3923b3df4eca53eb863773bf0a9a4c3a67 67180 main/debian-installer/binary-i386/Packages.gz + eff551b62b72a1c0b183d4903a1452f2be08f3da 246636 main/debian-installer/binary-powerpc/Packages + 5c8aa09d48d7a792d555e7b16f4c89733e8441af 50309 main/debian-installer/binary-powerpc/Packages.bz2 + 582a86208e89e77a7f284e10a50b9cceaf4358ee 64468 main/debian-installer/binary-powerpc/Packages.gz + f426621b1015147e766dc003d1d2f140dc9c062d 3706 main/i18n/Index + b22a946cdae39d29535a63b020c0f2ad74c3c992 4356187 main/source/Sources + 711225fd252e77d85c7bb992aeb5aa5e45414ae1 933770 main/source/Sources.bz2 + a8807bf20dbaceb9d408f959840951131fd7d9f9 1174967 main/source/Sources.gz + cc2d2f6ce53597666df1a5ab216a08f08995f43f 98 main/source/Release + 06b070fc1ae771806c65e791742832320cc588e7 119109 multiverse/binary-amd64/Packages.bz2 + ae591617f4b6f988d6534270d4c32e3f0876166b 151924 multiverse/binary-amd64/Packages.gz + a28786a87a6136fb74a005c480c78a152123b9c0 581550 multiverse/binary-amd64/Packages + 3860a3ce6d87bb8a43803a1048cc96d4de3ae8a7 103 multiverse/binary-amd64/Release + 4bae80c3f5270e45f825141bcadb94d7dd82cd0e 136295 multiverse/binary-armel/Packages.gz + 9534dfc2e4a40386f48eff79062ee1742212b7d3 519605 multiverse/binary-armel/Packages + 92d1536ae99c958afd74299ffe30bdc6800cd8d0 103 multiverse/binary-armel/Release + 8e3ec557dc8f750e82e8ed5cbb0c509182feba79 106873 multiverse/binary-armel/Packages.bz2 + 009531e7cfb08701883a9e7a5f50235325e109cd 104529 multiverse/binary-armhf/Packages.bz2 + 596a666233560852574d9bca0109f4933a12c949 505901 multiverse/binary-armhf/Packages + eca4ab620c41d76c00a9615d8530db5a9c918fe8 103 multiverse/binary-armhf/Release + 53916a24cff0523e218bfee2c5464866d2099042 133117 multiverse/binary-armhf/Packages.gz + a7518b6b3e693d840a49b125020785d2049e75b9 121196 multiverse/binary-i386/Packages.bz2 + 84069f1643bd0092f4ec1b24eb921310532d72b2 591662 multiverse/binary-i386/Packages + 1d42b054d297b33cf69af011fa91f601c6b1a1b9 102 multiverse/binary-i386/Release + 8eae892b29234e9aac4c58a7098b097fe5ebde16 154762 multiverse/binary-i386/Packages.gz + 873bc8f864de428a4a47a3afaf53bc3a3a6e81c0 105 multiverse/binary-powerpc/Release + 665942774934afa56721d082a398735a067afe91 107209 multiverse/binary-powerpc/Packages.bz2 + c965416be0f7bf88c78394becf4a72aee342b829 520882 multiverse/binary-powerpc/Packages + e304951d28df0b75065fd3ef8166c65415a3cad2 136930 multiverse/binary-powerpc/Packages.gz + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-amd64/Packages + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-amd64/Packages.gz + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-amd64/Packages.bz2 + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-armel/Packages.bz2 + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-armel/Packages + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-armel/Packages.gz + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-armhf/Packages.gz + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-armhf/Packages + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-armhf/Packages.bz2 + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-i386/Packages.bz2 + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-i386/Packages.gz + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-i386/Packages + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-powerpc/Packages.gz + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-powerpc/Packages + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 + 09a8aff01c419e0eae19749acf3b223e1f95eccc 2676 multiverse/i18n/Index + a088c61bca210afebf4c53904049e2a969d8ece3 154990 multiverse/source/Sources.bz2 + df4078a91645024ce93b1ee363003c83ffa2aa84 628753 multiverse/source/Sources + e6ec0430d594fa7fa2c98cb9a5fa8ac7ed0d506d 188325 multiverse/source/Sources.gz + 0750588f28b1c2cf6a005501c7d027cfa663cce1 104 multiverse/source/Release + 200fdeee1984ac78b6fdabfad34d2b485512ca2d 9098 restricted/binary-amd64/Packages.gz + 0e7ebd3d2690c7f89d19f8b337cf292cac913c18 134705 restricted/binary-amd64/Packages + c968d68baa554ffc7009688ee7d0d3e70663243c 103 restricted/binary-amd64/Release + 4185a5b6c2e702ea4754437ebfef23d828ec67a0 8452 restricted/binary-amd64/Packages.bz2 + 27886dcc6c7d08369cc65d4c35f26b806f57be56 103 restricted/binary-armel/Release + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/binary-armel/Packages.gz + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/binary-armel/Packages.bz2 + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/binary-armel/Packages + d83803a5f6c2f5c7321d68d126733b6015c8e2a9 103 restricted/binary-armhf/Release + 6607111b78dcd3de05cb88692c1e2142abf9a4c1 1103 restricted/binary-armhf/Packages.bz2 + b9f55d161632f89b5125a638ca6ad4fe5e9d11fe 2477 restricted/binary-armhf/Packages + d0c0a616aeac580d13256693cfbd507ae7c9b280 941 restricted/binary-armhf/Packages.gz + f3e483bbe77cbf0f64accbd0291df19b4e4d694b 9108 restricted/binary-i386/Packages.gz + 48d76b03a19e4d66d6f7a20339dab91acebaba99 8431 restricted/binary-i386/Packages.bz2 + 3ca46ea8f32b7cbc49ce76dd1c1ab91589900fd7 134582 restricted/binary-i386/Packages + 2aad61f5084ecdd64ff520520d77e980e8b21f81 102 restricted/binary-i386/Release + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/binary-powerpc/Packages.gz + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/binary-powerpc/Packages.bz2 + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/binary-powerpc/Packages + 6b0a230bbf47463e3d7e88f535e210aaa96a1251 105 restricted/binary-powerpc/Release + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-amd64/Packages + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-amd64/Packages.bz2 + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-amd64/Packages.gz + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-armel/Packages.gz + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-armel/Packages.bz2 + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-armel/Packages + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-armhf/Packages.bz2 + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-armhf/Packages.gz + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-armhf/Packages + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-i386/Packages.gz + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-i386/Packages.bz2 + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-i386/Packages + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-powerpc/Packages.gz + 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-powerpc/Packages.bz2 + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-powerpc/Packages + d59f5ac2532dcc7cb2f1e5b788c700bf8ab13b66 2596 restricted/i18n/Index + 8a80cdcf50cdcabcf4f47c772d7b252587cc9dc1 19001 restricted/source/Sources + ff7d82cf1d965953c745d224a1d4adc67b586528 5470 restricted/source/Sources.bz2 + f64da9da2038712c5d73ce3337e91d92ee39cd30 5306 restricted/source/Sources.gz + 5c963f5f4d4720afa5fbb914375d0033bcd50078 104 restricted/source/Release + 10c6989f4a241aabe00146905e776391fc4d9ac0 25546870 universe/binary-amd64/Packages + f6900616102430e0eafa8ac89795efff7edc0710 4785960 universe/binary-amd64/Packages.bz2 + 4f938bde9dff32a49bccd917613666017185882d 6166988 universe/binary-amd64/Packages.gz + 9d6cba1ed46b5eee1f6c065934e5f4854b3efee5 101 universe/binary-amd64/Release + 3573e863c714c0a083f9c962ea9136916f796e92 101 universe/binary-armel/Release + bb8f53ead3723737c13950e5343327884f737da9 4667308 universe/binary-armel/Packages.bz2 + 43d9a98706b6e50c21092ce35313b5b034f30d01 6009219 universe/binary-armel/Packages.gz + 7f97dcbe710882d281efcfd2f8d70ca7d4e47265 24901082 universe/binary-armel/Packages + 8f6d42d7f8178a51a7065d7bf3234eecbca12810 5948128 universe/binary-armhf/Packages.gz + ea648f433d0edd47de820582fa6a1cd89ef66681 101 universe/binary-armhf/Release + e6ad9bdb18ce9e09e262b9e6f85b0b307a3456f1 4618508 universe/binary-armhf/Packages.bz2 + ba55530da6c3a9604977ea4a37b4b4d8943ff994 24642528 universe/binary-armhf/Packages + 05de59263866a33c104787943347164e7b124aba 6179579 universe/binary-i386/Packages.gz + 286a3dd2fda0d98d2ff14eafee0bba5c912d6df2 25568759 universe/binary-i386/Packages + 839529b6f6e2a64465e4a825fa5ad46a36f1c73d 100 universe/binary-i386/Release + 70c27be4d8bc87dc26bbe6f21fbb7328dc1c4d01 4795820 universe/binary-i386/Packages.bz2 + 06af7fdef1a54920a7667728a7b810553d00a9c8 25188905 universe/binary-powerpc/Packages + 4df1b07075b25ccae6e60d26d5a5761444ece689 6080488 universe/binary-powerpc/Packages.gz + 15d041ad1284527b07f75218cf6eb32322092f84 4716652 universe/binary-powerpc/Packages.bz2 + 42d6a46ed2e525b219f8f6dc076dadbd06fc7f1b 103 universe/binary-powerpc/Release + 92c3bef6ad40051021a4e9dadb16e5edc7410b57 15255 universe/debian-installer/binary-amd64/Packages.bz2 + 31d8725b0d238c282d9b572bb56b7e45c0ff53f8 17243 universe/debian-installer/binary-amd64/Packages.gz + e334a7c80e14dae3055950d9e45213db65d4087b 61801 universe/debian-installer/binary-amd64/Packages + 1fd1ae2b87eb85525b173ea982d15f3c98e6e33d 113584 universe/debian-installer/binary-armel/Packages + c56579feb77b5aac2d261abbbb6c89a1458ca4d9 23193 universe/debian-installer/binary-armel/Packages.bz2 + e4b08e57397f3ab0599e0bf6a2fbcba3aed438b5 27397 universe/debian-installer/binary-armel/Packages.gz + 5a9608213061eab983392258288e8aec36d006f0 20065 universe/debian-installer/binary-armhf/Packages.gz + dc558d56aef72991a3188909a14f752aabdee325 17619 universe/debian-installer/binary-armhf/Packages.bz2 + c6afa0e14c706aceea60aad033b6a067320fc165 76034 universe/debian-installer/binary-armhf/Packages + f359cf916a19055133546a7b7f3e35c7c260488e 17260 universe/debian-installer/binary-i386/Packages.gz + 23920ee4974d88ba824b0e884f8df6e2711a20db 15272 universe/debian-installer/binary-i386/Packages.bz2 + 21cfd020eefc848307fac14b8f0efe0d6cd9c6ea 61718 universe/debian-installer/binary-i386/Packages + f2ff72c8f1fe4ce40ccf44f8ccd6623cedf4e6f0 61121 universe/debian-installer/binary-powerpc/Packages + bd9c731941b261b22c022d97ca139bfeb1ad70ba 15024 universe/debian-installer/binary-powerpc/Packages.bz2 + e173071bda799068783c9192bff6536db9790a27 16860 universe/debian-installer/binary-powerpc/Packages.gz + 59a86abaed7cab292600b6766b18752b7e7c3d49 2922 universe/i18n/Index + 4b0ed5f327b0fa9b3f9d9410933a3d2afe467a7e 21256524 universe/source/Sources + d0525203f9ad5ec9183996e6765d0ef9a024691f 5019105 universe/source/Sources.bz2 + 00847d46051ba44d436000b0394b218503de125b 102 universe/source/Release + d9706a8ab2ffeadb51b50d042712536a95dc4343 6238766 universe/source/Sources.gz +SHA256: + 0d61aacd269015c0abfe01fe7f90a4f534c368e9c513f7e90d3111af82656b3d 1640344 main/binary-amd64/Packages.gz + a1bc8d839ca9966a0b924e4a4c60f1c23b4d431deb81e1bc529edf95f30fc29d 7818931 main/binary-amd64/Packages + a55d3b2e6e2a175529d73e6ca92989018cf57745e705f7ff675b05f80e5141f7 97 main/binary-amd64/Release + cc0d3a19c51188b4b4acb80e3013264462c6e0f60759bfd46206c60681bd4ba9 1272844 main/binary-amd64/Packages.bz2 + a841750f49bd11f99b9dae6941d2fa6ec1fd87906139d0ceeacf0d4df57a87cf 97 main/binary-armel/Release + e80eaf12c1aa520b353de8ad97e79364779e82ef011cb93db372edc900eb7be9 1619078 main/binary-armel/Packages.gz + 0ab0929c3c44837886e532f8ec4bee77f3664bdcc2cc3192a02b991c52b156ce 1257389 main/binary-armel/Packages.bz2 + ea400cf67f84c12265e4bf419de442a38880fab37d76999985972fc6df3e13b3 7743353 main/binary-armel/Packages + f3c40f057bb085f28ef2ed950f62366483d2a418571435c355dc27c0912dccff 97 main/binary-armhf/Release + cde037224f43e4619213c5195f2ea5c2f91d078f449579652dbd4128793d5062 7620333 main/binary-armhf/Packages + 7c6ea67e609b96dec6f2185df4cd81160e37ba467f9132a9bfb101da3f9a0468 1257653 main/binary-armhf/Packages.bz2 + 2b83bf5501ecae3347e5c96658edae7d48eef42108b4786471a3de241e75e7d3 1617483 main/binary-armhf/Packages.gz + 4d74c53917b84d37cb3277e2b755672a8733e2cfaf949f6e644e6e88094cdaa2 1273857 main/binary-i386/Packages.bz2 + 07f33bddfefdb4a0c44ddee59fd3eca497df2ad0456e0eeade136e4f0302ee3c 1641082 main/binary-i386/Packages.gz + 5182e22f799fe66c8db6dfb073fb040e9e583d88bb9d4d77e058b2afb87e9479 96 main/binary-i386/Release + 4cecfc8c0d2113d51b03afa8fdcdcc963d9ad74474696472ec1cdbdb38b856e2 7816415 main/binary-i386/Packages + 2795904625f466b4a2fb96d41c00b000ab7f2bdc7f288b0c9ef1283d7e110f87 1627734 main/binary-powerpc/Packages.gz + a9247e6d8b0c5977bc1e72be09b1f42a83b5f5a6a70b17f4fef35a0657e3c206 99 main/binary-powerpc/Release + 6e745b7edcd67755fa09f54cc3afdd0ffbd0475302a74293472e97e46ba75ddc 1263942 main/binary-powerpc/Packages.bz2 + 8b953dbae4a14e7ab47151044a47c7b0f0e1dd2a6480170b8172e00d9dad7a2a 7661552 main/binary-powerpc/Packages + a5bdf4116ecfeda052d5b3751138c6153e814ac58b2f551503f3ed90e6c3510c 62166 main/debian-installer/binary-amd64/Packages.gz + 6a9a4837a4a7df3e7e0566b354b7f1dd2dcf46254335ae3d06a72538f85e410a 234592 main/debian-installer/binary-amd64/Packages + 0da4f8190eebfef22103f1f6f7051adbe9489d454ab7224f09d05646407881e8 48784 main/debian-installer/binary-amd64/Packages.bz2 + ea01244357deb22c2a4bd7eaa34a1635c0915b89ce174f312c0e0a4b081eaf30 47964 main/debian-installer/binary-armel/Packages.bz2 + 4177b0519c75f7f950e5a0f0d72d40cc0c4ccf29ebe89fbb9bc1f11a80874526 230310 main/debian-installer/binary-armel/Packages + 2b6f81ef9fa687bfb2eb56bb3e90faef0c012351d096b141caa710fd50846043 61118 main/debian-installer/binary-armel/Packages.gz + 52c834247ff3a5475466e647802f6eff393f85589e5da5fd3e5b497669b8b49c 62777 main/debian-installer/binary-armhf/Packages.gz + 7090f1ad1307a012fbfff883885f16099ed66ebffdeece356f837e632b177a4f 49051 main/debian-installer/binary-armhf/Packages.bz2 + 4bae13f507993e977c279937406fc03e37fede7805a92508f6d3cba76f1aaf95 238862 main/debian-installer/binary-armhf/Packages + d1d23926ff15cfaa6160c5fd0327d181721093fbd2f2e8125be5559a991a81a8 52279 main/debian-installer/binary-i386/Packages.bz2 + 30e0ec7a2c3d47d5501de8414b436482ff523e9c4983b536b2c9911a30618b98 259996 main/debian-installer/binary-i386/Packages + 7a4dcb001ed4bb5fa2458af901de312e11a745bc86a0f877e47567d0f911bc0d 67180 main/debian-installer/binary-i386/Packages.gz + 30c2f590c2dedc9f78dfc7f0026b51bc9baa712ac8c9310404d9d6577af77d90 246636 main/debian-installer/binary-powerpc/Packages + 6c53fab780cf774c5cabb1788eea1e3446c528cde4352d106907f4ec22449370 50309 main/debian-installer/binary-powerpc/Packages.bz2 + b003f3fbf2fa6dbf7d47cf3fbd029ecd86b316ec497a9ac4eea3614cf4ec76af 64468 main/debian-installer/binary-powerpc/Packages.gz + fefed230e286d832ab6eb0fb7b72442165b50df23a68402ae6e9d265a31920a2 3706 main/i18n/Index + bb618cebb361a2a7148be0bad9af012c8d9de23dbc32d6d9ba035fa6ee0078ab 4356187 main/source/Sources + 0aeef2c2258136f9f774c36a158cf759389acf6a35a3153a03d3fa41d4f346d5 933770 main/source/Sources.bz2 + 4a058ba65244e8eaf17d159b72edebe4e621d54c274a82d4a973b358b4af9a28 1174967 main/source/Sources.gz + 864ba9a26e348c6297c08c047d8c228e5ed031ec3d46ef7aad93c3fa550395a8 98 main/source/Release + 85477d2b2e7ea2f46b6a059f7526cf52d75fea1a5120aa3b256c576e904d40ff 119109 multiverse/binary-amd64/Packages.bz2 + 2967ae6c1cc065bec03225d808b4511b138cc13b8de801a0562fec6e30710f36 151924 multiverse/binary-amd64/Packages.gz + 18fcf61bb74ef2a01c3d4a8d4646a75836f43244168b43d6ae202f368167b224 581550 multiverse/binary-amd64/Packages + fbc4931ef84d50a39da65d110f787aee274df8819a758a3c0aa1ff13f0ba6ee0 103 multiverse/binary-amd64/Release + 49f48a34696d08a13a0fdc19a0f6896af2cb477e72860a8880954926c7d45e60 136295 multiverse/binary-armel/Packages.gz + f20d7f0bc32b5b2fbcb442f7c128aaad7e18aece3781d53f560932bb191d6830 519605 multiverse/binary-armel/Packages + f7ea72b2c07af81f2e342414025dce7a658a6a9915c4d8adc13b992cb3b9fd2f 103 multiverse/binary-armel/Release + dd3d4e8a6ec9055d5b553af49822de74648f071ceb0fd314d6cd1aaf7ad6882b 106873 multiverse/binary-armel/Packages.bz2 + 567c1f9d30a4d6650552d66c5fb43d2d8910d3fed69793daed622d2c699f4bc8 104529 multiverse/binary-armhf/Packages.bz2 + a47ef2c0a68adeb70a0bc6b22c94b08402396ff6f5c77664e06c2fb7ee0e7ab0 505901 multiverse/binary-armhf/Packages + 6b95e8edaa2bb799f6e15a4a6aaf223da0faea670cd03340395bdcea90205afc 103 multiverse/binary-armhf/Release + 14721b333f19a6344addb185f161d1cd14e04ac284c8fa9d726064ec228269a8 133117 multiverse/binary-armhf/Packages.gz + 454436f374186007075445c1f206ba5c926f30609baa732c495f1ba456d71e59 121196 multiverse/binary-i386/Packages.bz2 + 9fabd7bfdbfd216968f7a17265e5609cdd72f1ea7c8f50941e294694e76b180d 591662 multiverse/binary-i386/Packages + 7141881b898ac6a78f1ca6f3e81481ee6657f6762fa22768816ab39f6b17e695 102 multiverse/binary-i386/Release + 3f4cae31df741f55d523ecea758d05a7e012a205bb03974ee20eb09e3f4fa63b 154762 multiverse/binary-i386/Packages.gz + 332dde644a8467496eb5f45ffd2d735ca61ea781da21cd205b3267cd83fa0563 105 multiverse/binary-powerpc/Release + 99ef0a611aa32ffa4f16a006d641fbd8dd9e3e73bde3c93b831cd6583746e64b 107209 multiverse/binary-powerpc/Packages.bz2 + 60f2431dab7bd02fe2c2428bf400c3535be49641cc9d5645a8f1b4fd44f5086f 520882 multiverse/binary-powerpc/Packages + cacfd10b40992a617ce32c479f9505531c8cc57e4cf964687d663a5f41f8dcbd 136930 multiverse/binary-powerpc/Packages.gz + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-amd64/Packages + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-amd64/Packages.gz + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-amd64/Packages.bz2 + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-armel/Packages.bz2 + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-armel/Packages + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-armel/Packages.gz + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-armhf/Packages.gz + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-armhf/Packages + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-armhf/Packages.bz2 + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-i386/Packages.bz2 + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-i386/Packages.gz + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-i386/Packages + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-powerpc/Packages.gz + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-powerpc/Packages + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 + f0b16a5cfd2d633c9ddecfadfa6742544b18c23ed30023286e2b20ef29f33c73 2676 multiverse/i18n/Index + faa0360612fc00453dfdd55b6a1bb20e4f876e041ad6fca410d5da65608ab31e 154990 multiverse/source/Sources.bz2 + 2f0deae62e2cf7e5257bbd858cb0bf2a94122c4eb82be13e13768d0b9ce84c9e 628753 multiverse/source/Sources + 28f6d95fcba03e442cf24dc547653d5ec60177a29d7cfea771efcc5501077747 188325 multiverse/source/Sources.gz + f35f721bf16691842cc916c3563fab535f6bb83329f40c33ac02f4ba637707d3 104 multiverse/source/Release + 3e872fa356cbce4dfd75a88caa4fc6b47616e1fc7d224f4fc2123650fd7f4be3 9098 restricted/binary-amd64/Packages.gz + 459a26c3ef3cb5db8c8355ea6abfa8cfe0a7a266a197929d86d37686daf8a337 134705 restricted/binary-amd64/Packages + ea47572182da041b46543e471cb7a6fcc4e001fbe19a27740085ebf5d77252a9 103 restricted/binary-amd64/Release + adb08d7f0fa444f2869e8d932db7adb1515839f11af6032284cf1e20060e2dd6 8452 restricted/binary-amd64/Packages.bz2 + 65a5ac0820d61383f7dcf33699aa029b5965b7906bc8341f94f8f7f354cdcd83 103 restricted/binary-armel/Release + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/binary-armel/Packages.gz + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/binary-armel/Packages.bz2 + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/binary-armel/Packages + ee447ce81793bd3bc8c127d4e065c6ec24e5901573dffb7cc5abedfbcb86592c 103 restricted/binary-armhf/Release + d88ed7df97cd60cdce35c3ca81de66e2bedf0f22e67ec8922dbd5eca545b5e50 1103 restricted/binary-armhf/Packages.bz2 + 9ade66f4a49598fb371705a79244e5f3abb74c04467f9f9954641ae5acec6766 2477 restricted/binary-armhf/Packages + 03d8b64c445f327ce9e369bca815652844bd6aafb344d0287fb4e71f321d0414 941 restricted/binary-armhf/Packages.gz + 07e344ed07234876c3fddd9aa763e04bfc2e013fc18428738be71abfb9e1ca77 9108 restricted/binary-i386/Packages.gz + 8061335b923c49e72a2b60b437d5bbad1b98a45ac178a68fd8359cec9fad27ec 8431 restricted/binary-i386/Packages.bz2 + 122336146860047af3d5817dbc423f01d57a90cbf41db1ee0ad9235c0559a43e 134582 restricted/binary-i386/Packages + 58634ed42b6fadb280d48f419b960e28151320a62b4486e520ca327719db554a 102 restricted/binary-i386/Release + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/binary-powerpc/Packages.gz + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/binary-powerpc/Packages.bz2 + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/binary-powerpc/Packages + d9bce398e46f0eac57d1d33fd8a6caa0bd7ab6334508c0640956cb7adbe1eba1 105 restricted/binary-powerpc/Release + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-amd64/Packages + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-amd64/Packages.bz2 + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-amd64/Packages.gz + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-armel/Packages.gz + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-armel/Packages.bz2 + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-armel/Packages + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-armhf/Packages.bz2 + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-armhf/Packages.gz + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-armhf/Packages + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-i386/Packages.gz + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-i386/Packages.bz2 + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-i386/Packages + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-powerpc/Packages.gz + d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-powerpc/Packages.bz2 + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-powerpc/Packages + 17dde58abfdb4dfdad9c8a82db09c9dbc3d8a7cd84b51dd9167579d6899e9ff5 2596 restricted/i18n/Index + ee3655459e45778fdfa06fb649565e66b25d2dd0870c75890005fb3597bb71d7 19001 restricted/source/Sources + cff18d2ad74ead8712f1b77a23b32e84e54269b03ba2a409ae4227860d1181f5 5470 restricted/source/Sources.bz2 + cf085bdcb323dd2c2a599ddb7a9b3ae7bd37121f42024d68b367a4f735df900f 5306 restricted/source/Sources.gz + 9137393fc24cf64808d55ca7665bc5a7bd46b48918e6720a95ba239a8fab092e 104 restricted/source/Release + 901469729d2354891be94c192dabd8c1d0bc31e1497ea8360b70d2e847c1f3c1 25546870 universe/binary-amd64/Packages + 799347395d4e011a215aa5ce0c9006449d8af884795ffbce7a35767a55f99074 4785960 universe/binary-amd64/Packages.bz2 + 68b08847604c4efe7d6f56ba79f923ce0ab82127dfcc6e8cffaf12af25d7adba 6166988 universe/binary-amd64/Packages.gz + 52ffdd1777a886edc5e1e1ef430b03a72937920f9722fd453ee8243cb0aac860 101 universe/binary-amd64/Release + a78a1304e105b2fe4c950c77c1794f715c1256d14d8541cca8f5cd13db48119e 101 universe/binary-armel/Release + d6d4bfa5d0891086f5a4f2aabfaecd7a1e0c0d8b46aef33b3470e349e7a9210e 4667308 universe/binary-armel/Packages.bz2 + 374d50d0335c655da46f9cd54cd00d9a20058d2fe7c56989aa121b49883cfb88 6009219 universe/binary-armel/Packages.gz + ab5073e90417b729d1fe3b68052e6a8e66e48986c35470944f6a58676e967450 24901082 universe/binary-armel/Packages + af74034d1a3e1f90745dc48b996a98c471d997b12a1d810eb8754088540591d7 5948128 universe/binary-armhf/Packages.gz + 6697d196b35850817476e884fdc013d9670b4bac73310c54a4d62cd810f02c70 101 universe/binary-armhf/Release + 1ca17d3aecec2325cba53e1c299aeb6a1fed01d7acbc40163595de9e651abdeb 4618508 universe/binary-armhf/Packages.bz2 + 2b422ffa77d4374650d4cc543c5a1123b2535effb2c8cdaf25fd77d1dde632c4 24642528 universe/binary-armhf/Packages + cd6b5cb8165553482abee1bf85e5cd3288abadccb6acf34239ec45f79a090784 6179579 universe/binary-i386/Packages.gz + 8ef7db20ba08cf1b4d98a618189c615c69865f4da025ac654e3e6b8a4382a3ae 25568759 universe/binary-i386/Packages + 06af492500145bd64762d885417d167269db6ea03022c6968f1a5d0515ac55dd 100 universe/binary-i386/Release + 530a2efb8051a63ed17431ae0c7243df79ecb418acf1dadc2487cd6fd79fb420 4795820 universe/binary-i386/Packages.bz2 + 1e8fa52a64292d2c73cee0645d0eed5583ea7cc1138af4744838c6833716d638 25188905 universe/binary-powerpc/Packages + 5d2b8e23e0a16f13e25595b63807fb64afd9074aadf7a37b8e238b2011e894b8 6080488 universe/binary-powerpc/Packages.gz + eb482b008c8c882b349230abaa812ed6e545a2ef9132bb0d3d3bffa74da0c6c7 4716652 universe/binary-powerpc/Packages.bz2 + 98d44cc7544f79c18b8e8ea697d476e9b85d91088385b643c82d4064b21f4657 103 universe/binary-powerpc/Release + 3da2d1e57aaca628148e2688a951cbb784a9a54b7f6b1f84d530add1b66fcceb 15255 universe/debian-installer/binary-amd64/Packages.bz2 + 43f891ac590f44fde5854de9ba15222c088b70562f5dc4ff26064909e60cf62e 17243 universe/debian-installer/binary-amd64/Packages.gz + 3084a8a441e961eeb3865ff411557166ec105be86a55df268cdb6725f49e1f67 61801 universe/debian-installer/binary-amd64/Packages + a1ff01f18766744f36d0774a68d8a89355246c585c4b28ee18e5e139fafae530 113584 universe/debian-installer/binary-armel/Packages + e0713f86f5f5121deb60ce61d774951468625184a7ae9576f81d70202ef585b7 23193 universe/debian-installer/binary-armel/Packages.bz2 + 5a8411e2b0648e553fa25ac82ea83fb17dd2d2a77bd10cec14cab12f5582d4c4 27397 universe/debian-installer/binary-armel/Packages.gz + b79c86d926c3129f5c27e50185157a78d85abde8ada90a9910338e660c4318be 20065 universe/debian-installer/binary-armhf/Packages.gz + b2113b25380423be8f6202a4860479e44a00072e46fa035f0da2f3a5a280de20 17619 universe/debian-installer/binary-armhf/Packages.bz2 + 3f023d2cc55d6ebab883f6f2d7305a4e3564f918f63ca4f745d6fd1318e67ab7 76034 universe/debian-installer/binary-armhf/Packages + 5ea61a62a3e8fc755c22e23c9d87b20924707c0986a490458472a3d7e9cbe117 17260 universe/debian-installer/binary-i386/Packages.gz + 7a90b014c655311e92de1ea4cf24e100665c564a2ed699df63d17c82ad9e1349 15272 universe/debian-installer/binary-i386/Packages.bz2 + 7e39417ce073e3a35d048847a29a0414af69c4e923c018dc22438319c79adea5 61718 universe/debian-installer/binary-i386/Packages + cdf17a791544d0c522fa853a23b317deffa76ac643e88bec0b84b0aa5afe957b 61121 universe/debian-installer/binary-powerpc/Packages + b470146da791dc4f4593d2bb00ea4e305d6f55f346a5f3ac6755d890a3318080 15024 universe/debian-installer/binary-powerpc/Packages.bz2 + 810d1590d1cd7298e1fd5465f85ba49b6ae79780b42d8e8b68aebb42283785ea 16860 universe/debian-installer/binary-powerpc/Packages.gz + 563a55a892e1ec8bf565e3294c033b4e8dbbbe4651e73733eac7338db77282f7 2922 universe/i18n/Index + 7bc01d4f10bbcf882ce6931aa9371b2de6b35277efc2ae52e233280dcd12a18d 21256524 universe/source/Sources + 95135631873f4dce05ba657478475033d02462bbb8f7263832585d1decb5c9b8 5019105 universe/source/Sources.bz2 + 0fd2ae580be352cb8ab4bb87e5504b78f78bcb7249b644719b3c2db3b5d3ca8c 102 universe/source/Release + d1dd96015e24dd369ea22413a2b876686a60c5d9d91958a5df3745a66289910f 6238766 universe/source/Sources.gz diff --git a/tests/test_utils.py b/tests/test_utils.py index 26ee0bff..dc54c1ba 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -12,11 +12,19 @@ import apt.utils import datetime import unittest +from apt.utils import ( + get_maintenance_end_date, + get_release_date_from_release_file, + ) + class TestUtils(unittest.TestCase): + def test_get_release_date_from_release_file(self): + t = get_release_date_from_release_file("./tests/data/misc/foo_Release") + self.assertEqual(str(datetime.datetime.utcfromtimestamp(t)), + "2012-04-25 22:49:23") 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) -- cgit v1.2.3 From b5cd01652e1ccbc6c3416df88ac66d2cfcbc0a76 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 11 Jun 2012 20:28:54 +0000 Subject: utils/get_ubuntu_mirrors_from_lp.py: move this script to python3 --- debian/changelog | 3 +++ utils/get_ubuntu_mirrors_from_lp.py | 11 +++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d786c3c1..8b860590 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ python-apt (0.8.5) UNRELEASED; urgency=low * data/templates/Ubuntu.info.in: - add quantal + [ Steve Langasek ] + * utils/get_ubuntu_mirrors_from_lp.py: move this script to python3 + -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 python-apt (0.8.4) unstable; urgency=low diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py index ed0ee936..5f9325e4 100755 --- a/utils/get_ubuntu_mirrors_from_lp.py +++ b/utils/get_ubuntu_mirrors_from_lp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # get_ubuntu_lp_mirrors.py # @@ -40,9 +40,8 @@ for entry in d.entries: countries[countrycode].add(link.href) -keys = countries.keys() -keys.sort() -print "mirror://mirrors.ubuntu.com/mirrors.txt" +keys = sorted(countries.keys()) +print("mirror://mirrors.ubuntu.com/mirrors.txt") for country in keys: - print "#LOC:%s" % country - print "\n".join(sorted(countries[country])) + print("#LOC:%s" % country) + print("\n".join(sorted(countries[country]))) -- cgit v1.2.3 From adb0326614b3c06968eb0c30c91f1290773cd4cc Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 11 Jun 2012 20:46:17 +0000 Subject: pre-build.sh: call dpkg-checkbuilddeps with the list of our source-build-dependencies; this may save someone else an hour down the line scratching their head over gratuitous test-suite failures... --- debian/changelog | 3 +++ pre-build.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8b860590..05b8c664 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ Steve Langasek ] * utils/get_ubuntu_mirrors_from_lp.py: move this script to python3 + * pre-build.sh: call dpkg-checkbuilddeps with the list of our + source-build-dependencies; this may save someone else an hour down the + line scratching their head over gratuitous test-suite failures... -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/pre-build.sh b/pre-build.sh index 026a491e..08c0bef6 100755 --- a/pre-build.sh +++ b/pre-build.sh @@ -1,4 +1,7 @@ #!/bin/sh +set -e + +dpkg-checkbuilddeps -d 'python-debian, python3-feedparser' echo "updating Ubuntu mirror list from launchpad" if [ -n "$https_proxy" ]; then -- cgit v1.2.3 From 6b2a358bb63c6b51b6a1215b047ea879046fd965 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 11 Jun 2012 14:20:54 -0700 Subject: drop the unnecessary use of .keys() here, thanks Barry\! --- utils/get_ubuntu_mirrors_from_lp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py index 5f9325e4..7c4d3831 100755 --- a/utils/get_ubuntu_mirrors_from_lp.py +++ b/utils/get_ubuntu_mirrors_from_lp.py @@ -40,7 +40,7 @@ for entry in d.entries: countries[countrycode].add(link.href) -keys = sorted(countries.keys()) +keys = sorted(countries) print("mirror://mirrors.ubuntu.com/mirrors.txt") for country in keys: print("#LOC:%s" % country) -- cgit v1.2.3 From 32eb1cd06404fdcb0d4507ea77e1685a19d185c1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 12 Jun 2012 09:00:23 +0200 Subject: merge fix from lp:~ev/python-apt/dont-leak-fds, many thanks --- apt/progress/base.py | 4 ++++ debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/apt/progress/base.py b/apt/progress/base.py index 4943978c..88b1ad21 100644 --- a/apt/progress/base.py +++ b/apt/progress/base.py @@ -146,6 +146,10 @@ class InstallProgress(object): self.status_stream = os.fdopen(self.statusfd, "r") fcntl.fcntl(self.statusfd, fcntl.F_SETFL, os.O_NONBLOCK) + def __del__(self): + self.write_stream.close() + self.status_stream.close() + def start_update(self): """(Abstract) Start update.""" diff --git a/debian/changelog b/debian/changelog index 63f72fa5..8d8be6a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,12 @@ python-apt (0.8.4~exp1) experimental; urgency=low -- Michael Vogt Tue, 24 Jan 2012 14:02:46 +0100 +python-apt (0.8.3ubuntu9) UNRELEASED; urgency=low + + * Don't leak file descriptors. + + -- Evan Dandrea Mon, 11 Jun 2012 17:00:37 +0100 + python-apt (0.8.3) unstable; urgency=low [ Alexey Feldgendler ] -- cgit v1.2.3 From 02f1443ee316fe5c0dcf1c56471168b5482c49df Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 12 Jun 2012 09:30:56 +0200 Subject: cherry pick r472 from lp:~ubuntu-core-dev/python-apt/ubuntu (thanks Colin!) --- aptsources/distinfo.py | 18 ++++++++++-------- aptsources/distro.py | 6 ++++-- aptsources/sourceslist.py | 4 +++- debian/changelog | 7 +++++++ setup.py | 4 ++++ 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index ddaeb218..e0ee915d 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -21,6 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA +from __future__ import print_function + import errno import logging import os @@ -51,7 +53,7 @@ class Template(object): def has_component(self, comp): ''' Check if the distribution provides the given component ''' - return comp in map(lambda c: c.name, self.components) + return comp in (c.name for c in self.components) def is_mirror(self, url): ''' Check if a given url of a repository is a valid mirror ''' @@ -107,7 +109,7 @@ class Mirror(object): self.repositories.append(Repository(proto, dir)) def get_repositories_for_proto(self, proto): - return filter(lambda r: r.proto == proto, self.repositories) + return [r for r in self.repositories if r.proto == proto] def has_repository(self, proto, dir): if dir is None: @@ -118,7 +120,7 @@ class Mirror(object): return False def get_repo_urls(self): - return map(lambda r: r.get_url(self.hostname), self.repositories) + return [r.get_url(self.hostname) for r in self.repositories] def get_location(self): return self.location @@ -230,11 +232,11 @@ class DistInfo(object): mirror_set = {} try: with open(value) as value_f: - mirror_data = filter(match_mirror_line.match, - [x.strip() for x in - value_f]) + mirror_data = list(filter( + match_mirror_line.match, + [x.strip() for x in value_f])) except Exception: - print "WARNING: Failed to read mirror file" + print("WARNING: Failed to read mirror file") mirror_data = [] for line in mirror_data: if line.startswith("#LOC:"): @@ -298,7 +300,7 @@ if __name__ == "__main__": logging.info("BaseURI: %s" % template.base_uri) logging.info("MatchURI: %s" % template.match_uri) if template.mirror_set != {}: - logging.info("Mirrors: %s" % template.mirror_set.keys()) + logging.info("Mirrors: %s" % list(template.mirror_set.keys())) for comp in template.components: logging.info(" %s -%s -%s" % (comp.name, comp.description, diff --git a/aptsources/distro.py b/aptsources/distro.py index 27d7f859..ca87a919 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -327,12 +327,14 @@ class Distribution(object): if s.type == self.binary_type: if s.dist not in comps_per_dist: comps_per_dist[s.dist] = set() - map(comps_per_dist[s.dist].add, s.comps) + for c in s.comps: + comps_per_dist[s.dist].add(c) for s in self.source_code_sources: if s.type == self.source_type: if s.dist not in comps_per_sdist: comps_per_sdist[s.dist] = set() - map(comps_per_sdist[s.dist].add, s.comps) + for c in s.comps: + comps_per_sdist[s.dist].add(c) # check if there is a main source at all if len(self.main_sources) < 1: diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 03377258..61b75f75 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -23,6 +23,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA +from __future__ import absolute_import + import glob import logging import os.path @@ -31,7 +33,7 @@ import shutil import time import apt_pkg -from distinfo import DistInfo +from .distinfo import DistInfo from apt.deprecation import function_deprecated_by #from apt_pkg import gettext as _ diff --git a/debian/changelog b/debian/changelog index 1466ad7b..fe560625 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,8 +56,15 @@ python-apt (0.8.4~exp1) experimental; urgency=low python-apt (0.8.3ubuntu9) UNRELEASED; urgency=low + [ Steve Langasek ] * Don't leak file descriptors. + [ Colin Watson ] + * aptsources/*.py, setup.py: Make aptsources modules work directly in + either Python 2 or 3, and exclude the "future" 2to3 fixer so that 2to3 + doesn't need to modify them. This makes life a little easier for the + strange tricks update-manager plays with its dist-upgrader tarball. + -- Evan Dandrea Mon, 11 Jun 2012 17:00:37 +0100 python-apt (0.8.3) unstable; urgency=low diff --git a/setup.py b/setup.py index eff78379..8af5c2a6 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,11 @@ except ImportError: if sys.version_info[0] == 3: from distutils.command.build_py import build_py_2to3 + from lib2to3.refactor import get_fixers_from_package cmdclass['build_py'] = build_py_2to3 + cmdclass['build_py'].fixer_names = sorted( + set(get_fixers_from_package("lib2to3.fixes")) - + set(["lib2to3.fixes.fix_future"])) # The apt_pkg module. files = ['apt_pkgmodule.cc', 'acquire.cc', 'cache.cc', 'cdrom.cc', -- cgit v1.2.3 From 1cc440e8426cdd297f73f7322356744d190f58fe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 12 Jun 2012 10:06:30 +0200 Subject: tests/test_utils.py: fix absolute path in the test --- tests/test_utils.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index dc54c1ba..2676bb98 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -6,11 +6,13 @@ # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. +import datetime +import os import sys +import unittest + import apt_pkg import apt.utils -import datetime -import unittest from apt.utils import ( get_maintenance_end_date, @@ -20,7 +22,9 @@ from apt.utils import ( class TestUtils(unittest.TestCase): def test_get_release_date_from_release_file(self): - t = get_release_date_from_release_file("./tests/data/misc/foo_Release") + path = os.path.join(os.path.dirname(__file__), + "data", "misc", "foo_Release") + t = get_release_date_from_release_file(path) self.assertEqual(str(datetime.datetime.utcfromtimestamp(t)), "2012-04-25 22:49:23") -- cgit v1.2.3 From 5cdd74bc9e017f8802f96d915131c8cf525d4146 Mon Sep 17 00:00:00 2001 From: Evan Dandrea Date: Tue, 12 Jun 2012 16:06:16 +0100 Subject: Drop __del__ statement, which is unsafe: http://www.algorithm.co.il/blogs/programming/python-gotchas-1-__del__-is-not-the-opposite-of-__init__/ --- apt/progress/base.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apt/progress/base.py b/apt/progress/base.py index 88b1ad21..ab57dd82 100644 --- a/apt/progress/base.py +++ b/apt/progress/base.py @@ -142,14 +142,11 @@ class InstallProgress(object): def __init__(self): (self.statusfd, self.writefd) = os.pipe() + # These will leak fds, but fixing this safely requires API changes. self.write_stream = os.fdopen(self.writefd, "w") self.status_stream = os.fdopen(self.statusfd, "r") fcntl.fcntl(self.statusfd, fcntl.F_SETFL, os.O_NONBLOCK) - def __del__(self): - self.write_stream.close() - self.status_stream.close() - def start_update(self): """(Abstract) Start update.""" -- cgit v1.2.3 From fc60f397b99b46bfd108ccf1a206dec490915d0b Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 15:57:40 -0400 Subject: * po/*.po: update PO files against current POT file --- debian/changelog | 3 + po/am.po | 300 +++++++++++++++++++++++++----------- po/ar.po | 300 +++++++++++++++++++++++++----------- po/be.po | 304 +++++++++++++++++++++++++----------- po/bg.po | 310 ++++++++++++++++++++++++++----------- po/bn.po | 310 ++++++++++++++++++++++++++----------- po/br.po | 300 +++++++++++++++++++++++++----------- po/ca.po | 310 ++++++++++++++++++++++++++----------- po/cs.po | 316 +++++++++++++++++++++++++++----------- po/csb.po | 300 +++++++++++++++++++++++++----------- po/da.po | 334 ++++++++++++++++++++++++++++------------ po/de.po | 314 ++++++++++++++++++++++++++----------- po/el.po | 312 ++++++++++++++++++++++++++----------- po/en_AU.po | 312 ++++++++++++++++++++++++++----------- po/en_CA.po | 310 ++++++++++++++++++++++++++----------- po/en_GB.po | 312 ++++++++++++++++++++++++++----------- po/eo.po | 239 +++++++++++++++++------------ po/es.po | 312 ++++++++++++++++++++++++++----------- po/et.po | 300 +++++++++++++++++++++++++----------- po/eu.po | 300 +++++++++++++++++++++++++----------- po/fa.po | 300 +++++++++++++++++++++++++----------- po/fi.po | 312 ++++++++++++++++++++++++++----------- po/fr.po | 324 ++++++++++++++++++++++++++++----------- po/fur.po | 300 +++++++++++++++++++++++++----------- po/gl.po | 312 ++++++++++++++++++++++++++----------- po/he.po | 312 ++++++++++++++++++++++++++----------- po/hi.po | 300 +++++++++++++++++++++++++----------- po/hr.po | 316 +++++++++++++++++++++++++++----------- po/hu.po | 312 ++++++++++++++++++++++++++----------- po/id.po | 305 +++++++++++++++++++++++++----------- po/it.po | 312 ++++++++++++++++++++++++++----------- po/ja.po | 318 +++++++++++++++++++++++++++----------- po/ka.po | 312 ++++++++++++++++++++++++++----------- po/ko.po | 312 ++++++++++++++++++++++++++----------- po/ku.po | 312 ++++++++++++++++++++++++++----------- po/lt.po | 316 +++++++++++++++++++++++++++----------- po/lv.po | 303 +++++++++++++++++++++++++----------- po/mk.po | 310 ++++++++++++++++++++++++++----------- po/mr.po | 300 +++++++++++++++++++++++++----------- po/ms.po | 300 +++++++++++++++++++++++++----------- po/nb.po | 310 ++++++++++++++++++++++++++----------- po/ne.po | 310 ++++++++++++++++++++++++++----------- po/nl.po | 312 ++++++++++++++++++++++++++----------- po/nn.po | 300 +++++++++++++++++++++++++----------- po/no.po | 310 ++++++++++++++++++++++++++----------- po/oc.po | 310 ++++++++++++++++++++++++++----------- po/pa.po | 300 +++++++++++++++++++++++++----------- po/pl.po | 312 ++++++++++++++++++++++++++----------- po/ps.po | 300 +++++++++++++++++++++++++----------- po/pt.po | 312 ++++++++++++++++++++++++++----------- po/pt_BR.po | 287 ++++++++++++++++++++-------------- po/qu.po | 300 +++++++++++++++++++++++++----------- po/ro.po | 312 ++++++++++++++++++++++++++----------- po/ru.po | 316 +++++++++++++++++++++++++++----------- po/rw.po | 310 ++++++++++++++++++++++++++----------- po/sk.po | 310 ++++++++++++++++++++++++++----------- po/sl.po | 261 ++++++++++++++++++------------- po/sq.po | 300 +++++++++++++++++++++++++----------- po/sr.po | 349 +++++++++++++++++++++++++++++------------ po/sv.po | 312 ++++++++++++++++++++++++++----------- po/ta.po | 300 +++++++++++++++++++++++++----------- po/th.po | 312 ++++++++++++++++++++++++++----------- po/tl.po | 303 +++++++++++++++++++++++++----------- po/tr.po | 312 ++++++++++++++++++++++++++----------- po/uk.po | 307 +++++++++++++++++++++++++------------ po/ur.po | 300 +++++++++++++++++++++++++----------- po/vi.po | 310 ++++++++++++++++++++++++++----------- po/xh.po | 300 +++++++++++++++++++++++++----------- po/zh_CN.po | 460 +++++++++++++++++++++++++++++++++++++++++++++++-------- po/zh_HK.po | 303 +++++++++++++++++++++++++----------- po/zh_TW.po | 315 ++++++++++++++++++++++++++----------- 71 files changed, 15231 insertions(+), 6410 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ecddacf..8cc9776f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ python-apt (0.8.5) UNRELEASED; urgency=low - this is a port of the software-properties AptAuth module to python-apt with some cleanups. It provides a wrapper API for the apt-key command + [ David Prévot ] + * po/*.po: update PO files against current POT file + -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 python-apt (0.8.4) unstable; urgency=low diff --git a/po/am.po b/po/am.po index 37ad7aed..34f3bdb6 100644 --- a/po/am.po +++ b/po/am.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-09 15:49+0000\n" "Last-Translator: Habte \n" "Language-Team: Amharic \n" +"Language: am\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,49 +419,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "በየቀኑ" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,86 +470,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -477,19 +595,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ar.po b/po/ar.po index 6e00b3c9..5e099fdd 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:14+0000\n" "Last-Translator: Saleh Odeh \n" "Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,249 +25,329 @@ 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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "ملاحظات الإصدار" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "تحديثات الإنترنت" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "مدعوم بشكل رسمي" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "حقوق نقل محدودة" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -318,22 +399,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -341,48 +422,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "التّفاصيل" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -391,88 +472,125 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "الرجاء التأكد من إتصالك بالإنترنت" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "تعذّر تثبيت '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -481,19 +599,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/be.po b/po/be.po index f950f327..8d31048c 100644 --- a/po/be.po +++ b/po/be.po @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:05+0000\n" "Last-Translator: Alexander Nyakhaychyk \n" "Language-Team: Belarusian \n" +"Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -25,247 +26,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -316,22 +397,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -339,49 +420,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Штодзённа" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -390,88 +471,125 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "Калі ласка, праверце вашае далучэньне да інтэрнэту." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Немагчыма ўсталяваць \"%s\"" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -480,19 +598,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/bg.po b/po/bg.po index 0fc3ed71..3bf51e92 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:01+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,283 +25,373 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 актуализации на сигурността" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 актуализации" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Допринесен софтуер" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Поддържани от обществото (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Несвободни (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Несвободни (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "_Инсталиране на актуализациите" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "_Инсталиране на актуализациите" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 актуализации" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Състарени версии" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Официално поддържани" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 актуализации" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Състарени версии" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Несвободни (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Официално поддържан" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Ограничени авторски права" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 обновления по сигурността" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 обновления" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Състарени версии" @@ -360,23 +451,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (тестване)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (нестабилен)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-съвместим софтуер с несвободни зависимости" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Софтуер несъвместим с DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -384,50 +475,50 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Сваляне на файл %li от %li при %s/сек" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Сваляне на файл %li от %li при %s/сек" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Детайли" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Настройки" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -436,7 +527,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -445,81 +536,118 @@ msgstr "" "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет " "връзката си." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Не може да се инсталира '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -528,19 +656,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/bn.po b/po/bn.po index f090b822..6e38909a 100644 --- a/po/bn.po +++ b/po/bn.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:02+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,277 +25,367 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "উবুন্টু ৫.১০ আপডেট" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "আপডেট ইন্সটল করো (_I)" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "আপডেট ইন্সটল করো (_I)" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "অফিসিয়াল ভাবে সমর্থিত" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" @@ -353,23 +444,23 @@ msgid "Debian testing" msgstr "ডেবিয়ান \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "ডেবিয়ান \"Sid\" (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -377,49 +468,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "বিস্তারিত" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -428,7 +519,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -436,81 +527,118 @@ msgid "" msgstr "" "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "'%s' ইন্সটল করা যাচ্ছে না" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -519,19 +647,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/br.po b/po/br.po index a846d409..35d1c481 100644 --- a/po/br.po +++ b/po/br.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" +"Language: br\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,48 +419,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -388,86 +469,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -476,19 +594,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ca.po b/po/ca.po index ab55c5ee..b7e19a04 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:14+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,282 +24,372 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualitzacions d'Ubuntu 5.10" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Programari de la comunitat" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Paquets sense llicència lliure (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Debian Stable Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "_Instal·la les actualitzacions" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "_Instal·la les actualitzacions" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Actualitzacions d'Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Paquets mantinguts oficialment (Main)" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Actualitzacions d'Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Algun programari ja no es mantindrà oficialment" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Paquets amb restriccions per copyright (Restricted)" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Actualitzacions d'Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" @@ -358,23 +449,23 @@ msgid "Debian testing" msgstr "Debian Testing" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Programari compatible DFSG amb dependències no lliures" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Programari no compatible DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -382,51 +473,51 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Servidor principal" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 #, fuzzy msgid "Custom servers" msgstr "Servidor més proper" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "S'està descarregant el fitxer %li de %li amb %s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "S'està descarregant el fitxer %li de %li amb %s/s" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalls" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Paràmetres" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "La llista de canvis encara no està disponible. Proveu-ho després." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -435,7 +526,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -444,81 +535,118 @@ msgstr "" "S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió " "a Internet." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "No s'ha pogut instal·lar '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "S'haurà d'esborrar un paquet essencial" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -527,19 +655,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/cs.po b/po/cs.po index 0eeec1d6..aeab84fe 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-18 22:54+0000\n" "Last-Translator: Dominik Sauer \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Bezpečnostní aktualizace Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Bezpečnostní aktualizace Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Bezpečnostní aktualizace Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Udržováno komunitou" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Nesvobodný software" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom s Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Svobodný software oficiálně podporovaný společností Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Udržováno komunitou (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Software s otevřeným zdrojovým kódem, který je udržován komunitou" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Nesvobodné ovladače" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Patentované (proprietární) ovladače zařízení" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Software s omezující licencí (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Software omezený ochrannou známkou nebo jinými právními prostředky" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom s Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Důležité bezpečnostní aktualizace" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Doporučené aktualizace" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Navržené aktualizace" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Aktualizace přenesené z vyšších verzí distribuce" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Bezpečnostní aktualizace Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Aktualizace Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Software přenesený z vyšší verze distribuce na Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Oficiálně podporováno" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Bezpečnostní aktualizace Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Aktualizace Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Aplikace přenesené z vyšších verzí distribuce na Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Udržováno komunitou (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Nesvobodný (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Již není oficiálně podporováno" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Omezený copyright" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Bezpečnostní aktualizace Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Aktualizace Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Aplikace přenesené z vyšších verzí distribuce na Ubuntu 4.10" @@ -341,23 +434,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Software kompatibilní s DFSG, ale závisející na nesvobodných balících" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Software nekompatibilní s DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server pro zemi \"%s\"" @@ -365,48 +458,48 @@ msgstr "Server pro zemi \"%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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Hlavní server" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Uživatelem vybrané servery" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Stahuji %(current)li. soubor z %(total)li rychlostí %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Stahuji %(current)li. soubor of %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Podrobnosti" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Seznam změn není dostupný." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -415,7 +508,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -423,81 +516,118 @@ msgstr "" "Stažení seznamu změn selhalo. \n" "Prosím zkontrolujte své internetové připojení." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Nemohu nainstalovat '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Toto by vedlo k odstranění základního balíku" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -506,19 +636,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/csb.po b/po/csb.po index c38aafde..270069f8 100644 --- a/po/csb.po +++ b/po/csb.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-08 04:10+0000\n" "Last-Translator: Michôł Òstrowsczi \n" "Language-Team: Kashubian \n" +"Language: csb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,248 +26,328 @@ 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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "%s aktualizacëji" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -318,22 +399,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Serwera dlô kraju %s" @@ -341,49 +422,49 @@ msgstr "Serwera dlô kraju %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Przédny serwera" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Jine serwerë" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Codniowò" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -392,86 +473,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Nie je mòżno zainstalowac '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -480,19 +598,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/da.po b/po/da.po index 5195389c..48e38604 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: python-apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2011-06-22 14:44+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -26,247 +26,351 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 \"Feisty Fawn\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cd-rom med Ubuntu 7.04 \"Feisty Fawn\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +#| msgid "Ubuntu 9.10 'Karmic Koala'" +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 9.10 \"Karmic Koala\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cd-rom med Ubuntu 9.10 \"Karmic Koala\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +#| msgid "Ubuntu 9.10 'Karmic Koala'" +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 9.10 \"Karmic Koala\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cd-rom med Ubuntu 9.10 \"Karmic Koala\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +#| msgid "Ubuntu 8.04 'Hardy Heron'" +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 8.04 \"Hardy Heron\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cd-rom med Ubuntu 8.04 \"Hardy Heron\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 9.10 \"Karmic Koala\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cd-rom med Ubuntu 9.10 \"Karmic Koala\"" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 9.04 \"Jaunty Jackalope\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cd-rom med Ubuntu 9.04 \"Jaunty Jackalope\"" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 8.10 \"Intrepid Ibex\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cd-rom med Ubuntu 8.10 \"Intrepid Ibex\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04 \"Hardy Heron\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cd-rom med Ubuntu 8.04 \"Hardy Heron\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10 \"Gutsy Gibbon\"" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cd-rom med Ubuntu 7.10 \"Gutsy Gibbon\"" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 \"Feisty Fawn\"" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cd-rom med Ubuntu 7.04 \"Feisty Fawn\"" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "Vedligeholdt af fællesskabet" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Ikke-frit software" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\"" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Canonical-understøttet software med åben kildekode" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "Vedligeholdt af fællesskabet (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Software med åben kildekode vedligeholdt af fællesskabet" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Proprietære drivere" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Proprietære drivere til enheder" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Ikke-frit software (multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Software begrænset af ophavsret eller legale problemer" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cd-rom med Ubuntu 6.06 LTS \"Dapper Drake\"" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Vigtige sikkerhedsopdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Anbefalede opdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "Ikke-frigivne opdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "Ikke-understøttede opdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 sikkerhedsopdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 opdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 tilbageporteringer" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Understøttet officielt" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 sikkerhedsopdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 opdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 tilbageporteringer" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Ikke-frit (multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Ikke længere officielt supporteret" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Begrænset ophavsret" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 sikkerhedsopdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 opdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 tilbageporteringer" @@ -317,22 +421,22 @@ msgid "Debian testing" msgstr "Debian tester" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (ustabil)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibel software med ikke-frie afhængigheder" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel software" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -340,48 +444,48 @@ msgstr "Server for %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Hovedserver" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Brugerdefinerede servere" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Henter fil %(current)li af %(total)li med %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Henter fil %(current)li af %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detaljer" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "Starter..." -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "Færdig" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "Ugyldig unicode i beskrivelsen af \"%s\" (%s). Se venligst rapport." -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Listen med ændringer er ikke tilgængelig" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -394,7 +498,7 @@ msgstr "" "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 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -402,80 +506,119 @@ msgstr "" "Fejl ved hentning af ændringslisten.\n" "Undersøg venligst din internetforbindelse." -#: ../apt/debfile.py:56 -#, python-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler \"%s-medlem\"" +#: ../apt/debfile.py:82 +#, fuzzy, python-format +#| msgid "List of files for '%s'could not be read" +msgid "List of files for '%s' could not be read" +msgstr "Listen over filer for \"%s\" kunne ikke læses" -#: ../apt/debfile.py:81 -#, python-format -msgid "List of files for '%s'could not be read" +#: ../apt/debfile.py:93 +#, fuzzy, python-format +#| msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "Listen over filer for \"%s\" kunne ikke læses" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "Afhængighed kan ikke opfyldes; %s\n" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "I konflikt med den installerede pakke \"%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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "Forkert arkitektur \"%s\"" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "Der er allerede installeret en senere version" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "Kunne ikke opfylde alle afhængigheder (beskadiget cache)" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "Kan ikke installere \"%s\"" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "Installér bygge-afhængigheder til kildepakke \"%s\" der bygger %s\n" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 msgid "An essential package would be removed" msgstr "En nødvendig pakke vil blive fjernet" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "%c%s... Færdig" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "Tjekkede " -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "Ign " -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "Fejl " -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "Henter:" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr " [Arbejder]" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -487,21 +630,22 @@ msgstr "" "i drevet '%s' og tryk retur\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 "Hentede %sB på %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 "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "Indsæt en disk i drevet og tryk retur" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "Opbygger datastrukturer" - +#~ msgid "This is not a valid DEB archive, missing '%s' member" +#~ msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler \"%s-medlem\"" diff --git a/po/de.po b/po/de.po index 1a981522..28ab7494 100644 --- a/po/de.po +++ b/po/de.po @@ -10,10 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: python-apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-31 17:09+0100\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2010-01-31 17:14+0100\n" "Last-Translator: Julian Andres Klode \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,257 +27,347 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 »Feisty Fawn«" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD mit Ubuntu 7.04 »Feisty Fawn«" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +#| msgid "Ubuntu 9.10 'Karmic Koala'" +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 9.10 »Karmic Koala«" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM mit Ubuntu 9.10 »Karmic Koala«" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 »Warty Warthog«" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM mit Ubuntu 4.10 »Warty Warthog«" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +#| msgid "Ubuntu 9.10 'Karmic Koala'" +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 9.10 »Karmic Koala«" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM mit Ubuntu 9.10 »Karmic Koala«" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "Ubuntu 10.04 »Lucid Lynx«" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:589 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "CD mit Ubuntu 10.04 »Lucid Lynx«" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 9.10 »Karmic Koala«" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM mit Ubuntu 9.10 »Karmic Koala«" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 9.04 »Jaunty Jackalope«" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD-ROM mit Ubuntu 9.04 »Jaunty Jackalope«" #. Description -#: ../data/templates/Ubuntu.info.in:196 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 8.10 »Intrepid Ibex«" #. Description -#: ../data/templates/Ubuntu.info.in:214 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD mit Ubuntu 8.10 »Intrepid Ibex«" #. Description -#: ../data/templates/Ubuntu.info.in:258 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04 »Hardy Heron«" #. Description -#: ../data/templates/Ubuntu.info.in:276 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD mit Ubuntu 8.04 »Hardy Heron«" #. Description -#: ../data/templates/Ubuntu.info.in:313 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10 »Gutsy Gibbon«" #. Description -#: ../data/templates/Ubuntu.info.in:331 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD mit Ubuntu 7.10 »Gutsy Gibbon«" #. Description -#: ../data/templates/Ubuntu.info.in:366 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 »Feisty Fawn«" #. Description -#: ../data/templates/Ubuntu.info.in:384 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD mit Ubuntu 7.04 »Feisty Fawn«" #. Description -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 »Edgy Eft«" #. CompDescription -#: ../data/templates/Ubuntu.info.in:423 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "Von der Ubuntu-Gemeinde betreut" #. CompDescription -#: ../data/templates/Ubuntu.info.in:429 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Eingeschränkte Software" #. Description -#: ../data/templates/Ubuntu.info.in:436 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD mit Ubuntu 6.10 »Edgy Eft«" #. Description -#: ../data/templates/Ubuntu.info.in:470 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS »Dapper Drake«" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:473 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Von Canonical unterstütze Open-Source-Software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "Von der Gemeinde betreut (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:476 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Von der Ubuntu-Gemeinde betreute Open-Source-Software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:478 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Proprietäre Treiber" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:479 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Proprietäre Gerätetreiber" #. CompDescription -#: ../data/templates/Ubuntu.info.in:481 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Eingeschränkte Software (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:482 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Rechtlich eingeschränkte Software" #. Description -#: ../data/templates/Ubuntu.info.in:488 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD mit Ubuntu 6.06 LTS »Dapper Drake«" #. Description -#: ../data/templates/Ubuntu.info.in:500 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Wichtige Sicherheitsaktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:505 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Empfohlene Aktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:510 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "Vorabveröffentlichte Aktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:515 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "Nicht unterstütze Aktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:522 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 »Breezy Badger«" #. Description -#: ../data/templates/Ubuntu.info.in:536 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD mit Ubuntu 5.10 »Breezy Badger«" #. Description -#: ../data/templates/Ubuntu.info.in:548 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:553 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:558 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 »Hoary Hedgehog«" #. Description -#: ../data/templates/Ubuntu.info.in:579 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD mit Ubuntu 5.04 »Hoary Hedgehog«" #. CompDescription -#: ../data/templates/Ubuntu.info.in:582 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Offiziell unterstützt" #. Description -#: ../data/templates/Ubuntu.info.in:591 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:596 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Aktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:601 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:607 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 »Warty Warthog«" #. CompDescription -#: ../data/templates/Ubuntu.info.in:613 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "Von der Ubuntu-Gemeinde betreut (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:615 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Unfrei (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:621 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM mit Ubuntu 4.10 »Warty Warthog«" #. CompDescription -#: ../data/templates/Ubuntu.info.in:624 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Unterstützung ist ausgelaufen" #. CompDescription -#: ../data/templates/Ubuntu.info.in:626 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Eingeschränktes Copyright" #. Description -#: ../data/templates/Ubuntu.info.in:633 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:638 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Aktualisierungen" #. Description -#: ../data/templates/Ubuntu.info.in:643 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" @@ -327,22 +418,22 @@ 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 "DFSG-kompatible Software mit unfreien Abhängigkeiten" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server für %s" @@ -350,48 +441,48 @@ msgstr "Server für %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Haupt-Server" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Benutzerdefinierte Server" -#: ../apt/progress/gtk2.py:259 ../apt/progress/gtk2.py:315 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Datei %(current)li von %(total)li wird mit %(speed)s/s heruntergeladen" -#: ../apt/progress/gtk2.py:265 ../apt/progress/gtk2.py:321 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Datei %(current)li von %(total)li wird heruntergeladen" #. Setup some child widgets -#: ../apt/progress/gtk2.py:341 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Details" -#: ../apt/progress/gtk2.py:429 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "Starte..." -#: ../apt/progress/gtk2.py:435 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "Fertig" -#: ../apt/package.py:333 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "Ungültiger Unicode-Wert in Beschreibung für '%s' (%s). Bitte melden." -#: ../apt/package.py:989 ../apt/package.py:1095 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Die Liste mit Änderungen ist momentan nicht verfügbar." -#: ../apt/package.py:1099 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -404,7 +495,7 @@ msgstr "" "Bitte benutzen Sie http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "bis die Liste verfügbar ist oder versuchen sie es später erneut." -#: ../apt/package.py:1105 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -412,76 +503,119 @@ msgstr "" "Die Liste mit Änderungen konnte nicht heruntergeladen werden. \n" "Bitte überprüfen Sie Ihre Internet-Verbindung." -#: ../apt/debfile.py:70 +#: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" msgstr "Die Liste der Dateien von ›%s‹ konnte nicht gelesen werden." -#: ../apt/debfile.py:138 +#: ../apt/debfile.py:93 +#, fuzzy, python-format +#| msgid "List of files for '%s' could not be read" +msgid "List of control files for '%s' could not be read" +msgstr "Die Liste der Dateien von ›%s‹ konnte nicht gelesen werden." + +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "Abhängigkeit nicht erfüllbar: %s\n" -#: ../apt/debfile.py:162 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "Steht in Konflikt zu dem installiertem Paket ›%s‹" -#: ../apt/debfile.py:308 +#. 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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "Falsche Architektur ›%s‹" #. the deb is older than the installed -#: ../apt/debfile.py:314 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "Eine spätere Version is bereits installiert." -#: ../apt/debfile.py:334 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "Es konnten nicht alle Abhängigkeiten erfüllt werden (Cache defekt)" -#: ../apt/debfile.py:365 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "›%s‹ kann nicht installiert werden" -#: ../apt/debfile.py:473 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" "Installiere Bau-Abhängigkeiten für das Quellpaket ›%s‹ welches ›%s‹baut\n" -#: ../apt/debfile.py:483 +#: ../apt/debfile.py:700 msgid "An essential package would be removed" msgstr "Ein grundlegendes Paket müsste entfernt werden" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "%c%s... Fertig" -#: ../apt/progress/text.py:120 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "OK " -#: ../apt/progress/text.py:129 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "Ign " -#: ../apt/progress/text.py:131 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "Fehl " -#: ../apt/progress/text.py:142 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "Hole:" -#: ../apt/progress/text.py:202 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr " [Verarbeite]" -#: ../apt/progress/text.py:213 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -493,22 +627,22 @@ msgstr "" "in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" #. Trick for getting a translation from apt -#: ../apt/progress/text.py:222 +#: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Es wurden %sB in %s geholt (%sB/s)\n" -#: ../apt/progress/text.py:238 +#: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.1r1 " "Disk 1«" -#: ../apt/progress/text.py:254 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" -#: ../apt/cache.py:127 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "Datenstrukturen werden aufgebaut" diff --git a/po/el.po b/po/el.po index 835417bc..4d021395 100644 --- a/po/el.po +++ b/po/el.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:13+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,267 +24,359 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Community maintained" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Λογισμικό με περιορισμούς" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom με το Ubuntu 6.10 'Edgy Eft" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 TLS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Λογισμικό ανοικτού κώδικα υποστηριζόμενο από την Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Υποστηριζόμενα από την κοινότητα (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Community maintained Open Source software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Όχι-ελεύθεροι οδηγοί" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Οδηγοί με κλειστό κώδικα για συσκευές" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Όχι-ελεύθερο (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Λογισμικό με περιορισμούς από πνευματικά δικαιώματα και νόμους" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom με Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Σημαντικές ενημερώσεις ασφαλείας" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Συνιστώμενες ενημερώσεις" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Προτεινόμενες ενημερώσεις" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Backported ενημερώσεις" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ενημερώσεις Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Δεν υποστηρίζονται πια επίσημα" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Περιορισμένα πνευματικά δικαιώματα" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ενημερώσεις ασφαλείας Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ενημερώσεις Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" @@ -340,23 +433,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Εξυπηρετητής για %s" @@ -364,48 +457,48 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Κύριος εξυπηρετητής" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Προσαρμοσμένοι εξυπηρετητές" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Λήψη αρχείου %(current)li από %(total)li με %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Λήψη αρχείου %(current)li από %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Λεπτομέρειες" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -414,7 +507,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -422,81 +515,118 @@ msgstr "" "Αποτυχία λήψης της λίστας των αλλαγών.\n" "Παρακαλώ ελέγξτε τη σύνδεση σας στο διαδίκτυο." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -505,19 +635,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/en_AU.po b/po/en_AU.po index 3c7125e5..c7c3415b 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:01+0000\n" "Last-Translator: David Satchell \n" "Language-Team: English (Australia) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,266 +25,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Community maintained" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Restricted software" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM with Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Community maintained Open Source software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Community maintained (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Community maintained Open Source software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Non-free drivers" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Proprietary drivers for devices" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Restricted software (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM with Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Important security updates" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Recommended updates" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Proposed updates" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Backported updates" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" @@ -340,23 +433,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "DFSG-compatible Software with Non-Free Dependencies" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Non-DFSG-compatible Software" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -364,48 +457,48 @@ msgstr "Server for %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Main server" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Custom servers" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Downloading file %li of %li with %s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Downloading file %li of %li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Details" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "The list of changes is not available" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -414,7 +507,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -423,81 +516,118 @@ msgstr "" "Failed to download the list of changes. Please check your Internet " "connection." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Can't install '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "An essential package would have to be removed" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -506,19 +636,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/en_CA.po b/po/en_CA.po index 2586ed53..4c63b739 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:06+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,287 +25,377 @@ 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:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.04 Updates" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Contributed software" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "_Install" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "_Install" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 #, fuzzy msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Officially supported" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.04 Updates" @@ -362,22 +453,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -385,51 +476,51 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Details" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Settings" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "There is a new release of Ubuntu available!" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -438,7 +529,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -447,80 +538,117 @@ msgstr "" "Failed to download changes. Please check if there is an active internet " "connection." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -529,19 +657,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index aa451a85..e8313021 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:14+0000\n" "Last-Translator: Jeff Bailes \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,266 +24,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Community maintained" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Restricted software" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom with Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Canonical supported Open Source software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Community maintained (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Community maintained Open Source software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Non-free drivers" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Proprietary drivers for devices" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Restricted software (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Software restricted by copyright or legal issues" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Important security updates" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Recommended updates" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Proposed updates" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Backported updates" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "No longer officially supported" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" @@ -340,23 +433,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "DFSG-compatible Software with Non-Free Dependencies" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Non-DFSG-compatible Software" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -364,49 +457,49 @@ msgstr "Server for %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Main server" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Custom servers" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Downloading file %(current)li of %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Details" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "_Settings" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "The list of changes is not available" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -415,7 +508,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -423,81 +516,118 @@ msgstr "" "Failed to download the list of changes. \n" "Please check your Internet connection." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Can't install '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "An essential package would have to be removed" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -506,19 +636,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/eo.po b/po/eo.po index dcac3593..d8c8cfb7 100644 --- a/po/eo.po +++ b/po/eo.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-27 15:56+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2011-05-09 16:09+0200\n" "Last-Translator: Kristjan SCHMIDT \n" "Language-Team: Esperanto \n" @@ -31,297 +31,343 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "KD kun Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +#| msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +#| msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "KD kun Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "KD kun Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:506 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "KD kun Ubuntu 10.10 'Maverick Meerkat'" #. Description -#: ../data/templates/Ubuntu.info.in:43 +#: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" msgstr "Partneroj de Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:45 +#: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" msgstr "Programaro pakita de Canonical por iliaj partneroj" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:46 +#: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." msgstr "Tiuj ĉi programoj ne estas parto de Ubuntu." #. Description -#: ../data/templates/Ubuntu.info.in:53 +#: ../data/templates/Ubuntu.info.in:528 msgid "Independent" msgstr "Sendepende" #. CompDescription -#: ../data/templates/Ubuntu.info.in:55 +#: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" msgstr "Ofertitaj de aliaj programistoj kaj firmaoj" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:56 +#: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." msgstr "Programoj ofertitaj de aliaj programistoj kaj firmaoj" #. Description -#: ../data/templates/Ubuntu.info.in:94 +#: ../data/templates/Ubuntu.info.in:569 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description -#: ../data/templates/Ubuntu.info.in:112 +#: ../data/templates/Ubuntu.info.in:589 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "KD kun Ubuntu 10.04 'Lucid Lynx'" #. Description -#: ../data/templates/Ubuntu.info.in:155 +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:173 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "KD kun Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:216 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:234 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "KD kun Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:277 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:295 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "KD kun Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:339 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "KD kun Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:402 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "KD kun Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:465 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:483 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "KD kun Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:525 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "Komunume prizorgata" #. CompDescription -#: ../data/templates/Ubuntu.info.in:536 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Limigita programaro" #. Description -#: ../data/templates/Ubuntu.info.in:543 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "KD kun Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:585 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:588 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Malfermitkoda programaro subtenata de Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:590 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "Komunume prizorgata (universo)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:591 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Komunume prizorgata malfermitkoda programaro" #. CompDescription -#: ../data/templates/Ubuntu.info.in:593 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Neliberaj peliloj" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:594 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Fermitkoda peliloj por aparatoj" #. CompDescription -#: ../data/templates/Ubuntu.info.in:596 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Limigita programaro (multiverso)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:597 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Programaro limigita per kopirajto aŭ leĝaj temoj" #. Description -#: ../data/templates/Ubuntu.info.in:603 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "KD kun Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:619 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Gravaj sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:624 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Rekomenditaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:629 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "Antaŭ-eldonataj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:634 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "Nesubtenataj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:645 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:659 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "KD kun Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:675 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:680 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:685 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Retroportoj" #. Description -#: ../data/templates/Ubuntu.info.in:696 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:710 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "KD kun Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:713 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Oficiale subtenata" #. Description -#: ../data/templates/Ubuntu.info.in:726 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:731 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:736 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Retroportoj" #. Description -#: ../data/templates/Ubuntu.info.in:742 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:748 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "Komunume flegata (univreso)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:750 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Mallibere (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:756 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "KD kun Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:759 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Ne plu oficiale subtenata" #. CompDescription -#: ../data/templates/Ubuntu.info.in:761 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Limigita kopirajto" #. Description -#: ../data/templates/Ubuntu.info.in:768 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:773 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:778 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Retroportoj" @@ -387,7 +433,7 @@ msgid "Non-DFSG-compatible Software" msgstr "Ne-DFSG-kongruaj programaroj" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:209 ../aptsources/distro.py:427 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Servilo por %s" @@ -395,48 +441,48 @@ msgstr "Servilo por %s" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:227 ../aptsources/distro.py:233 -#: ../aptsources/distro.py:249 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Ĉefa servilo" -#: ../aptsources/distro.py:253 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Propraj serviloj" -#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Elŝutante dosieron %(current)li sur %(total)li per %(speed)s/s" -#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Elŝutante dosieron %(current)li sur %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:342 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detaloj" -#: ../apt/progress/gtk2.py:430 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "Komencante..." -#: ../apt/progress/gtk2.py:436 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "Komplete" -#: ../apt/package.py:358 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "Nevalida unikodaĵo en priskribo por '%s' (%s). Bonvolu raporti." -#: ../apt/package.py:1065 ../apt/package.py:1171 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "La listo de ŝanĝoj ne haveblas" -#: ../apt/package.py:1177 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -449,7 +495,7 @@ msgstr "" "Bonvolu uzi http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "ĝis kiam la ŝanĝoj havebliĝos aŭ poste reklopodi." -#: ../apt/package.py:1184 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -462,18 +508,24 @@ msgstr "" msgid "List of files for '%s' could not be read" msgstr "Listo de dosieroj de '%s' ne legeblis" -#: ../apt/debfile.py:167 +#: ../apt/debfile.py:93 +#, fuzzy, python-format +#| msgid "List of files for '%s' could not be read" +msgid "List of control files for '%s' could not be read" +msgstr "Listo de dosieroj de '%s' ne legeblis" + +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "Dependeco ne plenumita: %s\n" -#: ../apt/debfile.py:188 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "Konfliktas kun la instalita pakaĵo '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation -#: ../apt/debfile.py:327 +#: ../apt/debfile.py:373 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -483,7 +535,7 @@ msgstr "" "(%(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 +#: ../apt/debfile.py:389 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " @@ -492,7 +544,7 @@ msgstr "" "Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' konflikto: %(targetpkg)s " "(%(comptype)s %(targetver)s)" -#: ../apt/debfile.py:353 +#: ../apt/debfile.py:399 #, python-format msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " @@ -501,34 +553,30 @@ msgstr "" "Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' kiu konfliktas kun: " "'%(targetpkg)s'. Sed la '%(debfile)s' ofertas ĝin per: '%(provides)s'" -#: ../apt/debfile.py:399 +#: ../apt/debfile.py:447 msgid "No Architecture field in the package" msgstr "Neniu arĥitekturo-kampo en la pakaĵo" -#: ../apt/debfile.py:404 +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "Malkorekta arĥitekturo: '%s'" #. the deb is older than the installed -#: ../apt/debfile.py:411 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "Pli nova versio estas jam instalita" -#: ../apt/debfile.py:436 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "Fiaskis plenumi ĉiujn dependecojn (difektita kaŝmemoro)" -#: ../apt/debfile.py:466 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "Ne instaleblas '%s'" -#: ../apt/debfile.py:508 -msgid "Python-debian module not available" -msgstr "Modulo Python-debian ne haveblas" - -#: ../apt/debfile.py:542 +#: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" @@ -536,16 +584,16 @@ msgstr "" "Aŭtomate malpakita:\n" "\n" -#: ../apt/debfile.py:548 +#: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" msgstr "Aŭtomate konvertita al presebla 'ascii':\n" -#: ../apt/debfile.py:638 +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "Instali kunmet-dependecojn por fontpakaĵo '%s', kiu kunmetas %s\n" -#: ../apt/debfile.py:648 +#: ../apt/debfile.py:700 msgid "An essential package would be removed" msgstr "Esenca pakaĵo estus forigita" @@ -599,6 +647,9 @@ msgstr "Bonvolu doni nomon al tiu ĉi disko, ekzemple 'Disko 1 de Debian 2.1r1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Bonvolu enmeti diskon en la diskingon kaj puŝi la enigan klavon" -#: ../apt/cache.py:149 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "Konstruado de datenaj strukturoj" + +#~ msgid "Python-debian module not available" +#~ msgstr "Modulo Python-debian ne haveblas" diff --git a/po/es.po b/po/es.po index 1c60e319..2c50a1fe 100644 --- a/po/es.po +++ b/po/es.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:15+0000\n" "Last-Translator: Ricardo Pérez López \n" "Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,266 +27,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Actualizaciones de seguridad de Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 «Hoary Hedgehog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 «Edgy Eft»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Mantenido por la comunidad" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Software restringido" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Software libre soportado por Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Mantenido por la comunidad (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Software libre mantenido por la comunidad" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Controladores no libres" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Controladores privativos para dispositivos" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Software restringido (multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Software restringido por copyright o cuestiones legales" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM con Ubuntu 6.06 LTS «Dapper Drake»" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Actualizaciones importantes de seguridad" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Actualizaciones recomendadas" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Actualizaciones propuestas" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Actualizaciones «backport»" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Actualizaciones de Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "«Backports» de Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Soportado oficialmente" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Actualizaciones de Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "«Backports» de Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Mantenido por la comunidad (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Software no libre (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Sin más soporte oficial" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Copyright restringido" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Actualizaciones de seguridad" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Actualizaciones de Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "«Backports» de Ubuntu 4.10" @@ -342,23 +435,23 @@ msgid "Debian testing" msgstr "Debian «Etch» (pruebas)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian «Sid» (inestable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatible con la DFSG con dependencias no libres" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Software no compatible con la DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Servidor para %s" @@ -366,49 +459,49 @@ msgstr "Servidor para %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Servidor principal" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Descargando archivo %(current)li de %(total)li a %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Descargando archivo %(current)li de %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalles" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Preferencias" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "La lista de cambios no se encuentra disponible." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -417,7 +510,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -425,81 +518,118 @@ msgstr "" "Hubo un fallo al descargar la lista de cambios. \n" "Por favor, compruebe su conexión a Internet." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Se ha tenido que desinstalar un paquete esencial" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -508,19 +638,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/et.po b/po/et.po index d57a083d..ff3d0dad 100644 --- a/po/et.po +++ b/po/et.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-09 15:49+0000\n" "Last-Translator: margus723 \n" "Language-Team: Estonian \n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,49 +419,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Iga päev" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,87 +470,124 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Ei saa paigaldada '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Hädavajalik pakett tuleks eemaldada" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -478,19 +596,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/eu.po b/po/eu.po index 086cca4b..aede14c1 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-09 15:49+0000\n" "Last-Translator: Xabi Ezpeleta \n" "Language-Team: Basque \n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,49 +419,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Egunero" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,87 +470,124 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Ezin da %s instalatu" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Ezinbesteko pakete bat ezabatu beharko da" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -478,19 +596,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/fa.po b/po/fa.po index 86a3fd9e..ef5bc19a 100644 --- a/po/fa.po +++ b/po/fa.po @@ -8,11 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-09 15:49+0000\n" "Last-Translator: Pedram Ganjeh Hadidi \n" "Language-Team: Persian \n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,247 +26,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -316,22 +397,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -339,48 +420,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,86 +470,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -477,19 +595,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/fi.po b/po/fi.po index a1f68731..be961e6c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-23 12:24+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,266 +24,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 turvallisuuspäivitykset" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Yhteisön ylläpitämät" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Rajoitetut ohjelmistot" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Canonicalin tukemat avoimen lähdekoodin ohjelmistot" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Yhteisön ylläpitämät avoimen lähdekoodin ohjelmistot" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Ei-vapaat ajurit" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Suljetut laiteajurit" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Käyttörajoitetut ohjelmistot (multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Tekijänoikeus- tai lakiasioilla rajoitetut ohjelmistot" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Tärkeät turvallisuuspäivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Suositellut päivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Ehdotetut päivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Takaisinsovitetut päivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Virallisesti tuettu" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 päivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 takaisinsovitukset" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Ei-vapaat ohjelmistot (multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Ei enää virallisesti tuettu" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Rajoitettu käyttöoikeus" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 turvallisuuspäivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 päivitykset" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 takaisinsovitukset" @@ -339,24 +432,24 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testattava)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (epävakaa)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "DFSG-yhteensopivat ohjelmistot joilla riippuvuuksia epävapaisiin ohjelmiin" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmistot" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Palvelin maalle: %s" @@ -364,49 +457,49 @@ msgstr "Palvelin maalle: %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Pääpalvelin" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Määrittele palvelin" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Noudetaan tiedostoa %(current)li/%(total)li nopeudella %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Noudetaan tiedostoa %(current)li/%(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Yksityiskohdat" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Asetukset" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Muutosluettelo ei ole saatavilla." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -415,7 +508,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -423,81 +516,118 @@ msgstr "" "Muutosluettelon nouto epäonnistui. \n" "Tarkista Internet-yhteytesi toimivuus." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Ei voitu asentaa pakettia \"%s\"" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Välttämätön paketti jouduttaisiin poistamaan" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -506,19 +636,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/fr.po b/po/fr.po index a12828ae..e750f209 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: python-apt 0.7.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2007-06-25 12:12+0100\n" "Last-Translator: Hugues NAULET \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,351 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 « Feisty Fawn »" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD-ROM contenant Ubuntu 7.04 « Feisty Fawn »" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +#| msgid "Ubuntu 9.10 'Karmic Koala'" +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 9.10 « Karmic Koala »" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM contenant Ubuntu 9.10 « Karmic Koala »" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 « Warty Warthog »" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM contenant Ubuntu 4.10 « Warty Warthog »" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +#| msgid "Ubuntu 9.10 'Karmic Koala'" +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 9.10 « Karmic Koala »" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM contenant Ubuntu 9.10 « Karmic Koala »" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +#| msgid "Ubuntu 8.04 'Hardy Heron'" +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 8.04 « Hardy Heron »" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD-ROM contenant Ubuntu 8.04 « Hardy Heron »" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 9.10 « Karmic Koala »" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM contenant Ubuntu 9.10 « Karmic Koala »" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 9.04 « Jaunty Jackalope »" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD-ROM contenant Ubuntu 9.04 « Jaunty Jackalope »" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 8.10 « Intrepid Ibex »" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD-ROM contenant Ubuntu 8.10 « Intrepid Ibex »" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04 « Hardy Heron »" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD-ROM contenant Ubuntu 8.04 « Hardy Heron »" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10 « Gutsy Gibbon »" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD-ROM contenant Ubuntu 7.10 « Gutsy Gibbon »" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 « Feisty Fawn »" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD-ROM contenant Ubuntu 7.04 « Feisty Fawn »" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 « Edgy Eft »" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "Maintenu par la communauté" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Logiciel non libre" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM contenant Ubuntu 6.10 « Edgy Eft »" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS « Dapper Drake »" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Logiciel libre maintenu par Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "Maintenu par la communauté (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Logiciel libre maintenu par la communauté" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Pilotes non libres" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Pilotes propriétaires de périphériques" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Logiciel non libre (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Logiciel soumis au droit d'auteur ou à des restrictions légales" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM contenant Ubuntu 6.06 LTS « Dapper Drake »" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Mises à jour de sécurité" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Mises à jour recommandées" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "Mises à jour suggérées" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "Mises à jour non gérées" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 « Breezy Badger »" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM contenant Ubuntu 5.10 « Breezy Badger »" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "« Backports » pour Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 « Hoary Hedgehog »" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM contenant Ubuntu 5.04 « Hoary Hedgehog »" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Supporté officiellement" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Mises à jour pour Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "« Backports » pour Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 « Warty Warthog »" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "Maintenu par la communauté (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Non libre (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM contenant Ubuntu 4.10 « Warty Warthog »" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Support officiel terminé" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Copyright restreint" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Mises à jour pour Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "« Backports » pour Ubuntu 4.10" @@ -315,24 +420,24 @@ msgid "Debian testing" msgstr "Debian « Lenny » (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 "" "Logiciel libre (selon les lignes directrices du projet Debian) dont les " "dépendances ne sont pas libres" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Serveur pour %s" @@ -340,49 +445,49 @@ msgstr "Serveur pour %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Serveur principal" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Serveurs personnalisés" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Téléchargement du fichier %(current)li sur %(total)li à %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Téléchargement du fichier %(current)li sur %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Détails" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Paramètres" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "La liste des modifications n'est pas disponible" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -391,7 +496,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -399,81 +504,118 @@ msgstr "" "Échec lors du téléchargement de la liste des modifications. \n" "Veuillez vérifier votre connexion Internet." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Impossible d'installer « %s »" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Un paquet essentiel devrait être enlevé" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -482,19 +624,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/fur.po b/po/fur.po index 68966ebb..67716d9d 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-08-25 05:55+0000\n" "Last-Translator: Marco \n" "Language-Team: Friulian \n" +"Language: fur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,49 +419,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Ogni dì" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,86 +470,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -477,19 +595,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/gl.po b/po/gl.po index 4a608218..511a2658 100644 --- a/po/gl.po +++ b/po/gl.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-19 00:43+0000\n" "Last-Translator: Felipe Gil Castiñeira \n" "Language-Team: galician\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,266 +27,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Actualizacións de Seguranza para Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Actualizacións de Seguranza para Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Actualizacións de Seguranza para Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Mantido pola Comunidade" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Aplicacións restrinxidas" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom con Ubuntu 6.10 \"Edgy Eft\"" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Software de Código Aberto soportado por Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Mantido pola Comunidade (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Software de Código Aberto mantido pola Comunidade" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Controladores non libres" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Controladores propietarios de dispositivos" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Software restrinxido (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Software restrinxido por razóns de copyright ou legais" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom con Ubuntu 6.06 LTS \"Dapper Drake\"" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Actualizacións de seguranza importantes" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Actualizacións recomendadas" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Actualizacións aconselladas" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Actualizacións de backports" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Soportado oficialmente" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizacións de Seguranza para Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Actualizacións para Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Backports para Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Mantido pola comunidade (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Software non libre (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Xa non se mantén oficialmente" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Copyright restrinxido" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Actualizacións de Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Backports para Ubuntu 4.10" @@ -342,23 +435,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (probas)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (inestable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatible coa DFSG con dependencias non libres" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Software non compatible coa DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Servidor desde %s" @@ -366,48 +459,48 @@ msgstr "Servidor desde %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Servidor principal" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "A descargar o ficheiro %(current)li de %(total)li con %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "A descargar o ficheiro %(current)li de %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalles" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Non se dispón da lista de cambios" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -416,7 +509,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -424,81 +517,118 @@ msgstr "" "Non se puido descargar a lista de cambios.\n" "Comprobe a súa conexión á Internet." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Non se puido instalar '%s»" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Tívose que desinstalar un paquete esencial" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -507,19 +637,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/he.po b/po/he.po index 9df8ed16..4a4126f7 100644 --- a/po/he.po +++ b/po/he.po @@ -10,10 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 08:48+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: Hebrew \n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,268 +28,360 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "עדכוני אבטחה - אובונטו 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "אובונטו 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "אובונטו 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "אובונטו 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "אובונטו 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "אובונטו 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "אובונטו 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "אובונטו 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "אובונטו 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "עדכוני אבטחה - אובונטו 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "עדכוני אבטחה - אובונטו 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "אובונטו 6.10 \"Edgy Eft\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "מתוחזק ע\"י הקהילה" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "תוכנה בעלת הגבלות" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "תקליטור אובונטו 6.10 \"Edgy Eft\"" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "אובונטו 6.06 LTS \"DapperDrake\"" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "תוכנות קוד פתוח הנתמכות ע\"י Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "מתוחזק ע\"י הקהילה (Universe(" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "תוכנות קוד פתוח המתוחזקות ע\"י הקהילה" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "דרייברים לא חופשיים" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "דרייברים קניינים להתקנים" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "תוכנה בעלת הגבלות (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "תקליטור אובונטו 6.06 LTS \"Dapper Drake\"" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "עדכוני אבטחה חשובים" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "עדכונים מומלצים" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "עדכונים מוצעים" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "עדכונים מוצעים" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "אובונטו 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "אובונטו 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "נתמך רשמית" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "עדכונים - אובונטו 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "לא-חופשי (Multiverse(" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "אינה נתמכת רשמית יותר" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "זכויות יוצרים מגבילות" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "עדכונים - אובונטו 5.10" @@ -347,23 +440,23 @@ msgid "Debian testing" msgstr "דביאן בדיקה" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "דביאן לא ארה\"ב (לא יציב)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "השרת ב%s" @@ -371,50 +464,50 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "שרת ראשי" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 #, fuzzy msgid "Custom servers" msgstr "השרת הקרוב ביותר" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "פרטים" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "הגדרות" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "רשימת השינויים אינה זמינה" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -423,88 +516,125 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "נכשל בהורדת רשימת השינויים. אנא בדוק אם החיבור לאינטרנט עובד." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "לא ניתן להתקין את \"%s\"" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -513,19 +643,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/hi.po b/po/hi.po index 24836e22..926da227 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-08-01 15:30+0000\n" "Last-Translator: Gaurav Mishra \n" "Language-Team: Hindi \n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,49 +419,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "प्रतिदिन" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,86 +470,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -477,19 +595,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/hr.po b/po/hr.po index 4b268169..24e6526a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-18 19:37+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 sigurnosne nadogradnje" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Wart Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Wart Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Wart Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Wart Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Wart Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 sigurnosne nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 sigurnosne nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Održavani od strane zajednice" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Neslobodni softver" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CDROM sa Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Službeno podržani Open Source softver" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Održavani od strane zajednice (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Softver održavan od strane zajednice" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Neslobodni pogonski programi" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Neslobodni upogonitelji za uređaje" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Ograničeni softver (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Softver ograničen autorskim pravom ili legalnim pitanjima" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CDROM s Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Važne sigurnosne nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Preporučene nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Predložene nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Backport nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 osvježenja" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 backporti" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Službeno podržani" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 sigurnosne nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 backporti" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Wart Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Održavani od strane zajednice (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Neslobodni (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Više nisu službeno podržani" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Ograničeno autorsko pravo" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 sigurnosne nadogradnje" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 osvježenja" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 backports" @@ -341,23 +434,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testni)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (nestabilni)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "DFSG-nekompatibilni programi" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Poslužitelj za %s" @@ -365,48 +458,48 @@ msgstr "Poslužitelj za %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Glavni poslužitelj" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Osobni poslužitelji" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Preuzimanje datoteke %(current)li od %(total)li brzinom %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Preuzimam datoteku %(current)li od %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalji" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Popis promjena nije dostupan." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -415,7 +508,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -423,81 +516,118 @@ msgstr "" "Preuzimanje popisa promjena nije uspjelo. \n" "Molim, provjerite svoju internet vezu." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Ne mogu instalirati '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Bitan paket bi morao biti uklonjen" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -506,19 +636,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/hu.po b/po/hu.po index cdfd526f..b43b9a3f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:03+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,266 +25,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 biztonsági frissítések" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 biztonsági frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 biztonsági frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Közösségi karbantartású" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Nem-szabad" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Az Ubuntu 6.10 \"Edgy Eft\" CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "A Canonical által támogatott nyílt forrású szoftverek" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Közösségi karbantartású (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Közösségi karbantartású nyílt forrású szoftverek" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Nem-szabad meghajtók" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Szabadalmazott eszközmeghajtók" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Nem-szabad szoftverek (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Szerzői vagy egyéb jogi problémák miatt korlátozott szoftver" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Az Ubuntu 6.06 LTS \"Dapper Drake\"-et tartalmazó CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Fontos biztonsági frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Ajánlott frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Javasolt frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Visszaportolt frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Hivatalosan támogatott" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 biztonsági frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 visszaportolt csomagok" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Közösségi karbantartású (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Nem-szabad (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Hivatalosan már nem támogatott" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Szerzői jogi korlátozás alatt" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 biztonsági frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 frissítések" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 visszaportolt csomagok" @@ -340,23 +433,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (tesztelés alatt)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (instabil)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Kiszolgáló a következőhöz: %s" @@ -364,49 +457,49 @@ msgstr "Kiszolgáló a következőhöz: %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Fő kiszolgáló" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Egyéni kiszolgálók" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "%(current)li. fájl letöltése, összesen: %(total)li, sebesség: %(speed)s/mp" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(current)li. fájl letöltése, összesen: %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Részletek" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "A módosítások listája nem érhető el" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -415,7 +508,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -423,81 +516,118 @@ msgstr "" "A módosítások listájának letöltése meghiúsult.\n" "Ellenőrizze az internetkapcsolatát." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "'%s' nem telepíthető" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Egy alapvető csomag eltávolításra kerülne" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -506,19 +636,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/id.po b/po/id.po index d16e283f..140b4201 100644 --- a/po/id.po +++ b/po/id.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:03+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,274 +24,359 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 6.06 LTS Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 6.06 LTS Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 6.06 LTS Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 6.06 LTS Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 6.06 LTS Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Tidak-bebas (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Updates" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Tidak-bebas (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Tidak-bebas (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Pemutakhiran lewat Internet" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "_Instal Update" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "_Instal Update" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 6.06 LTS Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Resmi disokong" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 6.06 LTS Backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Tidak-bebas (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Hak cipta terlarang" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 6.06 LTS Backports" @@ -349,25 +435,25 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "" "Perangkat Lunak yang sesuai dengan DFSG tapi tergantung pada Perangkat Lunak " "Tidak-Bebas" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -375,49 +461,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Mengunduh berkas %li dari %li dengan %s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Mengunduh berkas %li dari %li dengan %s/s" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Rincian" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -426,7 +512,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -435,81 +521,118 @@ msgstr "" "Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet " "anda." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Tidak dapat menginstal '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Paket esensial akan dihapus" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -518,19 +641,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/it.po b/po/it.po index 5d1ac5a7..76fce0b8 100644 --- a/po/it.po +++ b/po/it.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-22 10:13+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 «Hoary Hedgehog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 «Edgy Eft»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Mantenuto dalla comunità" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Software con restrizioni" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Software open source supportato da Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Mantenuto dalla comunità (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Software open source mantenuto dalla comunità" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Driver non liberi" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Driver proprietari per i dispositivi" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Software con restrizioni (multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Software con restrizioni per copyright o motivi legali" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM con Ubuntu 6.06 LTS «Drapper Drake»" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Aggiornamenti di sicurezza importanti" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Aggiornamenti raccomandati" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Aggiornamenti proposti" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Aggiornamenti di backport" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 - Aggiornamenti di sicurezza" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 - Aggiornamenti" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Backport di Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 «Hoary Hedgehog»" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Supportati ufficialmente" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 - Aggiornamenti" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Backport per Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Mantenuti dalla comunità (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Non libero (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Software non più supportato ufficialmente" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Copyright con restrizioni" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 - Aggiornamenti di sicurezza" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Aggiornamenti di Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Backport per Ubuntu 4.10" @@ -342,23 +435,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Software compatibile con le DFSG con dipendenze non libere" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Software non compatibile con le DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server in %s" @@ -366,49 +459,49 @@ msgstr "Server in %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Server principale" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Server personalizzati" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Scaricamento del file %(current)li di %(total)li a %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Scaricamento del file %(current)li di %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Dettagli" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Impostazioni" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "L'elenco dei cambiamenti non è disponibile" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -417,7 +510,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -425,81 +518,118 @@ msgstr "" "Fallito lo scaricamento dell'elenco dei cambiamenti. \n" "Verificare la connessione a Internet." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Impossibile installare \"%s\"" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Un pacchetto essenziale dovrebbe essere rimosso" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -508,19 +638,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ja.po b/po/ja.po index 26ec8567..9a9cf53f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,10 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: python-apt 0.7.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2007-12-04 22:51+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Ubuntu Japanese Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,257 +27,355 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 'Feisty Fawn' のCD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog' のCD-ROM" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.10 'Breezy Badger' のCD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog' のCD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.04 'Feisty Fawn' のCD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 'Feisty Fawn' のCD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "コミュニティによるメンテナンス" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "制限のあるソフトウェア" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft' のCD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Canonical によってサポートされるオープンソースソフトウェア" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "コミュニティによってメンテナンスされるオープンソースソフトウェア" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "フリーではないドライバ" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "デバイス用のプロプライエタリなドライバ" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "制限されたソフトウェア (Multiuniverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "著作権もしくは法的な問題によって制限されたソフトウェア" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake' の CD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "重要なセキュリティアップデート" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "推奨アップデート" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "プレリリースされたアップデート" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "サポートされていないアップデート" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger' のCD-ROM" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 バックポート" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog' のCD-ROM" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "公式なサポート対象" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 セキュリティアップデート" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 アップデート" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 バックポート" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "フリーではない (Multiuniverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "もう公式にサポートされません" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "制限された著作権" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 セキュリティアップデート" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 アップデート" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 バックポート" @@ -330,22 +429,22 @@ msgid "Debian testing" msgstr "Debian テスト版" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (不安定版)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "フリーではないものに依存関係のあるDFSG適合ソフトウェア" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "DFSGに適合しないソフトウェア" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "%s のサーバ" @@ -353,48 +452,48 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "メインサーバ" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "カスタムサーバ" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -403,86 +502,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -491,20 +627,20 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ka.po b/po/ka.po index 49a1729a..5318eccc 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-18 01:28+0000\n" "Last-Translator: Malkhaz Barkalaya \n" "Language-Team: Georgian \n" +"Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,266 +27,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 უსაფრთხოების განახლება" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 უსაფრთხოების განახლება" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 უსაფრთხოების განახლება" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "universe საზოგადოების მხრდაჭერით" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "არათავისუფალი პროგრამები" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'-ს ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "თავისუფალი პროგრამები (Open Source) Canonical-ის მხარდაჭერით" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "universe საზოგადოების მხრდაჭერით" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "თავისუფალი პროგრამები (Open Source) universe საზოგადოების მხარდაჭერით" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "არათავისუფალი დრაივერები" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "მოწყობილობების საკუთარი დრაივერები" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "არათავისუფალი პროგრამები (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "პატენტებითა და კანონებით შეზღუდული პროგრამები" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'-ის ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "უსაფრთხოების მნიშვნელოვანი განახლებები" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "რეკომენდებული განახლებები" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "შემოთავაზებული განახლებები" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Backport-განახლებები" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 ბექპორტები" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "ოფიციალური მხარდაჭერით" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 უსაფრთხოების განახლება" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 განახლებები" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 ბექპორტები" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "საზოგადოების მხარდაჭერით (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "არათავისუფალი (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "მოხსნილი აქვს ოფიციალური მხარდაჭერა" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "შეზღუდული საავტორო უფლება" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 უსაფრთხოების განახლებები" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 განახლებები" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 ბექპორტები" @@ -342,23 +435,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "არათავისუფალ პროგრამებზე დამოკიდებული DFSG-თავსებადი პროგრამები" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "DFSG-არათავსებადი პროგრამები" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "%s სერვერი" @@ -366,48 +459,48 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "მთავარი სერვერი" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "საკუთარი სერვერები" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "მე-%(current)li ფაილის ჩამოქაჩვა %(total)li-დან. სიჩქარე - %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "მე-%(current)li ფაილის ჩამოქაჩვა %(total)li-დან" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "ცნობები" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "ცვლილებების სია არ არის ხელმისაწვდომი." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -416,7 +509,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -424,81 +517,118 @@ msgstr "" "ვერ განხორციელდა ცვლილებების სიის ჩამოქაჩვა.\n" "შეამოწმეთ ინტერნეტ-კავშირი." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "'%s' ვერ დაყენდა" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -507,19 +637,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ko.po b/po/ko.po index dea0a295..d40f53c6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:04+0000\n" "Last-Translator: Eungkyu Song \n" "Language-Team: Korean \n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,266 +24,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "우분투 5.04 보안 업데이트" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "우분투 5.10 'Breezy Badger' 씨디롬" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "우분투 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "우분투 4.10 'Warty Warthog' 씨디롬" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "우분투 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "우분투 4.10 'Warty Warthog' 씨디롬" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "우분투 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "우분투 4.10 'Warty Warthog' 씨디롬" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "우분투 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "우분투 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "우분투 4.10 'Warty Warthog' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "우분투 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "우분투 4.10 'Warty Warthog' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "우분투 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "우분투 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "우분투 5.04 보안 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "우분투 5.10 'Breezy Badger' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "우분투 5.04 보안 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "우분투 5.10 'Breezy Badger' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "우분투 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "커뮤니티에서 관리" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "제한된 소프트웨어" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "우분투 6.10 'Edgy Eft' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Canonical이 지원하는 오픈 소스 소프트웨어" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "커뮤니티에서 관리 (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "커뮤니티에서 관리하는 오픈 소스 소프트웨어" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "비자유 드라이버" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "장치의 독점 드라이버" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "제한된 소프트웨어 (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 LTS 'Dapper Drake' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "중요한 보안 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "추천하는 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "제안하는 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Backport 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger' 씨디롬" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "우분투 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "우분투 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "공식적으로 지원함" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "우분투 5.04 보안 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "우분투 5.04 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "우분투 5.04 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "우분투 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "커뮤니티에서 관리 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "비자유 (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "우분투 4.10 'Warty Warthog' 씨디롬" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "더 이상 공식적으로 지원하지 않음" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "저작권이 제한됨" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "우분투 4.10 보안 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "우분투 4.10 업데이트" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "우분투 4.10 Backports" @@ -339,23 +432,23 @@ msgid "Debian testing" msgstr "데비안 \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "데비안 \"Sid\" (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG 호환이 되지만 비자유 소프트웨어에 의존하는 소프트웨어" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "DFSG와 호환이 되지 않는 소프트웨어" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "%s 서버" @@ -363,49 +456,49 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "주 서버" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "사용자 정의 서버" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "%(total)li개중 %(current)li번째 파일을 %(speed)s/s의 속도로 받고 있습니다" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(total)li개중 %(current)li번째 파일을 받고 있습니다" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "자세한 정보" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "변경 사항 목록이 없습니다" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -414,7 +507,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -422,81 +515,118 @@ msgid "" msgstr "" "변경 사항 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "'%s'을(를) 설치할 수 없습니다" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -505,19 +635,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ku.po b/po/ku.po index 357e7c42..3b96e13f 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-17 09:50+0000\n" "Last-Translator: rizoye-xerzi \n" "Language-Team: Kurdish \n" +"Language: ku\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,267 +25,359 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Yên ji aliyê komekê ber çav hatiye derbaskirin" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Nivîsbariya bi sînor" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdroma Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Çavkaniya xwezayî ya li gorî bingeha nermalavê" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Yên ji aliyê koman lê hatine nihêrtin" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "" "Nivîsbariyên Kodên Çavkaniyên Azad yên ji aliyê koman lê hatine nihêrtin" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Ajokerên ne azad" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Ji bo cîhazan ajokerên ku çavkaniyên wan girtî ne" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Nivîsbariya bi sînor" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Nivîsbariya bi mafên weşan û belavkirinê sînor kirî" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdroma Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Rojanekirinên ewlekariyê yên girîng" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Rojanekirinên têne pêşniyarkirin" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Rojanekirinên hatine pêşniyarkirin" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Rojanekirinên paş de hatine kişandin" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Rojanekirinên Ewlekariyê yên Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Rojanekirina Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Rojanekirinên Paş de Hatine Kişandin yên Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Bi piştgiriya fermî" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Rojanekirinên Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Rojanekirinên Paş de Hatine Kişandin yên Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Yên ji aliyê koman ve lê tê nihêrîn (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Ne-azad (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Êdi bi awayekî fermî nayê destekkirin" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Mafê kopîkrinê yê sînorkirî" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Rojanekirinên Ubuntu 4.10 yên Ewlekarî" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Rojanekirinên Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 nivîsbariyên bi paş de kişandî (Backports)" @@ -341,23 +434,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "DFSG-nivîsbariya hevgirtî ya ne azad" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "nivîsbariya hevgirtî ya ne li gorî -DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Pêşkêşkera %s" @@ -365,48 +458,48 @@ msgstr "Pêşkêşkera %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Pêşkêşkera Mak" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Pêşkêşkera taybet" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Pelgeha %(current)li ji %(total)li bi %(speed)s/ç tê daxistin" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Pelgeha %(current)li ji %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Hûragahî" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Lîsteya guherînan ne gihiştbar e" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -415,7 +508,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -423,81 +516,118 @@ msgstr "" "Daxistina lîsteya guhertinan biserneket.\n" "Ji kerema xwe re girêdana internetê kontrol bike." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Nikarî '%s' saz bike" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Dê pêwiste be ku pakêta bingehîn were jêbirin" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -506,19 +636,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/lt.po b/po/lt.po index adc096fa..ee9fe8b0 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,15 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:04+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -24,271 +25,363 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 saugumo atnaujinimai" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 „Warty Warthog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 „Hoary Hedgehog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 saugumo atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 saugumo atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Prižiūrima bendruomenės" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Ne Laisva (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD diskas su Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Prižiūrima bendruomenės (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Bendruomenės prižiūrima laisva programinė įranga" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Ne Laisva (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ne Laisva (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD diskas su Ubuntu 6.06 LTS „Dapper Drake“" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Svarbūs saugumo atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Rekomenduojami atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Testuojami atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Naujos ir atnaujintos programos" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Naujos programos Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Oficialiai palaikoma" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 saugumo atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Naujos programos Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 „Warty Warthog“" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Ne Laisva (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Apribotos autorinės teisės" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 saugumo atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 atnaujinimai" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Naujos programos Ubuntu 4.10" @@ -345,23 +438,23 @@ msgid "Debian testing" msgstr "Debian „Etch“ (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Su DFSG nesuderinama programinė įranga" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -369,48 +462,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Atsiunčiamas failas %(current)li iš %(total)li, %(speed)s/s greičiu" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Atsiunčiamas failas %(current)li iš %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalės" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Pakeitimų sąrašas neprieinamas" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -419,7 +512,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -427,81 +520,118 @@ msgstr "" "Nepavyko atsiųsti pakeitimų sąrašo. \n" "Patikrinkite Interneto ryšį." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Turėtų būti pašalintas esminis paketas" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -510,19 +640,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/lv.po b/po/lv.po index 8532bf82..58660cd0 100644 --- a/po/lv.po +++ b/po/lv.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: lp-upd-manager-lv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-09-05 20:00+0000\n" "Last-Translator: Raivis Dejus \n" "Language-Team: Latvian \n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,252 +28,333 @@ 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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Sabiedrības uzturētie (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" -msgstr "" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +msgid "Canonical-supported free and open-source software" +msgstr "Sabiedrības uzturētie (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Sabiedrības uzturētie (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Sabiedrības uzturētie (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "%s atjauninājumi" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Oficiāli atbalstītie" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Sabiedrības uzturētie (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Maksas (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Saistītie autortiesību" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -324,22 +406,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -347,48 +429,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Galvenais serveris" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detaļas" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -397,86 +479,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Nevar instalēt '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -485,19 +604,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/mk.po b/po/mk.po index ad7e6faf..7be4a45b 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:04+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,283 +25,373 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Безбедносни надградби за Убунту 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Безбедносни надградби за Убунту 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Безбедносни надградби за Убунту 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Надградби за Убунту 5.10" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Додатен софтвер" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Оддржувано од заедницата (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Неслободно (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Неслободно (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Безбедносни надградби за Debian Stable" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Инсталирам надградби..." #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Инсталирам надградби..." #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Безбедносни надградби за Убунту 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Официјално поддржано" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Безбедносни надградби за Убунту 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Надградби за Убунту 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Неслободно (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Официјално поддржано" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Безбедносни надградби за Убунту 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Надградби за Убунту 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Надградби за Убунту 5.10" @@ -360,23 +451,23 @@ msgid "Debian testing" msgstr "Debian Testing" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-компатибилен софтвер со неслободни зависности" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-компатибилен софтвер" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -384,51 +475,51 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Детали" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Поставувања" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "Достапна е нова верзија на Убунту!" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -437,7 +528,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -446,81 +537,118 @@ msgstr "" "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет " "врска е активна." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Не може да се инсталира %s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -529,19 +657,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/mr.po b/po/mr.po index a259fddd..8e5663d3 100644 --- a/po/mr.po +++ b/po/mr.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Marathi \n" +"Language: mr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,48 +419,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -388,86 +469,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -476,19 +594,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ms.po b/po/ms.po index 4e0d1eed..929b0729 100644 --- a/po/ms.po +++ b/po/ms.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:04+0000\n" "Last-Translator: azlinux \n" "Language-Team: Malay \n" +"Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,248 +25,328 @@ 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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -316,22 +397,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -339,49 +420,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Harian" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -390,87 +471,124 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Satu pakej yang perlu terpaksa dikeluarkan" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -479,19 +597,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/nb.po b/po/nb.po index 5cc30e76..c7fc8405 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:04+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,284 +25,374 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Oppdateringer" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Bidratt programvare" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 #, fuzzy msgid "Recommended updates" msgstr "Anbefalte oppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Installerer oppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Installerer oppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Offisielt støttet" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Noe programvare er ikke lenger offisielt støttet" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -361,23 +452,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "DFSG-kompatiblel programvare med Non-Free avhengigheter" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel programvare" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, fuzzy, python-format msgid "Server for %s" msgstr "Tjener for %s" @@ -385,52 +476,52 @@ msgstr "Tjener for %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 #, fuzzy msgid "Main server" msgstr "Hovedtjener" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 #, fuzzy msgid "Custom servers" msgstr "Egendefinerte tjenere" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Laster ned filen %li av %li med %s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Laster ned filen %li av %li med %s/s" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detaljer" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Instillinger" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -439,7 +530,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -448,81 +539,118 @@ msgstr "" "Kunne ikke laste ned listen med endringer. Vennligst kontrollér " "internettilkoblingen." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Kan ikke installere '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "En nødvendig pakke må fjernes" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -531,19 +659,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ne.po b/po/ne.po index 30cb6542..c26e0451 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:13+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" +"Language: ne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,287 +26,377 @@ 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:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "योगदान गरिएको सफ्टवेयर" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "नन-फ्री (बहुभर्स)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 #, fuzzy msgid "Officially supported" msgstr "कार्यालय बाट समर्थित" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "कार्यालय बाट समर्थित" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "निषेधित प्रतिलिपि अधिकार" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" @@ -364,23 +455,23 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -388,51 +479,51 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "विवरणहरु" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "सेटिंगहरु" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -441,87 +532,124 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -530,19 +658,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/nl.po b/po/nl.po index b46d889f..01bda2c5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-21 13:15+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,267 +24,359 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 veiligheidsupdates" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 ‘Warty Warthog’" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 ‘Warty Warthog’" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 ‘Warty Warthog’" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 ‘Hoary Hedgehog’" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 ‘Warty Warthog’" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 ‘Warty Warthog’" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 ‘Hoary Hedgehog’" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 ‘Hoary Hedgehog’" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 veiligheidsupdates" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 veiligheidsupdates" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 ‘Edgy Eft’" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Door de gemeenschap beheerd" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Beperkte software" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cd-rom met Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Door Canonical beheerde Open Source software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Door de gemeenschap beheerd (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Door de gemeenschap beheerde Open Source software" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Niet-vrije stuurprogramma's" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Niet-vrije stuurprogramma's voor apparaten" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Beperkte software (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" "Software die door auteursrechten of wettelijke regelingen beperkt wordt." #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cd-rom met Ubuntu 6.06 LTS ‘Dapper Drake’" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Belangrijke veiligheidsupdates" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Aanbevolen updates" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Voorgestelde updates" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Updates die van een nieuwere distributie afkomstig zijn (backports)" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 updates" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 ‘Hoary Hedgehog’" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Officieel ondersteund" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 veiligheidsupdates" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 updates" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 ‘Warty Warthog’" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Niet-vrij (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Niet meer officieel ondersteund" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Beperkte auteursrechten" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 veiligheidsupdates" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 updates" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 backports" @@ -340,23 +433,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (onstabiel)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Software niet compatibel met DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server voor %s" @@ -364,48 +457,48 @@ msgstr "Server voor %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Hoofdserver" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Andere servers" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Downloaden van bestand %(current)li uit %(total)li met %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Downloaden van bestand %(current)li uit %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Details" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Een overzicht van de wijzigingen is nog niet beschikbaar." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -414,7 +507,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -422,81 +515,118 @@ msgstr "" "Kon de lijst met wijzigingen niet downloaden. \n" "Controleer uw internetverbinding." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Kan '%s' niet installeren" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Een essentieel pakket zou verwijderd worden" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -505,19 +635,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/nn.po b/po/nn.po index 1da62fa0..db4de889 100644 --- a/po/nn.po +++ b/po/nn.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-09 15:50+0000\n" "Last-Translator: Willy André Bergstrøm \n" "Language-Team: Norwegian Nynorsk \n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,49 +419,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Kvar dag" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,87 +470,124 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Kan ikkje installere '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Ein naudsynt pakke vil måtte fjernast" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -478,19 +596,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/no.po b/po/no.po index 2a8259e8..b6002293 100644 --- a/po/no.po +++ b/po/no.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,286 +25,376 @@ 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:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD med Ubuntu 5.10 «Breezy Badger»" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Bidratt programvare" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Installerer oppdateringer..." #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Installerer oppdateringer..." #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 #, fuzzy msgid "Officially supported" msgstr "Offisielt støttet" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Offisielt støttet" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Updates" @@ -363,23 +454,23 @@ msgid "Debian testing" msgstr "Debian Testing" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -387,51 +478,51 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Detaljer" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Instillinger" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "Det er en ny versjon av Ubuntu tilgjengelig!" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -440,87 +531,124 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "_Installer" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -529,19 +657,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/oc.po b/po/oc.po index 7a18ca33..17b6e3d3 100644 --- a/po/oc.po +++ b/po/oc.po @@ -8,11 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-18 10:01+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" "Language-Team: Occitan (post 1500) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,271 +26,361 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Mesas a jorn de seguretat per Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Mesas a jorn de seguretat per Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Mesas a jorn de seguretat per Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Pas liure (multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM que conten Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Pilòts pas liures" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Pas liure (multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM que conten Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Mesas a jorn de seguretat importantas" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Autras mesas a jorn" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Mesas a jorn de seguretat importantas" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Mesas a jorn de seguretat per Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Mesas a jorn per Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Mesas a jorn de seguretat per Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Pas liure (multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -346,23 +437,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (en tèst)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (instable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Servidor per %s" @@ -370,48 +461,48 @@ msgstr "Servidor per %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Servidor principal" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Servidors personalizats" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalhs" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "La tièra de las modificacioons es pas disponibla" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -420,87 +511,124 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "Verificatz vòstra connection internet." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Impossible d'installar '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -509,19 +637,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/pa.po b/po/pa.po index fc645ce8..f0465e0b 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:16+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" +"Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,250 +25,330 @@ 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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -320,22 +401,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -343,49 +424,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "ਵੇਰਵਾ" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -394,86 +475,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -482,19 +600,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/pl.po b/po/pl.po index d57ebc98..19976714 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-21 12:05+0000\n" "Last-Translator: Dominik Zablotny \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,267 +25,359 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu·4.10·\"Warty·Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu·4.10·\"Warty·Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu·4.10·\"Warty·Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu·4.10·\"Warty·Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu·4.10·\"Warty·Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Pod opieką społeczeństwa" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Ograniczone oprogramowanie" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM z Ubuntu 6.10 \"Edgy Eft\"" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Oprogramowanie Open Source wspierane przez firmę Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Obsługiwane przez społeczność (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Oprogramowanie Open Source pod opieką społeczeństwa" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Sterowniki nie-wolnodostępne" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Własnościowe sterowniki dla urządzeń" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Oprogramowanie nie-wolnodostępne (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" "Oprogramowanie ograniczone prawami autorskimi lub problemami natury prawnej" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM z Ubuntu 6.06 LTS \"Dapper Drake\"" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Ważne aktualizacje bezpieczeństwa" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Aktualizacje polecane" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Aktualizacje proponowane" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Aktualizacje backportowane" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Wspierane oficjalnie" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Aktualizacje dla Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Aktualizacje dla Ubuntu 5.04 (backporty)" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu·4.10·\"Warty·Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Już nieobsługiwane" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "O ograniczonych prawach kopiowania" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Aktualizacje dla Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Aktualizacje dla Ubuntu 4.10 (backporty)" @@ -341,23 +434,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (wersja testowa)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (wersja unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Oprogramowanie niekompatybilne z DFSG." #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Serwer dla kraju %s" @@ -365,49 +458,49 @@ msgstr "Serwer dla kraju %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Serwer główny" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Inne serwery" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Pobieranie pliku %(current)li z %(total)li z prędkością %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Pobieranie pliku %(current)li z %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Szczegóły" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Ustawienia" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Lista zmian nie jest dostępna." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -416,7 +509,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -424,81 +517,118 @@ msgstr "" "Nie udało się pobrać listy zmian. \n" "Proszę sprawdzić swoje połączenie intenetowe." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Nie można zainstalować \"%s\"" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Niezbędny pakiet musiałby zostać usunięty" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -507,19 +637,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ps.po b/po/ps.po index 711ca4fe..6f63b964 100644 --- a/po/ps.po +++ b/po/ps.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Pushto \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,48 +419,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -388,86 +469,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -476,19 +594,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/pt.po b/po/pt.po index a8a52a99..2e2b21f5 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 11:04+0000\n" "Last-Translator: Tiago Silva \n" "Language-Team: Ubuntu Portuguese Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,266 +23,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Actualizações de Segurança do Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Actualizações de Segurança do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Actualizações de Segurança do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Mantido pela comunidade" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Software Restrito" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom com o Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Software de Código Aberto suportado pela Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Mantido pela comunidade (universal)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Software de Código Fonte Aberto mantido pela comunidade" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Controladores não-livres" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Drivers proprietários para dispositivos" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Software não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Software restringido por copyright ou questões legais" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom com o Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Actualizações de segurança importantes" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Actualizações recomendadas" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Actualizações propostas" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Actualizações dos repositórios \"backport\"" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom 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:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Suportado Oficialmente" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizações de Segurança do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Actualizações do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Backports do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Mantido pela comunidade (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Sem mais suporte oficial" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Direitos de autor restritos" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizações de Segurança do Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Actualizações do Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Backports do Ubuntu 4.10" @@ -338,23 +431,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Software compatível-DFSG 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 "Software compatível-DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Servidor para %s" @@ -362,48 +455,48 @@ msgstr "Servidor para %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Servidor principal" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "A descarregar ficheiro %(current)li de %(total)li a %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "A descarregar ficheiro %(current)li de %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalhes" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 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:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -412,7 +505,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -420,81 +513,118 @@ msgstr "" "Falha ao descarregar a lista de alterações. \n" "Por favor verifique a sua ligação à Internet." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Impossível de instalar '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Um pacote essencial teria que ser removido" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -503,19 +633,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index fb350b10..67e9de58 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-28 13:01-0300\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2011-05-28 13:25-0300\n" "Last-Translator: Sérgio Cipolla \n" "Language-Team: \n" @@ -25,298 +25,343 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD-ROM com o Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +#| msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +#| msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM com o Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM com o Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:506 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 +#: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" msgstr "Parceiros da Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:45 +#: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" msgstr "Aplicativos empacotados pela Canonical para os seus parceiros" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:46 +#: ../data/templates/Ubuntu.info.in:521 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 +#: ../data/templates/Ubuntu.info.in:528 msgid "Independent" msgstr "Independentes" #. CompDescription -#: ../data/templates/Ubuntu.info.in:55 +#: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" msgstr "Fornecidos por desenvolvedores de software terceiros" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:56 +#: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." msgstr "Aplicativos oferecidos por desenvolvedores terceiros." #. Description -#: ../data/templates/Ubuntu.info.in:94 +#: ../data/templates/Ubuntu.info.in:569 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description -#: ../data/templates/Ubuntu.info.in:112 +#: ../data/templates/Ubuntu.info.in:589 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 +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:173 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD-ROM com o Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:216 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:234 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD-ROM com o Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:277 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:295 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD-ROM com o Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:339 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD-ROM com o Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:402 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD-ROM com o Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:465 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:483 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD-ROM com o Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:525 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "Mantido pela comunidade" #. CompDescription -#: ../data/templates/Ubuntu.info.in:536 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Aplicativos restritos" #. Description -#: ../data/templates/Ubuntu.info.in:543 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM com o Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:585 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:588 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Aplicativo de código aberto suportado pela Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:590 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "Mantido pela comunidade (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:591 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Aplicativo de código aberto mantido pela comunidade" #. CompDescription -#: ../data/templates/Ubuntu.info.in:593 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Drivers não-livres" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:594 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Drivers proprietários para dispositivos" #. CompDescription -#: ../data/templates/Ubuntu.info.in:596 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Aplicativos restritos (multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:597 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Aplicativos restritos por copyright ou questões legais" #. Description -#: ../data/templates/Ubuntu.info.in:603 +#: ../data/templates/Ubuntu.info.in:1091 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:619 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Atualizações de segurança importantes" #. Description -#: ../data/templates/Ubuntu.info.in:624 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Atualizações recomendadas" #. Description -#: ../data/templates/Ubuntu.info.in:629 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "Atualizações de pré-lançamento" #. Description -#: ../data/templates/Ubuntu.info.in:634 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "Atualizações não suportadas" #. Description -#: ../data/templates/Ubuntu.info.in:645 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:659 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM com o Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:675 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Atualizações de segurança do Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:680 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:685 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Backports do Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:696 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:710 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM com o Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:713 -#: ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Suportados oficialmente" #. Description -#: ../data/templates/Ubuntu.info.in:726 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Atualizações de segurança do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:731 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Atualizações do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:736 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Backports do Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:742 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:748 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "Mantido pela comunidade (universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:750 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Não-livres (multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:756 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM com o Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:759 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Não mais suportado oficialmente" #. CompDescription -#: ../data/templates/Ubuntu.info.in:761 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Copyright restrito" #. Description -#: ../data/templates/Ubuntu.info.in:768 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Atualizações de segurança do Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:773 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Atualizações do Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:778 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Backports do Ubuntu 4.10" @@ -382,8 +427,7 @@ msgid "Non-DFSG-compatible Software" msgstr "Aplicativos não compatíveis com a DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:209 -#: ../aptsources/distro.py:427 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Servidor - %s" @@ -391,52 +435,48 @@ 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:227 -#: ../aptsources/distro.py:233 -#: ../aptsources/distro.py:249 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Servidor principal" -#: ../aptsources/distro.py:253 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../apt/progress/gtk2.py:260 -#: ../apt/progress/gtk2.py:316 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, 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:266 -#: ../apt/progress/gtk2.py:322 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, 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:342 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalhes" -#: ../apt/progress/gtk2.py:430 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "Iniciando..." -#: ../apt/progress/gtk2.py:436 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "Completo" -#: ../apt/package.py:358 +#: ../apt/package.py:359 #, 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:1065 -#: ../apt/package.py:1171 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "A lista de alterações não está disponível" -#: ../apt/package.py:1177 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -449,7 +489,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:1184 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -462,61 +502,75 @@ msgstr "" 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:167 +#: ../apt/debfile.py:93 +#, fuzzy, python-format +#| msgid "List of files for '%s' could not be read" +msgid "List of control files for '%s' could not be read" +msgstr "A lista de arquivos de '%s' não pôde ser lida" + +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "A dependência não é contentável: %s\n" -#: ../apt/debfile.py:188 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "Conflita com o pacote instalado '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation -#: ../apt/debfile.py:327 +#: ../apt/debfile.py:373 #, 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)" +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 +#: ../apt/debfile.py:389 #, 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)" +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 +#: ../apt/debfile.py:399 #, 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'" +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 +#: ../apt/debfile.py:447 msgid "No Architecture field in the package" msgstr "Sem campo de arquitetura no pacote" -#: ../apt/debfile.py:404 +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "Arquitetura incorreta '%s'" #. the deb is older than the installed -#: ../apt/debfile.py:411 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "Uma versão mais atual já está instalada" -#: ../apt/debfile.py:436 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "Falha na satisfação de todas as dependências (cache quebrado)" -#: ../apt/debfile.py:466 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "Incapaz de instalar '%s'" -#: ../apt/debfile.py:508 -msgid "Python-debian module not available" -msgstr "Módulo python-debian não disponível" - -#: ../apt/debfile.py:542 +#: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" @@ -524,16 +578,17 @@ msgstr "" "Descompactado automaticamente:\n" "\n" -#: ../apt/debfile.py:548 +#: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" msgstr "Convertido automaticamente para ascii imprimível:\n" -#: ../apt/debfile.py:638 +#: ../apt/debfile.py:689 #, 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:648 +#: ../apt/debfile.py:700 msgid "An essential package would be removed" msgstr "Um pacote essencial teria de ser removido" @@ -581,25 +636,25 @@ msgstr "Obtidos %sB em %s (%sB/s)\n" #: ../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 6.0.1 Disco 1'" +msgstr "" +"Por favor, forneça um nome para este disco, como 'Debian 6.0.1 Disco 1'" #: ../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:149 +#: ../apt/cache.py:157 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" +#~ msgid "Python-debian module not available" +#~ msgstr "Módulo python-debian não disponível" + +#~ 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 "--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/qu.po b/po/qu.po index 30815be8..79f0a116 100644 --- a/po/qu.po +++ b/po/qu.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-09 15:50+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Quechua \n" +"Language: qu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,48 +419,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -388,86 +469,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -476,19 +594,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ro.po b/po/ro.po index 82b3c199..be165f96 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:13+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,268 +26,360 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Actualizări de Securitate Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Actualizări de Securitate Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Actualizări de Securitate Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Software în contribuţie" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom cu Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Pachete non-libere" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Software restricţionat (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom cu Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Actualizări importante de securitate" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Actualizări recomandate" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Pachete propuse" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Actualizări portate înapoi" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Pachete suportate oficial" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Actualizări Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Pachete non-libere (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Pachete suportate oficial" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Copyright restrictiv" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizări de securitate Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Actualizări Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" @@ -343,23 +436,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Software compatibil DFSG cu dependenţe negratuite" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Software incompatibil DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server pentru %s" @@ -367,48 +460,48 @@ msgstr "Server pentru %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Server principal" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Servere preferenţiale" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detalii" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Lista schimbărilor nu este disponibilă" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -417,7 +510,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -426,81 +519,118 @@ msgstr "" "Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o " "conexiune internet activă." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Nu pot instala '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Un pachet esenţial ar trebui şters" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -509,19 +639,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ru.po b/po/ru.po index 2b17faa0..96646b9d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-18 09:11+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Обновления безопасности Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD с Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD с Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD с Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD с Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "CD с Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "CD с Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Обновления безопасности Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "CD с Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Обновления безопасности Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "CD с Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Поддерживается сообществом" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Несвободное ПО" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CDROM с Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Open Source приложения, поддерживаемые Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Поддерживается сообществом (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Поддерживаемое сообществом свободное ПО" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Несвободные драйвера" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Проприетарные драйвера устройств" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Несвободное обеспечение (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Программы, ограниченные патентами или законами" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD с Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Важные обновления безопасности" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Рекомендованые обновления" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Предлагаемые обновления" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Обновления в бэкпортах" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD с Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Обновления безопасности Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Обновления Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Официально поддерживается" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Обновления безопасности Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Обновления Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 бэкпорты" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Поддерживается сообществом (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Несвободное (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Официально больше не поддерживается" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Ограниченные авторские права" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Обновления безопасности Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Обновления Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 бэкпорты" @@ -341,23 +434,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "DFSG-совместимое ПО с зависимостями от несвободного ПО" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-совместимое ПО" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Сервер %s" @@ -365,48 +458,48 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Основной сервер" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Свои сервера" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Загрузка файла %(current)li из %(total)li со скоростью %(speed)s/с" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Загрузка файла %(current)li из %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Подробности" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Список изменений недоступен или отсутствует." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -415,7 +508,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -423,81 +516,118 @@ msgstr "" "Ошибка при загрузке списка изменений. \n" "Пожалуйста, проверьте ваше соединение с Интернет." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Невозможно установить '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -506,19 +636,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/rw.po b/po/rw.po index fcc7d589..35ea4544 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,10 +15,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:17+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" +"Language: rw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,283 +32,373 @@ 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:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "5" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "5" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Kohereza Nta gukoresha bisesuye" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Kigenga" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Kigenga" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Kwinjiza porogaramu" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Kwinjiza porogaramu" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "5" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 #, fuzzy msgid "Non-free (Multiverse)" msgstr "Kigenga" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 #, fuzzy msgid "Restricted copyright" msgstr "Uburenganzira bw'umuhimbyi" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "5" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "5" @@ -365,22 +456,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -388,51 +479,51 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "=) and the latest the version for the releation +#: ../apt/debfile.py:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -531,19 +659,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/sk.po b/po/sk.po index eeac9dda..aa612390 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:17+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,283 +25,373 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 - aktualizácie" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Softvér závislý na neslobornom softvéri" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Udržiavané komunitou (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Neslobodné (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neslobodné (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Nainštalovať _aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Nainštalovať _aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 - aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 - backporty" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Oficiálne podporované" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 - aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 - backporty" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Neslobodné (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Niektoré programy už nie sú viac oficiálne podporované" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "S obmedzujúcou licenciou" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 bezpečnostné aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 aktualizácie" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 - backporty" @@ -360,23 +451,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Softvér nekompatibilný s DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server pre %s" @@ -384,52 +475,52 @@ msgstr "Server pre %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 #, fuzzy msgid "Main server" msgstr "Najbližší server" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 #, fuzzy msgid "Custom servers" msgstr "Najbližší server" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Sťahovanie súboru %li z %li pri %s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Sťahovanie súboru %li z %li pri %s/s" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Podrobnosti" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Nastavenia" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -438,7 +529,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -447,81 +538,118 @@ msgstr "" "Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové " "pripojenie." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Nemôžem inštalovať '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Musel by byť odstránený dôležitý balík" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -530,19 +658,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/sl.po b/po/sl.po index 323cf9ac..87b7914e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: python-apt-rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-17 16:13+0100\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2010-09-01 08:08+0200\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian \n" @@ -25,299 +25,345 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Nosilec CD z Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +#| msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +#| msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Nosilec CD z Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Nosilec CD z Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:506 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "Nosilec CD z Ubuntu 10.10 'Maverick Meerkat'" #. Description -#: ../data/templates/Ubuntu.info.in:43 +#: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:45 +#: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:46 +#: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:53 +#: ../data/templates/Ubuntu.info.in:528 msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:55 +#: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:56 +#: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:94 +#: ../data/templates/Ubuntu.info.in:569 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description -#: ../data/templates/Ubuntu.info.in:112 +#: ../data/templates/Ubuntu.info.in:589 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "Nosilec CD z Ubuntu 10.04 'Lucid Lynx'" #. Description -#: ../data/templates/Ubuntu.info.in:155 +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:173 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Nosilec CD z Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:216 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:234 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Nosilec CD z Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:277 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:295 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Nosilec CD z Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:339 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Nosilec CD z Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:402 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Nosilec CD z Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:465 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:483 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Nosilec CD z Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:525 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "Paketi skupnosti" #. CompDescription -#: ../data/templates/Ubuntu.info.in:536 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Avtorsko omejena programska oprema" #. Description -#: ../data/templates/Ubuntu.info.in:543 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Nosilec CD z Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:585 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:588 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Odprtokodna programska oprema podprta s strani Canonical Ltd" #. CompDescription -#: ../data/templates/Ubuntu.info.in:590 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "Paketi skupnosti (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:591 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Programska oprema, ki jo vzdržuje odprtokodna skupnost" #. CompDescription -#: ../data/templates/Ubuntu.info.in:593 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Neprosti gonilniki" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:594 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Lastniški gonilniki za naprave" #. CompDescription -#: ../data/templates/Ubuntu.info.in:596 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Avtorsko omejena programska oprema (multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:597 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" "Programska oprema, ki je omejena z avtorskimi pravicami ali drugimi pravnimi " "vidiki" #. Description -#: ../data/templates/Ubuntu.info.in:603 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Nosilec CD z Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:619 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Pomembne varnostne posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:624 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Priporočene posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:629 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "Predhodno izdane posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:634 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "Nepodprte posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:645 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:659 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Nosilec CD z Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:675 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 varnostne posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:680 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:685 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 postarani paketi" #. Description -#: ../data/templates/Ubuntu.info.in:696 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:710 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Nosilec CD z Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:713 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Uradno podprto" #. Description -#: ../data/templates/Ubuntu.info.in:726 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 varnostne posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:731 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:736 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 postarani paketi" #. Description -#: ../data/templates/Ubuntu.info.in:742 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:748 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "Paketi skupnosti (universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:750 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Ne-prosti paketi (multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:756 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Nosilec CD z Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:759 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Brez uradne podpore" #. CompDescription -#: ../data/templates/Ubuntu.info.in:761 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Omejeno z avtorskimi pravicami" #. Description -#: ../data/templates/Ubuntu.info.in:768 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 varnostne posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:773 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 posodobitve" #. Description -#: ../data/templates/Ubuntu.info.in:778 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 postarani paketi" @@ -383,7 +429,7 @@ msgid "Non-DFSG-compatible Software" msgstr "Program ni skladen z DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:209 ../aptsources/distro.py:424 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Strežnik za %s" @@ -391,51 +437,51 @@ msgstr "Strežnik za %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:227 ../aptsources/distro.py:233 -#: ../aptsources/distro.py:249 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Glavni strežnik" -#: ../aptsources/distro.py:253 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Strežniki po meri" -#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "Prejemanje %(current)li. datoteke od skupno %(total)li s hitrostjo %(speed)s/" "s" -#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Prejemanje %(current)li. datoteke od skupno %(total)li." #. Setup some child widgets -#: ../apt/progress/gtk2.py:342 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Podrobnosti" -#: ../apt/progress/gtk2.py:430 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "Začenjanje ..." -#: ../apt/progress/gtk2.py:436 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "Končano" -#: ../apt/package.py:342 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" "Neveljaven unicode znak v opisu za '%s' (%s). Pošljite poročilo o napaki." -#: ../apt/package.py:1012 ../apt/package.py:1117 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Seznam sprememb ni na voljo" -#: ../apt/package.py:1123 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -448,7 +494,7 @@ msgstr "" "Več podrobnosti je na http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "dokler dnevnik ne bo posodobljen ali pa poskusite kasneje." -#: ../apt/package.py:1130 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -456,23 +502,29 @@ msgstr "" "Prjemanje seznama sprememb je spodletelo.\n" "Preverite internetno povezavo." -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" msgstr "Seznama datotek za '%s' ni mogoče prebrati" -#: ../apt/debfile.py:166 +#: ../apt/debfile.py:93 +#, fuzzy, python-format +#| msgid "List of files for '%s' could not be read" +msgid "List of control files for '%s' could not be read" +msgstr "Seznama datotek za '%s' ni mogoče prebrati" + +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "Odvisnost ni razrešena: %s\n" -#: ../apt/debfile.py:187 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "Spor z nameščenim paketom '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation -#: ../apt/debfile.py:326 +#: ../apt/debfile.py:373 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -482,7 +534,7 @@ msgstr "" "(%(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:342 +#: ../apt/debfile.py:389 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " @@ -491,7 +543,7 @@ msgstr "" "Pokvari spor obstoječega paketa '%(pkgname)s': %(targetpkg)s (%(comptype)s " "%(targetver)s)" -#: ../apt/debfile.py:352 +#: ../apt/debfile.py:399 #, python-format msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " @@ -500,34 +552,30 @@ msgstr "" "Pokvari obstoječi paket '%(pkgname)s', ki je v sporu z: '%(targetpkg)s'. " "Toda '%(debfile)s' ga zagotavlja preko: '%(provides)s'" -#: ../apt/debfile.py:398 +#: ../apt/debfile.py:447 msgid "No Architecture field in the package" msgstr "Ni polja določila arhitekture sistema v paketu" -#: ../apt/debfile.py:403 +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "Napačna arhitektura '%s'" #. the deb is older than the installed -#: ../apt/debfile.py:410 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "Novejša različica je že nameščena." -#: ../apt/debfile.py:435 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "Ni mogoče razrešiti vseh odvisnosti (napaka v predpomnilniku)" -#: ../apt/debfile.py:465 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "Ni mogoče namestiti '%s'" -#: ../apt/debfile.py:507 -msgid "Python-debian module not available" -msgstr "Modul Python-debian ni na voljo" - -#: ../apt/debfile.py:539 +#: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" @@ -535,47 +583,47 @@ msgstr "" "Samodejno razširjeno:\n" "\n" -#: ../apt/debfile.py:545 +#: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" msgstr "Samodejno pretvorjeno v zapis ascii:\n" -#: ../apt/debfile.py:635 +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" "Namestiti je treba pakete za izgradnjo iz izvorne kode '%s' s katerimi je " "mogoče izgraditi %s\n" -#: ../apt/debfile.py:645 +#: ../apt/debfile.py:700 msgid "An essential package would be removed" msgstr "Z dejanjem bi bil odstranjen sistemski paket" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "%c%s... Končano." -#: ../apt/progress/text.py:120 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "Zad " -#: ../apt/progress/text.py:129 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "Prz " -#: ../apt/progress/text.py:131 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "Nap " -#: ../apt/progress/text.py:142 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "Pridobi:" -#: ../apt/progress/text.py:202 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr " [V delovanju]" -#: ../apt/progress/text.py:213 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -587,19 +635,22 @@ msgstr "" "v enoto '%s' in pritisnite vnosno tipko\n" #. Trick for getting a translation from apt -#: ../apt/progress/text.py:222 +#: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Pridobljenih %sB v %s (%sB/s)\n" -#: ../apt/progress/text.py:238 +#: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "Poimenujte disk, na primer 'Debian 2.1r1 Disk 1'" -#: ../apt/progress/text.py:254 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "Vstavite disk v pogon in pritisnite vnosno tipko" -#: ../apt/cache.py:135 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "Izgradnja podatkovnega drevesa" + +#~ msgid "Python-debian module not available" +#~ msgstr "Modul Python-debian ni na voljo" diff --git a/po/sq.po b/po/sq.po index 031f5955..2753a123 100644 --- a/po/sq.po +++ b/po/sq.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-09 15:50+0000\n" "Last-Translator: Alejdin Tirolli \n" "Language-Team: Albanian \n" +"Language: sq\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,248 +25,328 @@ 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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "%s përmirësimet" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -317,22 +398,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Serveri për %s" @@ -340,51 +421,51 @@ msgstr "Serveri për %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 #, fuzzy msgid "Main server" msgstr "Serveri më i afërt" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 #, fuzzy msgid "Custom servers" msgstr "Serveri më i afërt" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Përditë" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -393,87 +474,124 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "'%s' nuk mund të instalohet" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Një paketë themelore u deshtë të largohej" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -482,19 +600,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/sr.po b/po/sr.po index c99341a4..74172777 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:17+0000\n" "Last-Translator: Nikola Nenadic \n" "Language-Team: Serbian \n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -25,247 +26,351 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Оптички диск са Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +#| msgid "Ubuntu 9.10 'Karmic Koala'" +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 9.10 'Karmic Koala'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Оптички диск са Ubuntu 9.10 'Karmic Koala'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Оптички диск са Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +#| msgid "Ubuntu 9.10 'Karmic Koala'" +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 9.10 'Karmic Koala'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Оптички диск са Ubuntu 9.10 'Karmic Koala'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +#| msgid "Ubuntu 8.04 'Hardy Heron'" +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 8.04 'Hardy Heron'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Оптички диск са Ubuntu 8.04 'Hardy Heron'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Оптички диск са Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 9.04 'Jaunty Jackalope" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Оптички диск са Ubuntu 9.04 'Jaunty Jackalope" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Оптички диск са Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Оптички диск са Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Оптички диск са Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Оптички диск са Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "Одржаван од стране заједнице" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Ограничени софтвер" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Оптички диск са Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Canonical-подржава софтвер отвореног кода" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "Одржаван од стране заједнице" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Заједница урећује софтвер отвореног кода" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Не слободни драјвери" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Власнички драјвери за уређаје" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Ограничени софтвер" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Софтвер ограничен ауторским правом или правним регулативама" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Оптички диск са Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Важне сигурносне исправке" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Препоручено ажурирање" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "Унапријед објављене исправке" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "Некомпитабилна ажурирања" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Оптички диск са Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 сигурносне исправке" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 исправке" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Оптички диск са Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Званично подржани" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Исправке" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "Одржаван од стране заједнице" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Не слободни драјвери" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Оптички диск са Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Званично није више подржано" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Ограничена права" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 сигурносне исправке" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Исправке" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" @@ -277,12 +382,16 @@ 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'" +#, fuzzy +#| msgid "Debian 6.0 'Squeeze'" +msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze'" #. Description #: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny'" +#, fuzzy +#| msgid "Debian 5.0 'Lenny'" +msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny'" #. Description @@ -316,22 +425,22 @@ msgid "Debian testing" msgstr "Дебиан-тестирање" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (нестабилно)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-компитабилан са не слободним софтвером" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Непостоји-DFSG компитабилног софтвера" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Сервер за %s" @@ -339,48 +448,48 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Главни сервер" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Прилагођени сервер" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Преужимам фајл %(current)li од %(total)li са %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Преужимам фајл %(current)li од %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Детаљи" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "Покретање..." -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "Крај" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "Неважећи unicode у опису за '%s' (%s). Молим извјештај" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Листа промјена није доступна" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -392,8 +501,7 @@ msgstr "" "Молимо искористите http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "док промјене не постану доступне или покушајте поново касније." - -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -401,103 +509,144 @@ msgstr "" "Преузиманје листе промјена неуспјешно. \n" "Молимо провјерите своју конекцију са интернетом." -#: ../apt/debfile.py:56 -#, python-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Ово није валидна DEB архива, недостаје '% с' члан" - -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" msgstr "Листа фајлова за '%s' не може да се прочита" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:93 +#, fuzzy, python-format +#| msgid "List of files for '%s' could not be read" +msgid "List of control files for '%s' could not be read" +msgstr "Листа фајлова за '%s' не може да се прочита" + +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "Зависнот није задовољена: %s\n" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "Сукоби међу инсталираним пакетима" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "Погрешна архитектура '%s'" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "Новија верзија је већ инсталирана" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "Није успео да задовољи све зависности (грешка у кешу)" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Не могу да се инсталирају %s" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "Инсталирајте Build-Dependencies за кодни пакет '%s' који гради %s\n" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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 "%c%s... Крај" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "Погодак" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "Игнорисано" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "Грешка" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "УзимамЧ" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "[Радим]" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Молимо вас да убаците означени диск\n " -"у оптички диск '%s' и притиснете enter\n" +"Молимо вас да убаците означени диск\n" +" у оптички диск '%s' и притиснете 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 "Преузето %sB in %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 "Молимо обезбједите име за диск, као нпр. 'Debian 2.1r1 Disk 1'" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "Молимо Вас да убаците диск у оптички уређај и притиснете enter" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "Изградња структуре података" + +#~ msgid "This is not a valid DEB archive, missing '%s' member" +#~ msgstr "Ово није валидна DEB архива, недостаје '% с' члан" diff --git a/po/sv.po b/po/sv.po index 5926f2b4..fcfcbc56 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 05:06+0000\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Säkerhetsuppdateringar för Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Säkerhetsuppdateringar för Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Säkerhetsuppdateringar för Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Gemenskapsunderhållen" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Inskränkt programvara" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\"" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Öppen källkodsprogramvara som stöds av Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Gemenskapsunderhållen (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Öppen källkodsprogramvara underhållen av gemenskapen" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Ickefria drivrutiner" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Properitära drivrutiner för enheter" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Inskränkt programvara (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Programvara begränsad av upphovsrätt eller juridiska avtal" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cd-rom med Ubuntu 6.06 LTS \"Dapper Drake\"" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Viktiga säkerhetsuppdateringar" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Rekommenderade uppdateringar" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Föreslagna uppdateringar" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Bakåtporterade uppdateringar" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Bakåtportar" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Stöds officiellt" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Säkerhetsuppdateringar för Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Uppdateringar för Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Bakåtporteringar för Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Ickefri (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Stöds inte längre officiellt" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Begränsad upphovsrätt" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Säkerhetsuppdateringar för Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Uppdateringar för Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Bakåtporteringar för Ubuntu 4.10" @@ -341,23 +434,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "DFSG-kompatibel programvara med icke-fria beroenden" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Icke-DFSG-kompatibel programvara" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Server för %s" @@ -365,50 +458,50 @@ msgstr "Server för %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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Huvudserver" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Anpassade servrar" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Hämtar fil %(current)li av %(total)li med %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Hämtar fil %(current)li av %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Detaljer" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Söker..." -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 #, fuzzy msgid "Complete" msgstr "Komponenter" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Listan över ändringar finns inte tillgänglig" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -417,7 +510,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -425,81 +518,118 @@ msgstr "" "Misslyckades med att hämta listan över ändringar. \n" "Kontrollera din Internetanslutning." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, fuzzy, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "Beroendeupplösning misslyckades" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Kan inte installera \"%s\"" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Ett grundläggande paket skulle behöva tas bort" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -508,19 +638,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ta.po b/po/ta.po index 2189ffdc..8dcac56a 100644 --- a/po/ta.po +++ b/po/ta.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:06+0000\n" "Last-Translator: Raghavan \n" "Language-Team: Tamil \n" +"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,49 +419,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "தினமும்" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,86 +470,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "'%s' நிறுவமுடியவில்லை" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -477,19 +595,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/th.po b/po/th.po index 8070774e..90f509d2 100644 --- a/po/th.po +++ b/po/th.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:17+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,266 +24,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "อูบันตู 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "อูบันตู 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "อูบันตู 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "อูบันตู 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "อูบันตู 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "อูบันตู 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "อูบันตู 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "อูบันตู 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "อูบันตู 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "ชุมชนดูแล" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "ซอฟต์แวร์จำกัดการใช้งาน" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "ซีดีรอมที่มีอูบันตู 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "อูบันตู 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "ซอฟต์แบบเปิดเผยสนับสนุนโดย Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "ชุมชนดูแล ซอฟต์แวร์แบบเปิดเผย" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "ไดรเวอร์ที่ไม่ฟรี" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "ซอฟต์แวร์จำกัดการใช้งาน(Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "ซอฟต์แวร์นี้มีลิขสิทธ์หรือข้อกฏหมายจำกัดอยู่" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "ซีดีรอมที่มีอูบันตู 6.06 LST 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "ปรับปรุงด้านความปลอดภัยที่สำคัญ" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "การปรับปรุงที่แนะนำให้ทำ" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "การปรับปรุงที่เสนอให้ทำ" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "การปรับปรุงแบบย้อนหลัง" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "อูบันตู 5.10 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "อูบันตู 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "สนับสนุนอย่างเป็นทางการ" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "อูบันตู 5.04 ปรับปรุง" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "อูบันตู 5.04 พอร์ตย้อนหลัง" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "อูบันตู 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "ไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "จำกัดลิขสิทธิ์" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "อูบันตู 4.10 ปรับปรุงด้านความปลอดภัย" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "อูบันตู 4.10 ปรับปรุง" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "อูบันตู 4.10 พอร์ตย้อนหลัง" @@ -339,23 +432,23 @@ msgid "Debian testing" msgstr "เดเบียน \"Etch\" (กำลังทดสอบ)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "เดเบียน \"Sid\" (ผันผวน)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอยู่กับไม่ฟรี" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "เซิร์ฟเวอร์สำหรับประเทศ %s" @@ -363,49 +456,49 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "เซิร์ฟเวอร์หลัก" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "เซิร์ฟเวอร์ที่กำหนดเอาเอง" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li ด้วยความเร็ว %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "รายละเอียด" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -414,7 +507,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -422,81 +515,118 @@ msgstr "" "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง \n" "กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "ไม่สามารถติดตั้ง '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -505,19 +635,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/tl.po b/po/tl.po index 7ba4939b..8d2dddca 100644 --- a/po/tl.po +++ b/po/tl.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-09-16 15:44+0000\n" "Last-Translator: Ariel S. Betan \n" "Language-Team: Tagalog \n" +"Language: tl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,253 +25,334 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Inaalagaan ng kumunidad (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" -msgstr "" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +msgid "Canonical-supported free and open-source software" +msgstr "Inaalagaan ng kumunidad (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Inaalagaan ng kumunidad (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Inaalagaan ng kumunidad (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Release Notes" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Mga updates mula sa Internet" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Opisyal na sinusuportahan" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Inaalagaan ng kumunidad (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Di-malaya (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Mahigpit na copyright" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -327,23 +409,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (testing)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy 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 "Software na DFSG-compatible na may Di-Malayang mga Dependensiya" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "Software na Di-DFSG-compatible" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -351,48 +433,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Mga Detalye" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -401,88 +483,125 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "Mangyaring suriin ang inyong internet connection" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Hindi ma-install '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Isang esensiyal na pakete ang kailangang tanggalin" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -491,19 +610,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/tr.po b/po/tr.po index d3abf69a..b82b8b67 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-21 20:58+0000\n" "Last-Translator: Atilla Karaman \n" "Language-Team: Turkish \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,266 +25,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Topluluk tarafından bakılan" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Kısıtlı yazılımlar" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 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:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Canonical Açık Kaynak yazılımı destekledi" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Topluluk tarafından bakılan (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Topluluk tarafından bakılan Açık Kaynak Kodlu yazılımlar" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "Özgür olmayan sürücüler" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "Aygıtlar için kapalı kaynak sürücüler" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "Kısıtlı yazılımlar (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "Yazılım telif haklarıyla veya yasal sorunlar sebebiyle kısıtlanmıştır" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "Önemli güvenlik güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "Önerilen güncellemeler" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Teklif edilmiş güncellemeler" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Geritaşınmış (backported) güncellemeler" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Geritaşınmış Yazılımlar (Backports)" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Resmi olarak desteklenenler" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Geritaşınmış Yazılımlar (Backports)" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Topluluk tarafından bakılan (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Özgür olmayan (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "Artık resmi olarak desteklenmiyor" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Sınırlı telif hakkı" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Güncelleştirmeleri" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Geritaşınmış Yazılımlar (Backports)" @@ -340,23 +433,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (test)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (kararsız)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Özgür Olmayan Bağımlılığı Bulunan DFSG Uyumlu Yazılım" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "DFSG Uyumlu Olmayan Yazılım" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "%s sunucusu" @@ -364,48 +457,48 @@ msgstr "%s sunucusu" #. 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:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "Ana sunucu" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "Özel sunucular" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Ayrıntılar" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Değişiklikler listesi erişilebilir değil" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -414,7 +507,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -422,81 +515,118 @@ msgstr "" "Değişiklik listesini indirme başarısız oldu. \n" "Lütfen İnternet bağlantınızı kontrol edin." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "'%s' yüklenemiyor" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Gerekli bir paketin kaldırılması gerekmekte" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -505,19 +635,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/uk.po b/po/uk.po index aebb5d88..7abe872f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,15 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: uk(5)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:15+0000\n" "Last-Translator: Vadim Abramchuck \n" "Language-Team: Ukrainian \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.2\n" #. ChangelogURI @@ -25,252 +26,333 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" -msgstr "" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +msgid "Canonical-supported free and open-source software" +msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Підтримується спільнотою (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Оновлення через Інтернет" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Офіційно підтримуються" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Не-вільний (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Обмежені авторські права" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -327,23 +409,23 @@ msgid "Debian testing" msgstr "Debian \"Etch\" (тестовий)" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (нестабільний)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -351,48 +433,48 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Завантажується файл %li of %li at %s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Завантажується файл %li of %li at %s/s" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "Деталі" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -401,7 +483,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -409,81 +491,118 @@ msgid "" msgstr "" "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Не можливо встановити '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Це призведе до видалення !essential! пакунку системи" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -492,19 +611,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/ur.po b/po/ur.po index 5dc339e8..cbde9c04 100644 --- a/po/ur.po +++ b/po/ur.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,247 +25,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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -315,22 +396,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -338,49 +419,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "روز" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -389,86 +470,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -477,19 +595,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/vi.po b/po/vi.po index ed7892cd..eb7e19ce 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:17+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,286 +24,376 @@ 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:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Bản cập nhật Ubuntu 5.10" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 #, fuzzy msgid "Restricted software" msgstr "Phần mềm đã đóng góp" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 #, fuzzy msgid "Non-free drivers" msgstr "Không tự do (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Không tự do (Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Đang cài đặt bản cập nhật..." #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Đang cài đặt bản cập nhật..." #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 #, fuzzy msgid "Officially supported" msgstr "Được hỗ trợ một cách chính thức" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "Không tự do (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 #, fuzzy msgid "No longer officially supported" msgstr "Được hỗ trợ một cách chính thức" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Bản quyền bị giới hạn" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Bản cập nhật Ubuntu 4.10" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" @@ -362,23 +453,23 @@ msgid "Debian testing" msgstr "Thử ra Debian" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Không Mỹ Debian (Bất định)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -386,51 +477,51 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 #, fuzzy msgid "Details" msgstr "Chi tiết" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 #, fuzzy msgid "Starting..." msgstr "Thiết lập" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "Có một bản phát hành Ubuntu mới công bố." -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -439,7 +530,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" @@ -448,81 +539,118 @@ msgstr "" "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động " "chưa." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "Không thể cài đặt '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "Một gói quan trọng cần phải bị gỡ bỏ" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -531,19 +659,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/xh.po b/po/xh.po index bdf2a903..9ce4355b 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-05 20:45+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" +"Language: xh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,250 +25,330 @@ 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:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 #, fuzzy msgid "Important security updates" msgstr "Bonisa izihlaziyo" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "Bonisa izihlaziyo" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "Bonisa izihlaziyo" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -320,22 +401,22 @@ msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -343,49 +424,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "Kukho i-%i yohlaziyo ekhoyo" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -394,86 +475,123 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -482,19 +600,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index f7bb9fec..ae4d0132 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-04 09:06+0000\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2009-09-06 03:14+0000\n" "Last-Translator: Feng Chao \n" "Language-Team: zh_CN \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,217 +24,361 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:8 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +#| msgid "Ubuntu 7.04 'Feisty Fawn'" +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 7.04‘(Feisty Fawn)’" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "已插入 Ubuntu 7.04 'Feisty Fawn' 光盘的光驱" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +#| msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 6.10 'Edgy Eft' 光盘" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'光盘" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'光盘" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +#| msgid "Ubuntu 8.04 'Hardy Heron'" +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 8.04‘Hardy Heron’" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "已插入 Ubuntu 8.04 'Hardy Heron' 光盘的光驱" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 9.10 'Karmic Koala'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:652 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgstr "Ubuntu 4.10 'Warty Warthog'光盘" + +#. Description +#: ../data/templates/Ubuntu.info.in:695 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 9.04 'Jaunty Jackalope'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:714 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" +msgstr "Ubuntu 4.10 'Warty Warthog'光盘" + +#. Description +#: ../data/templates/Ubuntu.info.in:757 +#, fuzzy +#| msgid "Ubuntu 8.04 'Hardy Heron'" +msgid "Ubuntu 8.10 'Intrepid Ibex'" +msgstr "Ubuntu 8.04‘Hardy Heron’" + +#. Description +#: ../data/templates/Ubuntu.info.in:777 +#, fuzzy +#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" +msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" +msgstr "已插入 Ubuntu 8.04 'Hardy Heron' 光盘的光驱" + +#. Description +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04‘Hardy Heron’" #. Description -#: ../data/templates/Ubuntu.info.in:25 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "已插入 Ubuntu 8.04 'Hardy Heron' 光盘的光驱" #. Description -#: ../data/templates/Ubuntu.info.in:60 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10‘Gutsy Gibbon’" #. Description -#: ../data/templates/Ubuntu.info.in:77 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10‘Gutsy Gibbon’光盘" #. Description -#: ../data/templates/Ubuntu.info.in:112 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04‘(Feisty Fawn)’" #. Description -#: ../data/templates/Ubuntu.info.in:129 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "已插入 Ubuntu 7.04 'Feisty Fawn' 光盘的光驱" #. Description -#: ../data/templates/Ubuntu.info.in:163 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:168 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "社区维护" #. CompDescription -#: ../data/templates/Ubuntu.info.in:174 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "受限软件" #. Description -#: ../data/templates/Ubuntu.info.in:180 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft' 光盘" #. Description -#: ../data/templates/Ubuntu.info.in:214 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:217 -msgid "Canonical-supported Open Source software" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +#| msgid "Canonical-supported Open Source software" +msgid "Canonical-supported free and open-source software" msgstr "Canonical 支持的开源软件" #. CompDescription -#: ../data/templates/Ubuntu.info.in:219 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "社区维护 (universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:220 -msgid "Community-maintained Open Source software" +#: ../data/templates/Ubuntu.info.in:1078 +#, fuzzy +#| msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "社区维护的开源软件" #. CompDescription -#: ../data/templates/Ubuntu.info.in:222 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "非开源或私有驱动" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "设备的专有驱动" #. CompDescription -#: ../data/templates/Ubuntu.info.in:225 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "受限软件(Multiverse)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:226 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "有版权和合法性问题的的软件" #. Description -#: ../data/templates/Ubuntu.info.in:231 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake' 光盘" #. Description -#: ../data/templates/Ubuntu.info.in:243 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "重要安全更新" #. Description -#: ../data/templates/Ubuntu.info.in:248 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "推荐更新" #. Description -#: ../data/templates/Ubuntu.info.in:253 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "提前释放出的更新" #. Description -#: ../data/templates/Ubuntu.info.in:258 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "不支持的更新" #. Description -#: ../data/templates/Ubuntu.info.in:265 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:278 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger' 光盘" #. Description -#: ../data/templates/Ubuntu.info.in:290 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全更新" #. Description -#: ../data/templates/Ubuntu.info.in:295 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/templates/Ubuntu.info.in:300 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 移植" #. Description -#: ../data/templates/Ubuntu.info.in:307 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:320 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'光盘" #. CompDescription -#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "官方支持" #. Description -#: ../data/templates/Ubuntu.info.in:332 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 安全更新" #. Description -#: ../data/templates/Ubuntu.info.in:337 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/templates/Ubuntu.info.in:342 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" #. Description -#: ../data/templates/Ubuntu.info.in:348 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:354 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "社区维护 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:356 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "非自由" #. Description -#: ../data/templates/Ubuntu.info.in:361 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'光盘" #. CompDescription -#: ../data/templates/Ubuntu.info.in:364 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "官方不再支持" #. CompDescription -#: ../data/templates/Ubuntu.info.in:366 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "版权受限" #. Description -#: ../data/templates/Ubuntu.info.in:373 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 安全更新" #. Description -#: ../data/templates/Ubuntu.info.in:378 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 更新" #. Description -#: ../data/templates/Ubuntu.info.in:383 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" @@ -245,53 +390,66 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 -msgid "Debian 4.0 'Etch' " -msgstr "" +#, fuzzy +msgid "Debian 6.0 'Squeeze' " +msgstr "Debian 3.1 \"Sarge\"" + +#. Description +#: ../data/templates/Debian.info.in:33 +#, fuzzy +msgid "Debian 5.0 'Lenny' " +msgstr "Debian 3.1 \"Sarge\"" #. Description -#: ../data/templates/Debian.info.in:31 +#: ../data/templates/Debian.info.in:58 +#, fuzzy +msgid "Debian 4.0 'Etch'" +msgstr "Debian 3.1 \"Sarge\"" + +#. Description +#: ../data/templates/Debian.info.in:83 #, fuzzy msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 \"Sarge\"" #. Description -#: ../data/templates/Debian.info.in:42 +#: ../data/templates/Debian.info.in:94 msgid "Proposed updates" msgstr "建议更新" #. Description -#: ../data/templates/Debian.info.in:47 +#: ../data/templates/Debian.info.in:101 msgid "Security updates" msgstr "安全更新" #. Description -#: ../data/templates/Debian.info.in:54 +#: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" msgstr "当前稳定的 Debian 发布" #. Description -#: ../data/templates/Debian.info.in:67 +#: ../data/templates/Debian.info.in:121 msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:92 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (非稳定)" #. CompDescription -#: ../data/templates/Debian.info.in:96 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "带有非自由依赖关系的DFSG兼容软件" #. CompDescription -#: ../data/templates/Debian.info.in:98 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "非DFSG兼容软件" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:194 ../aptsources/distro.py:401 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "%s 的服务器" @@ -299,12 +457,194 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:213 ../aptsources/distro.py:218 -#: ../aptsources/distro.py:232 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "主服务器" -#: ../aptsources/distro.py:235 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "自定义服务器" +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 +#, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" +msgstr "" + +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 +#, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "" + +#. Setup some child widgets +#: ../apt/progress/gtk2.py:340 +msgid "Details" +msgstr "" + +#: ../apt/progress/gtk2.py:428 +msgid "Starting..." +msgstr "" + +#: ../apt/progress/gtk2.py:434 +msgid "Complete" +msgstr "" + +#: ../apt/package.py:359 +#, python-format +msgid "Invalid unicode in description for '%s' (%s). Please report." +msgstr "" + +#: ../apt/package.py:1088 ../apt/package.py:1194 +msgid "The list of changes is not available" +msgstr "" + +#: ../apt/package.py:1200 +#, python-format +msgid "" +"The list of changes is not available yet.\n" +"\n" +"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"until the changes become available or try again later." +msgstr "" + +#: ../apt/package.py:1207 +msgid "" +"Failed to download the list of changes. \n" +"Please check your Internet connection." +msgstr "" + +#: ../apt/debfile.py:82 +#, python-format +msgid "List of files for '%s' could not be read" +msgstr "" + +#: ../apt/debfile.py:93 +#, python-format +msgid "List of control files for '%s' could not be read" +msgstr "" + +#: ../apt/debfile.py:211 +#, python-format +msgid "Dependency is not satisfiable: %s\n" +msgstr "" + +#: ../apt/debfile.py:232 +#, 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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 +#, python-format +msgid "Wrong architecture '%s'" +msgstr "" + +#. the deb is older than the installed +#: ../apt/debfile.py:464 +msgid "A later version is already installed" +msgstr "" + +#: ../apt/debfile.py:489 +msgid "Failed to satisfy all dependencies (broken cache)" +msgstr "" + +#: ../apt/debfile.py:519 +#, python-format +msgid "Cannot install '%s'" +msgstr "" + +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 +#, python-format +msgid "Install Build-Dependencies for source package '%s' that builds %s\n" +msgstr "" + +#: ../apt/debfile.py:700 +msgid "An essential package would be removed" +msgstr "" + +#: ../apt/progress/text.py:82 +#, python-format +msgid "%c%s... Done" +msgstr "" + +#: ../apt/progress/text.py:122 +msgid "Hit " +msgstr "" + +#: ../apt/progress/text.py:131 +msgid "Ign " +msgstr "" + +#: ../apt/progress/text.py:133 +msgid "Err " +msgstr "" + +#: ../apt/progress/text.py:144 +msgid "Get:" +msgstr "" + +#: ../apt/progress/text.py:203 +msgid " [Working]" +msgstr "" + +#: ../apt/progress/text.py:214 +#, python-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" + +#. Trick for getting a translation from apt +#: ../apt/progress/text.py:223 +#, python-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "" + +#: ../apt/progress/text.py:239 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: ../apt/progress/text.py:255 +msgid "Please insert a Disc in the drive and press enter" +msgstr "" + +#: ../apt/cache.py:157 +msgid "Building data structures" +msgstr "" diff --git a/po/zh_HK.po b/po/zh_HK.po index 1b5891ec..ed9cad2b 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:15+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (Hong Kong) \n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,253 +23,334 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" -msgstr "" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +msgid "Canonical-supported free and open-source software" +msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "協力維護軟件 (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "發行通告" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "網絡更新" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "正式支援" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "非自由軟件 (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "版權受限" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -325,23 +407,23 @@ msgid "Debian testing" msgstr "Debian 「Etch」（測試版）" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian 「Sid」（不穩定版）" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "符合 DFSG 的軟件，但依賴於非自由軟件" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "和 DFSG 不相容的軟件" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" @@ -349,49 +431,49 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "正在下載檔案 %li/%li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "詳細資料" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "修改紀錄不存在，請稍後再試。" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -400,88 +482,125 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "無法安裝「%s」" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy msgid "An essential package would be removed" msgstr "準備移除 %s 個套件。" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -490,19 +609,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index b71f291b..c937de60 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2,10 +2,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" "PO-Revision-Date: 2006-10-16 04:15+0000\n" "Last-Translator: SOC Ho \n" "Language-Team: Chinese (Taiwan) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,265 +19,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:151 +#, fuzzy +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.04安全性更新" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +#, fuzzy +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 5.10 'Breezy Badger'的光碟" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +#, fuzzy +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +#, fuzzy +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +#, fuzzy +#| msgid "Ubuntu 4.10 'Warty Warthog'" +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +#, fuzzy +#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +#, fuzzy +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +#, fuzzy +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +#, fuzzy +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +#, fuzzy +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 #, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:695 #, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:757 #, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:821 #, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:886 #, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.04安全性更新" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 5.10 'Breezy Badger'的光碟" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.04安全性更新" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 5.10 'Breezy Badger'的光碟" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:1016 #, fuzzy msgid "Community-maintained" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'的光碟" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" -msgstr "" +#: ../data/templates/Ubuntu.info.in:1075 +#, fuzzy +msgid "Canonical-supported free and open-source software" +msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:1077 #, fuzzy msgid "Community-maintained (universe)" msgstr "協力維護軟體 (Universe)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -msgid "Community-maintained Open Source software" +msgid "Community-maintained free and open-source software" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "含Ubuntu 6.06 LTS 'Dapper Drake'之光碟" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "重要的安全更新" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" msgstr "建議的安全更新" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" msgstr "建議的安全更新" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" msgstr "重要的安全更新" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'的光碟" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10安全性更新" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10更新" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "官方支援" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04安全性更新" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04更新" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:1238 #, fuzzy msgid "Community-maintained (Universe)" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "非自由軟體 (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "版權受限制" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10安全性更新" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10更新" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -333,23 +427,23 @@ msgid "Debian testing" msgstr "Debian “Etch”（測試版）" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian “Sid”（不穩定版）" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" msgstr "不符合 DFSG 的軟體" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "位於%s的伺服器" @@ -357,49 +451,49 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "主要伺服器" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "個人伺服器" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "正在下載檔案 %li/%li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "詳細資料" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" -#: ../apt/package.py:301 +#: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1088 ../apt/package.py:1194 #, fuzzy msgid "The list of changes is not available" msgstr "修改紀錄不存在，請稍後再試。" -#: ../apt/package.py:1047 +#: ../apt/package.py:1200 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -408,88 +502,125 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1053 +#: ../apt/package.py:1207 #, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "無法下載更動列表。請檢查網路連線是否正常。" -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:93 #, python-format -msgid "List of files for '%s'could not be read" +msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:149 +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../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:373 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +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 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:399 +#, 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 +msgid "No Architecture field in the package" +msgstr "" + +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:376 +#: ../apt/debfile.py:519 #, fuzzy, python-format msgid "Cannot install '%s'" msgstr "無法安裝‘%s’" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "" + +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:700 #, fuzzy 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:118 +#: ../apt/progress/text.py:122 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " msgstr "" -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -498,19 +629,19 @@ msgid "" msgstr "" #. 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 "" -#: ../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 "" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:96 +#: ../apt/cache.py:157 msgid "Building data structures" msgstr "" -- cgit v1.2.3 From b0c180e4ab5ccb57c92b924cdb45869b4a773532 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:21:21 -0400 Subject: * po/fr.po: French translation updated (closes: #567765) --- debian/changelog | 1 + po/fr.po | 217 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 112 insertions(+), 106 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8cc9776f..b525007a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file + * po/fr.po: French translation updated (closes: #567765) -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/po/fr.po b/po/fr.po index e750f209..f0598662 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,22 +1,27 @@ # french translation of python-apt # Copyright (C) 2007 Hugues NAULET +# Copyright (C) 2005, 2007-2010, 2012 Debian French l10n team # This file is distributed under the same license as the python-apt package. -# Jean Privat , 2005. -# Vincent Carriere , 2005 # +# Jean Privat , 2005. +# Vincent Carriere , 2005. +# Hugues NAULET , 2007-2009. +# Bruno Travouillon , 2010. +# David Prévot , 2012. msgid "" msgstr "" -"Project-Id-Version: python-apt 0.7.2\n" +"Project-Id-Version: python-apt 0.7.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2007-06-25 12:12+0100\n" -"Last-Translator: Hugues NAULET \n" +"PO-Revision-Date: 2012-01-12 18:20-0400\n" +"Last-Translator: David Prévot \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" +"X-Generator: Lokalize 1.2\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -26,168 +31,148 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy -#| msgid "Ubuntu 7.04 'Feisty Fawn'" msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 7.04 « Feisty Fawn »" +msgstr "Ubuntu 12.04 « Precise Pangolin »" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy -#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "CD-ROM contenant Ubuntu 7.04 « Feisty Fawn »" +msgstr "CD contenant Ubuntu 12.04 « Precise Pangolin »" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy -#| msgid "Ubuntu 9.10 'Karmic Koala'" msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 9.10 « Karmic Koala »" +msgstr "Ubuntu 11.10 « Oneiric Ocelot »" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy -#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "CD-ROM contenant Ubuntu 9.10 « Karmic Koala »" +msgstr "CD contenant Ubuntu 11.10 « Oneiric Ocelot »" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 « Warty Warthog »" +msgstr "Ubuntu 11.04 « Natty Narwhal »" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "CD-ROM contenant Ubuntu 4.10 « Warty Warthog »" +msgstr "CD contenant Ubuntu 11.04 « Natty Narwhal »" #. Description #: ../data/templates/Ubuntu.info.in:486 -#, fuzzy -#| msgid "Ubuntu 9.10 'Karmic Koala'" msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 9.10 « Karmic Koala »" +msgstr "Ubuntu 10.10 « Maverick Meerkat »" #. Description #: ../data/templates/Ubuntu.info.in:506 -#, fuzzy -#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "CD-ROM contenant Ubuntu 9.10 « Karmic Koala »" +msgstr "CD contenant Ubuntu 10.10 « Maverick Meerkat »" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Partenaires de Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Logiciel empaqueté par Canonical pour ses partenaires" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Ce logiciel ne fait pas partie d'Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Indépendant" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Fourni par des développeurs de logiciel tiers" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Logiciel offert par des développeurs de logiciel tiers." #. Description #: ../data/templates/Ubuntu.info.in:569 -#, fuzzy -#| msgid "Ubuntu 8.04 'Hardy Heron'" msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 8.04 « Hardy Heron »" +msgstr "Ubuntu 10.04 « Lucid Lynx »" #. Description #: ../data/templates/Ubuntu.info.in:589 -#, fuzzy -#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "CD-ROM contenant Ubuntu 8.04 « Hardy Heron »" +msgstr "CD contenant Ubuntu 10.04 « Lucid Lynx »" #. Description #: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "Ubuntu 9.10 « Karmic Koala »" +msgstr "Ubuntu 9.10 « Karmic Koala »" #. Description #: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "CD-ROM contenant Ubuntu 9.10 « Karmic Koala »" +msgstr "CD contenant Ubuntu 9.10 « Karmic Koala »" #. Description #: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Ubuntu 9.04 « Jaunty Jackalope »" +msgstr "Ubuntu 9.04 « Jaunty Jackalope »" #. Description #: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "CD-ROM contenant Ubuntu 9.04 « Jaunty Jackalope »" +msgstr "CD contenant Ubuntu 9.04 « Jaunty Jackalope »" #. Description #: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Ubuntu 8.10 « Intrepid Ibex »" +msgstr "Ubuntu 8.10 « Intrepid Ibex »" #. Description #: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "CD-ROM contenant Ubuntu 8.10 « Intrepid Ibex »" +msgstr "CD contenant Ubuntu 8.10 « Intrepid Ibex »" #. Description #: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "Ubuntu 8.04 « Hardy Heron »" +msgstr "Ubuntu 8.04 « Hardy Heron »" #. Description #: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "CD-ROM contenant Ubuntu 8.04 « Hardy Heron »" +msgstr "CD contenant Ubuntu 8.04 « Hardy Heron »" #. Description #: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 7.10 « Gutsy Gibbon »" +msgstr "Ubuntu 7.10 « Gutsy Gibbon »" #. Description #: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "CD-ROM contenant Ubuntu 7.10 « Gutsy Gibbon »" +msgstr "CD contenant Ubuntu 7.10 « Gutsy Gibbon »" #. Description #: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 7.04 « Feisty Fawn »" +msgstr "Ubuntu 7.04 « Feisty Fawn »" #. Description #: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "CD-ROM contenant Ubuntu 7.04 « Feisty Fawn »" +msgstr "CD contenant Ubuntu 7.04 « Feisty Fawn »" #. Description #: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "Ubuntu 6.10 « Edgy Eft »" +msgstr "Ubuntu 6.10 « Edgy Eft »" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 @@ -202,17 +187,15 @@ msgstr "Logiciel non libre" #. Description #: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "CD-ROM contenant Ubuntu 6.10 « Edgy Eft »" +msgstr "CD contenant Ubuntu 6.10 « Edgy Eft »" #. Description #: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Ubuntu 6.06 LTS « Dapper Drake »" +msgstr "Ubuntu 6.06 LTS « Dapper Drake »" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy -#| msgid "Canonical-supported Open Source software" msgid "Canonical-supported free and open-source software" msgstr "Logiciel libre maintenu par Canonical" @@ -223,8 +206,6 @@ msgstr "Maintenu par la communauté (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy -#| msgid "Community-maintained Open Source software" msgid "Community-maintained free and open-source software" msgstr "Logiciel libre maintenu par la communauté" @@ -251,7 +232,7 @@ msgstr "Logiciel soumis au droit d'auteur ou à des restrictions légales" #. Description #: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "CD-ROM contenant Ubuntu 6.06 LTS « Dapper Drake »" +msgstr "CD contenant Ubuntu 6.06 LTS « Dapper Drake »" #. Description #: ../data/templates/Ubuntu.info.in:1107 @@ -276,12 +257,12 @@ msgstr "Mises à jour non gérées" #. Description #: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "Ubuntu 5.10 « Breezy Badger »" +msgstr "Ubuntu 5.10 « Breezy Badger »" #. Description #: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "CD-ROM contenant Ubuntu 5.10 « Breezy Badger »" +msgstr "CD contenant Ubuntu 5.10 « Breezy Badger »" #. Description #: ../data/templates/Ubuntu.info.in:1164 @@ -296,22 +277,22 @@ msgstr "Mises à jour pour Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" -msgstr "« Backports » pour Ubuntu 5.10" +msgstr "Rétroportages pour Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Ubuntu 5.04 « Hoary Hedgehog »" +msgstr "Ubuntu 5.04 « Hoary Hedgehog »" #. Description #: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "CD-ROM contenant Ubuntu 5.04 « Hoary Hedgehog »" +msgstr "CD contenant Ubuntu 5.04 « Hoary Hedgehog »" #. CompDescription #: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" -msgstr "Supporté officiellement" +msgstr "Officiellement pris en charge" #. Description #: ../data/templates/Ubuntu.info.in:1216 @@ -326,12 +307,12 @@ msgstr "Mises à jour pour Ubuntu 5.04" #. Description #: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" -msgstr "« Backports » pour Ubuntu 5.04" +msgstr "Rétroportages pour Ubuntu 5.04" #. Description #: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "Ubuntu 4.10 « Warty Warthog »" +msgstr "Ubuntu 4.10 « Warty Warthog »" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 @@ -346,12 +327,12 @@ msgstr "Non libre (Multiverse)" #. Description #: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "CD-ROM contenant Ubuntu 4.10 « Warty Warthog »" +msgstr "CD contenant Ubuntu 4.10 « Warty Warthog »" #. CompDescription #: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" -msgstr "Support officiel terminé" +msgstr "Suivi officiel terminé" #. CompDescription #: ../data/templates/Ubuntu.info.in:1252 @@ -371,7 +352,7 @@ msgstr "Mises à jour pour Ubuntu 4.10" #. Description #: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" -msgstr "« Backports » pour Ubuntu 4.10" +msgstr "Rétroportages pour Ubuntu 4.10" #. ChangelogURI #: ../data/templates/Debian.info.in.h:4 @@ -382,22 +363,22 @@ 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 "Debian 6.0 « Squeeze »" +msgstr "Debian 6.0 « Squeeze »" #. Description #: ../data/templates/Debian.info.in:33 msgid "Debian 5.0 'Lenny' " -msgstr "Debian 5.0 « Lenny »" +msgstr "Debian 5.0 « Lenny »" #. Description #: ../data/templates/Debian.info.in:58 msgid "Debian 4.0 'Etch'" -msgstr "Debian 4.0 « Etch »" +msgstr "Debian 4.0 « Etch »" #. Description #: ../data/templates/Debian.info.in:83 msgid "Debian 3.1 'Sarge'" -msgstr "Debian 3.1 « Sarge »" +msgstr "Debian 3.1 « Sarge »" #. Description #: ../data/templates/Debian.info.in:94 @@ -417,24 +398,24 @@ msgstr "Debian stable actuelle" #. Description #: ../data/templates/Debian.info.in:121 msgid "Debian testing" -msgstr "Debian « Lenny » (testing)" +msgstr "Debian « Lenny » (testing)" #. Description #: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" -msgstr "Debian « Sid » (unstable)" +msgstr "Debian « Sid » (unstable)" #. CompDescription #: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" -"Logiciel libre (selon les lignes directrices du projet Debian) dont les " -"dépendances ne sont pas libres" +"Logiciel libre (selon les principes du projet Debian) dont les dépendances " +"ne sont pas libres" #. CompDescription #: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" -msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" +msgstr "Logiciel non libre (selon les principes du projet Debian)" #. TRANSLATORS: %s is a country #: ../aptsources/distro.py:206 ../aptsources/distro.py:436 @@ -470,18 +451,18 @@ msgid "Details" msgstr "Détails" #: ../apt/progress/gtk2.py:428 -#, fuzzy msgid "Starting..." -msgstr "Paramètres" +msgstr "Démarrage…" #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Terminé" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" +"Unicode incorrect dans la description de « %s » (%s). Merci de le signaler." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" @@ -495,6 +476,10 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"La liste des modifications n'est pas encore disponible.\n" +"\n" +"Veuillez utiliser http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"jusqu'à ce que les changements soient disponibles ou essayer plus tard." #: ../apt/package.py:1207 msgid "" @@ -507,22 +492,22 @@ msgstr "" #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "La liste des fichiers pour « %s » ne peut pas être lue" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "La liste des fichiers de contrôle pour « %s » ne peut pas être lue" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "La dépendance ne peut être satisfaite : %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Conflit avec le paquet installé « %s »" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -531,6 +516,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Casse le paquet existant « %(pkgname)s » à cause de sa dépendance " +"%(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:389 @@ -539,6 +526,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Casse le paquet existant « %(pkgname)s » car en conflit avec %(targetpkg)s " +"(%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -546,74 +535,79 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Casse le paquet existant « %(pkgname)s » car en conflit avec %(targetpkg)s. " +"Mais le « %(debfile)s » le fournit à l'aide de « %(provides)s »" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Aucun champ Architecture dans ce paquet" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Architecture « %s » incorrecte" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Une version plus récente est déjà installée" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Impossible de résoudre les dépendances, le cache est corrompu." #: ../apt/debfile.py:519 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" -msgstr "Impossible d'installer « %s »" +msgstr "Impossible d'installer « %s »" #: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Décompression automatique :\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Conversion automatique en ASCII affichable :\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" +"Installation des dépendances de construction pour le paquet source « %s » " +"qui compile %s\n" #: ../apt/debfile.py:700 -#, fuzzy msgid "An essential package would be removed" -msgstr "Un paquet essentiel devrait être enlevé" +msgstr "Un paquet essentiel devrait être désinstallé" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s… Terminé" #: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Att " #: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Ign " #: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Err " #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Prendre :" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr " [En cours]" #: ../apt/progress/text.py:214 #, python-format @@ -622,21 +616,32 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Changement de support : veuillez insérer le disque nommé\n" +" « %s »\n" +"dans le lecteur « %s » et appuyer sur entrée\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "%s o téléchargés en %s (%s o/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" +"Veuillez fournir le nom de ce disque, par exemple « Debian 2.1r1 disque 1 »" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Veuillez insérer un disque dans le lecteur et appuyer sur entrée" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "" +msgstr "Construction des structures de données" + +#~ msgid "Python-debian module not available" +#~ msgstr "Module Python-debian non disponible" + +#~ msgid "This is not a valid DEB archive, missing '%s' member" +#~ msgstr "" +#~ "Ce n'est pas une archive « DEB » valide, le membre « %s » est absent" -- cgit v1.2.3 From 1993db1155989a66ecde64a27f0ac04e8e700095 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:21:54 -0400 Subject: * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) --- debian/changelog | 1 + po/nl.po | 217 +++++++++++++++++++++++++------------------------------ 2 files changed, 100 insertions(+), 118 deletions(-) diff --git a/debian/changelog b/debian/changelog index b525007a..1440748f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file * po/fr.po: French translation updated (closes: #567765) + * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/po/nl.po b/po/nl.po index 01bda2c5..3243c520 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,21 +1,21 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Ducht translation of python-apt. +# Copyright (C) 2006-2012 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the python-apt package. +# Tino Meinen , 2006. +# Jeroen Schot \n" -"Language-Team: Nederlands \n" -"Language: \n" +"PO-Revision-Date: 2012-06-13 12:12+0200\n" +"Last-Translator: Jeroen Schot \n" +"Language-Team: Debian l10n Dutch \n" +"Language: nl\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,176 +25,151 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 5.04 veiligheidsupdates" +msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’" +msgstr "CD met Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 4.10 ‘Warty Warthog’" +msgstr "Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" +msgstr "CD met Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 ‘Warty Warthog’" +msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" +msgstr "CD met Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 -#, fuzzy msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 4.10 ‘Warty Warthog’" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:506 -#, fuzzy msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" +msgstr "CD met Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Partners van Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Software dis is verpakt door Canonical voor zijn partners" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Deze software is geen onderdeel van Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Onafhankelijk" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Aangeboden door externe ontwikkelaars" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Software die door externe ontwikkelaars wordt aangeboden." #. Description #: ../data/templates/Ubuntu.info.in:569 -#, fuzzy msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 5.04 ‘Hoary Hedgehog’" +msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:589 -#, fuzzy msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’" +msgstr "CD met Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:632 -#, 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:652 -#, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" +msgstr "CD met Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:695 -#, 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:714 -#, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" +msgstr "CD met Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:757 -#, 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:777 -#, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’" +msgstr "CD met Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:821 -#, 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:841 -#, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’" +msgstr "CD met Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:886 -#, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 5.04 veiligheidsupdates" +msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:905 -#, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’" +msgstr "CD met Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:950 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.04 veiligheidsupdates" +msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:969 -#, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’" +msgstr "CD met Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "Ubuntu 6.10 ‘Edgy Eft’" +msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 -#, fuzzy msgid "Community-maintained" msgstr "Door de gemeenschap beheerd" @@ -206,30 +181,27 @@ msgstr "Beperkte software" #. Description #: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "Cd-rom met Ubuntu 6.10 'Edgy Eft'" +msgstr "CD met Ubuntu 6.10 'Edgy Eft'" #. Description #: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Ubuntu 6.06 LTS ‘Dapper Drake’" +msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy msgid "Canonical-supported free and open-source software" -msgstr "Door Canonical beheerde Open Source software" +msgstr "Door Canonical ondersteunde vrije en opensourcesoftware" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 -#, fuzzy msgid "Community-maintained (universe)" msgstr "Door de gemeenschap beheerd (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy msgid "Community-maintained free and open-source software" -msgstr "Door de gemeenschap beheerde Open Source software" +msgstr "Door de gemeenschap beheerde vrije en opensourcesoftware" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 @@ -255,7 +227,7 @@ msgstr "" #. Description #: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Cd-rom met Ubuntu 6.06 LTS ‘Dapper Drake’" +msgstr "CD met Ubuntu 6.06 LTS 'Dapper Drake'" #. Description #: ../data/templates/Ubuntu.info.in:1107 @@ -269,15 +241,13 @@ msgstr "Aanbevolen updates" #. Description #: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy msgid "Pre-released updates" msgstr "Voorgestelde updates" #. Description #: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy msgid "Unsupported updates" -msgstr "Updates die van een nieuwere distributie afkomstig zijn (backports)" +msgstr "Niet-ondersteunde updates" #. Description #: ../data/templates/Ubuntu.info.in:1133 @@ -287,7 +257,7 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’" +msgstr "CD met Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1164 @@ -307,12 +277,12 @@ msgstr "Ubuntu 5.10 backports" #. Description #: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Ubuntu 5.04 ‘Hoary Hedgehog’" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description #: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’" +msgstr "CD met Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 @@ -337,11 +307,10 @@ msgstr "Ubuntu 5.04 backports" #. Description #: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "Ubuntu 4.10 ‘Warty Warthog’" +msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 -#, fuzzy msgid "Community-maintained (Universe)" msgstr "Door de gemeenschap beheerd (Universe)" @@ -353,7 +322,7 @@ msgstr "Niet-vrij (Multiverse)" #. Description #: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’" +msgstr "CD met Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1250 @@ -388,27 +357,23 @@ 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\"" +msgstr "Debian 3.1 'Sarge'" #. Description #: ../data/templates/Debian.info.in:94 @@ -417,26 +382,23 @@ msgstr "Voorgestelde updates" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Belangrijke veiligheidsupdates" +msgstr "veiligheidsupdates" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Huidige stabiele uitgave van Debian" #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian testing (test)" #. Description #: ../data/templates/Debian.info.in:147 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (onstabiel)" +msgstr "Debian 'Sid' (unstable/onstabiel)" #. CompDescription #: ../data/templates/Debian.info.in:151 @@ -483,16 +445,17 @@ msgstr "Details" #: ../apt/progress/gtk2.py:428 msgid "Starting..." -msgstr "" +msgstr "Opstarten..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Voltooid" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" +"Ongeldige unicode in de beschrijving van '%s' (%s). Gelieve dit te melden." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" @@ -506,6 +469,10 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"De lijst van veranderingen is nog niet beschikbaar\n" +"\n" +"Gebruik http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"todat de veranderingen beschikbaar zijn of probeer het later nog eens." #: ../apt/package.py:1207 msgid "" @@ -518,22 +485,22 @@ msgstr "" #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "De lijst van bestanden voor '%s' kon niet gelezen worden" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "De lijst van bestanden voor '%s' kon niet gelezen worden" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Afhankelijkheid is niet vervulbaar: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Conflicteerd met het geinstalleerde pakket '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -542,6 +509,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Maakt het bestaande pakket '%(pkgname)s' stuk door afhankelijkheid " +"%(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:389 @@ -550,6 +519,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Maakt het bestaande pakket '%(pkgname)s' stuk door conflict: %(targetpkg)s " +"(%(comptype)s %(targetver)s) " #: ../apt/debfile.py:399 #, python-format @@ -557,27 +528,29 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Maakt het bestaande pakket '%(pkgname)s' stuk die conflicteert: " +"'%(targetpkg)s'. Maar de '%(debfile)s biedt deze aan via: '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Pakket heeft geen Architecture-veld" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Verkeerde architectuur '%s'" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Er is al een nieuwere versie geïnstalleerd" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Voldoen van alle vereisten is mislukt (defecte cache)" #: ../apt/debfile.py:519 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" msgstr "Kan '%s' niet installeren" @@ -586,45 +559,48 @@ msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Automatisch uitgepakt:\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Automatisch omgezet naar toonbare ASCII:\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" +"Installeer de bouwevereisten voor het bronpakket '%s' waaruit '%s' wordt " +"gebouwd\n" #: ../apt/debfile.py:700 -#, fuzzy msgid "An essential package would be removed" msgstr "Een essentieel pakket zou verwijderd worden" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Klaar" #: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Geraakt " #: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Genegeerd " #: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Fout " #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Ophalen:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr " [Bezig]" #: ../apt/progress/text.py:214 #, python-format @@ -633,21 +609,26 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Medium wisselen: Gelieve de schijf met label\n" +" '%s'\n" +"in het station '%s' te plaatsen en op 'enter' te drukken\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "%sB opgehaald in %s (%sB/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" +"Gelieve een naam voor deze schijf op te geven, bijvoorbeeld 'Debian 2.1r1 " +"schijf 1'" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Gelieve een schijf in het station te plaatsen en op 'Enter' te drukken" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "" +msgstr "Opbouwen van pakketstructuren" -- cgit v1.2.3 From 03163dbea0af1628b78e4768e3ff2b3f3ad35e47 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:22:27 -0400 Subject: * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 1 + po/pt_BR.po | 41 ++++++++++++----------------------------- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1440748f..4b411939 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/*.po: update PO files against current POT file * po/fr.po: French translation updated (closes: #567765) * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) + * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/po/pt_BR.po b/po/pt_BR.po index 67e9de58..b182b952 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,13 +1,13 @@ # Brazilian Portuguese translation for python-apt. # This file is distributed under the same licence as the update-manager package. -# Sérgio Cipolla , 2010, 2011. +# Sérgio Cipolla , 2010 - 2012. # msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2011-05-28 13:25-0300\n" +"PO-Revision-Date: 2012-06-10 15:53-0300\n" "Last-Translator: Sérgio Cipolla \n" "Language-Team: \n" "Language: \n" @@ -26,45 +26,33 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy -#| msgid "Ubuntu 7.04 'Feisty Fawn'" msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 7.04 'Feisty Fawn'" +msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy -#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "CD-ROM com o Ubuntu 7.04 'Feisty Fawn'" +msgstr "CD-ROM com o Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy -#| msgid "Ubuntu 10.10 'Maverick Meerkat'" msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy -#| msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "CD-ROM com o Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM com o Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "CD-ROM com o Ubuntu 4.10 'Warty Warthog'" +msgstr "CD-ROM com o Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 @@ -203,10 +191,8 @@ msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy -#| msgid "Canonical-supported Open Source software" msgid "Canonical-supported free and open-source software" -msgstr "Aplicativo de código aberto suportado pela Canonical" +msgstr "Aplicativos livres de código aberto suportados pela Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 @@ -215,10 +201,8 @@ msgstr "Mantido pela comunidade (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy -#| msgid "Community-maintained Open Source software" msgid "Community-maintained free and open-source software" -msgstr "Aplicativo de código aberto mantido pela comunidade" +msgstr "Aplicativos livres de código aberto mantidos pela comunidade" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 @@ -503,10 +487,9 @@ 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:93 -#, fuzzy, python-format -#| msgid "List of files for '%s' could not be read" +#, python-format msgid "List of control files for '%s' could not be read" -msgstr "A lista de arquivos de '%s' não pôde ser lida" +msgstr "A lista de arquivos de controle de '%s' não pôde ser lida" #: ../apt/debfile.py:211 #, python-format -- cgit v1.2.3 From 1db0686eea007adaa15373c902521c3c162bded8 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:24:54 -0400 Subject: * po/sl.po: Slovenian translation updated by Matej Urbančič MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 1 + po/sl.po | 76 ++++++++++++++++++++++++-------------------------------- 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4b411939..f66b0b9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/fr.po: French translation updated (closes: #567765) * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla + * po/sl.po: Slovenian translation updated by Matej Urbančič -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/po/sl.po b/po/sl.po index 87b7914e..d06f8724 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,22 +1,28 @@ # Slovenian translation for python-apt-rosetta. # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 # This file is distributed under the same license as the python-apt-rosetta package. -# FIRST AUTHOR , 2006. +# +# Matej Urbančič , 2006 - 2012. # msgid "" msgstr "" "Project-Id-Version: python-apt-rosetta\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2010-09-01 08:08+0200\n" +"PO-Revision-Date: 2012-06-10 22:24+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 17:55+0000\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" +"X-Launchpad-Export-Date: 2010-12-03 00:21+0000\n" "X-Generator: Launchpad (build Unknown)\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -26,45 +32,33 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy -#| msgid "Ubuntu 7.04 'Feisty Fawn'" msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 7.04 'Feisty Fawn'" +msgstr "xUbuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy -#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "Nosilec CD z Ubuntu 7.04 'Feisty Fawn'" +msgstr "Nosilec CD z Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy -#| msgid "Ubuntu 10.10 'Maverick Meerkat'" msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "xUbuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy -#| msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Nosilec CD z Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Nosilec CD z Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "xUbuntu 4.10 'Warty Warthog'" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "Nosilec CD z Ubuntu 4.10 'Warty Warthog'" +msgstr "Nosilec CD z Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 @@ -79,32 +73,32 @@ msgstr "Nosilec CD z Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Partnerske ustanove Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Programska oprema Canonical za partnerske ustanove" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Programska opreme ni del distribucije Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Neodvisno" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Programska oprema, ki jo objavljajo razvijalci skupnosti" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Programska oprema tretje roke." #. Description #: ../data/templates/Ubuntu.info.in:569 @@ -203,8 +197,6 @@ msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy -#| msgid "Canonical-supported Open Source software" msgid "Canonical-supported free and open-source software" msgstr "Odprtokodna programska oprema podprta s strani Canonical Ltd" @@ -215,8 +207,6 @@ msgstr "Paketi skupnosti (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy -#| msgid "Community-maintained Open Source software" msgid "Community-maintained free and open-source software" msgstr "Programska oprema, ki jo vzdržuje odprtokodna skupnost" @@ -450,13 +440,12 @@ msgstr "Strežniki po meri" #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -"Prejemanje %(current)li. datoteke od skupno %(total)li s hitrostjo %(speed)s/" -"s" +"Prejemanje datoteke %(current)li od skupno %(total)li s hitrostjo %(speed)s/s" #: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "Prejemanje %(current)li. datoteke od skupno %(total)li." +msgstr "Prejemanje datoteke %(current)li od skupno %(total)li." #. Setup some child widgets #: ../apt/progress/gtk2.py:340 @@ -475,7 +464,7 @@ msgstr "Končano" #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -"Neveljaven unicode znak v opisu za '%s' (%s). Pošljite poročilo o napaki." +"Neveljaven znak unikod v opisu za '%s' (%s). Pošljite poročilo o napaki." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" @@ -499,7 +488,7 @@ msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -"Prjemanje seznama sprememb je spodletelo.\n" +"Prejemanje seznama sprememb je spodletelo.\n" "Preverite internetno povezavo." #: ../apt/debfile.py:82 @@ -508,10 +497,9 @@ msgid "List of files for '%s' could not be read" msgstr "Seznama datotek za '%s' ni mogoče prebrati" #: ../apt/debfile.py:93 -#, fuzzy, python-format -#| msgid "List of files for '%s' could not be read" +#, python-format msgid "List of control files for '%s' could not be read" -msgstr "Seznama datotek za '%s' ni mogoče prebrati" +msgstr "Nadzornega seznama datotek za '%s' ni mogoče prebrati" #: ../apt/debfile.py:211 #, python-format @@ -549,12 +537,12 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" -"Pokvari obstoječi paket '%(pkgname)s', ki je v sporu z: '%(targetpkg)s'. " -"Toda '%(debfile)s' ga zagotavlja preko: '%(provides)s'" +"Pokvari obstoječi paket '%(pkgname)s', ki je v sporu s paketom: " +"'%(targetpkg)s'. Paket '%(debfile)s' ga zagotavlja preko: '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "Ni polja določila arhitekture sistema v paketu" +msgstr "V paketu ni polja določila arhitekture sistema" #: ../apt/debfile.py:457 #, python-format @@ -585,7 +573,7 @@ msgstr "" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "Samodejno pretvorjeno v zapis ascii:\n" +msgstr "Samodejno pretvorjeno v zapis ASCII:\n" #: ../apt/debfile.py:689 #, python-format @@ -601,7 +589,7 @@ msgstr "Z dejanjem bi bil odstranjen sistemski paket" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "%c%s... Končano." +msgstr "%c%s ... Končano." #: ../apt/progress/text.py:122 msgid "Hit " -- cgit v1.2.3 From eaed43b512c8db66f3fe3ed15602674886f27bc0 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:28:43 -0400 Subject: * po/id.po: Indonesian by Andika Triwidada (closes: #676960) --- debian/changelog | 1 + po/id.po | 294 +++++++++++++++++++++++++------------------------------ 2 files changed, 135 insertions(+), 160 deletions(-) diff --git a/debian/changelog b/debian/changelog index f66b0b9d..f6b8fb3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file * po/fr.po: French translation updated (closes: #567765) + * po/id.po: Indonesian translation by Andika Triwidada (closes: #676960) * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla * po/sl.po: Slovenian translation updated by Matej Urbančič diff --git a/po/id.po b/po/id.po index 140b4201..3fdfa2ef 100644 --- a/po/id.po +++ b/po/id.po @@ -1,21 +1,24 @@ -# Indonesian translation for update-manager +# Indonesian translation for python-apt # 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 , 2006. +# This file is distributed under the same license as the python-apt package. +# Andy Apdhani , 2006. +# Andika Triwidada , 2012. # msgid "" msgstr "" -"Project-Id-Version: update-manager\n" +"Project-Id-Version: python-apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:03+0000\n" -"Last-Translator: Andy Apdhani \n" +"PO-Revision-Date: 2012-06-11 01:59+0700\n" +"Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" +"X-Poedit-Language: Indonesian\n" +"X-Poedit-Country: INDONESIA\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -25,320 +28,291 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:276 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 -#, fuzzy msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:506 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Partner Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Perangkat lunak yang dipaketkan oleh Canonical bagi partner mereka" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Perangkat lunak ini bukan bagian dari Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Independen" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Disediakan oleh para pengembang perangkat lunak pihak ketiga" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Perangkat lunak ditawarkan oleh para pengembang pihak ketiga." #. Description #: ../data/templates/Ubuntu.info.in:569 -#, fuzzy msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:589 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:632 -#, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:695 -#, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:757 -#, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:821 -#, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:886 -#, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:950 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" +msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 -#, fuzzy msgid "Community-maintained" -msgstr "Dikelola oleh komunitas (Universe)" +msgstr "Dikelola oleh komunitas" #. CompDescription #: ../data/templates/Ubuntu.info.in:1022 -#, fuzzy msgid "Restricted software" -msgstr "Tidak-bebas (Multiverse)" +msgstr "Perangkat lunak terbatas" #. Description #: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 6.10 'Edgy Eft'" #. Description #: ../data/templates/Ubuntu.info.in:1072 -#, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Ubuntu 6.06 LTS Updates" +msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy msgid "Canonical-supported free and open-source software" -msgstr "Dikelola oleh komunitas (Universe)" +msgstr "Perangkat lunak open-source dan bebas yang didukung oleh Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 -#, fuzzy msgid "Community-maintained (universe)" -msgstr "Dikelola oleh komunitas (Universe)" +msgstr "Dikelola oleh komunitas (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy msgid "Community-maintained free and open-source software" -msgstr "Dikelola oleh komunitas (Universe)" +msgstr "Perangkat lunak open-source dan bebas yang dikelola oleh komunitas" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 -#, fuzzy msgid "Non-free drivers" -msgstr "Tidak-bebas (Multiverse)" +msgstr "Driver tidak-bebas" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" -msgstr "" +msgstr "Driver proprietary bagi perangkat" #. CompDescription #: ../data/templates/Ubuntu.info.in:1083 -#, fuzzy msgid "Restricted software (Multiverse)" -msgstr "Tidak-bebas (Multiverse)" +msgstr "Perangkat lunak terbatas (Multiverse)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" -msgstr "" +msgstr "Perangkat lunak yang terbatas karena masalah hak cipta atau hukum" #. Description #: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 6.06 LTS 'Dapper Drake'" #. Description #: ../data/templates/Ubuntu.info.in:1107 -#, fuzzy msgid "Important security updates" -msgstr "Pemutakhiran lewat Internet" +msgstr "Pemutakhiran keamanan penting" #. Description #: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" -msgstr "" +msgstr "Pemutakhiran yang disarankan" #. Description #: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy msgid "Pre-released updates" -msgstr "_Instal Update" +msgstr "Pemutakhira prarilis" #. Description #: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy msgid "Unsupported updates" -msgstr "_Instal Update" +msgstr "Pemutakhiran yang tak didukung" #. Description #: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1164 -#, fuzzy msgid "Ubuntu 5.10 Security Updates" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Pemutakhiran Keamanan Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1169 -#, fuzzy msgid "Ubuntu 5.10 Updates" -msgstr "Ubuntu 6.06 LTS Updates" +msgstr "Pemutakhiran Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1174 -#, fuzzy msgid "Ubuntu 5.10 Backports" -msgstr "Ubuntu 6.06 LTS Backports" +msgstr "Ubuntu 5.10 Backport" #. Description #: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description #: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" -msgstr "Resmi disokong" +msgstr "Resmi didukung" #. Description #: ../data/templates/Ubuntu.info.in:1216 -#, fuzzy msgid "Ubuntu 5.04 Security Updates" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Pemutakhiran Keamanan Ubuntu 5.04" #. Description #: ../data/templates/Ubuntu.info.in:1221 -#, fuzzy msgid "Ubuntu 5.04 Updates" -msgstr "Ubuntu 6.06 LTS Updates" +msgstr "Pemutakhiran Ubuntu 5.04" #. Description #: ../data/templates/Ubuntu.info.in:1226 -#, fuzzy msgid "Ubuntu 5.04 Backports" -msgstr "Ubuntu 6.06 LTS Backports" +msgstr "Ubuntu 5.04 Backport" #. Description #: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" +msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 -#, fuzzy msgid "Community-maintained (Universe)" msgstr "Dikelola oleh komunitas (Universe)" @@ -350,36 +324,32 @@ msgstr "Tidak-bebas (Multiverse)" #. Description #: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" +msgstr "Cdrom dengan Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1250 -#, fuzzy msgid "No longer officially supported" -msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" +msgstr "Tak lagi didukung secara resmi" #. CompDescription #: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" -msgstr "Hak cipta terlarang" +msgstr "Hak cipta terbatas" #. Description #: ../data/templates/Ubuntu.info.in:1259 -#, fuzzy msgid "Ubuntu 4.10 Security Updates" -msgstr "Ubuntu 6.06 LTS Security Updates" +msgstr "Pemutakhiran Keamanan Ubuntu 4.10" #. Description #: ../data/templates/Ubuntu.info.in:1264 -#, fuzzy msgid "Ubuntu 4.10 Updates" -msgstr "Ubuntu 6.06 LTS Updates" +msgstr "Pemutakhiran Ubuntu 4.10" #. Description #: ../data/templates/Ubuntu.info.in:1269 -#, fuzzy msgid "Ubuntu 4.10 Backports" -msgstr "Ubuntu 6.06 LTS Backports" +msgstr "Ubuntu 4.10 Backport" #. ChangelogURI #: ../data/templates/Debian.info.in.h:4 @@ -389,74 +359,66 @@ 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\"" +msgstr "Debian 3.1 'Sarge'" #. Description #: ../data/templates/Debian.info.in:94 -#, fuzzy msgid "Proposed updates" -msgstr "_Instal Update" +msgstr "Pemutakhiran yang diusulkan" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Pemutakhiran lewat Internet" +msgstr "Pemutakhiran keamanan" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Rilis stabil Debian saat ini" #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian testing" #. Description #: ../data/templates/Debian.info.in:147 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" +msgstr "Debian 'Sid' (unstable)" #. CompDescription #: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" -"Perangkat Lunak yang sesuai dengan DFSG tapi tergantung pada Perangkat Lunak " -"Tidak-Bebas" +"Perangkat lunak yang kompatibel dengan DFSG tapi tergantung pada Perangkat " +"Lunak Tidak-Bebas" #. CompDescription #: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" -msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" +msgstr "Perangkat Lunak yang tidak kompatibel dengan DFSG" #. TRANSLATORS: %s is a country #: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" -msgstr "" +msgstr "Server untuk %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 @@ -464,21 +426,21 @@ msgstr "" #: ../aptsources/distro.py:224 ../aptsources/distro.py:230 #: ../aptsources/distro.py:246 msgid "Main server" -msgstr "" +msgstr "Server utama" #: ../aptsources/distro.py:250 msgid "Custom servers" -msgstr "" +msgstr "Server gubahan" #: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, fuzzy, python-format +#, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "Mengunduh berkas %li dari %li dengan %s/s" +msgstr "Mengunduh berkas %(current)li dari %(total)li dalam %(speed)s/dt" #: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, fuzzy, python-format +#, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "Mengunduh berkas %li dari %li dengan %s/s" +msgstr "Mengunduh berkas %(current)li dari %(total)li" #. Setup some child widgets #: ../apt/progress/gtk2.py:340 @@ -487,21 +449,20 @@ msgstr "Rincian" #: ../apt/progress/gtk2.py:428 msgid "Starting..." -msgstr "" +msgstr "Memulai..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Komplit" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" +msgstr "Unicode tak valid dalam deskripsi bagi '%s' (%s). Mohon laporkan." #: ../apt/package.py:1088 ../apt/package.py:1194 -#, fuzzy msgid "The list of changes is not available" -msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." +msgstr "Senarai dari perubahan tak tersedia" #: ../apt/package.py:1200 #, python-format @@ -511,35 +472,38 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"Senarai perubahan belum tersedia.\n" +"\n" +"Silakan pakai http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"sampai perubahan menjadi tersedia atau coba lagi nanti" #: ../apt/package.py:1207 -#, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -"Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet " -"anda." +"Gagal mengunduh senarai dari perubahan. \n" +"Silakan periksa koneksi Internet Anda." #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "Senarai berkas bagi '%s' tak dapat dibaca" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "Senarai berkas kendali bagi '%s' tak dapat dibaca" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Kebergantungan tak dapat dipenuhi: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Konflik dengan paket terpasang '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -548,6 +512,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Merusak kebergantungan %(depname)s (%(deprelation)s %(depversion)s) dari " +"paket '%(pkgname)s' yang telah ada" #. 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 @@ -556,6 +522,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Merusak paket '%(pkgname)s' yang telah ada, konflik: %(targetpkg)s " +"(%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -563,74 +531,77 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Merusak paket '%(pkgname)s' yang telah ada, yang konflik: %(targetpkg)s. " +"Tapi '%(debfile)s' menyediakannya melalui: '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Tak ada ruas Architecture dalam paket" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Arsitektur '%s' salah" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Versi lebih baru telah terpasang" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Gagal memenuhi semua kebergantungan (singgahan rusak)" #: ../apt/debfile.py:519 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" -msgstr "Tidak dapat menginstal '%s'" +msgstr "Tak bisa memasang '%s'" #: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Membuka kompresi secara otomatis:\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Otomatis dikonversi ke ascii yang dapat dicetak:\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" +msgstr "Memasang Build-Dependencies bagi paket sumber '%s' yang membangun %s\n" #: ../apt/debfile.py:700 -#, fuzzy msgid "An essential package would be removed" msgstr "Paket esensial akan dihapus" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Usai" #: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Hit " #: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Ign " #: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Err " #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Ambil:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr " [Bekerja]" #: ../apt/progress/text.py:214 #, python-format @@ -639,21 +610,24 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Media berubah: mohon masukkan cakram berlabel\n" +"'%s'\n" +"ke drive '%s' dan tekan enter\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Diambil %sB dalam %s (%sB/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Mohon beri nama Cakram ini, seperti misalnya 'Debian 2.1r1 Disk 1'" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Mohon masukkan Cakram ke dalam drive dan menekan enter" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "" +msgstr "Membangun struktur data" -- cgit v1.2.3 From 70999ee29567331e88c5bd57df0138eb1e76d5e0 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:30:58 -0400 Subject: * po/eo.po: Esperanto translation by Kristjan Schmidt and Michael Moroni --- debian/changelog | 1 + po/eo.po | 165 ++++++++++++++++++++++++++----------------------------- 2 files changed, 78 insertions(+), 88 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6b8fb3d..cd6bed98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file + * po/eo.po: Esperanto translation by Kristjan Schmidt and Michael Moroni * po/fr.po: French translation updated (closes: #567765) * po/id.po: Indonesian translation by Andika Triwidada (closes: #676960) * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) diff --git a/po/eo.po b/po/eo.po index d8c8cfb7..52e7ccd5 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13,16 +13,15 @@ msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2011-05-09 16:09+0200\n" -"Last-Translator: Kristjan SCHMIDT \n" +"PO-Revision-Date: 2012-06-11 09:54+0000\n" +"Last-Translator: Michael Moroni \n" "Language-Team: Esperanto \n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-09 14:00+0000\n" -"X-Generator: Launchpad (build 12981)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Launchpad-Export-Date: 2012-06-11 09:56+0000\n" +"X-Generator: Launchpad (build 15376)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -32,45 +31,33 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy -#| msgid "Ubuntu 7.04 'Feisty Fawn'" msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 7.04 'Feisty Fawn'" +msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy -#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "KD kun Ubuntu 7.04 'Feisty Fawn'" +msgstr "KD kun Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy -#| msgid "Ubuntu 10.10 'Maverick Meerkat'" msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy -#| msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "KD kun Ubuntu 10.10 'Maverick Meerkat'" +msgstr "KD kun Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "KD kun Ubuntu 4.10 'Warty Warthog'" +msgstr "KD kun Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 @@ -90,12 +77,12 @@ msgstr "Partneroj de Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "Programaro pakita de Canonical por iliaj partneroj" +msgstr "Programaro pakita de Canonical por siaj partneroj" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "Tiuj ĉi programoj ne estas parto de Ubuntu." +msgstr "Ĉi tiu programaro ne estas parto de Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 @@ -105,12 +92,12 @@ msgstr "Sendepende" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "Ofertitaj de aliaj programistoj kaj firmaoj" +msgstr "Ofertitaj de eksteraj programistoj" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "Programoj ofertitaj de aliaj programistoj kaj firmaoj" +msgstr "Programaro ofertita de eksteraj programistoj" #. Description #: ../data/templates/Ubuntu.info.in:569 @@ -190,7 +177,7 @@ msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" -msgstr "Komunume prizorgata" +msgstr "Prizorgata de komunumo" #. CompDescription #: ../data/templates/Ubuntu.info.in:1022 @@ -209,22 +196,18 @@ msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy -#| msgid "Canonical-supported Open Source software" msgid "Canonical-supported free and open-source software" -msgstr "Malfermitkoda programaro subtenata de Canonical" +msgstr "Libera kaj malfermitkoda programaro subtenata de Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" -msgstr "Komunume prizorgata (universo)" +msgstr "Prizorgata de komunumo (universo)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy -#| msgid "Community-maintained Open Source software" msgid "Community-maintained free and open-source software" -msgstr "Komunume prizorgata malfermitkoda programaro" +msgstr "Libera kaj malfermitkoda programaro prizorgata de komunumo" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 @@ -244,7 +227,7 @@ msgstr "Limigita programaro (multiverso)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" -msgstr "Programaro limigita per kopirajto aŭ leĝaj temoj" +msgstr "Programaro limigita pro kopirajto aŭ leĝaj temoj" #. Description #: ../data/templates/Ubuntu.info.in:1091 @@ -254,7 +237,7 @@ msgstr "KD kun Ubuntu 6.06 LTS 'Dapper Drake'" #. Description #: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" -msgstr "Gravaj sekurecaj ĝisdatigoj" +msgstr "Gravaj ĝisdatigoj pri sekureco" #. Description #: ../data/templates/Ubuntu.info.in:1112 @@ -284,17 +267,17 @@ msgstr "KD kun Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" -msgstr "Ubuntu 5.10 Sekurecaj ĝisdatigoj" +msgstr "Sekurecaj ĝisdatigoj de Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" -msgstr "Ubuntu 5.10 Ĝisdatigoj" +msgstr "Ĝisdatigoj de Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" -msgstr "Ubuntu 5.10 Retroportoj" +msgstr "Retroportoj de Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1185 @@ -314,17 +297,17 @@ msgstr "Oficiale subtenata" #. Description #: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" -msgstr "Ubuntu 5.04 Sekurecaj ĝisdatigoj" +msgstr "Sekurecaj ĝisdatigoj de Ubuntu 5.04" #. Description #: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" -msgstr "Ubuntu 5.04 Ĝisdatigoj" +msgstr "Ĝisdatigoj de Ubuntu 5.04" #. Description #: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" -msgstr "Ubuntu 5.04 Retroportoj" +msgstr "Retroportoj de Ubuntu 5.04" #. Description #: ../data/templates/Ubuntu.info.in:1232 @@ -334,12 +317,12 @@ msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" -msgstr "Komunume flegata (univreso)" +msgstr "Prizorgata de komunumo (universo)" #. CompDescription #: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" -msgstr "Mallibere (Multiverse)" +msgstr "Mallibera (multiverso)" #. Description #: ../data/templates/Ubuntu.info.in:1247 @@ -359,17 +342,17 @@ msgstr "Limigita kopirajto" #. Description #: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" -msgstr "Ubuntu 4.10 Sekurecaj ĝisdatigoj" +msgstr "Sekurecaj ĝisdatigoj de Ubuntu 4.10" #. Description #: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" -msgstr "Ubuntu 4.10 Ĝisdatigoj" +msgstr "Ĝisdatigoj de Ubuntu 4.10" #. Description #: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" -msgstr "Ubuntu 4.10 Retroportoj" +msgstr "Retroportoj de Ubuntu 4.10" #. ChangelogURI #: ../data/templates/Debian.info.in.h:4 @@ -410,17 +393,17 @@ msgstr "Sekurecaj ĝisdatigoj" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "Debiana aktuala stabila eldono" +msgstr "Aktuala stabila eldono de Debiano" #. Description #: ../data/templates/Debian.info.in:121 msgid "Debian testing" -msgstr "Debiana testado" +msgstr "Testado de Debiano" #. Description #: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" -msgstr "Debiano 'Sid' (nestabile)" +msgstr "Debiano 'Sid' (nestabila)" #. CompDescription #: ../data/templates/Debian.info.in:151 @@ -430,7 +413,7 @@ msgstr "DFSG-kongrua programaro kun malliberaj dependecoj" #. CompDescription #: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" -msgstr "Ne-DFSG-kongruaj programaroj" +msgstr "DFSG-nekongruaj programaroj" #. TRANSLATORS: %s is a country #: ../aptsources/distro.py:206 ../aptsources/distro.py:436 @@ -453,12 +436,12 @@ msgstr "Propraj serviloj" #: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "Elŝutante dosieron %(current)li sur %(total)li per %(speed)s/s" +msgstr "Elŝutanta dosieron %(current)li el %(total)li per %(speed)s/s" #: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "Elŝutante dosieron %(current)li sur %(total)li" +msgstr "Elŝutanta dosieron %(current)li el %(total)li" #. Setup some child widgets #: ../apt/progress/gtk2.py:340 @@ -467,20 +450,20 @@ msgstr "Detaloj" #: ../apt/progress/gtk2.py:428 msgid "Starting..." -msgstr "Komencante..." +msgstr "Komencanta..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "Komplete" +msgstr "Kompleta" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "Nevalida unikodaĵo en priskribo por '%s' (%s). Bonvolu raporti." +msgstr "Nevalida unikodaĵo en priskribo por '%s' (%s). Bonvole raportu." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" -msgstr "La listo de ŝanĝoj ne haveblas" +msgstr "La listo de ŝanĝoj ne disponeblas" #: ../apt/package.py:1200 #, python-format @@ -490,39 +473,38 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" -"La listo de ŝanĝoj ankoraŭ ne haveblas.\n" +"La listo de ŝanĝoj ankoraŭ ne disponeblas.\n" "\n" -"Bonvolu uzi http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"ĝis kiam la ŝanĝoj havebliĝos aŭ poste reklopodi." +"Bonvole uzu http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"ĝis kiam la ŝanĝoj disponebligos aŭ provu denove poste." #: ../apt/package.py:1207 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -"Malsukcesis elŝuti la liston de ŝanĝoj. \n" -"Bonvolu kontroli vian interretan konekton." +"Elŝutado de listo de ŝanĝoj fiaskis. \n" +"Bonvole kontrolu vian interretan konekton." #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "Listo de dosieroj de '%s' ne legeblis" +msgstr "Listo de dosieroj de '%s' ne legeblas" #: ../apt/debfile.py:93 -#, fuzzy, python-format -#| msgid "List of files for '%s' could not be read" +#, python-format msgid "List of control files for '%s' could not be read" -msgstr "Listo de dosieroj de '%s' ne legeblis" +msgstr "Listo de kontroldosieroj por '%s' ne legeblas" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "Dependeco ne plenumita: %s\n" +msgstr "Dependeco ne plenumeblas: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "Konfliktas kun la instalita pakaĵo '%s'" +msgstr "Ĝi konfliktas kun la instalita pakaĵo '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -531,8 +513,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" -"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' dependaĵo %(depname)s " -"(%(deprelation)s %(depversion)s)" +"Ĝi malfunkciigas la dependaĵon %(depname)s (%(deprelation)s %(depversion)s) " +"de la ekzistanta pakaĵo '%(pkgname)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:389 @@ -541,8 +523,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" -"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' konflikto: %(targetpkg)s " -"(%(comptype)s %(targetver)s)" +"Ĝi malfunkciigas la konflikton de la ekzistanta pakaĵo '%(pkgname)s': " +"%(targetpkg)s (%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -550,12 +532,12 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" -"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' kiu konfliktas kun: " -"'%(targetpkg)s'. Sed la '%(debfile)s' ofertas ĝin per: '%(provides)s'" +"Ĝi malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' kiu konfliktas kun " +"'%(targetpkg)s' sed la '%(debfile)s' ofertas ĝin per '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "Neniu arĥitekturo-kampo en la pakaĵo" +msgstr "Neniu kampo pri arĥitekturo en la pakaĵo" #: ../apt/debfile.py:457 #, python-format @@ -569,12 +551,12 @@ msgstr "Pli nova versio estas jam instalita" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "Fiaskis plenumi ĉiujn dependecojn (difektita kaŝmemoro)" +msgstr "Plenumado de ĉiuj dependecoj fiaskis (difektita kaŝmemoro)" #: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" -msgstr "Ne instaleblas '%s'" +msgstr "'%s' ne instaleblas" #: ../apt/debfile.py:593 msgid "" @@ -586,7 +568,7 @@ msgstr "" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "Aŭtomate konvertita al presebla 'ascii':\n" +msgstr "Aŭtomate konvertita al presebla ascii:\n" #: ../apt/debfile.py:689 #, python-format @@ -600,7 +582,7 @@ msgstr "Esenca pakaĵo estus forigita" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "%c%s... Farite" +msgstr "%c%s... Farita" #: ../apt/progress/text.py:122 msgid "Hit " @@ -616,11 +598,11 @@ msgstr "Era " #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "Akiri:" +msgstr "Aki:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr " [laborante]" +msgstr " [laboranta]" #: ../apt/progress/text.py:214 #, python-format @@ -629,27 +611,34 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Ŝanĝo de datenportilo: bonvolu enmeti la diskon nomitan\n" +"Ŝanĝo de datumportilo: bonvole enmetu la diskon nomatan\n" " '%s'\n" -"en la diskingon '%s' kaj puŝi la enigan klavon\n" +"en la diskingon '%s' kaj presu la enigan klavon\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Prenis %sB en %s (%sB/s)\n" +msgstr "Prenitaj %sB en %s (%sB/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Bonvolu doni nomon al tiu ĉi disko, ekzemple 'Disko 1 de Debian 2.1r1'" +msgstr "" +"Bonvole provizi nomon al ĉi tiu disko, ekzemple 'Disko 1 de Debiano 2.1r1'" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "Bonvolu enmeti diskon en la diskingon kaj puŝi la enigan klavon" +msgstr "Bonvole enmetu diskon en la diskingon kaj presu la enigan klavon" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "Konstruado de datenaj strukturoj" +msgstr "Konstruanta datumstrukturojn" #~ msgid "Python-debian module not available" #~ msgstr "Modulo Python-debian ne haveblas" + +#~ msgid "Community-maintained Open Source software" +#~ msgstr "Komunume prizorgata malfermitkoda programaro" + +#~ msgid "Canonical-supported Open Source software" +#~ msgstr "Malfermitkoda programaro subtenata de Canonical" -- cgit v1.2.3 From de0d2d826009fea154e1a19259b575254bba76ff Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:36:08 -0400 Subject: * po/sk.po: Slovak translation updated by Ivan Masár (closes: #676973) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 1 + po/sk.po | 283 +++++++++++++++++++++++-------------------------------- 2 files changed, 121 insertions(+), 163 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd6bed98..369fb5e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/id.po: Indonesian translation by Andika Triwidada (closes: #676960) * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla + * po/sk.po: Slovak translation updated by Ivan Masár (closes: #676973) * po/sl.po: Slovenian translation updated by Matej Urbančič -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/po/sk.po b/po/sk.po index aa612390..187c7aa5 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,16 +2,16 @@ # Copyright (C) 2006 Canonical Ltd, and Rosetta Contributors 2006 # This file is distributed under the same license as the update-manager package. # Peter Chabada , 2006. -# +# Ivan Masár , 2012. # msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:17+0000\n" -"Last-Translator: Peter Chabada \n" -"Language-Team: Slovak \n" +"PO-Revision-Date: 2012-06-10 23:28+0100\n" +"Last-Translator: Ivan Masár \n" +"Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,264 +26,228 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +msgstr "Ubuntu 12.04 „Precise Pangolin“" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD-ROM s Ubuntu 12.04 „Precise Pangolin“" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 11.10 „Oneiric Ocelot“" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "CD-ROM s Ubuntu 11.10 „Oneiric Ocelot“" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 11.04 „Natty Narwhal“" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "CD-ROM s Ubuntu 11.04 „Natty Narwhal“" #. Description #: ../data/templates/Ubuntu.info.in:486 -#, fuzzy msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 10.10 „Maverick Meerkat“" #. Description #: ../data/templates/Ubuntu.info.in:506 -#, fuzzy msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "CD-ROM s Ubuntu 10.10 „Maverick Meerkat“" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Partneri Canonicalu" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Balíky softvéru, ktoré pripravil Canonical pre svojich partnerov" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Tento softvér nie je súčasťou Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Nezávislé" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Poskytované vývojármi tretích strán" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Softvér, ktorý ponúkajú vývojári tretích strán." #. Description #: ../data/templates/Ubuntu.info.in:569 -#, fuzzy msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 10.04 „Lucid Lynx“" #. Description #: ../data/templates/Ubuntu.info.in:589 -#, fuzzy msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "CD-ROM s Ubuntu 10.04 „Lucid Lynx“" #. Description #: ../data/templates/Ubuntu.info.in:632 -#, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 9.10 „Karmic Koala“" #. Description #: ../data/templates/Ubuntu.info.in:652 -#, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "CD-ROM s Ubuntu 9.10 „Karmic Koala“" #. Description #: ../data/templates/Ubuntu.info.in:695 -#, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 9.04 „Jaunty Jackalope“" #. Description #: ../data/templates/Ubuntu.info.in:714 -#, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "CD-ROM s Ubuntu 9.04 „Jaunty Jackalope“" #. Description #: ../data/templates/Ubuntu.info.in:757 -#, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 8.10 „Intrepid Ibex“" #. Description #: ../data/templates/Ubuntu.info.in:777 -#, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Disk s Ubuntu 5.04 „Hoary Hedgehog“" #. Description #: ../data/templates/Ubuntu.info.in:821 -#, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 8.04 „Hardy Heron“" #. Description #: ../data/templates/Ubuntu.info.in:841 -#, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "CD-ROM s Ubuntu 8.04 „Hardy Heron“" #. Description #: ../data/templates/Ubuntu.info.in:886 -#, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +msgstr "Ubuntu 7.10 „Gutsy Gibbon“" #. Description #: ../data/templates/Ubuntu.info.in:905 -#, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD-ROM s Ubuntu 7.10 „Gutsy Gibbon“" #. Description #: ../data/templates/Ubuntu.info.in:950 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +msgstr "Ubuntu 7.04 „Feisty Fawn“" #. Description #: ../data/templates/Ubuntu.info.in:969 -#, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD-ROM s Ubuntu 7.04 „Feisty Fawn“" #. Description #: ../data/templates/Ubuntu.info.in:1011 -#, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "Ubuntu 5.10 - aktualizácie" +msgstr "Ubuntu 6.10 „Edgy Eft“" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 -#, fuzzy msgid "Community-maintained" -msgstr "Udržiavané komunitou (Universe)" +msgstr "Udržiavané komunitou" #. CompDescription #: ../data/templates/Ubuntu.info.in:1022 -#, fuzzy msgid "Restricted software" -msgstr "Softvér závislý na neslobornom softvéri" +msgstr "Softvér závislý na neslobodnom softvéri" #. Description #: ../data/templates/Ubuntu.info.in:1030 -#, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "CD-ROM s Ubuntu 6.10 „Edgy Eft“" #. Description #: ../data/templates/Ubuntu.info.in:1072 -#, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Ubuntu 6.06 'Dapper Drake'" +msgstr "Ubuntu 6.06 LTS „Dapper Drake“" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy msgid "Canonical-supported free and open-source software" -msgstr "Udržiavané komunitou (Universe)" +msgstr "Slobodný a open source softvér, ktorý podporuje Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 -#, fuzzy msgid "Community-maintained (universe)" -msgstr "Udržiavané komunitou (Universe)" +msgstr "Udržiavané komunitou (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy msgid "Community-maintained free and open-source software" -msgstr "Udržiavané komunitou (Universe)" +msgstr "Slobodný a open source softvér udržiavaný komunitou" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 -#, fuzzy msgid "Non-free drivers" -msgstr "Neslobodné (Multiverse)" +msgstr "Neslobodné ovládače" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" -msgstr "" +msgstr "Proprietárne ovládače zariadení" #. CompDescription #: ../data/templates/Ubuntu.info.in:1083 -#, fuzzy msgid "Restricted software (Multiverse)" -msgstr "Neslobodné (Multiverse)" +msgstr "Neslobodný softvér (Multiverse)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" -msgstr "" +msgstr "Softvér obmedzený autorskými právami alebo právnymi otázkami" #. Description #: ../data/templates/Ubuntu.info.in:1091 -#, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Ubuntu 6.06 'Dapper Drake'" +msgstr "CD-ROM s Ubuntu 6.06 LTS „Dapper Drake“" #. Description #: ../data/templates/Ubuntu.info.in:1107 -#, fuzzy msgid "Important security updates" -msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +msgstr "Dôležité bezpečnostné aktualizácie" #. Description #: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" -msgstr "" +msgstr "Odporúčané aktualizácie" #. Description #: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy msgid "Pre-released updates" -msgstr "Nainštalovať _aktualizácie" +msgstr "Aktualizácie pred vydaním" #. Description #: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy msgid "Unsupported updates" -msgstr "Nainštalovať _aktualizácie" +msgstr "Nepodporované aktualizácie" #. Description #: ../data/templates/Ubuntu.info.in:1133 @@ -292,9 +256,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1148 -#, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD-ROM s Ubuntu 5.10 „Breezy Badger“" #. Description #: ../data/templates/Ubuntu.info.in:1164 @@ -313,15 +276,13 @@ msgstr "Ubuntu 5.10 - backporty" #. Description #: ../data/templates/Ubuntu.info.in:1185 -#, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 5.04 „Hoary Hedgehog“" #. Description #: ../data/templates/Ubuntu.info.in:1200 -#, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "CD-ROM s Ubuntu 5.04 „Hoary Hedgehog“" #. CompDescription #: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 @@ -330,31 +291,26 @@ msgstr "Oficiálne podporované" #. Description #: ../data/templates/Ubuntu.info.in:1216 -#, fuzzy msgid "Ubuntu 5.04 Security Updates" -msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +msgstr "Ubuntu 5.04 - bezpečnostné aktualizácie" #. Description #: ../data/templates/Ubuntu.info.in:1221 -#, fuzzy msgid "Ubuntu 5.04 Updates" -msgstr "Ubuntu 5.10 - aktualizácie" +msgstr "Ubuntu 5.04 - aktualizácie" #. Description #: ../data/templates/Ubuntu.info.in:1226 -#, fuzzy msgid "Ubuntu 5.04 Backports" -msgstr "Ubuntu 5.10 - backporty" +msgstr "Ubuntu 5.04 - backporty" #. Description #: ../data/templates/Ubuntu.info.in:1232 -#, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 4.10 „Warty Warthog“" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 -#, fuzzy msgid "Community-maintained (Universe)" msgstr "Udržiavané komunitou (Universe)" @@ -365,15 +321,13 @@ msgstr "Neslobodné (Multiverse)" #. Description #: ../data/templates/Ubuntu.info.in:1247 -#, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +msgstr "CD-ROM s Ubuntu 4.10 „Warty Warthog“" #. CompDescription #: ../data/templates/Ubuntu.info.in:1250 -#, fuzzy msgid "No longer officially supported" -msgstr "Niektoré programy už nie sú viac oficiálne podporované" +msgstr "Už nie sú oficiálne podporované" #. CompDescription #: ../data/templates/Ubuntu.info.in:1252 @@ -392,9 +346,8 @@ msgstr "Ubuntu 4.10 aktualizácie" #. Description #: ../data/templates/Ubuntu.info.in:1269 -#, fuzzy msgid "Ubuntu 4.10 Backports" -msgstr "Ubuntu 5.10 - backporty" +msgstr "Ubuntu 4.10 - backporty" #. ChangelogURI #: ../data/templates/Debian.info.in.h:4 @@ -404,57 +357,48 @@ 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\"" +msgstr "Debian 3.1 „Sarge“" #. Description #: ../data/templates/Debian.info.in:94 -#, fuzzy msgid "Proposed updates" -msgstr "Nainštalovať _aktualizácie" +msgstr "Navrhované aktualizácie" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +msgstr "Bezpečnostné aktualizácie" #. Description #: ../data/templates/Debian.info.in:108 -#, fuzzy msgid "Debian current stable release" -msgstr "Debian Unstable \"Sid\"" +msgstr "Aktuálne vydanie Debian stable" #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian testing" #. Description #: ../data/templates/Debian.info.in:147 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" +msgstr "Debian „Sid“ (nestabilné)" #. CompDescription #: ../data/templates/Debian.info.in:151 @@ -477,24 +421,22 @@ msgstr "Server pre %s" #. append a list of all used servers #: ../aptsources/distro.py:224 ../aptsources/distro.py:230 #: ../aptsources/distro.py:246 -#, fuzzy msgid "Main server" -msgstr "Najbližší server" +msgstr "Hlavný server" #: ../aptsources/distro.py:250 -#, fuzzy msgid "Custom servers" -msgstr "Najbližší server" +msgstr "Vlastné servery" #: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, fuzzy, python-format +#, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "Sťahovanie súboru %li z %li pri %s/s" +msgstr "Sťahuje sa súbor %(current)li z %(total)li pri %(speed)s/s" #: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, fuzzy, python-format +#, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "Sťahovanie súboru %li z %li pri %s/s" +msgstr "Sťahuje sa súbor %(current)li z %(total)li" #. Setup some child widgets #: ../apt/progress/gtk2.py:340 @@ -502,23 +444,21 @@ msgid "Details" msgstr "Podrobnosti" #: ../apt/progress/gtk2.py:428 -#, fuzzy msgid "Starting..." -msgstr "Nastavenia" +msgstr "Spúšťa sa..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Hotovo" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" +msgstr "Neplatný Unicode v pospise „%s“ (%s). Nahláste to, prosím." #: ../apt/package.py:1088 ../apt/package.py:1194 -#, fuzzy msgid "The list of changes is not available" -msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." +msgstr "Zoznam zmien nie je k dispozícii" #: ../apt/package.py:1200 #, python-format @@ -528,35 +468,38 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"Zoznam zmien zatiaľ nie je dostupný.\n" +"\n" +"Prosím, použite http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"pokým zmeny nebudú dostupné alebo to skúste znova neskôr." #: ../apt/package.py:1207 -#, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -"Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové " -"pripojenie." +"Nepodarilo sa stiahnuť zoznam zmien. \n" +"Prosím, skontrolujte si svoje pripojenie k internetu." #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "Zoznam súborov „%s“ nebolo možné načítať" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "Zoznam riadiacich súborov „%s“ nebolo možné načítať" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Závislosť nemožno uspokojiť: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Je v konflikte s nainštalovaným balíkom „%s“" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -565,6 +508,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Kazí závislosť %(depname)s (%(deprelation)s %(depversion)s) existujúceho " +"balíka „'%(pkgname)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:389 @@ -573,6 +518,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Kazí konflikt %(targetpkg)s (%(comptype)s %(targetver)s) existujúceho balíka " +"„'%(pkgname)s“" #: ../apt/debfile.py:399 #, python-format @@ -580,74 +527,81 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Kazí existujúci balík „'%(pkgname)s“, ktorý je v konflikte s: " +"„'%(targetpkg)s“. Ale „'%(debfile)s“ ho poskytuje prostredníctvom " +"„'%(provides)s“" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Balíku chýba pole Architecture (architektúra)" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Nesprávna architektúra „%s“" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Novšia verzia už je nainštalovaná" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" +"Nepodarilo sa uspokojiť všetky závislosti (poškodená vyrovnávacia pamäť)" #: ../apt/debfile.py:519 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" -msgstr "Nemôžem inštalovať '%s'" +msgstr "Nie je možné bainštalovať „%s“" #: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Automaticky rozbalené:\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Automaticky prevedené na tlačiteľné znaky ASCII:\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" +"Nainštalovať závislosti zostavenia zdrojového balíka „%s“, ktorý zostavuje " +"%s\n" #: ../apt/debfile.py:700 -#, fuzzy msgid "An essential package would be removed" -msgstr "Musel by byť odstránený dôležitý balík" +msgstr "Bol by odstránený nevyhnutný balík" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Hotovo" #: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Stiah " #: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Ignor " #: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Chyba " #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Získať:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr " [Pracuje sa]" #: ../apt/progress/text.py:214 #, python-format @@ -656,21 +610,24 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Výmena média: prosím, vložte disk s označením\n" +" „%s“\n" +"do mechaniky „%s“ a stlačte Enter\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Stiahnutých %sB za %s (%sB/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Prosím, zadajte názov tohto disku. Napr. „Debian 2.1r1 Disk 1“" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Prosím, vložte disk do mechaniky a stlačte Enter" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "" +msgstr "Zostavujú sa údajové štruktúry" -- cgit v1.2.3 From 200d79a18b466e29b79a29422dc6ec8df61cbcb1 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:46:15 -0400 Subject: * po/tl.po: Tagalog translation updated by Ariel S. Betan --- debian/changelog | 1 + po/tl.po | 238 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 123 insertions(+), 116 deletions(-) diff --git a/debian/changelog b/debian/changelog index 369fb5e2..549d8aa3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla * po/sk.po: Slovak translation updated by Ivan Masár (closes: #676973) * po/sl.po: Slovenian translation updated by Matej Urbančič + * po/tl.po: Tagalog translation updated by Ariel S. Betan -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/po/tl.po b/po/tl.po index 8d2dddca..ee4ff508 100644 --- a/po/tl.po +++ b/po/tl.po @@ -3,13 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-09-16 15:44+0000\n" +"PO-Revision-Date: 2012-06-11 11:13+0800\n" "Last-Translator: Ariel S. Betan \n" "Language-Team: Tagalog \n" "Language: tl\n" @@ -27,268 +26,263 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" +msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" +msgstr "Cdrom na may Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" +msgstr "Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:276 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" +msgstr "Cdrom na may Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" +msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" +msgstr "Cdrom na may Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:506 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" +msgstr "Cdrom na may Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Mga Kasama ng Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Software na pinakete ng Canonical para sa kanilang mga kasama" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Ang software na ito ay hindi bahagi ng Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Malaya" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Ipinamahagi ng mga third-party software developers" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Software na ibinigay mga third party developers " #. Description #: ../data/templates/Ubuntu.info.in:569 msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" +msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:589 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" +msgstr "Cdrom na may Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" +msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" +msgstr "Cdrom na may Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" +msgstr "Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" +msgstr "Cdrom na may Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" +msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" +msgstr "Cdrom na may Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" +msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" +msgstr "Cdrom na may Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" +msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" +msgstr "Cdrom na may Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" +msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" +msgstr "Cdrom na may Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" +msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 -#, fuzzy msgid "Community-maintained" -msgstr "Inaalagaan ng kumunidad (Universe)" +msgstr "Inaalagaan ng kumunidad" #. CompDescription #: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" -msgstr "" +msgstr "Software na may mahigpit na gamit" #. Description #: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" +msgstr "Cdrom na may Ubuntu 6.10 'Edgy Eft'" #. Description #: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" +msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy msgid "Canonical-supported free and open-source software" -msgstr "Inaalagaan ng kumunidad (Universe)" +msgstr "Malaya at bukas na software suportado ng Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 -#, fuzzy msgid "Community-maintained (universe)" -msgstr "Inaalagaan ng kumunidad (Universe)" +msgstr "Inaalagaan ng kumunidad (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy msgid "Community-maintained free and open-source software" -msgstr "Inaalagaan ng kumunidad (Universe)" +msgstr "Malaya at bukas na software suportado ng Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" -msgstr "" +msgstr "Hindi malayang drivers" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" -msgstr "" +msgstr "Proprietary drivers para sa mga devices" #. CompDescription #: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" -msgstr "" +msgstr "Software na may mahigpit na gamit (Multiverse)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" +"Software na may mahigpit na gamit dahil sa copyright o mga legal issues" #. Description #: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" +msgstr "Cdrom na may Ubuntu 6.06 LTS 'Dapper Drake'" #. Description #: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" -msgstr "" +msgstr "Mga mahalagang updates pang-seguridad" #. Description #: ../data/templates/Ubuntu.info.in:1112 msgid "Recommended updates" -msgstr "" +msgstr "Mga mungkahing updates" #. Description #: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy msgid "Pre-released updates" -msgstr "Release Notes" +msgstr "Mga updates bago ma-released" #. Description #: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy msgid "Unsupported updates" -msgstr "Mga updates mula sa Internet" +msgstr "Mga hindi suportadong updates" #. Description #: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" +msgstr "Cdrom na may Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" -msgstr "" +msgstr "Ubuntu 5.10 Security Updates" #. Description #: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" -msgstr "" +msgstr "Ubuntu 5.10 Updates" #. Description #: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" -msgstr "" +msgstr "Ubuntu 5.10 Backports" #. Description #: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description #: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" +msgstr "Cdrom na may Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 @@ -298,26 +292,25 @@ msgstr "Opisyal na sinusuportahan" #. Description #: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" -msgstr "" +msgstr "Ubuntu 5.04 Security Updates" #. Description #: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" -msgstr "" +msgstr "Ubuntu 5.04 Updates" #. Description #: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" -msgstr "" +msgstr "Ubuntu 5.04 Backports" #. Description #: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" +msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 -#, fuzzy msgid "Community-maintained (Universe)" msgstr "Inaalagaan ng kumunidad (Universe)" @@ -329,12 +322,12 @@ msgstr "Di-malaya (Multiverse)" #. Description #: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" +msgstr "Cdrom na may Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" -msgstr "" +msgstr "Hindi na opisyal na sinusuportahan" #. CompDescription #: ../data/templates/Ubuntu.info.in:1252 @@ -344,17 +337,17 @@ msgstr "Mahigpit na copyright" #. Description #: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" -msgstr "" +msgstr "Ubuntu 4.10 Security Updates" #. Description #: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" -msgstr "" +msgstr "Ubuntu 4.10 Updates" #. Description #: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" -msgstr "" +msgstr "Ubuntu 4.10 Backports" #. ChangelogURI #: ../data/templates/Debian.info.in.h:4 @@ -364,55 +357,48 @@ 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\"" +msgstr "Debian 3.1 'Sarge'" #. Description #: ../data/templates/Debian.info.in:94 msgid "Proposed updates" -msgstr "" +msgstr "Mga mungkahing updates" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Mga updates mula sa Internet" +msgstr "Mga updates pang-seguridad" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Kasalukuyang stable release ng Debian" #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian testing" #. Description #: ../data/templates/Debian.info.in:147 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" +msgstr "Debian 'Sid' (unstable)" #. CompDescription #: ../data/templates/Debian.info.in:151 @@ -428,7 +414,7 @@ msgstr "Software na Di-DFSG-compatible" #: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" -msgstr "" +msgstr "Server para sa %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 @@ -436,21 +422,21 @@ msgstr "" #: ../aptsources/distro.py:224 ../aptsources/distro.py:230 #: ../aptsources/distro.py:246 msgid "Main server" -msgstr "" +msgstr "Pangunahing server" #: ../aptsources/distro.py:250 msgid "Custom servers" -msgstr "" +msgstr "Pasadyang mga servers" #: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" +msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s" #: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "" +msgstr "Downloading file %(current)li of %(total)li" #. Setup some child widgets #: ../apt/progress/gtk2.py:340 @@ -459,20 +445,21 @@ msgstr "Mga Detalye" #: ../apt/progress/gtk2.py:428 msgid "Starting..." -msgstr "" +msgstr "Nagsisimula..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Kumpleto" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" +"Invalidong unicode sa deskripsyon para '%s' (%s). Mangyaring ipagbigay alam." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" -msgstr "" +msgstr "Ang talaan ng mga pagbabago ay wala" #: ../apt/package.py:1200 #, python-format @@ -482,33 +469,38 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"Ang talaan ng mga pagbabago ay wala pa.\n" +"\n" +"Mangyaring gamitin http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"hanggang mayroon ng mga pagbabago o subukang muli mamaya." #: ../apt/package.py:1207 -#, fuzzy msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." -msgstr "Mangyaring suriin ang inyong internet connection" +msgstr "" +"Bigo sa pag-download ng talaan ng mga pagbabago. \n" +"Mangyaring suriin ang inyong koneksyon sa internet." #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "Ang talaan ng mga files para sa '%s' ay hindi mabasa" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "Ang talaan ng mga files na pang-kontrol para sa '%s' ay hindi mabasa" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Ang Dependensiya ay hindi sapat: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Mga mga conflicts sa na-install na paketeng '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -517,6 +509,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Binabasag ang umiiral na paketeng '%(pkgname)s' dependency %(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:389 @@ -525,6 +519,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Binabasag ang umiiral na paketeng '%(pkgname)s' conflict: %(targetpkg)s " +"(%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -532,27 +528,30 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Binabasag ang umiiral na paketeng '%(pkgname)s' na may conflict sa: " +"'%(targetpkg)s'. Ngunit ang '%(debfile)s' ay nagbibigay nito sa pamamagitan " +"ng: '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Walang Architecture field sa loob ng pakete" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Maling architecture '%s'" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Mas naunang bersiyon ang kasalukuyang naka-install" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Bigo na maging sapat ang lahat ng dependensiya (broken cache)" #: ../apt/debfile.py:519 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" msgstr "Hindi ma-install '%s'" @@ -561,45 +560,48 @@ msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Automatikong na decompressed:\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Automatikong na-convert sa printable ascii:\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" +"Install Build-Dependencies para sa pinagmulang pakete '%s' na nag-build ng " +"%s\n" #: ../apt/debfile.py:700 -#, fuzzy msgid "An essential package would be removed" -msgstr "Isang esensiyal na pakete ang kailangang tanggalin" +msgstr "Isang kinakailangang pakete ang kailangang tanggalin" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Tapos na" #: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Hit " #: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Ign " #: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Err " #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Kunin:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr " [Nagtatrabaho]" #: ../apt/progress/text.py:214 #, python-format @@ -608,21 +610,25 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Bagong media: magyaring ipasok ang disc na may label na\n" +" '%s'\n" +"sa drive '%s' at pindutin ang enter\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Kinuha %sB sa %s (%sB/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" +"Mangyaring magbigay ng pangalan para sa Disc, tulad ng 'Debian 2.1r1 Disk 1'" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Mangyaring magpasok ng Disc sa drive at pindutin ang enter" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "" +msgstr "Nagbubuo ng data structures" -- cgit v1.2.3 From dbde3f0ed9512b1fd6a37ac6c9791be28e8806ca Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:48:36 -0400 Subject: * po/fi.po: Finnish translation updated by Timo Jyrinki --- debian/changelog | 1 + po/fi.po | 184 +++++++++++++++++++++++++------------------------------ 2 files changed, 83 insertions(+), 102 deletions(-) diff --git a/debian/changelog b/debian/changelog index 549d8aa3..7636e3c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file * po/eo.po: Esperanto translation by Kristjan Schmidt and Michael Moroni + * po/fi.po: Finnish translation updated by Timo Jyrinki * po/fr.po: French translation updated (closes: #567765) * po/id.po: Indonesian translation by Andika Triwidada (closes: #676960) * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) diff --git a/po/fi.po b/po/fi.po index be961e6c..dc741a9c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-23 12:24+0000\n" +"PO-Revision-Date: 2012-06-11 08:55+0300\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -25,167 +25,143 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 5.04 turvallisuuspäivitykset" +msgstr "Ubuntu 12.04 \"Precise PAngolin\"" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy" +msgstr "Ubuntu 12.04 \"Precise Pangolin\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 11.10 \"Oneiric Ocelot\"" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" +msgstr "Ubuntu 11.10 \"Oneiric Ocelot\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 11.04 \"Natty Narwhal\"" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" +msgstr "Ubuntu 11.04 \"Natty Narwhal\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:486 -#, fuzzy msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 10.10 \"Maverick Meerkat\"" #. Description #: ../data/templates/Ubuntu.info.in:506 -#, fuzzy msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" +msgstr "Ubuntu 10.10 \"Maverick Meerkat\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Canonicalin partnerit" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Canonicalin pakkaamia partnereiden sovelluksia" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Tämä ohjelma ei ole osa Ubuntua." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Riippumaton" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Muiden kehittäjien sovelluksia" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Kolmansien osapuolien tarjoamia sovelluksia." #. Description #: ../data/templates/Ubuntu.info.in:569 -#, fuzzy msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 10.04 \"Lucid Lynx\"" #. Description #: ../data/templates/Ubuntu.info.in:589 -#, fuzzy msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" +msgstr "Ubuntu 10.04 \"Lucid Lynx\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:632 -#, 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:652 -#, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" +msgstr "Ubuntu 9.10 \"Karmic Koala\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:695 -#, 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:714 -#, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" +msgstr "Ubuntu 9.04 \"Jaunty Jackalope\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:757 -#, 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:777 -#, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" +msgstr "Ubuntu 8.10 \"Intrepid Ibex\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:821 -#, 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:841 -#, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" +msgstr "Ubuntu 8.04 \"Hardy Heron\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:886 -#, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 5.04 turvallisuuspäivitykset" +msgstr "Ubuntu 7.10 \"Gutsy Gibbon\"" #. Description #: ../data/templates/Ubuntu.info.in:905 -#, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy" +msgstr "Ubuntu 7.10 \"Gutsy Gibbon\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:950 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.04 turvallisuuspäivitykset" +msgstr "Ubuntu 7.04 \"Feisty Fawn\"" #. Description #: ../data/templates/Ubuntu.info.in:969 -#, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy" +msgstr "Ubuntu 7.04 \"Feisty Fawn\" -CD-levy" #. Description #: ../data/templates/Ubuntu.info.in:1011 @@ -194,7 +170,6 @@ msgstr "Ubuntu 6.10 \"Edgy Eft\"" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 -#, fuzzy msgid "Community-maintained" msgstr "Yhteisön ylläpitämät" @@ -215,21 +190,18 @@ msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy msgid "Canonical-supported free and open-source software" -msgstr "Canonicalin tukemat avoimen lähdekoodin ohjelmistot" +msgstr "Canonicalin tukemat vapaat ja avoimen lähdekoodin ohjelmistot" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 -#, fuzzy msgid "Community-maintained (universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy msgid "Community-maintained free and open-source software" -msgstr "Yhteisön ylläpitämät avoimen lähdekoodin ohjelmistot" +msgstr "Yhteisön ylläpitämät vapaat ja avoimen lähdekoodin ohjelmistot" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 @@ -268,15 +240,13 @@ msgstr "Suositellut päivitykset" #. Description #: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy msgid "Pre-released updates" -msgstr "Ehdotetut päivitykset" +msgstr "Esijulkaistut päivitykset" #. Description #: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy msgid "Unsupported updates" -msgstr "Takaisinsovitetut päivitykset" +msgstr "Tukemattomat päivitykset" #. Description #: ../data/templates/Ubuntu.info.in:1133 @@ -340,7 +310,6 @@ msgstr "Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 -#, fuzzy msgid "Community-maintained (Universe)" msgstr "Yhteisön ylläpitämät (universe)" @@ -387,25 +356,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\"" @@ -416,24 +381,21 @@ msgstr "Ehdotetut päivitykset" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Tärkeät turvallisuuspäivitykset" +msgstr "Turvallisuuspäivitykset" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Debian stable (tämänhetkinen vakaa julkaisu)" #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testattava)" +msgstr "Debian testing (testattava)" #. Description #: ../data/templates/Debian.info.in:147 -#, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (epävakaa)" @@ -482,18 +444,19 @@ msgid "Details" msgstr "Yksityiskohdat" #: ../apt/progress/gtk2.py:428 -#, fuzzy msgid "Starting..." -msgstr "Asetukset" +msgstr "Käynnistetään..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Valmis" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" +"\"%s\":n kuvauksessa virheellinen unicode-merkki %s. Ole hyvä ja raportoi " +"virheestä kehittäjille." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" @@ -507,6 +470,10 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"Muutosluettelo ei ole vielä saatavilla.\n" +"\n" +"Käytä osoitetta http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"kunnes muutokset tulevat saataville, tai yritä myöhemmin uudelleen." #: ../apt/package.py:1207 msgid "" @@ -519,22 +486,22 @@ msgstr "" #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "Kohteen \"%s\" tiedostoluetteloa ei voi lukea" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "Kohteen \"%s\" hallintatiedostoja ei voi lukea" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Riippuvuus ei täytettävissä: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Ristiriidassa asennetun paketin \"%s\" kanssa" #. 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 @@ -543,6 +510,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Rikkoo olemassa olevan paketin '%(pkgname)s', riippuvuus %(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:389 @@ -551,6 +520,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Rikkoo olemassa olevan paketin '%(pkgname)s', ristiriita: %(targetpkg)s " +"(%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -558,74 +529,80 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Rikkoo olemassa olevan paketin '%(pkgname)s', joka on ristiriidassa " +"seuraavien kanssa: '%(targetpkg)s'. Mutta '%(debfile)s' tarjoaa sen " +"seuraavasti: '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Ei Architecture-kenttää paketissa" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Väärä arkkitehtuuri \"%s\"" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Myöhempi versio on jo asennettu" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Kaikkia riippuvuuksia ei voi täyttää (rikkinäinen välimuisti)" #: ../apt/debfile.py:519 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" -msgstr "Ei voitu asentaa pakettia \"%s\"" +msgstr "Ei voi asentaa \"%s\"" #: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Purettu automaattisesti:\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Automaattisesti muunnettu tulostettavaksi asciiksi:\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" +"Asenna käännösriippuvuudet (Build-Dependencies) lähdepaketille \"%s\", josta " +"%s rakennetaan\n" #: ../apt/debfile.py:700 -#, fuzzy msgid "An essential package would be removed" msgstr "Välttämätön paketti jouduttaisiin poistamaan" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... valmis" #: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Osuma " #: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Ohi " #: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Vir " #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Hae:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr " [Työskennellään]" #: ../apt/progress/text.py:214 #, python-format @@ -634,21 +611,24 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Tallennusvälineen vaihto: syötä levy \n" +"\"%s\"\n" +"asemaan ”%s” ja paina Enter\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Noudettu %sB in %s (%sB/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Syötä nimi tälle levylle, esimerkiksi \"Debian 6.0r2 levy 1\"" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Syötä levy asemaan ja paina Enter" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "" +msgstr "Kasataan tietorakenteita" -- cgit v1.2.3 From 02649b5eeb6af1657ad7ccfe10fbc898aa20cece Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:55:44 -0400 Subject: * po/el.po: Greek translation updated by Thomas Vasileiou (closes: #677331) --- debian/changelog | 1 + po/el.po | 202 +++++++++++++++++++++++++------------------------------ 2 files changed, 92 insertions(+), 111 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7636e3c2..704f2969 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file + * po/el.po: Greek translation updated by Thomas Vasileiou (closes: #677331) * po/eo.po: Esperanto translation by Kristjan Schmidt and Michael Moroni * po/fi.po: Finnish translation updated by Timo Jyrinki * po/fr.po: French translation updated (closes: #567765) diff --git a/po/el.po b/po/el.po index 4d021395..d8e701fd 100644 --- a/po/el.po +++ b/po/el.po @@ -3,13 +3,14 @@ # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER. # # Kostas Papadimas , 2005, 2006. +# Thomas Vasileiou , 2012. msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:13+0000\n" -"Last-Translator: Kostas Papadimas \n" +"PO-Revision-Date: 2012-06-13 11:37+0100\n" +"Last-Translator: Thomas Vasileiou \n" "Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" @@ -25,167 +26,143 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" +msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'" +msgstr "Cdrom με Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 11.10 'Oneiric Ocelot''" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" +msgstr "Cdrom με το Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" +msgstr "Cdrom με το Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 -#, fuzzy msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:506 -#, fuzzy msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" +msgstr "Cdrom με το Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Συνεργάτες της Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Πακέτο λογισμικού της Canonical για τους συνεργάτες της " #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Αυτό το λογισμικό δεν αποτελεί μέρος των Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Ανεξάρτητο" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Παρέχεται από τρίτους" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Λογισμικό που προσφέρεται από τρίτους." #. Description #: ../data/templates/Ubuntu.info.in:569 -#, fuzzy msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:589 -#, fuzzy msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Cdrom με Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:632 -#, 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:652 -#, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" +msgstr "Cdrom με το Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:695 -#, 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:714 -#, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" +msgstr "Cdrom με το Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:757 -#, 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:777 -#, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Cdrom με Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:821 -#, 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:841 -#, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Cdrom με Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:886 -#, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" +msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:905 -#, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'" +msgstr "Cdrom με Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:950 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" +msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:969 -#, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'" +msgstr "Cdrom με Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:1011 @@ -194,9 +171,8 @@ msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 -#, fuzzy msgid "Community-maintained" -msgstr "Community maintained" +msgstr "Υποστηριζόμενα από την κοινότητα" #. CompDescription #: ../data/templates/Ubuntu.info.in:1022 @@ -215,21 +191,18 @@ msgstr "Ubuntu 6.06 TLS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy msgid "Canonical-supported free and open-source software" msgstr "Λογισμικό ανοικτού κώδικα υποστηριζόμενο από την Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 -#, fuzzy msgid "Community-maintained (universe)" -msgstr "Υποστηριζόμενα από την κοινότητα (Universe)" +msgstr "Υποστηριζόμενα από την κοινότητα (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy msgid "Community-maintained free and open-source software" -msgstr "Community maintained Open Source software" +msgstr "Λογισμικό ανοιχτού κώδικα υποστηριζόμενο από την κοινότητα" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 @@ -268,15 +241,13 @@ msgstr "Συνιστώμενες ενημερώσεις" #. Description #: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy msgid "Pre-released updates" msgstr "Προτεινόμενες ενημερώσεις" #. Description #: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy msgid "Unsupported updates" -msgstr "Backported ενημερώσεις" +msgstr "Μη υποστηριζόμενες ενημερώσεις" #. Description #: ../data/templates/Ubuntu.info.in:1133 @@ -296,7 +267,7 @@ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" -msgstr "Αναβαθμίσεις Ubuntu 5.10" +msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description #: ../data/templates/Ubuntu.info.in:1174 @@ -305,19 +276,18 @@ msgstr "Ubuntu 5.10 Backports" #. Description #: ../data/templates/Ubuntu.info.in:1185 -#, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description #: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Cdrom με Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 msgid "Officially supported" -msgstr "Officially supported" +msgstr "Επίσημα υποστηριζόμενο" #. Description #: ../data/templates/Ubuntu.info.in:1216 @@ -341,9 +311,8 @@ msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 -#, fuzzy msgid "Community-maintained (Universe)" -msgstr "Community maintained (Universe)" +msgstr "Υποστηριζόμενα από την κοινότητα (Universe)" #. CompDescription #: ../data/templates/Ubuntu.info.in:1240 @@ -388,27 +357,23 @@ 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\"" +msgstr "Debian 3.1 'Sarge'" #. Description #: ../data/templates/Debian.info.in:94 @@ -417,26 +382,23 @@ msgstr "Προτεινόμενες ενημερώσεις" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Σημαντικές ενημερώσεις ασφαλείας" +msgstr "Ενημερώσεις ασφαλείας" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Τρέχουσα σταθερή έκδοση Debian " #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian testing" #. Description #: ../data/templates/Debian.info.in:147 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" +msgstr "Debian 'Sid' (unstable)" #. CompDescription #: ../data/templates/Debian.info.in:151 @@ -483,20 +445,21 @@ msgstr "Λεπτομέρειες" #: ../apt/progress/gtk2.py:428 msgid "Starting..." -msgstr "" +msgstr "Εκκίνηση..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Ολοκληρώθηκε" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" +"Μη έγκυρος unicode στην περιγραφή για το '%s' (%s). Παρακαλώ αναφέρετέ το." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" -msgstr "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη." +msgstr "Η λίστα των αλλαγών δεν είναι διαθέσιμη." #: ../apt/package.py:1200 #, python-format @@ -506,6 +469,11 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"Η λίστα αλλαγών δεν είναι διαθέσιμη.\n" +"\n" +"Παρακαλώ χρησιμοποιήστε το http://launchpad.net/ubuntu/+source/%s/%s/" +"+changelog\n" +"έως ότου οι αλλαγές γίνουν διαθέσιμες ή προσπαθήστε αργότερα." #: ../apt/package.py:1207 msgid "" @@ -518,22 +486,22 @@ msgstr "" #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "Η λίστα των αρχείων για το '%s' δεν μπόρεσε να διαβαστεί" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "Η λίστα των αρχείων ελέγχου για το '%s' δεν μπόρεσε να διαβαστεί" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Η εξάρτηση δεν ικανοποιείται: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Συγκρούεται με το εγκατεστημένο πακέτο '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -542,6 +510,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Παραβιάζει υπάρχον πακέτο '%(pkgname)s' εξάρτηση %(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:389 @@ -550,6 +520,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Παραβιάζει υπάρχον πακέτο '%(pkgname)s' σύγκρουση με : %(targetpkg)s " +"(%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -557,74 +529,79 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Παραβιάζει υπάρχον πακέτο '%(pkgname)s' το οποίο συγκρούεται με: " +"'%(targetpkg)s'. Αλλά το '%(debfile)s', το παρέχει μέσω του: '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Δεν βρέθηκε το πεδίο Αρχιτεκτονική στο πακέτο" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Λάθος αρχιτεκτονική '%s'" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Μια πιο πρόσφατη έκδοση είναι ήδη εγκατεστημένη" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Αποτυχία ικανοποίησης όλων των εξαρτήσεων (σπασμένη cache)" #: ../apt/debfile.py:519 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" -msgstr "Αδυναμία εγκατάστασης '%s'" +msgstr "Αδυναμία εγκατάστασης του '%s'" #: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Αυτόματη αποσυμπίεση:\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Μετατράπηκε αυτόματα σε εκτυπώσιμο ascii:\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" +"Εγκαταστήστε τις Εξαρτήσεις Μεταγλώττισης για το πηγαίο πακέτο '%s' που " +"δομεί το %s\n" #: ../apt/debfile.py:700 -#, fuzzy msgid "An essential package would be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Ολοκληρώθηκε" #: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Πιέστε" #: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Αγν" #: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Λαθ" #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Φέρε:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr "[Λειτουργεί]" #: ../apt/progress/text.py:214 #, python-format @@ -633,21 +610,24 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Αλλαγή μέσου: παρακαλώ τοποθετήστε το δίσκο\n" +" '%s'\n" +"στον οδηγό '%s' και πατήστε enter\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Μεταφέρθηκαν %sB σε %s (%sB/s)\n" #: ../apt/progress/text.py:239 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:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Παρακαλώ τοποθετήστε ένα Δίσκο στον οδηγό και πατήστε enter" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "" +msgstr "Κατασκευή δομών δεδομένων" -- cgit v1.2.3 From 5b9791a4513c2ea17ac67b08f7ae32614e9bdcb3 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 16:58:54 -0400 Subject: * po/hu.po: Hungarian translation updated by Gabor Kelemen --- debian/changelog | 1 + po/hu.po | 224 ++++++++++++++++++++++++++----------------------------- 2 files changed, 107 insertions(+), 118 deletions(-) diff --git a/debian/changelog b/debian/changelog index 704f2969..3f0ffdf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/eo.po: Esperanto translation by Kristjan Schmidt and Michael Moroni * po/fi.po: Finnish translation updated by Timo Jyrinki * po/fr.po: French translation updated (closes: #567765) + * po/hu.po: Hungarian translation updated by Gabor Kelemen * po/id.po: Indonesian translation by Andika Triwidada (closes: #676960) * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla diff --git a/po/hu.po b/po/hu.po index b43b9a3f..b302f04d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,22 +1,22 @@ # Hungarian translation of update-manager # This file is distributed under the same license as the update-manager package. -# Copyright (C) 2005, Free Software Foundation, Inc. -# Gabor Kelemen , 2005. +# Copyright (C) 2005, 2007, Free Software Foundation, Inc. # +# Gabor Kelemen , 2005, 2007. msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:03+0000\n" -"Last-Translator: Gabor Kelemen \n" +"PO-Revision-Date: 2012-06-11 18:21+0000\n" +"Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"X-Launchpad-Export-Date: 2012-06-11 18:32+0000\n" +"X-Generator: Launchpad (build 15376)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -26,176 +26,151 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 5.04 biztonsági frissítések" +msgstr "Ubuntu 12.04 „Precise Pangolin”" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" +msgstr "Az Ubuntu 12.04 „Precise Pangolin”-t tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 11.10 „Oneiric Ocelot”" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 11.10 „Oneiric Ocelot”-ot tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 11.04 „Natty Narwhal”" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 11.04 „Natty Narwhal”-t tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:486 -#, fuzzy msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 10.10 „Maverick Meerkat”" #. Description #: ../data/templates/Ubuntu.info.in:506 -#, fuzzy msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 10.10 „Maverick Meerkat”-ot tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Canonical partnerek" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "A Canonical által partnereinek csomagolt szoftverek" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Ezek a szoftverek nem részei az Ubuntunak." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Független" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Külső szoftverfejlesztők által biztosított" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Külső szoftverfejlesztők által biztosított szoftverek." #. Description #: ../data/templates/Ubuntu.info.in:569 -#, fuzzy msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 10.04 „Lucid Lynx”" #. Description #: ../data/templates/Ubuntu.info.in:589 -#, fuzzy msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 10.04 „Lucid Lynx”-et tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:632 -#, 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:652 -#, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 9.10 „Karmic Koala”-t tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:695 -#, 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:714 -#, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 9.04 „Jaunty Jackalope”-ot tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:757 -#, 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:777 -#, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 8.10 „Intrepid Ibex”-et tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:821 -#, 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:841 -#, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 8.04 „Hardy Heron”-t tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:886 -#, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 5.04 biztonsági frissítések" +msgstr "Ubuntu 7.10 „Gutsy Gibbon”" #. Description #: ../data/templates/Ubuntu.info.in:905 -#, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" +msgstr "Az Ubuntu 7.10 „Gutsy Gibbon”-t tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:950 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.04 biztonsági frissítések" +msgstr "Ubuntu 7.04 „Feisty Fawn”" #. Description #: ../data/templates/Ubuntu.info.in:969 -#, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" +msgstr "Az Ubuntu 7.04 „Feisty Fawn”-t tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "Ubuntu 6.10 \"Edgy Eft\"" +msgstr "Ubuntu 6.10 „Edgy Eft”" #. CompDescription #: ../data/templates/Ubuntu.info.in:1016 -#, fuzzy msgid "Community-maintained" msgstr "Közösségi karbantartású" @@ -207,30 +182,27 @@ msgstr "Nem-szabad" #. Description #: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "Az Ubuntu 6.10 \"Edgy Eft\" CD-ROM" +msgstr "Az Ubuntu 6.10 „Edgy Eft” CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" +msgstr "Ubuntu 6.06 LTS „Dapper Drake”" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy msgid "Canonical-supported free and open-source software" -msgstr "A Canonical által támogatott nyílt forrású szoftverek" +msgstr "A Canonical által támogatott szabad és nyílt forrású szoftverek" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 -#, fuzzy msgid "Community-maintained (universe)" msgstr "Közösségi karbantartású (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy msgid "Community-maintained free and open-source software" -msgstr "Közösségi karbantartású nyílt forrású szoftverek" +msgstr "A közösség által karbantartott szabad és nyílt forrású szoftverek" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 @@ -255,7 +227,7 @@ msgstr "Szerzői vagy egyéb jogi problémák miatt korlátozott szoftver" #. Description #: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Az Ubuntu 6.06 LTS \"Dapper Drake\"-et tartalmazó CD-ROM" +msgstr "Az Ubuntu 6.06 LTS „Dapper Drake”-et tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:1107 @@ -269,15 +241,13 @@ msgstr "Ajánlott frissítések" #. Description #: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy msgid "Pre-released updates" -msgstr "Javasolt frissítések" +msgstr "Előzetesen kiadott frissítések" #. Description #: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy msgid "Unsupported updates" -msgstr "Visszaportolt frissítések" +msgstr "Nem támogatott frissítések" #. Description #: ../data/templates/Ubuntu.info.in:1133 @@ -287,7 +257,7 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" +msgstr "Az Ubuntu 5.10 „Breezy Badger”-t tartalmazó CD-ROM" #. Description #: ../data/templates/Ubuntu.info.in:1164 @@ -307,12 +277,12 @@ msgstr "Ubuntu 5.10 visszaportolt csomagok" #. Description #: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 5.04 „Hoary Hedgehog”" #. Description #: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 5.04 „Hoary Hedgehog”-ot tartalmazó CD-ROM" #. CompDescription #: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 @@ -337,11 +307,10 @@ msgstr "Ubuntu 5.04 visszaportolt csomagok" #. Description #: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "Ubuntu 4.10 \"Warty Warthog\"" +msgstr "Ubuntu 4.10 „Warty Warthog”" #. CompDescription #: ../data/templates/Ubuntu.info.in:1238 -#, fuzzy msgid "Community-maintained (Universe)" msgstr "Közösségi karbantartású (Universe)" @@ -353,7 +322,7 @@ msgstr "Nem-szabad (Multiverse)" #. Description #: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" +msgstr "Az Ubuntu 4.10 „Warty Warthog”-ot tartalmazó CD-ROM" #. CompDescription #: ../data/templates/Ubuntu.info.in:1250 @@ -388,27 +357,23 @@ 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\"" +msgstr "Debian 3.1 „Sarge”" #. Description #: ../data/templates/Debian.info.in:94 @@ -417,26 +382,23 @@ msgstr "Javasolt frissítések" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Fontos biztonsági frissítések" +msgstr "Biztonsági frissítések" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Jelenlegi stabil Debian kiadás" #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (tesztelés alatt)" +msgstr "Debian – tesztelés alatt" #. Description #: ../data/templates/Debian.info.in:147 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (instabil)" +msgstr "Debian „Sid” (instabil)" #. CompDescription #: ../data/templates/Debian.info.in:151 @@ -484,16 +446,17 @@ msgstr "Részletek" #: ../apt/progress/gtk2.py:428 msgid "Starting..." -msgstr "" +msgstr "Indítás…" #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Kész" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" +"Érvénytelen unicode karakter a(z) „%s” leírásában (%s). Kérem jelentse." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" @@ -507,6 +470,10 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"A változtatások listája még nem érhető el.\n" +"\n" +"Használja a http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"oldalt, míg nem válik hozzáférhetővé, vagy próbálja meg később." #: ../apt/package.py:1207 msgid "" @@ -519,22 +486,22 @@ msgstr "" #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "„%s” fájljainak listája nem olvasható" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "„%s” vezérlőfájljainak listája nem olvasható" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "A következő függőség nem elégíthető ki: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Ütközik a következő telepített csomaggal: „%s”" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -543,6 +510,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"„%(pkgname)s” csomag törik „%(depname)s” függősége által (%(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:389 @@ -551,6 +520,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Megsérti a meglévő „%(pkgname)s” csomag függőségeit; ütközés: %(targetpkg)s " +"(%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -558,74 +529,79 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Megsérti a meglévő „%(pkgname)s” csomag függőségeit; ütközés: " +"„%(targetpkg)s”. Azonban a(z) „%(debfile)s” biztosítja ezen keresztül: " +"„%(provides)s”" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "A csomagban nincs Architecture mező" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Rossz architektúra: „%s”" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Már telepítve van egy újabb verzió" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Nem elégíthető ki minden függőség (a gyorsítótár sérült)" #: ../apt/debfile.py:519 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" -msgstr "'%s' nem telepíthető" +msgstr "„%s” nem telepíthető" #: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Automatikusan kibontva:\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Automatikusan nyomtatható ascii-vé konvertálva:\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" +"„%s” csomag fordítási függőségeinek telepítése, ami a(z) %s csomagot építi\n" #: ../apt/debfile.py:700 -#, fuzzy msgid "An essential package would be removed" -msgstr "Egy alapvető csomag eltávolításra kerülne" +msgstr "Egy alapvető csomag törlődne" #: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Kész" #: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Találat " #: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Mellőz " #: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Hiba " #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Letöltés:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr " [Folyamatban]" #: ../apt/progress/text.py:214 #, python-format @@ -634,21 +610,33 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Helyezze be a(z)\n" +" „%s”\n" +"címkéjű lemezt a(z) %s meghajtóba, és nyomja meg az Entert\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "%sB letöltve %s alatt (%sB/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Adja meg a lemez nevét, például „Debian 2.1r1 1. lemez”" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert" #: ../apt/cache.py:157 msgid "Building data structures" -msgstr "" +msgstr "Adatstruktúrák építése" + +#~ msgid "Community-maintained Open Source software" +#~ msgstr "Közösségi karbantartású nyílt forrású szoftverek" + +#~ msgid "Canonical-supported Open Source software" +#~ msgstr "A Canonical által támogatott nyílt forrású szoftverek" + +#~ msgid "Python-debian module not available" +#~ msgstr "A Python-debian modul nem érhető el" -- cgit v1.2.3 From 8210f0ea8ca7ffb5da909a6bb3e18fbd669fb264 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 13 Jun 2012 17:03:12 -0400 Subject: * po/en_GB.po: Remove useless file <20120610190618.GA1387@burratino> --- debian/changelog | 1 + po/en_GB.po | 654 ------------------------------------------------------- 2 files changed, 1 insertion(+), 654 deletions(-) delete mode 100644 po/en_GB.po diff --git a/debian/changelog b/debian/changelog index 3f0ffdf7..f04326eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file * po/el.po: Greek translation updated by Thomas Vasileiou (closes: #677331) + * po/en_GB.po: Remove useless file <20120610190618.GA1387@burratino> * po/eo.po: Esperanto translation by Kristjan Schmidt and Michael Moroni * po/fi.po: Finnish translation updated by Timo Jyrinki * po/fr.po: French translation updated (closes: #567765) diff --git a/po/en_GB.po b/po/en_GB.po deleted file mode 100644 index e8313021..00000000 --- a/po/en_GB.po +++ /dev/null @@ -1,654 +0,0 @@ -# English (British) translation. -# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Abigail Brady , Bastien Nocera , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:14+0000\n" -"Last-Translator: Jeff Bailes \n" -"Language-Team: \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 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -#, fuzzy -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 5.04 Security Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -#, fuzzy -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -#, fuzzy -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -#, fuzzy -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -#, fuzzy -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -#, fuzzy -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -#, fuzzy -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 5.04 'Hoary Hedgehog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -#, fuzzy -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -#, fuzzy -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -#, fuzzy -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -#, fuzzy -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -#, fuzzy -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -#, fuzzy -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Ubuntu 5.04 'Hoary Hedgehog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -#, fuzzy -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -#, fuzzy -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "Ubuntu 5.04 'Hoary Hedgehog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -#, fuzzy -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -#, fuzzy -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Ubuntu 5.04 Security Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -#, fuzzy -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -#, fuzzy -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Ubuntu 5.04 Security Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -#, fuzzy -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "Ubuntu 6.10 'Edgy Eft'" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -#, fuzzy -msgid "Community-maintained" -msgstr "Community maintained" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "Restricted software" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "Cdrom with Ubuntu 6.10 'Edgy Eft'" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy -msgid "Canonical-supported free and open-source software" -msgstr "Canonical supported Open Source software" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -#, fuzzy -msgid "Community-maintained (universe)" -msgstr "Community maintained (universe)" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy -msgid "Community-maintained free and open-source software" -msgstr "Community maintained Open Source software" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "Non-free drivers" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "Proprietary drivers for devices" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "Restricted software (Multiverse)" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "Software restricted by copyright or legal issues" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "Important security updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "Recommended updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy -msgid "Pre-released updates" -msgstr "Proposed updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy -msgid "Unsupported updates" -msgstr "Backported updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "Ubuntu 5.10 'Breezy Badger'" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "Ubuntu 5.10 Security Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "Ubuntu 5.10 Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "Ubuntu 5.10 Backports" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Ubuntu 5.04 'Hoary Hedgehog'" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "Officially supported" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "Ubuntu 5.04 Security Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "Ubuntu 5.04 Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "Ubuntu 5.04 Backports" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "Ubuntu 4.10 'Warty Warthog'" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -#, fuzzy -msgid "Community-maintained (Universe)" -msgstr "Community maintained (Universe)" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "Non-free (Multiverse)" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "No longer officially supported" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "Restricted copyright" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "Ubuntu 4.10 Security Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "Ubuntu 4.10 Updates" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -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 "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\"" - -#. Description -#: ../data/templates/Debian.info.in:33 -#, fuzzy -msgid "Debian 5.0 'Lenny' " -msgstr "Debian Testing" - -#. Description -#: ../data/templates/Debian.info.in:58 -#, fuzzy -msgid "Debian 4.0 'Etch'" -msgstr "Debian Testing" - -#. Description -#: ../data/templates/Debian.info.in:83 -#, fuzzy -msgid "Debian 3.1 'Sarge'" -msgstr "Debian 3.1 \"Sarge\"" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "Proposed updates" - -#. Description -#: ../data/templates/Debian.info.in:101 -#, fuzzy -msgid "Security updates" -msgstr "Important security updates" - -#. Description -#: ../data/templates/Debian.info.in:108 -#, fuzzy -msgid "Debian current stable release" -msgstr "Debian Unstable \"Sid\"" - -#. Description -#: ../data/templates/Debian.info.in:121 -#, fuzzy -msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" - -#. Description -#: ../data/templates/Debian.info.in:147 -#, fuzzy -msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "DFSG-compatible Software with Non-Free Dependencies" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "Non-DFSG-compatible Software" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "Server for %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:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "Main server" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "Custom servers" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "Downloading file %(current)li of %(total)li" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -msgid "Details" -msgstr "Details" - -#: ../apt/progress/gtk2.py:428 -#, fuzzy -msgid "Starting..." -msgstr "_Settings" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "The list of changes is not available" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, fuzzy, python-format -msgid "Cannot install '%s'" -msgstr "Can't install '%s'" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -#, fuzzy -msgid "An essential package would be removed" -msgstr "An essential package would have to be removed" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" -- cgit v1.2.3 From fd7d70ceeec91861e9ded9a7f01df0a978dcbaa5 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 15 Jun 2012 23:16:30 +0200 Subject: Merge patch from Colin Watson to handle non-UTF8 tag files in Python 3, by using bytes instead of str when requested; and document this in the RST documentation (Closes: #656288) --- debian/changelog | 5 ++ doc/source/library/apt_pkg.rst | 6 +- python/tag.cc | 128 +++++++++++++++++++++++++++++++---------- tests/test_tagfile.py | 93 +++++++++++++++++++++++++++++- 4 files changed, 201 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index f04326eb..60a573f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,11 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/sl.po: Slovenian translation updated by Matej Urbančič * po/tl.po: Tagalog translation updated by Ariel S. Betan + [ Julian Andres Klode ] + * Merge patch from Colin Watson to handle non-UTF8 tag files in + Python 3, by using bytes instead of str when requested; and + document this in the RST documentation (Closes: #656288) + -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 python-apt (0.8.4) unstable; urgency=low diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst index bba7491f..b5ee1a53 100644 --- a/doc/source/library/apt_pkg.rst +++ b/doc/source/library/apt_pkg.rst @@ -1904,7 +1904,7 @@ thereof and provides a function :func:`RewriteSection` which takes a :class:`TagSection()` object and sorting information and outputs a sorted section as a string. -.. class:: TagFile(file) +.. class:: TagFile(file, bytes: bool = False) An object which represents a typical debian control file. Can be used for Packages, Sources, control, Release, etc. Such an object provides two @@ -1921,6 +1921,10 @@ section as a string. .. versionchanged:: 0.7.100 Added support for using gzip files, via :class:`gzip.GzipFile` or any file containing a compressed gzip stream. + + .. versionadded:: 0.8.5 + + Added support for using bytes instead of str in Python 3 .. method:: next() diff --git a/python/tag.cc b/python/tag.cc index 49f53c31..bf79debf 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -38,6 +38,10 @@ using namespace std; struct TagSecData : public CppPyObject { char *Data; + bool Bytes; +#if PY_MAJOR_VERSION >= 3 + PyObject *Encoding; +#endif }; // The owner of the TagFile is a Python file object. @@ -45,6 +49,10 @@ struct TagFileData : public CppPyObject { TagSecData *Section; FileFd Fd; + bool Bytes; +#if PY_MAJOR_VERSION >= 3 + PyObject *Encoding; +#endif }; // Traversal and Clean for owned objects @@ -60,6 +68,35 @@ int TagFileClear(PyObject *self) { return 0; } +// Helpers to return Unicode or bytes as appropriate. +#if PY_MAJOR_VERSION < 3 +#define TagSecString_FromStringAndSize(self, v, len) \ + PyString_FromStringAndSize((v), (len)) +#define TagSecString_FromString(self, v) PyString_FromString(v) +#else +PyObject *TagSecString_FromStringAndSize(PyObject *self, const char *v, + Py_ssize_t len) { + TagSecData *Self = (TagSecData *)self; + if (Self->Bytes) + return PyBytes_FromStringAndSize(v, len); + else if (Self->Encoding) + return PyUnicode_Decode(v, len, PyUnicode_AsString(Self->Encoding), 0); + else + return PyUnicode_FromStringAndSize(v, len); +} + +PyObject *TagSecString_FromString(PyObject *self, const char *v) { + TagSecData *Self = (TagSecData *)self; + if (Self->Bytes) + return PyBytes_FromString(v); + else if (Self->Encoding) + return PyUnicode_Decode(v, strlen(v), + PyUnicode_AsString(Self->Encoding), 0); + else + return PyUnicode_FromString(v); +} +#endif + /*}}}*/ // TagSecFree - Free a Tag Section /*{{{*/ @@ -107,9 +144,9 @@ static PyObject *TagSecFind(PyObject *Self,PyObject *Args) { if (Default == 0) Py_RETURN_NONE; - return PyString_FromString(Default); + return TagSecString_FromString(Self,Default); } - return PyString_FromStringAndSize(Start,Stop-Start); + return TagSecString_FromStringAndSize(Self,Start,Stop-Start); } static char *doc_FindRaw = @@ -128,14 +165,14 @@ static PyObject *TagSecFindRaw(PyObject *Self,PyObject *Args) { if (Default == 0) Py_RETURN_NONE; - return PyString_FromString(Default); + return TagSecString_FromString(Self,Default); } const char *Start; const char *Stop; GetCpp(Self).Get(Start,Stop,Pos); - return PyString_FromStringAndSize(Start,Stop-Start); + return TagSecString_FromStringAndSize(Self,Start,Stop-Start); } static char *doc_FindFlag = @@ -161,21 +198,18 @@ static PyObject *TagSecFindFlag(PyObject *Self,PyObject *Args) // Map access, operator [] static PyObject *TagSecMap(PyObject *Self,PyObject *Arg) { - if (PyString_Check(Arg) == 0) - { - PyErr_SetNone(PyExc_TypeError); + const char *Name = PyObject_AsString(Arg); + if (Name == 0) return 0; - } - const char *Start; const char *Stop; - if (GetCpp(Self).Find(PyString_AsString(Arg),Start,Stop) == false) + if (GetCpp(Self).Find(Name,Start,Stop) == false) { - PyErr_SetString(PyExc_KeyError,PyString_AsString(Arg)); + PyErr_SetString(PyExc_KeyError,Name); return 0; } - return PyString_FromStringAndSize(Start,Stop-Start); + return TagSecString_FromStringAndSize(Self,Start,Stop-Start); } // len() operation @@ -230,9 +264,9 @@ static PyObject *TagSecExists(PyObject *Self,PyObject *Args) static int TagSecContains(PyObject *Self,PyObject *Arg) { - if (PyString_Check(Arg) == 0) - return 0; - const char *Name = PyString_AsString(Arg); + const char *Name = PyObject_AsString(Arg); + if (Name == 0) + return 0; const char *Start; const char *Stop; if (GetCpp(Self).Find(Name,Start,Stop) == false) @@ -256,7 +290,7 @@ static PyObject *TagSecStr(PyObject *Self) const char *Start; const char *Stop; GetCpp(Self).GetSection(Start,Stop); - return PyString_FromStringAndSize(Start,Stop-Start); + return TagSecString_FromStringAndSize(Self,Start,Stop-Start); } /*}}}*/ // TagFile Wrappers /*{{{*/ @@ -286,6 +320,12 @@ static PyObject *TagFileNext(PyObject *Self) Obj.Section->Owner = Self; Py_INCREF(Obj.Section->Owner); Obj.Section->Data = 0; + Obj.Section->Bytes = Obj.Bytes; +#if PY_MAJOR_VERSION >= 3 + // We don't need to incref Encoding as the previous Section object already + // held a reference to it. + Obj.Section->Encoding = Obj.Encoding; +#endif if (Obj.Object.Step(Obj.Section->Object) == false) return HandleErrors(NULL); @@ -347,11 +387,12 @@ static PyObject *TagFileJump(PyObject *Self,PyObject *Args) static PyObject *TagSecNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) { char *Data; int Len; - char *kwlist[] = {"text", 0}; + char Bytes = 0; + char *kwlist[] = {"text", "bytes", 0}; // this allows reading "byte" types from python3 - but we don't // make (much) use of it yet - if (PyArg_ParseTupleAndKeywords(Args,kwds,"s#",kwlist,&Data,&Len) == 0) + if (PyArg_ParseTupleAndKeywords(Args,kwds,"s#|b",kwlist,&Data,&Len,&Bytes) == 0) return 0; // Create the object.. @@ -359,6 +400,10 @@ static PyObject *TagSecNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) { new (&New->Object) pkgTagSection(); New->Data = new char[strlen(Data)+2]; snprintf(New->Data,strlen(Data)+2,"%s\n",Data); + New->Bytes = Bytes; +#if PY_MAJOR_VERSION >= 3 + New->Encoding = 0; +#endif if (New->Object.Scan(New->Data,strlen(New->Data)) == false) { @@ -391,19 +436,21 @@ PyObject *ParseSection(PyObject *self,PyObject *Args) static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) { TagFileData *New; - PyObject *File; + PyObject *File = 0; + char Bytes = 0; - char *kwlist[] = {"file", 0}; - if (PyArg_ParseTupleAndKeywords(Args,kwds,"O",kwlist,&File) == 0) + char *kwlist[] = {"file", "bytes", 0}; + if (PyArg_ParseTupleAndKeywords(Args,kwds,"O|b",kwlist,&File,&Bytes) == 0) return 0; // check if we got a filename or a file object int fileno = -1; const char *filename = NULL; - if (PyString_Check(File)) - filename = PyObject_AsString(File); - else + filename = PyObject_AsString(File); + if (filename == NULL) { + PyErr_Clear(); fileno = PyObject_AsFileDescriptor(File); + } // handle invalid arguments if (fileno == -1 && filename == NULL) @@ -432,8 +479,18 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) new (&New->Fd) FileFd(filename, FileFd::ReadOnly, false); #endif } + New->Bytes = Bytes; New->Owner = File; Py_INCREF(New->Owner); +#if PY_MAJOR_VERSION >= 3 + if (fileno > 0) { + New->Encoding = PyObject_GetAttr(File, PyUnicode_FromString("encoding")); + if (New->Encoding && !PyUnicode_Check(New->Encoding)) + New->Encoding = 0; + } else + New->Encoding = 0; + Py_XINCREF(New->Encoding); +#endif new (&New->Object) pkgTagFile(&New->Fd); // Create the section @@ -442,6 +499,11 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) New->Section->Owner = New; Py_INCREF(New->Section->Owner); New->Section->Data = 0; + New->Section->Bytes = Bytes; +#if PY_MAJOR_VERSION >= 3 + New->Section->Encoding = New->Encoding; + Py_XINCREF(New->Section->Encoding); +#endif return HandleErrors(New); } @@ -519,7 +581,7 @@ PyObject *RewriteSection(PyObject *self,PyObject *Args) } // Return the string - PyObject *ResObj = PyString_FromStringAndSize(bp,size); + PyObject *ResObj = TagSecString_FromStringAndSize(Section,bp,size); free(bp); return HandleErrors(ResObj); } @@ -548,11 +610,15 @@ PySequenceMethods TagSecSeqMeth = {0,0,0,0,0,0,0,TagSecContains,0,0}; PyMappingMethods TagSecMapMeth = {TagSecLength,TagSecMap,0}; -static char *doc_TagSec = "TagSection(text: str)\n\n" +static char *doc_TagSec = "TagSection(text: str, [bytes: bool = False])\n\n" "Provide methods to access RFC822-style header sections, like those\n" "found in debian/control or Packages files.\n\n" "TagSection() behave like read-only dictionaries and also provide access\n" - "to the functions provided by the C++ class (e.g. find)"; + "to the functions provided by the C++ class (e.g. find).\n\n" + "By default, text read from files is treated as strings (binary data in\n" + "Python 2, Unicode strings in Python 3). Use bytes=True to cause all\n" + "header values read from this TagSection to be bytes even in Python 3.\n" + "Header names are always treated as Unicode."; PyTypeObject PyTagSection_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) @@ -623,7 +689,7 @@ static PyGetSetDef TagFileGetSet[] = { }; -static char *doc_TagFile = "TagFile(file)\n\n" +static char *doc_TagFile = "TagFile(file, [bytes: bool = False])\n\n" "TagFile() objects provide access to debian control files, which consist\n" "of multiple RFC822-style sections.\n\n" "To provide access to those sections, TagFile objects provide an iterator\n" @@ -635,7 +701,11 @@ static char *doc_TagFile = "TagFile(file)\n\n" "It is important to not mix the use of both APIs, because this can have\n" "unwanted effects.\n\n" "The parameter 'file' refers to an object providing a fileno() method or\n" - "a file descriptor (an integer)"; + "a file descriptor (an integer).\n\n" + "By default, text read from files is treated as strings (binary data in\n" + "Python 2, Unicode strings in Python 3). Use bytes=True to cause all\n" + "header values read from this TagFile to be bytes even in Python 3.\n" + "Header names are always treated as Unicode."; // Type for a Tag File PyTypeObject PyTagFile_Type = diff --git a/tests/test_tagfile.py b/tests/test_tagfile.py index 371cc6ee..33197e6a 100644 --- a/tests/test_tagfile.py +++ b/tests/test_tagfile.py @@ -1,18 +1,26 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # # Copyright (C) 2010 Michael Vogt +# Copyright (C) 2012 Canonical Ltd. +# Author: Colin Watson # # 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. """Unit tests for verifying the correctness of apt_pkg.TagFile""" +from __future__ import print_function, unicode_literals + +import io import glob import os +import shutil +import sys +import tempfile import unittest from test_all import get_library_dir -import sys sys.path.insert(0, get_library_dir()) import apt_pkg @@ -20,6 +28,13 @@ import apt_pkg class TestTagFile(unittest.TestCase): """ test the apt_pkg.TagFile """ + def setUp(self): + apt_pkg.init() + self.temp_dir = tempfile.mkdtemp() + + def tearDown(self): + shutil.rmtree(self.temp_dir) + def test_tag_file(self): basepath = os.path.dirname(__file__) tagfilepath = os.path.join(basepath, "./data/tagfile/*") @@ -38,5 +53,81 @@ class TestTagFile(unittest.TestCase): # Raises Type error self.assertRaises(TypeError, apt_pkg.TagFile, object()) + def test_utf8(self): + value = "Tést Persön " + packages = os.path.join(self.temp_dir, "Packages") + with io.open(packages, "w", encoding="UTF-8") as packages_file: + print("Maintainer: %s" % value, file=packages_file) + print("", file=packages_file) + if sys.version < '3': + # In Python 2, test the traditional file interface. + with open(packages) as packages_file: + tagfile = apt_pkg.TagFile(packages_file) + tagfile.step() + self.assertEqual( + value.encode("UTF-8"), tagfile.section["Maintainer"]) + with io.open(packages, encoding="UTF-8") as packages_file: + tagfile = apt_pkg.TagFile(packages_file) + tagfile.step() + if sys.version < '3': + self.assertEqual( + value.encode("UTF-8"), tagfile.section["Maintainer"]) + else: + self.assertEqual(value, tagfile.section["Maintainer"]) + + def test_latin1(self): + value = "Tést Persön " + packages = os.path.join(self.temp_dir, "Packages") + with io.open(packages, "w", encoding="ISO-8859-1") as packages_file: + print("Maintainer: %s" % value, file=packages_file) + print("", file=packages_file) + if sys.version < '3': + # In Python 2, test the traditional file interface. + with open(packages) as packages_file: + tagfile = apt_pkg.TagFile(packages_file) + tagfile.step() + self.assertEqual( + value.encode("ISO-8859-1"), tagfile.section["Maintainer"]) + with io.open(packages) as packages_file: + tagfile = apt_pkg.TagFile(packages_file, bytes=True) + tagfile.step() + self.assertEqual( + value.encode("ISO-8859-1"), tagfile.section["Maintainer"]) + if sys.version >= '3': + # In Python 3, TagFile can pick up the encoding of the file + # object. + with io.open(packages, encoding="ISO-8859-1") as packages_file: + tagfile = apt_pkg.TagFile(packages_file) + tagfile.step() + self.assertEqual(value, tagfile.section["Maintainer"]) + + def test_mixed(self): + value = "Tést Persön " + packages = os.path.join(self.temp_dir, "Packages") + with io.open(packages, "w", encoding="UTF-8") as packages_file: + print("Maintainer: %s" % value, file=packages_file) + print("", file=packages_file) + with io.open(packages, "a", encoding="ISO-8859-1") as packages_file: + print("Maintainer: %s" % value, file=packages_file) + print("", file=packages_file) + if sys.version < '3': + # In Python 2, test the traditional file interface. + with open(packages) as packages_file: + tagfile = apt_pkg.TagFile(packages_file) + tagfile.step() + self.assertEqual( + value.encode("UTF-8"), tagfile.section["Maintainer"]) + tagfile.step() + self.assertEqual( + value.encode("ISO-8859-1"), tagfile.section["Maintainer"]) + with io.open(packages) as packages_file: + tagfile = apt_pkg.TagFile(packages_file, bytes=True) + tagfile.step() + self.assertEqual( + value.encode("UTF-8"), tagfile.section["Maintainer"]) + tagfile.step() + self.assertEqual( + value.encode("ISO-8859-1"), tagfile.section["Maintainer"]) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From 6c96502e58b7947084456554fb0aac75ffd9288d Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 17 Jun 2012 17:52:31 +0200 Subject: * debian/control: - Drop Recommends on python2.6 (Closes: #645970) --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 60a573f0..5ba5fbe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ python-apt (0.8.5) UNRELEASED; urgency=low * Merge patch from Colin Watson to handle non-UTF8 tag files in Python 3, by using bytes instead of str when requested; and document this in the RST documentation (Closes: #656288) + * debian/control: + - Drop Recommends on python2.6 (Closes: #645970) -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/debian/control b/debian/control index 29392858..169ffd8b 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common -Recommends: lsb-release, iso-codes, python2.6, xz-lzma +Recommends: lsb-release, iso-codes, xz-lzma Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), computer-janitor (<< 1.14.1-1+), debdelta (<< 0.41+), -- cgit v1.2.3 From 9b108070aca5121523a74e744bce183f5cdbcb0f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 17 Jun 2012 18:03:41 +0200 Subject: * python/configuration.cc: - Handle the use of "del" on configuration values. Those are represented by calling the setter with NULL, which we did not handle before, causing a segmentation fault (Closes: #661062) --- debian/changelog | 4 ++++ python/configuration.cc | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ba5fbe5..52fed82b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,10 @@ python-apt (0.8.5) UNRELEASED; urgency=low document this in the RST documentation (Closes: #656288) * debian/control: - Drop Recommends on python2.6 (Closes: #645970) + * python/configuration.cc: + - Handle the use of "del" on configuration values. Those are represented + by calling the setter with NULL, which we did not handle before, causing + a segmentation fault (Closes: #661062) -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/python/configuration.cc b/python/configuration.cc index 3e634901..37374625 100644 --- a/python/configuration.cc +++ b/python/configuration.cc @@ -331,13 +331,16 @@ static PyObject *CnfMap(PyObject *Self,PyObject *Arg) // Assignment with operator [] static int CnfMapSet(PyObject *Self,PyObject *Arg,PyObject *Val) { - if (PyString_Check(Arg) == 0 || PyString_Check(Val) == 0) + if (PyString_Check(Arg) == 0 || (Val != NULL && PyString_Check(Val) == 0)) { PyErr_SetNone(PyExc_TypeError); return -1; } - GetSelf(Self).Set(PyString_AsString(Arg),PyString_AsString(Val)); + if (Val == NULL) + GetSelf(Self).Clear(PyString_AsString(Arg)); + else + GetSelf(Self).Set(PyString_AsString(Arg),PyString_AsString(Val)); return 0; } /*}}}*/ -- cgit v1.2.3 From 0703f34b084c4ab7c4bec08afd7e52d1d8b839dc Mon Sep 17 00:00:00 2001 From: David Prévot Date: Sun, 17 Jun 2012 15:19:02 -0400 Subject: * po/de.po: German translation updated by Holger Wansing (closes: #677916) --- debian/changelog | 1 + po/de.po | 132 ++++++++++++++++++++++++++----------------------------- 2 files changed, 63 insertions(+), 70 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52fed82b..e3397017 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file + * po/de.po: German translation updated by Holger Wansing (closes: #677916) * po/el.po: Greek translation updated by Thomas Vasileiou (closes: #677331) * po/en_GB.po: Remove useless file <20120610190618.GA1387@burratino> * po/eo.po: Esperanto translation by Kristjan Schmidt and Michael Moroni diff --git a/po/de.po b/po/de.po index 28ab7494..53206f04 100644 --- a/po/de.po +++ b/po/de.po @@ -4,6 +4,7 @@ # This file is distributed under the same license as the update-manager package. # Initial version by an unknown artist. # Frank Arnold , 2005. +# Holger Wansing , 2012. # # msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: python-apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2010-01-31 17:14+0100\n" -"Last-Translator: Julian Andres Klode \n" +"PO-Revision-Date: 2012-06-17 20:23+0200\n" +"Last-Translator: Holger Wansing \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -28,89 +29,73 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 -#, fuzzy -#| msgid "Ubuntu 7.04 'Feisty Fawn'" msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 7.04 »Feisty Fawn«" +msgstr "Ubuntu 12.04 »Precise Pangolin«" #. Description #: ../data/templates/Ubuntu.info.in:158 -#, fuzzy -#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "CD mit Ubuntu 7.04 »Feisty Fawn«" +msgstr "CD-ROM mit Ubuntu 12.04 »Precise Pangolin«" #. Description #: ../data/templates/Ubuntu.info.in:269 -#, fuzzy -#| msgid "Ubuntu 9.10 'Karmic Koala'" msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 9.10 »Karmic Koala«" +msgstr "Ubuntu 11.10 »Oneiric Ocelot«" #. Description #: ../data/templates/Ubuntu.info.in:276 -#, fuzzy -#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "CD-ROM mit Ubuntu 9.10 »Karmic Koala«" +msgstr "CD-ROM mit Ubuntu 11.10 »Oneiric Ocelot«" #. Description #: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 »Warty Warthog«" +msgstr "Ubuntu 11.04 »Natty Narwhal«" #. Description #: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "CD-ROM mit Ubuntu 4.10 »Warty Warthog«" +msgstr "CD-ROM mit Ubuntu 11.04 »Natty Narwhal«" #. Description #: ../data/templates/Ubuntu.info.in:486 -#, fuzzy -#| msgid "Ubuntu 9.10 'Karmic Koala'" msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 9.10 »Karmic Koala«" +msgstr "Ubuntu 10.10 »Maverick Meerkat«" #. Description #: ../data/templates/Ubuntu.info.in:506 -#, fuzzy -#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "CD-ROM mit Ubuntu 9.10 »Karmic Koala«" +msgstr "CD-ROM mit Ubuntu 10.10 »Maverick Meerkat«" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Canonical-Partner" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Software, die von Canonical für seine Partner paketiert wurde" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Diese Software ist nicht Teil von Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Unabhängig" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Bereitgestellt von Fremd-Software-Entwicklern" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Software, die von Fremd-Software-Entwicklern angeboten wurde" #. Description #: ../data/templates/Ubuntu.info.in:569 @@ -120,7 +105,7 @@ msgstr "Ubuntu 10.04 »Lucid Lynx«" #. Description #: ../data/templates/Ubuntu.info.in:589 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "CD mit Ubuntu 10.04 »Lucid Lynx«" +msgstr "CD-ROM mit Ubuntu 10.04 »Lucid Lynx«" #. Description #: ../data/templates/Ubuntu.info.in:632 @@ -150,7 +135,7 @@ msgstr "Ubuntu 8.10 »Intrepid Ibex«" #. Description #: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "CD mit Ubuntu 8.10 »Intrepid Ibex«" +msgstr "CD-ROM mit Ubuntu 8.10 »Intrepid Ibex«" #. Description #: ../data/templates/Ubuntu.info.in:821 @@ -160,7 +145,7 @@ msgstr "Ubuntu 8.04 »Hardy Heron«" #. Description #: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "CD mit Ubuntu 8.04 »Hardy Heron«" +msgstr "CD-ROM mit Ubuntu 8.04 »Hardy Heron«" #. Description #: ../data/templates/Ubuntu.info.in:886 @@ -170,7 +155,7 @@ msgstr "Ubuntu 7.10 »Gutsy Gibbon«" #. Description #: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "CD mit Ubuntu 7.10 »Gutsy Gibbon«" +msgstr "CD-ROM mit Ubuntu 7.10 »Gutsy Gibbon«" #. Description #: ../data/templates/Ubuntu.info.in:950 @@ -180,7 +165,7 @@ msgstr "Ubuntu 7.04 »Feisty Fawn«" #. Description #: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "CD mit Ubuntu 7.04 »Feisty Fawn«" +msgstr "CD-ROM mit Ubuntu 7.04 »Feisty Fawn«" #. Description #: ../data/templates/Ubuntu.info.in:1011 @@ -200,7 +185,7 @@ msgstr "Eingeschränkte Software" #. Description #: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "CD mit Ubuntu 6.10 »Edgy Eft«" +msgstr "CD-ROM mit Ubuntu 6.10 »Edgy Eft«" #. Description #: ../data/templates/Ubuntu.info.in:1072 @@ -209,10 +194,8 @@ msgstr "Ubuntu 6.06 LTS »Dapper Drake«" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 -#, fuzzy -#| msgid "Canonical-supported Open Source software" msgid "Canonical-supported free and open-source software" -msgstr "Von Canonical unterstütze Open-Source-Software" +msgstr "Von Canonical unterstützte freie und quelloffene Software" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 @@ -221,10 +204,8 @@ msgstr "Von der Gemeinde betreut (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 -#, fuzzy -#| msgid "Community-maintained Open Source software" msgid "Community-maintained free and open-source software" -msgstr "Von der Ubuntu-Gemeinde betreute Open-Source-Software" +msgstr "Von der Ubuntu-Gemeinde betreute freie und quelloffene Software" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 @@ -249,7 +230,7 @@ msgstr "Rechtlich eingeschränkte Software" #. Description #: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "CD mit Ubuntu 6.06 LTS »Dapper Drake«" +msgstr "CD-ROM mit Ubuntu 6.06 LTS »Dapper Drake«" #. Description #: ../data/templates/Ubuntu.info.in:1107 @@ -269,7 +250,7 @@ msgstr "Vorabveröffentlichte Aktualisierungen" #. Description #: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" -msgstr "Nicht unterstütze Aktualisierungen" +msgstr "Nicht unterstützte Aktualisierungen" #. Description #: ../data/templates/Ubuntu.info.in:1133 @@ -279,7 +260,7 @@ msgstr "Ubuntu 5.10 »Breezy Badger«" #. Description #: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "CD mit Ubuntu 5.10 »Breezy Badger«" +msgstr "CD-ROM mit Ubuntu 5.10 »Breezy Badger«" #. Description #: ../data/templates/Ubuntu.info.in:1164 @@ -304,7 +285,7 @@ msgstr "Ubuntu 5.04 »Hoary Hedgehog«" #. Description #: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "CD mit Ubuntu 5.04 »Hoary Hedgehog«" +msgstr "CD-ROM mit Ubuntu 5.04 »Hoary Hedgehog«" #. CompDescription #: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 @@ -410,7 +391,7 @@ msgstr "Sicherheitsaktualisierungen" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "Aktuelle stabile Freigabe von Debian" +msgstr "Aktuelle stabile Veröffentlichung von Debian" #. Description #: ../data/templates/Debian.info.in:121 @@ -420,7 +401,7 @@ msgstr "Debian Testing" #. Description #: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" -msgstr "Debian »Sid« (unstable)" +msgstr "Debian »Sid« (Unstable)" #. CompDescription #: ../data/templates/Debian.info.in:151 @@ -453,12 +434,13 @@ msgstr "Benutzerdefinierte Server" #: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "Datei %(current)li von %(total)li wird mit %(speed)s/s heruntergeladen" +msgstr "" +"Datei %(current)li von %(total)li wird mit %(speed)s/s heruntergeladen." #: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "Datei %(current)li von %(total)li wird heruntergeladen" +msgstr "Datei %(current)li von %(total)li wird heruntergeladen." #. Setup some child widgets #: ../apt/progress/gtk2.py:340 @@ -467,7 +449,7 @@ msgstr "Details" #: ../apt/progress/gtk2.py:428 msgid "Starting..." -msgstr "Starte..." +msgstr "Starten ..." #: ../apt/progress/gtk2.py:434 msgid "Complete" @@ -492,7 +474,7 @@ msgid "" msgstr "" "Die Liste mit Änderungen ist momentan nicht verfügbar.\n" "\n" -"Bitte benutzen Sie http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"Bitte benutzen Sie http://launchpad.net/ubuntu/+source/%s/%s/+changelog,\n" "bis die Liste verfügbar ist oder versuchen sie es später erneut." #: ../apt/package.py:1207 @@ -506,13 +488,12 @@ msgstr "" #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "Die Liste der Dateien von ›%s‹ konnte nicht gelesen werden." +msgstr "Die Liste der Dateien von »%s« konnte nicht gelesen werden." #: ../apt/debfile.py:93 -#, fuzzy, python-format -#| msgid "List of files for '%s' could not be read" +#, python-format msgid "List of control files for '%s' could not be read" -msgstr "Die Liste der Dateien von ›%s‹ konnte nicht gelesen werden." +msgstr "Die Liste der Dateien von »%s« konnte nicht gelesen werden." #: ../apt/debfile.py:211 #, python-format @@ -522,7 +503,7 @@ msgstr "Abhängigkeit nicht erfüllbar: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "Steht in Konflikt zu dem installiertem Paket ›%s‹" +msgstr "Steht in Konflikt zu dem installierten Paket »%s«" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -531,6 +512,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Beschädigt vorhandenes Paket »%(pkgname)s« wegen Abhängigkeit %(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:389 @@ -539,6 +522,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Beschädigt vorhandenes Paket »%(pkgname)s« wegen Konflikt: %(targetpkg)s " +"(%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -546,45 +531,52 @@ msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Beschädigt vorhandenes Paket »%(pkgname)s«, welches in Konflikt steht: " +"»%(targetpkg)s«. Aber »%(debfile)s« bietet es an über: »%(provides)s«" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Kein Architecture-Feld in dem Paket" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "Falsche Architektur ›%s‹" +msgstr "Falsche Architektur »%s«" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "Eine spätere Version is bereits installiert." +msgstr "Eine neuere Version ist bereits installiert." #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "Es konnten nicht alle Abhängigkeiten erfüllt werden (Cache defekt)" +msgstr "" +"Es konnten nicht alle Abhängigkeiten erfüllt werden (Zwischenspeicher " +"defekt)." #: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" -msgstr "›%s‹ kann nicht installiert werden" +msgstr "»%s« kann nicht installiert werden." #: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" msgstr "" +"Automatisch entpackt:\n" +"\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Automatisch konvertiert in druckfähiges ASCII:\n" #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -"Installiere Bau-Abhängigkeiten für das Quellpaket ›%s‹ welches ›%s‹baut\n" +"Installieren der Bau-Abhängigkeiten für das Quellpaket »%s«, welches »%s« " +"baut\n" #: ../apt/debfile.py:700 msgid "An essential package would be removed" @@ -613,7 +605,7 @@ msgstr "Hole:" #: ../apt/progress/text.py:203 msgid " [Working]" -msgstr " [Verarbeite]" +msgstr " [Verarbeiten]" #: ../apt/progress/text.py:214 #, python-format @@ -624,7 +616,7 @@ msgid "" msgstr "" "Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n" " »%s«\n" -"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" +"in Laufwerk »%s« ein und drücken Sie die Eingabetaste.\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:223 @@ -636,12 +628,12 @@ msgstr "Es wurden %sB in %s geholt (%sB/s)\n" msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.1r1 " -"Disk 1«" +"Disk 1«." #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" +"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste." #: ../apt/cache.py:157 msgid "Building data structures" -- cgit v1.2.3 From 0d6a27849d413e421c3b694a80582080c35d6fd4 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 17 Jun 2012 23:00:28 +0200 Subject: Replace xz-lzma Recommends by xz-utils (Closes: #677934) --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e3397017..2bb0c431 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low document this in the RST documentation (Closes: #656288) * debian/control: - Drop Recommends on python2.6 (Closes: #645970) + - Replace xz-lzma Recommends by xz-utils (Closes: #677934) * python/configuration.cc: - Handle the use of "del" on configuration values. Those are represented by calling the setter with NULL, which we did not handle before, causing diff --git a/debian/control b/debian/control index 169ffd8b..880da4bb 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common -Recommends: lsb-release, iso-codes, xz-lzma +Recommends: lsb-release, iso-codes, xz-utils Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), computer-janitor (<< 1.14.1-1+), debdelta (<< 0.41+), -- cgit v1.2.3 From 4133baa95eaf2a8638c2ad8acea42e061049db02 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 17 Jun 2012 23:11:16 +0200 Subject: * python/tag.cc: - Correctly handle file descriptor 0 aka stdin (Closes: #669458) --- debian/changelog | 2 ++ python/tag.cc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2bb0c431..771fed36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ python-apt (0.8.5) UNRELEASED; urgency=low - Handle the use of "del" on configuration values. Those are represented by calling the setter with NULL, which we did not handle before, causing a segmentation fault (Closes: #661062) + * python/tag.cc: + - Correctly handle file descriptor 0 aka stdin (Closes: #669458) -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/python/tag.cc b/python/tag.cc index bf79debf..248d818d 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -461,7 +461,7 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) } New = (TagFileData*)type->tp_alloc(type, 0); - if (fileno > 0) + if (fileno != -1) { #ifdef APT_HAS_GZIP new (&New->Fd) FileFd(); @@ -483,7 +483,7 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) New->Owner = File; Py_INCREF(New->Owner); #if PY_MAJOR_VERSION >= 3 - if (fileno > 0) { + if (fileno != -1) { New->Encoding = PyObject_GetAttr(File, PyUnicode_FromString("encoding")); if (New->Encoding && !PyUnicode_Check(New->Encoding)) New->Encoding = 0; -- cgit v1.2.3 From 1da9275d2c3e94f4c28302d0580f4d7a8fe8ebb3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 19 Jun 2012 10:48:45 +0200 Subject: python/acquire.cc: Use pkgAcquire::Setup() to setup the acquire class and handle errors from this (Closes: #629624) --- debian/changelog | 3 +++ python/acquire.cc | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 771fed36..20bf1b0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,9 @@ python-apt (0.8.5) UNRELEASED; urgency=low a segmentation fault (Closes: #661062) * python/tag.cc: - Correctly handle file descriptor 0 aka stdin (Closes: #669458) + * python/acquire.cc: + - Use pkgAcquire::Setup() to setup the acquire class and handle errors + from this (Closes: #629624) -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/python/acquire.cc b/python/acquire.cc index 6169ff40..45b4493c 100644 --- a/python/acquire.cc +++ b/python/acquire.cc @@ -328,18 +328,17 @@ static PyObject *PkgAcquireNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) // FIXME: memleak? progress = new PyFetchProgress(); progress->setCallbackInst(pyFetchProgressInst); - fetcher = new pkgAcquire(progress); - } - else { - fetcher = new pkgAcquire(); } + fetcher = new pkgAcquire(); + fetcher->Setup(progress); + PyObject *FetcherObj = CppPyObject_NEW(NULL, type, fetcher); if (progress != 0) progress->setPyAcquire(FetcherObj); // prepare our map of items. - return FetcherObj; + return HandleErrors(FetcherObj); } /** -- cgit v1.2.3 From 09074e01992cea7bfaf47bd81ed15ddc574d6f4a Mon Sep 17 00:00:00 2001 From: David Prévot Date: Tue, 19 Jun 2012 18:26:57 -0400 Subject: po/am.po po/be.po po/br.po po/et.po po/eu.po po/fa.po po/fur.po po/hi.po po/mr.po po/ms.po po/nn.po po/pa.po po/ps.po po/qu.po po/rw.po po/ta.po po/ur.po po/xh.po: remove useless (empty) translations --- debian/changelog | 3 + po/am.po | 613 ------------------------------------------------- po/be.po | 616 -------------------------------------------------- po/br.po | 612 ------------------------------------------------- po/et.po | 614 ------------------------------------------------- po/eu.po | 614 ------------------------------------------------- po/fa.po | 613 ------------------------------------------------- po/fur.po | 613 ------------------------------------------------- po/hi.po | 613 ------------------------------------------------- po/mr.po | 612 ------------------------------------------------- po/ms.po | 615 -------------------------------------------------- po/nn.po | 614 ------------------------------------------------- po/pa.po | 618 -------------------------------------------------- po/ps.po | 612 ------------------------------------------------- po/qu.po | 612 ------------------------------------------------- po/rw.po | 677 ------------------------------------------------------- po/ta.po | 613 ------------------------------------------------- po/ur.po | 613 ------------------------------------------------- po/xh.po | 618 -------------------------------------------------- 19 files changed, 3 insertions(+), 11112 deletions(-) delete mode 100644 po/am.po delete mode 100644 po/be.po delete mode 100644 po/br.po delete mode 100644 po/et.po delete mode 100644 po/eu.po delete mode 100644 po/fa.po delete mode 100644 po/fur.po delete mode 100644 po/hi.po delete mode 100644 po/mr.po delete mode 100644 po/ms.po delete mode 100644 po/nn.po delete mode 100644 po/pa.po delete mode 100644 po/ps.po delete mode 100644 po/qu.po delete mode 100644 po/rw.po delete mode 100644 po/ta.po delete mode 100644 po/ur.po delete mode 100644 po/xh.po diff --git a/debian/changelog b/debian/changelog index 20bf1b0b..d30b7473 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,9 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/sk.po: Slovak translation updated by Ivan Masár (closes: #676973) * po/sl.po: Slovenian translation updated by Matej Urbančič * po/tl.po: Tagalog translation updated by Ariel S. Betan + * po/am.po po/be.po po/br.po po/et.po po/eu.po po/fa.po po/fur.po po/hi.po + po/mr.po po/ms.po po/nn.po po/pa.po po/ps.po po/qu.po po/rw.po po/ta.po + po/ur.po po/xh.po: remove useless (empty) translations [ Julian Andres Klode ] * Merge patch from Colin Watson to handle non-UTF8 tag files in diff --git a/po/am.po b/po/am.po deleted file mode 100644 index 34f3bdb6..00000000 --- a/po/am.po +++ /dev/null @@ -1,613 +0,0 @@ -# Amharic 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-09 15:49+0000\n" -"Last-Translator: Habte \n" -"Language-Team: Amharic \n" -"Language: am\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "በየቀኑ" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/be.po b/po/be.po deleted file mode 100644 index 8d31048c..00000000 --- a/po/be.po +++ /dev/null @@ -1,616 +0,0 @@ -# Belarusian 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:05+0000\n" -"Last-Translator: Alexander Nyakhaychyk \n" -"Language-Team: Belarusian \n" -"Language: be\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "Штодзённа" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -#, fuzzy -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "Калі ласка, праверце вашае далучэньне да інтэрнэту." - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, fuzzy, python-format -msgid "Cannot install '%s'" -msgstr "Немагчыма ўсталяваць \"%s\"" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -#, fuzzy -msgid "An essential package would be removed" -msgstr "Трэба было-б выдаліць абавязковы пакет" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/br.po b/po/br.po deleted file mode 100644 index 35d1c481..00000000 --- a/po/br.po +++ /dev/null @@ -1,612 +0,0 @@ -# Breton 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-05-19 02:42+0000\n" -"Last-Translator: Oublieuse \n" -"Language-Team: Breton \n" -"Language: br\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -msgid "Details" -msgstr "" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/et.po b/po/et.po deleted file mode 100644 index ff3d0dad..00000000 --- a/po/et.po +++ /dev/null @@ -1,614 +0,0 @@ -# Estonian 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-09 15:49+0000\n" -"Last-Translator: margus723 \n" -"Language-Team: Estonian \n" -"Language: et\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "Iga päev" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, fuzzy, python-format -msgid "Cannot install '%s'" -msgstr "Ei saa paigaldada '%s'" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -#, fuzzy -msgid "An essential package would be removed" -msgstr "Hädavajalik pakett tuleks eemaldada" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/eu.po b/po/eu.po deleted file mode 100644 index aede14c1..00000000 --- a/po/eu.po +++ /dev/null @@ -1,614 +0,0 @@ -# Basque 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-09 15:49+0000\n" -"Last-Translator: Xabi Ezpeleta \n" -"Language-Team: Basque \n" -"Language: eu\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "Egunero" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, fuzzy, python-format -msgid "Cannot install '%s'" -msgstr "Ezin da %s instalatu" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -#, fuzzy -msgid "An essential package would be removed" -msgstr "Ezinbesteko pakete bat ezabatu beharko da" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/fa.po b/po/fa.po deleted file mode 100644 index ef5bc19a..00000000 --- a/po/fa.po +++ /dev/null @@ -1,613 +0,0 @@ -# Persian 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-09 15:49+0000\n" -"Last-Translator: Pedram Ganjeh Hadidi \n" -"Language-Team: Persian \n" -"Language: fa\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -msgid "Details" -msgstr "" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/fur.po b/po/fur.po deleted file mode 100644 index 67716d9d..00000000 --- a/po/fur.po +++ /dev/null @@ -1,613 +0,0 @@ -# Friulian 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-08-25 05:55+0000\n" -"Last-Translator: Marco \n" -"Language-Team: Friulian \n" -"Language: fur\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "Ogni dì" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/hi.po b/po/hi.po deleted file mode 100644 index 926da227..00000000 --- a/po/hi.po +++ /dev/null @@ -1,613 +0,0 @@ -# Hindi 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-08-01 15:30+0000\n" -"Last-Translator: Gaurav Mishra \n" -"Language-Team: Hindi \n" -"Language: hi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "प्रतिदिन" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/mr.po b/po/mr.po deleted file mode 100644 index 8e5663d3..00000000 --- a/po/mr.po +++ /dev/null @@ -1,612 +0,0 @@ -# Marathi 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Marathi \n" -"Language: mr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -msgid "Details" -msgstr "" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/ms.po b/po/ms.po deleted file mode 100644 index 929b0729..00000000 --- a/po/ms.po +++ /dev/null @@ -1,615 +0,0 @@ -# Malay 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:04+0000\n" -"Last-Translator: azlinux \n" -"Language-Team: Malay \n" -"Language: ms\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -#, fuzzy -msgid "No longer officially supported" -msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "Harian" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, fuzzy, python-format -msgid "Cannot install '%s'" -msgstr "Tidak dapat memasang '%s'" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -#, fuzzy -msgid "An essential package would be removed" -msgstr "Satu pakej yang perlu terpaksa dikeluarkan" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/nn.po b/po/nn.po deleted file mode 100644 index db4de889..00000000 --- a/po/nn.po +++ /dev/null @@ -1,614 +0,0 @@ -# Norwegian Nynorsk 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-09 15:50+0000\n" -"Last-Translator: Willy André Bergstrøm \n" -"Language-Team: Norwegian Nynorsk \n" -"Language: nn\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "Kvar dag" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, fuzzy, python-format -msgid "Cannot install '%s'" -msgstr "Kan ikkje installere '%s'" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -#, fuzzy -msgid "An essential package would be removed" -msgstr "Ein naudsynt pakke vil måtte fjernast" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/pa.po b/po/pa.po deleted file mode 100644 index f0465e0b..00000000 --- a/po/pa.po +++ /dev/null @@ -1,618 +0,0 @@ -# translation of pa.po to Punjabi -# This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. -# Amanpreet Singh Alam , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: pa\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:16+0000\n" -"Last-Translator: Amanpreet Singh Alam \n" -"Language-Team: Punjabi \n" -"Language: pa\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.9.1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -#, fuzzy -msgid "Important security updates" -msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy -msgid "Pre-released updates" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy -msgid "Unsupported updates" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -#, fuzzy -msgid "Proposed updates" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." - -#. Description -#: ../data/templates/Debian.info.in:101 -#, fuzzy -msgid "Security updates" -msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "ਵੇਰਵਾ" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/ps.po b/po/ps.po deleted file mode 100644 index 6f63b964..00000000 --- a/po/ps.po +++ /dev/null @@ -1,612 +0,0 @@ -# Pushto 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Pushto \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -msgid "Details" -msgstr "" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/qu.po b/po/qu.po deleted file mode 100644 index 79f0a116..00000000 --- a/po/qu.po +++ /dev/null @@ -1,612 +0,0 @@ -# Quechua 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-09 15:50+0000\n" -"Last-Translator: Rosetta Administrators \n" -"Language-Team: Quechua \n" -"Language: qu\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -msgid "Details" -msgstr "" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/rw.po b/po/rw.po deleted file mode 100644 index 35ea4544..00000000 --- a/po/rw.po +++ /dev/null @@ -1,677 +0,0 @@ -# translation of update-manager to Kinyarwanda. -# Copyright (C) 2005 Free Software Foundation, Inc. -# This file is distributed under the same license as the update-manager package. -# Steve Murphy , 2005 -# Steve performed initial rough translation from compendium built from translations provided by the following translators: -# Philibert Ndandali , 2005. -# Viateur MUGENZI , 2005. -# Noëlla Mupole , 2005. -# Carole Karema , 2005. -# JEAN BAPTISTE NGENDAHAYO , 2005. -# Augustin KIBERWA , 2005. -# Donatien NSENGIYUMVA , 2005.. -# -msgid "" -msgstr "" -"Project-Id-Version: update-manager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:17+0000\n" -"Last-Translator: Steve Murphy \n" -"Language-Team: Kinyarwanda \n" -"Language: rw\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -#, fuzzy -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -#, fuzzy -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -#, fuzzy -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -#, fuzzy -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -#, fuzzy -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -#, fuzzy -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -#, fuzzy -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -#, fuzzy -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -#, fuzzy -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -#, fuzzy -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -#, fuzzy -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -#, fuzzy -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -#, fuzzy -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -#, fuzzy -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -#, fuzzy -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -#, fuzzy -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -#, fuzzy -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -#, fuzzy -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -#, fuzzy -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -#, fuzzy -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -#, fuzzy -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -#, fuzzy -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -#, fuzzy -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "5" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -#, fuzzy -msgid "Restricted software" -msgstr "Kohereza Nta gukoresha bisesuye" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -#, fuzzy -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "5" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -#, fuzzy -msgid "Non-free drivers" -msgstr "Kigenga" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -#, fuzzy -msgid "Restricted software (Multiverse)" -msgstr "Kigenga" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -#, fuzzy -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -#, fuzzy -msgid "Important security updates" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy -msgid "Pre-released updates" -msgstr "Kwinjiza porogaramu" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy -msgid "Unsupported updates" -msgstr "Kwinjiza porogaramu" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -#, fuzzy -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -#, fuzzy -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -#, fuzzy -msgid "Ubuntu 5.10 Security Updates" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -#, fuzzy -msgid "Ubuntu 5.10 Updates" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -#, fuzzy -msgid "Ubuntu 5.10 Backports" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -#, fuzzy -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -#, fuzzy -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "5" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -#, fuzzy -msgid "Ubuntu 5.04 Security Updates" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -#, fuzzy -msgid "Ubuntu 5.04 Updates" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -#, fuzzy -msgid "Ubuntu 5.04 Backports" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -#, fuzzy -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "5" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -#, fuzzy -msgid "Non-free (Multiverse)" -msgstr "Kigenga" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -#, fuzzy -msgid "Restricted copyright" -msgstr "Uburenganzira bw'umuhimbyi" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -#, fuzzy -msgid "Ubuntu 4.10 Security Updates" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -#, fuzzy -msgid "Ubuntu 4.10 Updates" -msgstr "5" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -#, fuzzy -msgid "Ubuntu 4.10 Backports" -msgstr "5" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -#, fuzzy -msgid "Debian 6.0 'Squeeze' " -msgstr "4. 10" - -#. Description -#: ../data/templates/Debian.info.in:33 -#, fuzzy -msgid "Debian 5.0 'Lenny' " -msgstr "4. 10" - -#. Description -#: ../data/templates/Debian.info.in:58 -#, fuzzy -msgid "Debian 4.0 'Etch'" -msgstr "4. 10" - -#. Description -#: ../data/templates/Debian.info.in:83 -#, fuzzy -msgid "Debian 3.1 'Sarge'" -msgstr "4. 10" - -#. Description -#: ../data/templates/Debian.info.in:94 -#, fuzzy -msgid "Proposed updates" -msgstr "Kwinjiza porogaramu" - -#. Description -#: ../data/templates/Debian.info.in:101 -#, fuzzy -msgid "Security updates" -msgstr "5" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "=) and the latest the version for the releation -#: ../apt/debfile.py:373 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/ta.po b/po/ta.po deleted file mode 100644 index 8dcac56a..00000000 --- a/po/ta.po +++ /dev/null @@ -1,613 +0,0 @@ -# Tamil 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 , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-16 04:06+0000\n" -"Last-Translator: Raghavan \n" -"Language-Team: Tamil \n" -"Language: ta\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "தினமும்" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, fuzzy, python-format -msgid "Cannot install '%s'" -msgstr "'%s' நிறுவமுடியவில்லை" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/ur.po b/po/ur.po deleted file mode 100644 index cbde9c04..00000000 --- a/po/ur.po +++ /dev/null @@ -1,613 +0,0 @@ -# Urdu translation for update-manager -# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 -# This file is distributed under the same license as the update-manager package. -# FIRST AUTHOR , 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-05-19 02:46+0000\n" -"Last-Translator: Hameed محمد حمید \n" -"Language-Team: Urdu \n" -"Language: ur\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -#, fuzzy -msgid "Details" -msgstr "روز" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" diff --git a/po/xh.po b/po/xh.po deleted file mode 100644 index 9ce4355b..00000000 --- a/po/xh.po +++ /dev/null @@ -1,618 +0,0 @@ -# Xhosa translation of update-notifier -# Copyright (C) 2005 Canonical Ltd. -# This file is distributed under the same license as the update-notifier package. -# Translation by Canonical Ltd with thanks to -# Translation World CC in South Africa, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: update-notifier\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" -"PO-Revision-Date: 2006-10-05 20:45+0000\n" -"Last-Translator: Canonical Ltd \n" -"Language-Team: Xhosa \n" -"Language: xh\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n!=1;\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:151 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:158 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:269 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:276 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:388 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:395 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:486 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:506 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:520 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:521 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:528 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:530 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:531 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:569 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:589 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:632 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:652 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:695 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:714 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:757 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:777 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:821 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:841 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:886 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:950 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:969 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1011 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1016 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1022 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1030 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1072 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1075 -msgid "Canonical-supported free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1077 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1078 -msgid "Community-maintained free and open-source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1080 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1081 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1083 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:1084 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1091 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1107 -#, fuzzy -msgid "Important security updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/templates/Ubuntu.info.in:1112 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1117 -#, fuzzy -msgid "Pre-released updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -#, fuzzy -msgid "Unsupported updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/templates/Ubuntu.info.in:1133 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1148 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1164 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1169 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1174 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1185 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1200 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1216 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1221 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1226 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1232 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1238 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1240 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1247 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1250 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:1252 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1259 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1264 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1269 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -#, fuzzy -msgid "Proposed updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/templates/Debian.info.in:101 -#, fuzzy -msgid "Security updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:147 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:151 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:153 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 -#: ../aptsources/distro.py:246 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:250 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:340 -msgid "Details" -msgstr "" - -#: ../apt/progress/gtk2.py:428 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:434 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:359 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:1088 ../apt/package.py:1194 -#, fuzzy -msgid "The list of changes is not available" -msgstr "Kukho i-%i yohlaziyo ekhoyo" - -#: ../apt/package.py:1200 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1207 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:82 -#, python-format -msgid "List of files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:93 -#, python-format -msgid "List of control files for '%s' could not be read" -msgstr "" - -#: ../apt/debfile.py:211 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:232 -#, 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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" -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 -#, python-format -msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" -msgstr "" - -#: ../apt/debfile.py:399 -#, 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 -msgid "No Architecture field in the package" -msgstr "" - -#: ../apt/debfile.py:457 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:464 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:489 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:519 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:593 -msgid "" -"Automatically decompressed:\n" -"\n" -msgstr "" - -#: ../apt/debfile.py:599 -msgid "Automatically converted to printable ascii:\n" -msgstr "" - -#: ../apt/debfile.py:689 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:700 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:82 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:122 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:131 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:133 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:144 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:203 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:214 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:223 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:239 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:255 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:157 -msgid "Building data structures" -msgstr "" -- cgit v1.2.3 From 6418f22ff32eee43a67d5fc51914de9fd677d6da Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 20 Jun 2012 19:16:29 -0400 Subject: * po/be.po: Belarusian translation by Viktar Siarheichyk (closes: #678286) --- debian/changelog | 3 +- po/be.po | 623 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 625 insertions(+), 1 deletion(-) create mode 100644 po/be.po diff --git a/debian/changelog b/debian/changelog index d30b7473..1c9e0c70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low [ David Prévot ] * po/*.po: update PO files against current POT file + * po/be.po: Belarusian translation by Viktar Siarheichyk (closes: #678286) * po/de.po: German translation updated by Holger Wansing (closes: #677916) * po/el.po: Greek translation updated by Thomas Vasileiou (closes: #677331) * po/en_GB.po: Remove useless file <20120610190618.GA1387@burratino> @@ -35,7 +36,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/sk.po: Slovak translation updated by Ivan Masár (closes: #676973) * po/sl.po: Slovenian translation updated by Matej Urbančič * po/tl.po: Tagalog translation updated by Ariel S. Betan - * po/am.po po/be.po po/br.po po/et.po po/eu.po po/fa.po po/fur.po po/hi.po + * po/am.po po/br.po po/et.po po/eu.po po/fa.po po/fur.po po/hi.po po/mr.po po/ms.po po/nn.po po/pa.po po/ps.po po/qu.po po/rw.po po/ta.po po/ur.po po/xh.po: remove useless (empty) translations diff --git a/po/be.po b/po/be.po new file mode 100644 index 00000000..985d2687 --- /dev/null +++ b/po/be.po @@ -0,0 +1,623 @@ +# Belarusian 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 , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: update-manager\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"PO-Revision-Date: 2012-06-20 18:42+0300\n" +"Last-Translator: Viktar Siarheichyk \n" +"Language-Team: Belarusian \n" +"Language: be\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" + +#. ChangelogURI +#: ../data/templates/Ubuntu.info.in.h:4 +#, no-c-format +msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" + +#. Description +#: ../data/templates/Ubuntu.info.in:151 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "Ubuntu 12.04 'Precise Pangolin'" + +#. Description +#: ../data/templates/Ubuntu.info.in:158 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "CD-ROM з Ubuntu 12.04 'Precise Pangolin'" + +#. Description +#: ../data/templates/Ubuntu.info.in:269 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "Ubuntu 11.10 'Oneiric Ocelot'" + +#. Description +#: ../data/templates/Ubuntu.info.in:276 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "CD-ROM з Ubuntu 11.10 'Oneiric Ocelot'" + +#. Description +#: ../data/templates/Ubuntu.info.in:388 +msgid "Ubuntu 11.04 'Natty Narwhal'" +msgstr "Ubuntu 11.04 'Natty Narwhal'" + +#. Description +#: ../data/templates/Ubuntu.info.in:395 +msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" +msgstr "CD-ROM з Ubuntu 11.04 'Natty Narwhal'" + +#. Description +#: ../data/templates/Ubuntu.info.in:486 +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:506 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "CD-ROM з Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:518 +msgid "Canonical Partners" +msgstr "Партнёры Canonical" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:520 +msgid "Software packaged by Canonical for their partners" +msgstr "Праграмы, якія Canonical запакаваў для сваіх партнёраў" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:521 +msgid "This software is not part of Ubuntu." +msgstr "Гэтая праграма не ўваходзіць у Ubuntu." + +#. Description +#: ../data/templates/Ubuntu.info.in:528 +msgid "Independent" +msgstr "Незалежны" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:530 +msgid "Provided by third-party software developers" +msgstr "Пададзены пабочнымі распрацоўнікамі праграмаў" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:531 +msgid "Software offered by third party developers." +msgstr "Праграма, прапанаваная пабочнымі распрацоўнікамі." + +#. Description +#: ../data/templates/Ubuntu.info.in:569 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 10.04 'Lucid Lynx'" + +#. Description +#: ../data/templates/Ubuntu.info.in:589 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "CD-ROM з Ubuntu 10.04 'Lucid Lynx'" + +#. Description +#: ../data/templates/Ubuntu.info.in:632 +msgid "Ubuntu 9.10 'Karmic Koala'" +msgstr "Ubuntu 9.10 'Karmic Koala'" + +#. Description +#: ../data/templates/Ubuntu.info.in:652 +msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" +msgstr "CD-ROM з Ubuntu 9.10 'Karmic Koala'" + +#. Description +#: ../data/templates/Ubuntu.info.in:695 +msgid "Ubuntu 9.04 'Jaunty Jackalope'" +msgstr "Ubuntu 9.04 'Jaunty Jackalope'" + +#. Description +#: ../data/templates/Ubuntu.info.in:714 +msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" +msgstr "CD-ROM з Ubuntu 9.04 'Jaunty Jackalope'" + +#. Description +#: ../data/templates/Ubuntu.info.in:757 +msgid "Ubuntu 8.10 'Intrepid Ibex'" +msgstr "Ubuntu 8.10 'Intrepid Ibex'" + +#. Description +#: ../data/templates/Ubuntu.info.in:777 +msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" +msgstr "CD-ROM з Ubuntu 8.10 'Intrepid Ibex'" + +#. Description +#: ../data/templates/Ubuntu.info.in:821 +msgid "Ubuntu 8.04 'Hardy Heron'" +msgstr "Ubuntu 8.04 'Hardy Heron'" + +#. Description +#: ../data/templates/Ubuntu.info.in:841 +msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" +msgstr "CD-ROM з Ubuntu 8.04 'Hardy Heron'" + +#. Description +#: ../data/templates/Ubuntu.info.in:886 +msgid "Ubuntu 7.10 'Gutsy Gibbon'" +msgstr "Ubuntu 7.10 'Gutsy Gibbon'" + +#. Description +#: ../data/templates/Ubuntu.info.in:905 +msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" +msgstr "CD-ROM з Ubuntu 7.10 'Gutsy Gibbon'" + +#. Description +#: ../data/templates/Ubuntu.info.in:950 +msgid "Ubuntu 7.04 'Feisty Fawn'" +msgstr "Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:969 +msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" +msgstr "CD-ROM з Ubuntu 7.04 'Feisty Fawn'" + +#. Description +#: ../data/templates/Ubuntu.info.in:1011 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 6.10 'Edgy Eft'" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1016 +msgid "Community-maintained" +msgstr "Утрымоўваецца супольнасцю" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1022 +msgid "Restricted software" +msgstr "Абмежаваная праграма" + +#. Description +#: ../data/templates/Ubuntu.info.in:1030 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD-ROM з Ubuntu 6.10 'Edgy Eft'" + +#. Description +#: ../data/templates/Ubuntu.info.in:1072 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:1075 +msgid "Canonical-supported free and open-source software" +msgstr "Свабодныя праграмы і праграмы з адкрытым кодам, што падтрымваюцца Canonical" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1077 +msgid "Community-maintained (universe)" +msgstr "Падтрыманыя супольнасцю (universe)" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:1078 +msgid "Community-maintained free and open-source software" +msgstr "Свабодныя праграмы і праграмы з адкрытым кодам, што падтрымваюцца супольнасцю" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1080 +msgid "Non-free drivers" +msgstr "Несвабодныя драйверы" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:1081 +msgid "Proprietary drivers for devices" +msgstr "Уласніцкія драйверы прыладаў" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1083 +msgid "Restricted software (Multiverse)" +msgstr "Абмежаваныя праграмы (Multiverse)" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:1084 +msgid "Software restricted by copyright or legal issues" +msgstr "Праграмы, абмежаваныя аўтарскім правам ці юрыдычнымі пытаннямі" + +#. Description +#: ../data/templates/Ubuntu.info.in:1091 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "CD-ROM з Ubuntu 6.06 LTS 'Dapper Drake'" + +#. Description +#: ../data/templates/Ubuntu.info.in:1107 +msgid "Important security updates" +msgstr "Важныя абнаўленні бяспекі" + +#. Description +#: ../data/templates/Ubuntu.info.in:1112 +msgid "Recommended updates" +msgstr "Рэкамендаваныя абнаўленні" + +#. Description +#: ../data/templates/Ubuntu.info.in:1117 +msgid "Pre-released updates" +msgstr "Загадзя выдадзеныя абнаўленні" + +#. Description +#: ../data/templates/Ubuntu.info.in:1122 +msgid "Unsupported updates" +msgstr "Абнаўленні, што не падтрымваюцца" + +#. Description +#: ../data/templates/Ubuntu.info.in:1133 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:1148 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "CD-ROM з Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/templates/Ubuntu.info.in:1164 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Абнаўленні бяспекі Ubuntu 5.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:1169 +msgid "Ubuntu 5.10 Updates" +msgstr "Абнаўленні Ubuntu 5.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:1174 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/templates/Ubuntu.info.in:1185 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" + +#. Description +#: ../data/templates/Ubuntu.info.in:1200 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD-ROM з Ubuntu 5.04 'Hoary Hedgehog'" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1203 +#: ../data/templates/Debian.info.in:149 +msgid "Officially supported" +msgstr "Афіцыйна падтрымваюцца" + +#. Description +#: ../data/templates/Ubuntu.info.in:1216 +msgid "Ubuntu 5.04 Security Updates" +msgstr "Абнаўленні бяспекі Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:1221 +msgid "Ubuntu 5.04 Updates" +msgstr "Абнаўленні Ubuntu 5.04" + +#. Description +#: ../data/templates/Ubuntu.info.in:1226 +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.04 Backports" + +#. Description +#: ../data/templates/Ubuntu.info.in:1232 +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 4.10 'Warty Warthog'" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1238 +msgid "Community-maintained (Universe)" +msgstr "Падтымваецца супольнасцю (Universe)" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1240 +msgid "Non-free (Multiverse)" +msgstr "Несвабодныя (Multiverse)" + +#. Description +#: ../data/templates/Ubuntu.info.in:1247 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD-ROM з Ubuntu 4.10 'Warty Warthog'" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1250 +msgid "No longer officially supported" +msgstr "Больш не падтрымваюцца афіцыйна" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:1252 +msgid "Restricted copyright" +msgstr "Абмежаванае аўтарскае права" + +#. Description +#: ../data/templates/Ubuntu.info.in:1259 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Абнаўленні бяспекі Ubuntu 4.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:1264 +msgid "Ubuntu 4.10 Updates" +msgstr "Абнаўленні Ubuntu 4.10" + +#. Description +#: ../data/templates/Ubuntu.info.in:1269 +msgid "Ubuntu 4.10 Backports" +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 "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 "Debian 6.0 'Squeeze' " + +#. Description +#: ../data/templates/Debian.info.in:33 +msgid "Debian 5.0 'Lenny' " +msgstr "Debian 5.0 'Lenny' " + +#. Description +#: ../data/templates/Debian.info.in:58 +msgid "Debian 4.0 'Etch'" +msgstr "Debian 4.0 'Etch'" + +#. Description +#: ../data/templates/Debian.info.in:83 +msgid "Debian 3.1 'Sarge'" +msgstr "Debian 3.1 'Sarge'" + +#. Description +#: ../data/templates/Debian.info.in:94 +msgid "Proposed updates" +msgstr "Прапанаваныя абнаўленні" + +#. Description +#: ../data/templates/Debian.info.in:101 +msgid "Security updates" +msgstr "Абнаўленні бяспекі" + +#. Description +#: ../data/templates/Debian.info.in:108 +msgid "Debian current stable release" +msgstr "Цяперашняе стабільнае выданне Debian" + +#. Description +#: ../data/templates/Debian.info.in:121 +msgid "Debian testing" +msgstr "Debian testing" + +#. Description +#: ../data/templates/Debian.info.in:147 +msgid "Debian 'Sid' (unstable)" +msgstr "Debian 'Sid' (unstable)" + +#. CompDescription +#: ../data/templates/Debian.info.in:151 +msgid "DFSG-compatible Software with Non-Free Dependencies" +msgstr "Праграмы, сумяшчальныя з DFSG з несвабоднымі залежнымі" + +#. CompDescription +#: ../data/templates/Debian.info.in:153 +msgid "Non-DFSG-compatible Software" +msgstr "Праграмы, несумяшчальныя з DFSG" + +#. TRANSLATORS: %s is a country +#: ../aptsources/distro.py:206 +#: ../aptsources/distro.py:436 +#, python-format +msgid "Server for %s" +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 +#. append a list of all used servers +#: ../aptsources/distro.py:224 +#: ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 +msgid "Main server" +msgstr "Галоўны сервер" + +#: ../aptsources/distro.py:250 +msgid "Custom servers" +msgstr "Іншыя серверы" + +#: ../apt/progress/gtk2.py:258 +#: ../apt/progress/gtk2.py:314 +#, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" +msgstr "Выгрузка файла %(current)li з %(total)li на хуткасці %(speed)s/s" + +#: ../apt/progress/gtk2.py:264 +#: ../apt/progress/gtk2.py:320 +#, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Загрузка файла %(current)li of %(total)li" + +#. Setup some child widgets +#: ../apt/progress/gtk2.py:340 +msgid "Details" +msgstr "Падрабязнасці" + +#: ../apt/progress/gtk2.py:428 +msgid "Starting..." +msgstr "Пачынаецца..." + +#: ../apt/progress/gtk2.py:434 +msgid "Complete" +msgstr "Скончана" + +#: ../apt/package.py:359 +#, python-format +msgid "Invalid unicode in description for '%s' (%s). Please report." +msgstr "Несапраўдны unicode у апісанні да '%s' (%s). Паведаміце, калі ласка." + +#: ../apt/package.py:1088 +#: ../apt/package.py:1194 +msgid "The list of changes is not available" +msgstr "Недасяжны спіс зменаў" + +#: ../apt/package.py:1200 +#, python-format +msgid "" +"The list of changes is not available yet.\n" +"\n" +"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"until the changes become available or try again later." +msgstr "" +"Ліст зменаў пакуль што недасяжны.\n" +"\n" +"Глядзіце, калі ласка, http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"пакуль змены не стануць дасяжныя, альбо паспрабуйце пазней." + +#: ../apt/package.py:1207 +msgid "" +"Failed to download the list of changes. \n" +"Please check your Internet connection." +msgstr "" +"Не ўдалося атрымаць спіс зменаў. \n" +"Калі ласка, праверце вашае далучэнне да інтэрнэту." + +#: ../apt/debfile.py:82 +#, python-format +msgid "List of files for '%s' could not be read" +msgstr "Спіс файлаў да '%s' не атрымалася прачытаць" + +#: ../apt/debfile.py:93 +#, python-format +msgid "List of control files for '%s' could not be read" +msgstr "Спіс файлаў кіравання да '%s' не атрымалася прачытаць" + +#: ../apt/debfile.py:211 +#, python-format +msgid "Dependency is not satisfiable: %s\n" +msgstr "Залежнасць, якую не ўдаецца задаволіць: %s\n" + +#: ../apt/debfile.py:232 +#, python-format +msgid "Conflicts with the installed package '%s'" +msgstr "Канфліктуе з усталяваным пакетам '%s'" + +#. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation +#: ../apt/debfile.py:373 +#, python-format +msgid "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)s %(depversion)s)" +msgstr "Парушае залежнасць %(depname)s (%(deprelation)s %(depversion)s) наяўнага пакета '%(pkgname)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:389 +#, python-format +msgid "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s %(targetver)s)" +msgstr "Парушае канфлікт %(targetpkg)s (%(comptype)s %(targetver)s) наяўнага пакета '%(pkgname)s'" + +#: ../apt/debfile.py:399 +#, python-format +msgid "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But the '%(debfile)s' provides it via: '%(provides)s'" +msgstr "Парушае наяўны пакет '%(pkgname)s', які канфліктуе з: '%(targetpkg)s'. Але '%(debfile)s' забяспечваецца праз: '%(provides)s'" + +#: ../apt/debfile.py:447 +msgid "No Architecture field in the package" +msgstr "Гэты пакет не мае поля Architecture" + +#: ../apt/debfile.py:457 +#, python-format +msgid "Wrong architecture '%s'" +msgstr "Памылковая архітэктура '%s'" + +#. the deb is older than the installed +#: ../apt/debfile.py:464 +msgid "A later version is already installed" +msgstr "Ужо ўсталяваная апошняя версія" + +#: ../apt/debfile.py:489 +msgid "Failed to satisfy all dependencies (broken cache)" +msgstr "Не атрымалася задаволіць усе залежнасці (зламаны кэш)" + +#: ../apt/debfile.py:519 +#, python-format +msgid "Cannot install '%s'" +msgstr "Немагчыма ўсталяваць '%s'" + +#: ../apt/debfile.py:593 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" +"Аўтаматычна распакаваны:\n" +"\n" + +#: ../apt/debfile.py:599 +msgid "Automatically converted to printable ascii:\n" +msgstr "Аўтаматычна ператвораны ў друкаваныя ASCII:\n" + +#: ../apt/debfile.py:689 +#, python-format +msgid "Install Build-Dependencies for source package '%s' that builds %s\n" +msgstr "Усталяваць Build-Dependencies для зыходнага пакета '%s', які збірае %s\n" + +#: ../apt/debfile.py:700 +msgid "An essential package would be removed" +msgstr "Трэба было б выдаліць абавязковы пакет" + +#: ../apt/progress/text.py:82 +#, python-format +msgid "%c%s... Done" +msgstr "%c%s... Скончана" + +#: ../apt/progress/text.py:122 +msgid "Hit " +msgstr "Hit " + +#: ../apt/progress/text.py:131 +msgid "Ign " +msgstr "Ign " + +#: ../apt/progress/text.py:133 +msgid "Err " +msgstr "Err " + +#: ../apt/progress/text.py:144 +msgid "Get:" +msgstr "Атрымаць:" + +#: ../apt/progress/text.py:203 +msgid " [Working]" +msgstr " [Апрацоўваецца]" + +#: ../apt/progress/text.py:214 +#, python-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Змена носьбіта: Калі ласка, устаўце дыск з паметкай\n" +" '%s'\n" +"у прыладу '%s' і націсніце Enter\n" + +#. Trick for getting a translation from apt +#: ../apt/progress/text.py:223 +#, python-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Атрымана %sB з %s (%sB/s)\n" + +#: ../apt/progress/text.py:239 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Калі ласка, падайце імя для гэтага дыска, напрыклад, 'Debian 2.1r1 Disk 1'" + +#: ../apt/progress/text.py:255 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Калі ласка, устаўце дыск у прыладу і націсніце Enter" + +#: ../apt/cache.py:157 +msgid "Building data structures" +msgstr "Будуюцца структуры звестак" + -- cgit v1.2.3 From 66ebe7d613e14342d51ada537e81c6d2bdbf12b5 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 20 Jun 2012 19:20:23 -0400 Subject: po/ru.po: incomplete Russian translation updated by Andrey --- debian/changelog | 1 + po/ru.po | 104 ++++++++++++++++++++++++++++++------------------------- 2 files changed, 57 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c9e0c70..f7dff987 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/id.po: Indonesian translation by Andika Triwidada (closes: #676960) * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335) * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla + * po/ru.po: incomplete Russian translation updated by Andrey * po/sk.po: Slovak translation updated by Ivan Masár (closes: #676973) * po/sl.po: Slovenian translation updated by Matej Urbančič * po/tl.po: Tagalog translation updated by Ariel S. Betan diff --git a/po/ru.po b/po/ru.po index 96646b9d..2f22ad09 100644 --- a/po/ru.po +++ b/po/ru.po @@ -29,141 +29,141 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #: ../data/templates/Ubuntu.info.in:151 #, fuzzy msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Обновления безопасности Ubuntu 5.04" +msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 #, fuzzy msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "CD с Ubuntu 5.10 'Breezy Badger'" +msgstr "Диск с Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 #, fuzzy msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:276 #, fuzzy msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "CD с Ubuntu 4.10 'Warty Warthog'" +msgstr "Диск с Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 #, fuzzy #| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 #, fuzzy #| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "CD с Ubuntu 4.10 'Warty Warthog'" +msgstr "Диск с Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 #, fuzzy msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:506 #, fuzzy msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "CD с Ubuntu 4.10 'Warty Warthog'" +msgstr "Диск с Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Партнеры Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Програмное обеспечение упаковано Canonical для партнеров" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Это програмное обеспечение не является частью Ubuntu." #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Независимый" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Предоставлено сторонними разработчиками." #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Програмное обеспечение предлагается сторонними разработчиками." #. Description #: ../data/templates/Ubuntu.info.in:569 #, fuzzy msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:589 #, fuzzy msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Диск с Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:632 #, 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:652 #, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "CD с Ubuntu 4.10 'Warty Warthog'" +msgstr "Диск с Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:695 #, 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:714 #, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "CD с Ubuntu 4.10 'Warty Warthog'" +msgstr "Диск с Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:757 #, 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:777 #, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Диск с Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:821 #, 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:841 #, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Диск с Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:886 @@ -175,19 +175,19 @@ msgstr "Обновления безопасности Ubuntu 5.04" #: ../data/templates/Ubuntu.info.in:905 #, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "CD с Ubuntu 5.10 'Breezy Badger'" +msgstr "Диск с Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:950 #, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Обновления безопасности Ubuntu 5.04" +msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:969 #, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "CD с Ubuntu 5.10 'Breezy Badger'" +msgstr "Диск с Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:1011 @@ -272,13 +272,13 @@ msgstr "Рекомендованые обновления" #: ../data/templates/Ubuntu.info.in:1117 #, fuzzy msgid "Pre-released updates" -msgstr "Предлагаемые обновления" +msgstr "Пред-релизные обновления" #. Description #: ../data/templates/Ubuntu.info.in:1122 #, fuzzy msgid "Unsupported updates" -msgstr "Обновления в бэкпортах" +msgstr "Не поддерживаемые обновления" #. Description #: ../data/templates/Ubuntu.info.in:1133 @@ -391,25 +391,25 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #: ../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\"" +msgstr "Debian 3.1 'Sarge'" #. Description #: ../data/templates/Debian.info.in:94 @@ -420,24 +420,24 @@ msgstr "Предлагаемые обновления" #: ../data/templates/Debian.info.in:101 #, fuzzy msgid "Security updates" -msgstr "Важные обновления безопасности" +msgstr "Обновления безопасности" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Текущий стабильный релиз Debian" #. Description #: ../data/templates/Debian.info.in:121 #, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian testing" #. Description #: ../data/templates/Debian.info.in:147 #, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" +msgstr "Debian 'Sid' (unstable)" #. CompDescription #: ../data/templates/Debian.info.in:151 @@ -484,16 +484,16 @@ msgstr "Подробности" #: ../apt/progress/gtk2.py:428 msgid "Starting..." -msgstr "" +msgstr "Начинаем..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "" +msgstr "Завершено" #: ../apt/package.py:359 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" +msgstr "Неправильный unicode в описании '%s' (%s). Пожалуйста, сообщите." #: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" @@ -507,6 +507,10 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"Список изменений еще недоступен.\n" +"\n" +"Пожалуйста используйте http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"до тех пор, пока изменения не станут доступны или попробуйте позже." #: ../apt/package.py:1207 msgid "" @@ -519,22 +523,22 @@ msgstr "" #: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" -msgstr "" +msgstr "Список файлов для '%s' не может быть прочтен" #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "Список контролирующих файлов для '%s' не может быть прочтен" #: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "Неразрешимая зависимость: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Конфликт с установленым пакетом '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -543,6 +547,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Ломает в существующем пакете '%(pkgname)s' зависимость %(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:389 @@ -551,6 +557,8 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Ломает существующий пакет '%(pkgname)s' конфликтует с: %(targetpkg)s " +"(%(comptype)s %(targetver)s)" #: ../apt/debfile.py:399 #, python-format @@ -561,21 +569,21 @@ msgstr "" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Нет указания архитектуры в пакете" #: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Неправильная архитектура '%s'" #. the deb is older than the installed #: ../apt/debfile.py:464 msgid "A later version is already installed" -msgstr "" +msgstr "Более поздняя версия уже установлена" #: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Неудалось определить все зависимости (broken cache)" #: ../apt/debfile.py:519 #, fuzzy, python-format -- cgit v1.2.3 From 224f30fef83aa6a56809e6ed942d26194a6073b2 Mon Sep 17 00:00:00 2001 From: David Prévot Date: Wed, 20 Jun 2012 19:27:12 -0400 Subject: po/sr.po: incomplete Serbian translation updated by Nikola Nenadic --- debian/changelog | 1 + po/sr.po | 67 ++++++++++++++++++++++++++++++++------------------------ 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7dff987..66619e1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * po/ru.po: incomplete Russian translation updated by Andrey * po/sk.po: Slovak translation updated by Ivan Masár (closes: #676973) * po/sl.po: Slovenian translation updated by Matej Urbančič + * po/sr.po: incomplete Serbian translation updated by Nikola Nenadic * po/tl.po: Tagalog translation updated by Ariel S. Betan * po/am.po po/br.po po/et.po po/eu.po po/fa.po po/fur.po po/hi.po po/mr.po po/ms.po po/nn.po po/pa.po po/ps.po po/qu.po po/rw.po po/ta.po diff --git a/po/sr.po b/po/sr.po index 74172777..da885a6f 100644 --- a/po/sr.po +++ b/po/sr.po @@ -30,100 +30,100 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #, fuzzy #| msgid "Ubuntu 7.04 'Feisty Fawn'" msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "Ubuntu 7.04 'Feisty Fawn'" +msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 #, fuzzy #| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "Оптички диск са Ubuntu 7.04 'Feisty Fawn'" +msgstr "Оптички диск са Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 #, fuzzy #| msgid "Ubuntu 9.10 'Karmic Koala'" msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Ubuntu 9.10 'Karmic Koala'" +msgstr "Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:276 #, fuzzy #| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "Оптички диск са Ubuntu 9.10 'Karmic Koala'" +msgstr "Оптички диск са 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 #, fuzzy #| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "Ubuntu 4.10 'Warty Warthog" +msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 #, fuzzy #| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "Оптички диск са Ubuntu 4.10 'Warty Warthog'" +msgstr "Оптички диск са Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 #, fuzzy #| msgid "Ubuntu 9.10 'Karmic Koala'" msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Ubuntu 9.10 'Karmic Koala'" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:506 #, fuzzy #| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "Оптички диск са Ubuntu 9.10 'Karmic Koala'" +msgstr "Оптички диск са Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" -msgstr "" +msgstr "Canonical партнери" #. CompDescription #: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" -msgstr "" +msgstr "Софтвер упакован од Canonical за њихове партнере" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." -msgstr "" +msgstr "Овај софтвер није дио Ubuntu" #. Description #: ../data/templates/Ubuntu.info.in:528 msgid "Independent" -msgstr "" +msgstr "Независан" #. CompDescription #: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" -msgstr "" +msgstr "Обезбјеђен од независних програмера софтвера" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." -msgstr "" +msgstr "Софтвер је понуђен од независних програмера софтвера" #. Description #: ../data/templates/Ubuntu.info.in:569 #, fuzzy #| msgid "Ubuntu 8.04 'Hardy Heron'" msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "Ubuntu 8.04 'Hardy Heron'" +msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:589 #, fuzzy #| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "Оптички диск са Ubuntu 8.04 'Hardy Heron'" +msgstr "Оптички диск са Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:632 @@ -215,7 +215,7 @@ msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #, fuzzy #| msgid "Canonical-supported Open Source software" msgid "Canonical-supported free and open-source software" -msgstr "Canonical-подржава софтвер отвореног кода" +msgstr "Canonical-подржава слободан софтвер и софтвер отвореног кода" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 @@ -227,12 +227,12 @@ msgstr "Одржаван од стране заједнице" #, fuzzy #| msgid "Community-maintained Open Source software" msgid "Community-maintained free and open-source software" -msgstr "Заједница урећује софтвер отвореног кода" +msgstr "Заједница одржава слободан софтвер и софтвер отвореног кода" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" -msgstr "Не слободни драјвери" +msgstr "Комерцијални драјвери" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1081 @@ -342,7 +342,7 @@ msgstr "Одржаван од стране заједнице" #. CompDescription #: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" -msgstr "Не слободни драјвери" +msgstr "Не слободн драјвери" #. Description #: ../data/templates/Ubuntu.info.in:1247 @@ -460,12 +460,12 @@ msgstr "Прилагођени сервер" #: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "Преужимам фајл %(current)li од %(total)li са %(speed)s/s" +msgstr "Преузимам фајл %(current)li од %(total)li са %(speed)s/s" #: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "Преужимам фајл %(current)li од %(total)li" +msgstr "Преузимам фајл %(current)li од %(total)li" #. Setup some child widgets #: ../apt/progress/gtk2.py:340 @@ -478,7 +478,7 @@ msgstr "Покретање..." #: ../apt/progress/gtk2.py:434 msgid "Complete" -msgstr "Крај" +msgstr "Завршено" #: ../apt/package.py:359 #, python-format @@ -528,7 +528,7 @@ msgstr "Зависнот није задовољена: %s\n" #: ../apt/debfile.py:232 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "Сукоби међу инсталираним пакетима" +msgstr "Сукоби међу инсталираним пакетима '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 @@ -537,6 +537,8 @@ msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" +"Прекид постојања пакета '%(pkgname)s' зависи од %(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:389 @@ -545,17 +547,24 @@ msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" +"Прекид постојања пакета '%(pkgname)s' конфликт: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" #: ../apt/debfile.py:399 -#, python-format +#, fuzzy, python-format +#| msgid "" +#| "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " +#| "the '%(targetpkg)s' provides it via: '%(provides)s'" msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Прекид посојања пакета '%(pkgname)s' који је иѕаѕвао конфликт: " +"'%(targetpkg)s'. Али '%(targetpkg)s' га даје преко: '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" -msgstr "" +msgstr "Нема поља архитектуре у пакету" #: ../apt/debfile.py:457 #, python-format @@ -580,11 +589,11 @@ msgstr "Не могу да се инсталирају %s" msgid "" "Automatically decompressed:\n" "\n" -msgstr "" +msgstr "Аутомацка декомпресија:\n" #: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" -msgstr "" +msgstr "Аутомацко пребацивање за штампање ascii:\n" #: ../apt/debfile.py:689 #, python-format @@ -614,7 +623,7 @@ msgstr "Грешка" #: ../apt/progress/text.py:144 msgid "Get:" -msgstr "УзимамЧ" +msgstr "Узимам:" #: ../apt/progress/text.py:203 msgid " [Working]" -- cgit v1.2.3 From ab3ce632dfd77a685476e4243205c82fcefb566f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 22 Jun 2012 10:06:15 +0200 Subject: * debian/control: - Set Standards-Version to 3.9.3 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 66619e1c..53664404 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,8 @@ python-apt (0.8.5) UNRELEASED; urgency=low * python/acquire.cc: - Use pkgAcquire::Setup() to setup the acquire class and handle errors from this (Closes: #629624) + * debian/control: + - Set Standards-Version to 3.9.3 -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/debian/control b/debian/control index 880da4bb..6f84f448 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: standard Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 XS-Python-Version: >= 2.6 X-Python3-Version: >= 3.1 Build-Depends: apt-utils, -- cgit v1.2.3 From 82c433f15822cc65896e046343d8e781141d62d2 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 22 Jun 2012 10:10:03 +0200 Subject: * utils/get_ubuntu_mirrors_from_lp.py: - Revert move to Python 3, python3-feedparser is not in the archive yet --- debian/changelog | 2 ++ pre-build.sh | 2 +- utils/get_ubuntu_mirrors_from_lp.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53664404..5833d94c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,8 @@ python-apt (0.8.5) UNRELEASED; urgency=low from this (Closes: #629624) * debian/control: - Set Standards-Version to 3.9.3 + * utils/get_ubuntu_mirrors_from_lp.py: + - Revert move to Python 3, python3-feedparser is not in the archive yet -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/pre-build.sh b/pre-build.sh index 08c0bef6..1c5a9183 100755 --- a/pre-build.sh +++ b/pre-build.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -dpkg-checkbuilddeps -d 'python-debian, python3-feedparser' +dpkg-checkbuilddeps -d 'python-debian, python-feedparser' echo "updating Ubuntu mirror list from launchpad" if [ -n "$https_proxy" ]; then diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py index 7c4d3831..ef049f78 100755 --- a/utils/get_ubuntu_mirrors_from_lp.py +++ b/utils/get_ubuntu_mirrors_from_lp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # get_ubuntu_lp_mirrors.py # -- cgit v1.2.3 From 653444b666238fb1a991821e8b0cce1a9cb2513f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 22 Jun 2012 10:36:30 +0200 Subject: * tests: - Fix new tests from Sebastian to work with Python 2.6 --- debian/changelog | 2 ++ tests/test_auth.py | 14 +++++++++++++- tests/test_lp659438.py | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5833d94c..5f368b3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,8 @@ python-apt (0.8.5) UNRELEASED; urgency=low - Set Standards-Version to 3.9.3 * utils/get_ubuntu_mirrors_from_lp.py: - Revert move to Python 3, python3-feedparser is not in the archive yet + * tests: + - Fix new tests from Sebastian to work with Python 2.6 -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 diff --git a/tests/test_auth.py b/tests/test_auth.py index f975c670..99c40db5 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -7,7 +7,7 @@ import tempfile import time import unittest -if sys.version_info.major > 2: +if sys.version_info[0] > 2: from http.server import HTTPServer from http.server import SimpleHTTPRequestHandler as HTTPRequestHandler else: @@ -107,6 +107,18 @@ class TestAuthKeys(unittest.TestCase): """Test handling of keys for signed repositories.""" + if sys.version_info[0] == 2 and sys.version_info[1] < 7: + def addCleanup(self, function, *args, **kwds): + try: + self.cleanup.append(lambda: function(*args, **kwds)) + except AttributeError: + self.cleanup = [lambda: function(*args, **kwds)] + + def tearDown(self): + for f in self.cleanup: + f() + self.cleanup = [] + def setUp(self): # reset any config manipulations done in the individual tests apt_pkg.init_config() diff --git a/tests/test_lp659438.py b/tests/test_lp659438.py index 01edf3bd..4564f0f6 100644 --- a/tests/test_lp659438.py +++ b/tests/test_lp659438.py @@ -39,8 +39,7 @@ class RegressionTestCase(unittest.TestCase): def setUp(self): apt_pkg.init_config() - chroot_path = tempfile.mkdtemp() - self.addCleanup(lambda: shutil.rmtree(chroot_path)) + self.chroot_path = chroot_path = tempfile.mkdtemp() # Create a damaged status file self.cache = apt.cache.Cache(rootdir=chroot_path) with open(apt_pkg.config.find_file("Dir::State::status"), @@ -62,6 +61,7 @@ Version: 3.6.9+build1+nobinonly-0ubuntu1""") # this resets the rootdir apt_pkg.config to ensure it does not # "pollute" the later tests cache = apt.cache.Cache(rootdir="/") + shutil.rmtree(self.chroot_path) def test_survive_reqreinst(self): """Test that we survive a package in require reinstallation state""" -- cgit v1.2.3 From a8290b2bd58aa4a75eeab34145daa4079b450533 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 22 Jun 2012 10:37:31 +0200 Subject: Release 0.8.5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f368b3a..ab424381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.8.5) UNRELEASED; urgency=low +python-apt (0.8.5) unstable; urgency=low [ Michael Vogt ] * python/cache.cc: @@ -65,7 +65,7 @@ python-apt (0.8.5) UNRELEASED; urgency=low * tests: - Fix new tests from Sebastian to work with Python 2.6 - -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 + -- Julian Andres Klode Fri, 22 Jun 2012 10:37:23 +0200 python-apt (0.8.4) unstable; urgency=low -- cgit v1.2.3 From fdffdc99bd66c46c3b502137e5fc4d113e5f2293 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Jun 2012 13:41:57 +0200 Subject: * debian/control: - increase build-dep for apt-utils to make tests during build for test_auth.py --- debian/changelog | 9 +++++++++ debian/control | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ab424381..ca1b50d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-apt (0.8.6) UNRELEASED; urgency=low + + [ Michael Vogt ] + * debian/control: + - increase build-dep for apt-utils to make tests during + build for test_auth.py + + -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 + python-apt (0.8.5) unstable; urgency=low [ Michael Vogt ] diff --git a/debian/control b/debian/control index 6f84f448..2a0e4ef2 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.9.3 XS-Python-Version: >= 2.6 X-Python3-Version: >= 3.1 -Build-Depends: apt-utils, +Build-Depends: apt-utils (>= 0.9.6), debhelper (>= 7.3.5), libapt-pkg-dev (>= 0.8.11), python-all-dev (>= 2.6.6-3~), -- cgit v1.2.3 From 0b90448722f7d00f01186267ba247117caf406ec Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Jun 2012 14:02:23 +0200 Subject: update b-d for apt, thanks to juliank --- debian/changelog | 4 ++-- debian/control | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca1b50d2..ffb6a2b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,8 @@ python-apt (0.8.6) UNRELEASED; urgency=low [ Michael Vogt ] * debian/control: - - increase build-dep for apt-utils to make tests during - build for test_auth.py + - add build-dep for apt (>= 0.9.6) to make test_auth.py test + work reliable -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 diff --git a/debian/control b/debian/control index 2a0e4ef2..615843f0 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.9.3 XS-Python-Version: >= 2.6 X-Python3-Version: >= 3.1 -Build-Depends: apt-utils (>= 0.9.6), +Build-Depends: apt (>= 0.9.6), + apt-utils, debhelper (>= 7.3.5), libapt-pkg-dev (>= 0.8.11), python-all-dev (>= 2.6.6-3~), -- cgit v1.2.3 From b50494275b8235e5c8a53e13fd56e3cea1c8d5b3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:23:10 +0200 Subject: * apt/auth.py: - Use tempfile.NamedTemporaryFile to create temporary file --- apt/auth.py | 52 +++++++++++++++++++++++++++------------------------- debian/changelog | 4 ++++ 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/apt/auth.py b/apt/auth.py index 38c4bdc6..1a81d3b0 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -51,38 +51,40 @@ class TrustedKey(object): def _call_apt_key_script(*args, **kwargs): """Run the apt-key script with the given arguments.""" + conf = None cmd = [apt_pkg.config.find_file("Dir::Bin::Apt-Key", "/usr/bin/apt-key")] cmd.extend(args) env = os.environ.copy() env["LANG"] = "C" - if apt_pkg.config.find_dir("Dir") != "/": - # If the key is to be installed into a chroot we have to export the - # configuration from the chroot to the apt-key script by using - # a temporary APT_CONFIG file. The apt-key script uses apt-config shell - # internally - conf_fd, conf_name = tempfile.mkstemp(prefix="apt-key", suffix="conf") - atexit.register(os.remove, conf_name) + try: + if apt_pkg.config.find_dir("Dir") != "/": + # If the key is to be installed into a chroot we have to export the + # configuration from the chroot to the apt-key script by using + # a temporary APT_CONFIG file. The apt-key script uses apt-config + # shell internally + conf = tempfile.NamedTemporaryFile(prefix="apt-key", suffix=".conf") + conf.write(apt_pkg.config.dump().encode("UTF-8")) + conf.flush() + env["APT_CONFIG"] = conf.name + proc = subprocess.Popen(cmd, env=env, universal_newlines=True, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) try: - os.write(conf_fd, apt_pkg.config.dump().encode("UTF-8")) + proc.stdin.write(kwargs["stdin"]) + except KeyError: + pass finally: - os.close(conf_fd) - env["APT_CONFIG"] = conf_name - proc = subprocess.Popen(cmd, env=env, universal_newlines=True, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - try: - proc.stdin.write(kwargs["stdin"]) - except KeyError: - pass + proc.stdin.close() + return_code = proc.wait() + output = proc.stdout.read() + if return_code: + raise SystemError("The apt-key script failed with return code %s:\n" + "%s\n%s" % (return_code, " ".join(cmd), output)) + return output.strip() finally: - proc.stdin.close() - return_code = proc.wait() - output = proc.stdout.read() - if return_code: - raise SystemError("The apt-key script failed with return code %s:\n" - "%s\n%s" % (return_code, " ".join(cmd), output)) - return output.strip() + if conf is not None: + conf.close() def add_key_from_file(filename): """Import a GnuPG key file to trust repositores signed by it. diff --git a/debian/changelog b/debian/changelog index ffb6a2b4..e6d6d648 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ python-apt (0.8.6) UNRELEASED; urgency=low - add build-dep for apt (>= 0.9.6) to make test_auth.py test work reliable + [ Julian Andres Klode ] + * apt/auth.py: + - Use tempfile.NamedTemporaryFile to create temporary file + -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 python-apt (0.8.5) unstable; urgency=low -- cgit v1.2.3 From f513760769e5e0c7ba08f171e4d5399000b8ae51 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:26:43 +0200 Subject: Use Popen.communicate() instead of stdin, stdout --- apt/auth.py | 22 ++++++++++++---------- debian/changelog | 1 + 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/apt/auth.py b/apt/auth.py index 1a81d3b0..5d4b1cd6 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -70,17 +70,19 @@ def _call_apt_key_script(*args, **kwargs): stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - try: - proc.stdin.write(kwargs["stdin"]) - except KeyError: - pass - finally: - proc.stdin.close() - return_code = proc.wait() - output = proc.stdout.read() - if return_code: + + content = kwargs.get("stdin", None) + if isinstance(content, unicode): + content = content.encode("utf-8") + + output, stderr = proc.communicate(content) + + assert stderr == None + + if proc.returncode: raise SystemError("The apt-key script failed with return code %s:\n" - "%s\n%s" % (return_code, " ".join(cmd), output)) + "%s\n%s" % (proc.returncode, " ".join(cmd), + output)) return output.strip() finally: if conf is not None: diff --git a/debian/changelog b/debian/changelog index e6d6d648..627ef655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ python-apt (0.8.6) UNRELEASED; urgency=low [ Julian Andres Klode ] * apt/auth.py: - Use tempfile.NamedTemporaryFile to create temporary file + - Use Popen.communicate() instead of stdin, stdout -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 -- cgit v1.2.3 From 4a155c244b52fd7490a2457830356b59fda6beab Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:27:16 +0200 Subject: * tests/fakeroot-apt-key: - exec apt-key, otherwise we ignore the return value --- debian/changelog | 2 ++ tests/fakeroot-apt-key | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 627ef655..cd55cd0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ python-apt (0.8.6) UNRELEASED; urgency=low * apt/auth.py: - Use tempfile.NamedTemporaryFile to create temporary file - Use Popen.communicate() instead of stdin, stdout + * tests/fakeroot-apt-key: + - exec apt-key, otherwise we ignore the return value -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 diff --git a/tests/fakeroot-apt-key b/tests/fakeroot-apt-key index 7be99711..997161a1 100755 --- a/tests/fakeroot-apt-key +++ b/tests/fakeroot-apt-key @@ -1,2 +1,2 @@ #!/bin/sh -fakeroot /usr/bin/apt-key $* +exec fakeroot /usr/bin/apt-key $* -- cgit v1.2.3 From d31dd887ff33a5b4ff7e266576560571d739bf0c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:28:17 +0200 Subject: * debian/control: - Build-depend on fakeroot, needed for the apt.auth tests --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index cd55cd0a..92507eed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ python-apt (0.8.6) UNRELEASED; urgency=low - Use Popen.communicate() instead of stdin, stdout * tests/fakeroot-apt-key: - exec apt-key, otherwise we ignore the return value + * debian/control: + - Build-depend on fakeroot, needed for the apt.auth tests -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 diff --git a/debian/control b/debian/control index 615843f0..ca32cb3b 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ X-Python3-Version: >= 3.1 Build-Depends: apt (>= 0.9.6), apt-utils, debhelper (>= 7.3.5), + fakeroot, libapt-pkg-dev (>= 0.8.11), python-all-dev (>= 2.6.6-3~), python-all-dbg, -- cgit v1.2.3 From fc369093bbefbd319f8713877026df9bedd48f6a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:33:29 +0200 Subject: * data/templates/Debian.info.in: - Add wheezy --- data/templates/Debian.info.in | 25 +++++++++++++++++++++++++ debian/changelog | 2 ++ po/python-apt.pot | 29 +++++++++++++++++------------ 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index b9f70940..21b07608 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -1,5 +1,30 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: wheezy +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org +MirrorsFile: Debian.mirrors +_Description: Debian 7.0 'Wheezy' +Component: main +_CompDescription: Officially supported +Component: contrib +_CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +_CompDescription: Non-DFSG-compatible Software + +Suite: wheezy-proposed-updates +RepositoryType: deb +ParentSuite: wheezy +_Description: Proposed updates + +Suite: wheezy/updates +RepositoryType: deb +BaseURI: http://security.debian.org/ +MatchURI: security\.debian\.org +ParentSuite: wheezy +_Description: Security updates + Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ diff --git a/debian/changelog b/debian/changelog index 92507eed..2ee2a17b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.8.6) UNRELEASED; urgency=low - exec apt-key, otherwise we ignore the return value * debian/control: - Build-depend on fakeroot, needed for the apt.auth tests + * data/templates/Debian.info.in: + - Add wheezy -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 diff --git a/po/python-apt.pot b/po/python-apt.pot index d6ac301e..940cd13a 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-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -284,7 +284,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "" @@ -356,56 +356,61 @@ msgstr "" #. Description #: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " +msgid "Debian 7.0 'Wheezy' " msgstr "" #. Description #: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " +msgid "Debian 6.0 'Squeeze' " msgstr "" #. Description #: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" +msgid "Debian 5.0 'Lenny' " msgstr "" #. Description #: ../data/templates/Debian.info.in:83 +msgid "Debian 4.0 'Etch'" +msgstr "" + +#. Description +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "" -- cgit v1.2.3 From da18719d29f310ff6caff2303e3a7d591386ba7f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:44:05 +0200 Subject: * po: - Fixup the translations for wheezy again --- debian/changelog | 2 ++ po/be.po | 85 +++++++++++++++++++++++++++++++++----------------------- po/de.po | 29 +++++++++++-------- po/el.po | 29 +++++++++++-------- po/eo.po | 29 +++++++++++-------- po/fi.po | 29 +++++++++++-------- po/fr.po | 29 +++++++++++-------- po/hu.po | 29 +++++++++++-------- po/id.po | 29 +++++++++++-------- po/nl.po | 29 +++++++++++-------- po/pt_BR.po | 29 +++++++++++-------- po/ru.po | 31 +++++++++++---------- po/sk.po | 29 +++++++++++-------- po/sl.po | 29 +++++++++++-------- po/sr.po | 47 ++++++++++++------------------- po/tl.po | 29 +++++++++++-------- 16 files changed, 290 insertions(+), 223 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ee2a17b..613b4b13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ python-apt (0.8.6) UNRELEASED; urgency=low - Build-depend on fakeroot, needed for the apt.auth tests * data/templates/Debian.info.in: - Add wheezy + * po: + - Fixup the translations for wheezy again -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 diff --git a/po/be.po b/po/be.po index 985d2687..22cfda03 100644 --- a/po/be.po +++ b/po/be.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-20 18:42+0300\n" "Last-Translator: Viktar Siarheichyk \n" "Language-Team: Belarusian \n" @@ -15,7 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -191,7 +192,8 @@ msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 msgid "Canonical-supported free and open-source software" -msgstr "Свабодныя праграмы і праграмы з адкрытым кодам, што падтрымваюцца Canonical" +msgstr "" +"Свабодныя праграмы і праграмы з адкрытым кодам, што падтрымваюцца Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:1077 @@ -201,7 +203,8 @@ msgstr "Падтрыманыя супольнасцю (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 msgid "Community-maintained free and open-source software" -msgstr "Свабодныя праграмы і праграмы з адкрытым кодам, што падтрымваюцца супольнасцю" +msgstr "" +"Свабодныя праграмы і праграмы з адкрытым кодам, што падтрымваюцца супольнасцю" #. CompDescription #: ../data/templates/Ubuntu.info.in:1080 @@ -284,8 +287,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM з Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 -#: ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Афіцыйна падтрымваюцца" @@ -357,62 +359,66 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Прапанаваныя абнаўленні" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Абнаўленні бяспекі" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Цяперашняе стабільнае выданне Debian" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Праграмы, сумяшчальныя з DFSG з несвабоднымі залежнымі" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Праграмы, несумяшчальныя з DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 -#: ../aptsources/distro.py:436 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "Сервер для %s" @@ -420,8 +426,7 @@ 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 #. append a list of all used servers -#: ../aptsources/distro.py:224 -#: ../aptsources/distro.py:230 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 #: ../aptsources/distro.py:246 msgid "Main server" msgstr "Галоўны сервер" @@ -430,14 +435,12 @@ msgstr "Галоўны сервер" msgid "Custom servers" msgstr "Іншыя серверы" -#: ../apt/progress/gtk2.py:258 -#: ../apt/progress/gtk2.py:314 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Выгрузка файла %(current)li з %(total)li на хуткасці %(speed)s/s" -#: ../apt/progress/gtk2.py:264 -#: ../apt/progress/gtk2.py:320 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Загрузка файла %(current)li of %(total)li" @@ -460,8 +463,7 @@ msgstr "Скончана" msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "Несапраўдны unicode у апісанні да '%s' (%s). Паведаміце, калі ласка." -#: ../apt/package.py:1088 -#: ../apt/package.py:1194 +#: ../apt/package.py:1088 ../apt/package.py:1194 msgid "The list of changes is not available" msgstr "Недасяжны спіс зменаў" @@ -509,19 +511,31 @@ msgstr "Канфліктуе з усталяваным пакетам '%s'" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation #: ../apt/debfile.py:373 #, python-format -msgid "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)s %(depversion)s)" -msgstr "Парушае залежнасць %(depname)s (%(deprelation)s %(depversion)s) наяўнага пакета '%(pkgname)s'" +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" +msgstr "" +"Парушае залежнасць %(depname)s (%(deprelation)s %(depversion)s) наяўнага " +"пакета '%(pkgname)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:389 #, python-format -msgid "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s %(targetver)s)" -msgstr "Парушае канфлікт %(targetpkg)s (%(comptype)s %(targetver)s) наяўнага пакета '%(pkgname)s'" +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" +"Парушае канфлікт %(targetpkg)s (%(comptype)s %(targetver)s) наяўнага пакета " +"'%(pkgname)s'" #: ../apt/debfile.py:399 #, python-format -msgid "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But the '%(debfile)s' provides it via: '%(provides)s'" -msgstr "Парушае наяўны пакет '%(pkgname)s', які канфліктуе з: '%(targetpkg)s'. Але '%(debfile)s' забяспечваецца праз: '%(provides)s'" +msgid "" +"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " +"the '%(debfile)s' provides it via: '%(provides)s'" +msgstr "" +"Парушае наяўны пакет '%(pkgname)s', які канфліктуе з: '%(targetpkg)s'. Але " +"'%(debfile)s' забяспечваецца праз: '%(provides)s'" #: ../apt/debfile.py:447 msgid "No Architecture field in the package" @@ -561,7 +575,8 @@ msgstr "Аўтаматычна ператвораны ў друкаваныя AS #: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "Усталяваць Build-Dependencies для зыходнага пакета '%s', які збірае %s\n" +msgstr "" +"Усталяваць Build-Dependencies для зыходнага пакета '%s', які збірае %s\n" #: ../apt/debfile.py:700 msgid "An essential package would be removed" @@ -611,7 +626,8 @@ msgstr "Атрымана %sB з %s (%sB/s)\n" #: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Калі ласка, падайце імя для гэтага дыска, напрыклад, 'Debian 2.1r1 Disk 1'" +msgstr "" +"Калі ласка, падайце імя для гэтага дыска, напрыклад, 'Debian 2.1r1 Disk 1'" #: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" @@ -620,4 +636,3 @@ msgstr "Калі ласка, устаўце дыск у прыладу і нац #: ../apt/cache.py:157 msgid "Building data structures" msgstr "Будуюцца структуры звестак" - diff --git a/po/de.po b/po/de.po index 53206f04..5f3fb0fa 100644 --- a/po/de.po +++ b/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: python-apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-17 20:23+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: German \n" @@ -288,7 +288,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM mit Ubuntu 5.04 »Hoary Hedgehog«" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Offiziell unterstützt" @@ -360,56 +360,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 »Wheezy«" + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 »Squeeze«" #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 »Lenny«" #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 »Etch«" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 »Sarge«" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Vorgeschlagene Aktualisierungen" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Sicherheitsaktualisierungen" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Aktuelle stabile Veröffentlichung von Debian" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian Testing" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian »Sid« (Unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" diff --git a/po/el.po b/po/el.po index d8e701fd..f5599eaf 100644 --- a/po/el.po +++ b/po/el.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-13 11:37+0100\n" "Last-Translator: Thomas Vasileiou \n" "Language-Team: Greek \n" @@ -285,7 +285,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom με Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Επίσημα υποστηριζόμενο" @@ -357,56 +357,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Προτεινόμενες ενημερώσεις" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Ενημερώσεις ασφαλείας" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Τρέχουσα σταθερή έκδοση Debian " #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" diff --git a/po/eo.po b/po/eo.po index 52e7ccd5..3eceb847 100644 --- a/po/eo.po +++ b/po/eo.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-11 09:54+0000\n" "Last-Translator: Michael Moroni \n" "Language-Team: Esperanto \n" @@ -290,7 +290,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "KD kun Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Oficiale subtenata" @@ -362,56 +362,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debiano 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debiano 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debiano 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debiano 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debiano 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Proponitaj ĝisdatigoj" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Aktuala stabila eldono de Debiano" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Testado de Debiano" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debiano 'Sid' (nestabila)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kongrua programaro kun malliberaj dependecoj" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "DFSG-nekongruaj programaroj" diff --git a/po/fi.po b/po/fi.po index dc741a9c..3f018385 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-11 08:55+0300\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -284,7 +284,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Virallisesti tuettu" @@ -356,57 +356,62 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 \"Wheezy\" " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 \"Squeeze\" " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 \"Lenny\" " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 \"Etch\"" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 \"Sarge\"" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Ehdotetut päivitykset" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Turvallisuuspäivitykset" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Debian stable (tämänhetkinen vakaa julkaisu)" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian testing (testattava)" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (epävakaa)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "DFSG-yhteensopivat ohjelmistot joilla riippuvuuksia epävapaisiin ohjelmiin" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmistot" diff --git a/po/fr.po b/po/fr.po index f0598662..116dff6f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: python-apt 0.7.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-01-12 18:20-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -290,7 +290,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD contenant Ubuntu 5.04 « Hoary Hedgehog »" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Officiellement pris en charge" @@ -362,58 +362,63 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 « Wheezy »" + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 « Squeeze »" #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 « Lenny »" #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 « Etch »" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 « Sarge »" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Mises à jour suggérées" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Mises à jour de sécurité" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Debian stable actuelle" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian « Lenny » (testing)" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian « Sid » (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "Logiciel libre (selon les principes du projet Debian) dont les dépendances " "ne sont pas libres" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les principes du projet Debian)" diff --git a/po/hu.po b/po/hu.po index b302f04d..f775801e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-11 18:21+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -285,7 +285,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Az Ubuntu 5.04 „Hoary Hedgehog”-ot tartalmazó CD-ROM" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Hivatalosan támogatott" @@ -357,56 +357,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 „Wheezy” " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 „Squeeze” " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 „Lenny” " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 „Etch”" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 „Sarge”" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Javasolt frissítések" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Biztonsági frissítések" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Jelenlegi stabil Debian kiadás" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian – tesztelés alatt" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian „Sid” (instabil)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" diff --git a/po/id.po b/po/id.po index 3fdfa2ef..8eb83d70 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: python-apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-11 01:59+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" @@ -287,7 +287,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom dengan Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Resmi didukung" @@ -359,58 +359,63 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Pemutakhiran yang diusulkan" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Pemutakhiran keamanan" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Rilis stabil Debian saat ini" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "Perangkat lunak yang kompatibel dengan DFSG tapi tergantung pada Perangkat " "Lunak Tidak-Bebas" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Perangkat Lunak yang tidak kompatibel dengan DFSG" diff --git a/po/nl.po b/po/nl.po index 3243c520..c9995edf 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: python-apt 0.8.4+nmu1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-13 12:12+0200\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -285,7 +285,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD met Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Officieel ondersteund" @@ -357,56 +357,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Voorgestelde updates" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "veiligheidsupdates" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Huidige stabiele uitgave van Debian" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian testing (test)" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (unstable/onstabiel)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Software niet compatibel met DFSG" diff --git a/po/pt_BR.po b/po/pt_BR.po index b182b952..a19c5c2c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-10 15:53-0300\n" "Last-Translator: Sérgio Cipolla \n" "Language-Team: \n" @@ -285,7 +285,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM com o Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Suportados oficialmente" @@ -357,56 +357,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Atualizações sugeridas" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Atualizações de segurança" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Atual versão estável do Debian" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 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:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Aplicativos não compatíveis com a DFSG" diff --git a/po/ru.po b/po/ru.po index 2f22ad09..aa8be8e4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2006-10-18 09:11+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -52,14 +52,12 @@ msgstr "Диск с Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 #, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 #, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" msgstr "Диск с Ubuntu 11.04 'Natty Narwhal'" @@ -316,7 +314,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Официально поддерживается" @@ -389,63 +387,68 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 #, fuzzy msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 #, fuzzy msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 #, fuzzy msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 #, fuzzy msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Предлагаемые обновления" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 #, fuzzy msgid "Security updates" msgstr "Обновления безопасности" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Текущий стабильный релиз Debian" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 #, fuzzy msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 #, fuzzy msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-совместимое ПО с зависимостями от несвободного ПО" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-совместимое ПО" diff --git a/po/sk.po b/po/sk.po index 187c7aa5..d01acebb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-10 23:28+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -285,7 +285,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM s Ubuntu 5.04 „Hoary Hedgehog“" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Oficiálne podporované" @@ -357,56 +357,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 „Wheezy“ " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 „Squeeze“ " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 „Lenny“ " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 „Etch“" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 „Sarge“" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Navrhované aktualizácie" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Bezpečnostné aktualizácie" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Aktuálne vydanie Debian stable" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian „Sid“ (nestabilné)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Softvér nekompatibilný s DFSG" diff --git a/po/sl.po b/po/sl.po index d06f8724..ce5d7081 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: python-apt-rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-10 22:24+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian \n" @@ -293,7 +293,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Nosilec CD z Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Uradno podprto" @@ -365,56 +365,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Predlagane posodobitve" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Varnostne posodobitve" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Debian trenutna stabilna različica" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian preizkusna različica" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian \"Sid\" (razvojna različica)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Program je skladen z DFSG-compatible ne prostimi odvisnostmi" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Program ni skladen z DFSG" diff --git a/po/sr.po b/po/sr.po index da885a6f..0726da4c 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2006-10-16 04:17+0000\n" "Last-Translator: Nikola Nenadic \n" "Language-Team: Serbian \n" @@ -28,56 +28,48 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:151 #, fuzzy -#| msgid "Ubuntu 7.04 'Feisty Fawn'" msgid "Ubuntu 12.04 'Precise Pangolin'" msgstr "Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:158 #, fuzzy -#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" msgstr "Оптички диск са Ubuntu 12.04 'Precise Pangolin'" #. Description #: ../data/templates/Ubuntu.info.in:269 #, fuzzy -#| msgid "Ubuntu 9.10 'Karmic Koala'" msgid "Ubuntu 11.10 'Oneiric Ocelot'" msgstr "Ubuntu 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:276 #, fuzzy -#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" msgstr "Оптички диск са 11.10 'Oneiric Ocelot'" #. Description #: ../data/templates/Ubuntu.info.in:388 #, fuzzy -#| msgid "Ubuntu 4.10 'Warty Warthog'" msgid "Ubuntu 11.04 'Natty Narwhal'" msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:395 #, fuzzy -#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" msgstr "Оптички диск са Ubuntu 11.04 'Natty Narwhal'" #. Description #: ../data/templates/Ubuntu.info.in:486 #, fuzzy -#| msgid "Ubuntu 9.10 'Karmic Koala'" msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:506 #, fuzzy -#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "Оптички диск са Ubuntu 10.10 'Maverick Meerkat'" @@ -114,14 +106,12 @@ msgstr "Софтвер је понуђен од независних прогр #. Description #: ../data/templates/Ubuntu.info.in:569 #, fuzzy -#| msgid "Ubuntu 8.04 'Hardy Heron'" msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description #: ../data/templates/Ubuntu.info.in:589 #, fuzzy -#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "Оптички диск са Ubuntu 10.04 'Lucid Lynx'" @@ -213,7 +203,6 @@ msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1075 #, fuzzy -#| msgid "Canonical-supported Open Source software" msgid "Canonical-supported free and open-source software" msgstr "Canonical-подржава слободан софтвер и софтвер отвореног кода" @@ -225,7 +214,6 @@ msgstr "Одржаван од стране заједнице" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:1078 #, fuzzy -#| msgid "Community-maintained Open Source software" msgid "Community-maintained free and open-source software" msgstr "Заједница одржава слободан софтвер и софтвер отвореног кода" @@ -310,7 +298,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Оптички диск са Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Званично подржани" @@ -382,60 +370,63 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 #, fuzzy -#| msgid "Debian 6.0 'Squeeze'" msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze'" #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 #, fuzzy -#| msgid "Debian 5.0 'Lenny'" msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny'" #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Предложене исправке (ажурирања)" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Сигурносне исправке" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Дебиан-тренутно стабилно издање" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Дебиан-тестирање" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (нестабилно)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-компитабилан са не слободним софтвером" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Непостоји-DFSG компитабилног софтвера" @@ -516,7 +507,6 @@ msgstr "Листа фајлова за '%s' не може да се прочит #: ../apt/debfile.py:93 #, fuzzy, python-format -#| msgid "List of files for '%s' could not be read" msgid "List of control files for '%s' could not be read" msgstr "Листа фајлова за '%s' не може да се прочита" @@ -552,9 +542,6 @@ msgstr "" #: ../apt/debfile.py:399 #, fuzzy, python-format -#| msgid "" -#| "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " -#| "the '%(targetpkg)s' provides it via: '%(provides)s'" msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" diff --git a/po/tl.po b/po/tl.po index ee4ff508..24260ca9 100644 --- a/po/tl.po +++ b/po/tl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:42+0200\n" "PO-Revision-Date: 2012-06-11 11:13+0800\n" "Last-Translator: Ariel S. Betan \n" "Language-Team: Tagalog \n" @@ -285,7 +285,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom na may Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "Opisyal na sinusuportahan" @@ -357,56 +357,61 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 +msgid "Debian 7.0 'Wheezy' " +msgstr "Debian 7.0 'Wheezy' " + +#. Description +#: ../data/templates/Debian.info.in:33 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:58 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:83 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "Mga mungkahing updates" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "Mga updates pang-seguridad" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "Kasalukuyang stable release ng Debian" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "Debian testing" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (unstable)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software na DFSG-compatible na may Di-Malayang mga Dependensiya" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "Software na Di-DFSG-compatible" -- cgit v1.2.3 From 30446f851f06569b1c1a014f76c96eaa303d370b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:54:45 +0200 Subject: Add wheezy-updates as Recommended Updates --- data/templates/Debian.info.in | 5 +++++ debian/changelog | 1 + 2 files changed, 6 insertions(+) diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index 21b07608..cfc8645a 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -25,6 +25,11 @@ MatchURI: security\.debian\.org ParentSuite: wheezy _Description: Security updates +Suite: wheezy-updates +RepositoryType: deb +ParentSuite: wheezy +_Description: Recommended updates + Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ diff --git a/debian/changelog b/debian/changelog index 613b4b13..8a8fcb6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ python-apt (0.8.6) UNRELEASED; urgency=low - Build-depend on fakeroot, needed for the apt.auth tests * data/templates/Debian.info.in: - Add wheezy + - Add wheezy-updates as Recommended Updates * po: - Fixup the translations for wheezy again -- cgit v1.2.3 From dfd6bacface878eecf3fec4876bdae2f0491a646 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:55:16 +0200 Subject: Order wheezy-proposed-updates after wheezy/updates and wheezy-updates --- data/templates/Debian.info.in | 10 +++++----- debian/changelog | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index cfc8645a..3ffe174d 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -13,11 +13,6 @@ _CompDescription: DFSG-compatible Software with Non-Free Dependencies Component: non-free _CompDescription: Non-DFSG-compatible Software -Suite: wheezy-proposed-updates -RepositoryType: deb -ParentSuite: wheezy -_Description: Proposed updates - Suite: wheezy/updates RepositoryType: deb BaseURI: http://security.debian.org/ @@ -30,6 +25,11 @@ RepositoryType: deb ParentSuite: wheezy _Description: Recommended updates +Suite: wheezy-proposed-updates +RepositoryType: deb +ParentSuite: wheezy +_Description: Proposed updates + Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ diff --git a/debian/changelog b/debian/changelog index 8a8fcb6b..59845f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ python-apt (0.8.6) UNRELEASED; urgency=low * data/templates/Debian.info.in: - Add wheezy - Add wheezy-updates as Recommended Updates + - Order wheezy-proposed-updates after wheezy/updates and wheezy-updates * po: - Fixup the translations for wheezy again -- cgit v1.2.3