summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt/auth.py56
-rw-r--r--apt/progress/base.py1
-rw-r--r--data/templates/Debian.info.in30
-rw-r--r--debian/changelog86
-rw-r--r--debian/control6
-rw-r--r--doc/source/library/apt_pkg.rst6
-rw-r--r--po/am.po495
-rw-r--r--po/ar.po300
-rw-r--r--po/be.po530
-rw-r--r--po/bg.po310
-rw-r--r--po/bn.po310
-rw-r--r--po/br.po494
-rw-r--r--po/ca.po310
-rw-r--r--po/cs.po316
-rw-r--r--po/csb.po300
-rw-r--r--po/da.po334
-rw-r--r--po/de.po387
-rw-r--r--po/el.po471
-rw-r--r--po/en_AU.po312
-rw-r--r--po/en_CA.po310
-rw-r--r--po/en_GB.po524
-rw-r--r--po/eo.po379
-rw-r--r--po/es.po312
-rw-r--r--po/et.po496
-rw-r--r--po/eu.po496
-rw-r--r--po/fa.po495
-rw-r--r--po/fi.po453
-rw-r--r--po/fr.po474
-rw-r--r--po/fur.po495
-rw-r--r--po/gl.po312
-rw-r--r--po/he.po312
-rw-r--r--po/hi.po495
-rw-r--r--po/hr.po316
-rw-r--r--po/hu.po493
-rw-r--r--po/id.po570
-rw-r--r--po/it.po312
-rw-r--r--po/ja.po318
-rw-r--r--po/ka.po312
-rw-r--r--po/ko.po312
-rw-r--r--po/ku.po312
-rw-r--r--po/lt.po316
-rw-r--r--po/lv.po303
-rw-r--r--po/mk.po310
-rw-r--r--po/mr.po494
-rw-r--r--po/ms.po497
-rw-r--r--po/nb.po310
-rw-r--r--po/ne.po310
-rw-r--r--po/nl.po484
-rw-r--r--po/nn.po496
-rw-r--r--po/no.po310
-rw-r--r--po/oc.po310
-rw-r--r--po/pa.po500
-rw-r--r--po/pl.po312
-rw-r--r--po/ps.po494
-rw-r--r--po/pt.po312
-rw-r--r--po/pt_BR.po303
-rw-r--r--po/python-apt.pot29
-rw-r--r--po/qu.po494
-rw-r--r--po/ro.po312
-rw-r--r--po/ru.po401
-rw-r--r--po/rw.po549
-rw-r--r--po/sk.po554
-rw-r--r--po/sl.po312
-rw-r--r--po/sq.po300
-rw-r--r--po/sr.po377
-rw-r--r--po/sv.po312
-rw-r--r--po/ta.po495
-rw-r--r--po/th.po312
-rw-r--r--po/tl.po518
-rw-r--r--po/tr.po312
-rw-r--r--po/uk.po307
-rw-r--r--po/ur.po495
-rw-r--r--po/vi.po310
-rw-r--r--po/xh.po500
-rw-r--r--po/zh_CN.po460
-rw-r--r--po/zh_HK.po303
-rw-r--r--po/zh_TW.po315
-rwxr-xr-xpre-build.sh2
-rw-r--r--python/acquire.cc9
-rw-r--r--python/configuration.cc7
-rw-r--r--python/tag.cc130
-rwxr-xr-xtests/fakeroot-apt-key2
-rw-r--r--tests/test_auth.py14
-rw-r--r--tests/test_lp659438.py4
-rw-r--r--tests/test_tagfile.py93
-rwxr-xr-xutils/get_ubuntu_mirrors_from_lp.py2
86 files changed, 12855 insertions, 14988 deletions
diff --git a/apt/auth.py b/apt/auth.py
index 38c4bdc6..5d4b1cd6 100644
--- a/apt/auth.py
+++ b/apt/auth.py
@@ -51,38 +51,42 @@ 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:
- 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
+ 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)
+
+ 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" % (proc.returncode, " ".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/apt/progress/base.py b/apt/progress/base.py
index 4943978c..ab57dd82 100644
--- a/apt/progress/base.py
+++ b/apt/progress/base.py
@@ -142,6 +142,7 @@ 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)
diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index b9f70940..3ffe174d 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -1,5 +1,35 @@
_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/updates
+RepositoryType: deb
+BaseURI: http://security.debian.org/
+MatchURI: security\.debian\.org
+ParentSuite: wheezy
+_Description: Security updates
+
+Suite: wheezy-updates
+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 4cd171fc..72bddb51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+python-apt (0.8.6) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * debian/control:
+ - add build-dep for apt (>= 0.9.6) to make test_auth.py test
+ work reliable
+
+ [ 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.
+
+ [ Julian Andres Klode ]
+ * 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
+ * debian/control:
+ - Build-depend on fakeroot, needed for the apt.auth tests
+ * 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
+
+ -- Michael Vogt <mvo@debian.org> Mon, 25 Jun 2012 13:41:02 +0200
+
python-apt (0.8.5~ubuntu2) quantal; urgency=low
* xz-lzma has been rolled into xz-utils, as of 5.1.1alpha+20120614-1
@@ -17,7 +47,7 @@ python-apt (0.8.5~ubuntu1) quantal-proposed; urgency=low
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 12 Jun 2012 08:23:06 -0700
-python-apt (0.8.5) UNRELEASED; urgency=low
+python-apt (0.8.5) unstable; urgency=low
[ Michael Vogt ]
* python/cache.cc:
@@ -28,9 +58,6 @@ python-apt (0.8.5) UNRELEASED; urgency=low
* data/templates/Ubuntu.info.in:
- add quantal
- [ Evan Dandrea ]
- * Don't leak file descriptors.
-
[ 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
@@ -42,13 +69,52 @@ 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
- [ 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.
+ [ 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>
+ * 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
+ * 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
+ 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
+ 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)
+ - 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
+ 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)
+ * 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
+ * tests:
+ - Fix new tests from Sebastian to work with Python 2.6
- -- Michael Vogt <mvo@debian.org> Tue, 17 Apr 2012 14:09:24 +0200
+ -- Julian Andres Klode <jak@debian.org> Fri, 22 Jun 2012 10:37:23 +0200
python-apt (0.8.3ubuntu8) quantal; urgency=low
diff --git a/debian/control b/debian/control
index 46580333..5707b0c2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,13 @@ Priority: standard
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
XS-Python-Version: >= 2.6
X-Python3-Version: >= 3.1
-Build-Depends: apt-utils,
+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,
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/po/am.po b/po/am.po
deleted file mode 100644
index 37ad7aed..00000000
--- a/po/am.po
+++ /dev/null
@@ -1,495 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-10-09 15:49+0000\n"
-"Last-Translator: Habte <adbaru@gmail.com>\n"
-"Language-Team: Amharic <am@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "በየቀኑ"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <kirk.lock@gmail.com>\n"
"Language-Team: Arabic <ar@li.org>\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..22cfda03 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,385 +3,471 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
#
-#, fuzzy
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: 2006-10-16 04:05+0000\n"
-"Last-Translator: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>\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 <viсs@eq.by>\n"
"Language-Team: Belarusian <be@li.org>\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
#, 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: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:13
+#: ../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 ""
+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 ""
+msgstr "CD-ROM з 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 ""
+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 ""
+msgstr "CD-ROM з 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 ""
+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 ""
+msgstr "CD-ROM з 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 ""
+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 ""
+msgstr "CD-ROM з 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 ""
+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 ""
+msgstr "CD-ROM з 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 ""
+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 ""
+msgstr "CD-ROM з 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 ""
+msgstr "Ubuntu 6.10 'Edgy Eft'"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
msgid "Community-maintained"
-msgstr ""
+msgstr "Утрымоўваецца супольнасцю"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
msgid "Restricted software"
-msgstr ""
+msgstr "Абмежаваная праграма"
#. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CD-ROM з 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 ""
+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
+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 ""
+msgstr "Падтрыманыя супольнасцю (universe)"
#. 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 ""
+msgstr "Несвабодныя драйверы"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Уласніцкія драйверы прыладаў"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
msgid "Restricted software (Multiverse)"
-msgstr ""
+msgstr "Абмежаваныя праграмы (Multiverse)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
msgid "Software restricted by copyright or legal issues"
-msgstr ""
+msgstr "Праграмы, абмежаваныя аўтарскім правам ці юрыдычнымі пытаннямі"
#. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 6.06 LTS 'Dapper Drake'"
#. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
msgid "Important security updates"
-msgstr ""
+msgstr "Важныя абнаўленні бяспекі"
#. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
msgid "Recommended updates"
-msgstr ""
+msgstr "Рэкамендаваныя абнаўленні"
#. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
msgid "Pre-released updates"
-msgstr ""
+msgstr "Загадзя выдадзеныя абнаўленні"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
msgid "Unsupported updates"
-msgstr ""
+msgstr "Абнаўленні, што не падтрымваюцца"
#. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../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:475
+#: ../data/templates/Ubuntu.info.in:1148
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "CD-ROM з 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 ""
+msgstr "Абнаўленні бяспекі Ubuntu 5.10"
#. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Абнаўленні Ubuntu 5.10"
#. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
msgid "Ubuntu 5.10 Backports"
-msgstr ""
+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 ""
+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 ""
+msgstr "CD-ROM з 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:174
msgid "Officially supported"
-msgstr ""
+msgstr "Афіцыйна падтрымваюцца"
#. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
+msgstr "Абнаўленні бяспекі Ubuntu 5.04"
#. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
msgid "Ubuntu 5.04 Updates"
-msgstr ""
+msgstr "Абнаўленні Ubuntu 5.04"
#. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
msgid "Ubuntu 5.04 Backports"
-msgstr ""
+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 ""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
msgid "Community-maintained (Universe)"
-msgstr ""
+msgstr "Падтымваецца супольнасцю (Universe)"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Несвабодныя (Multiverse)"
#. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 4.10 'Warty Warthog'"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
msgid "No longer officially supported"
-msgstr ""
+msgstr "Больш не падтрымваюцца афіцыйна"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
msgid "Restricted copyright"
-msgstr ""
+msgstr "Абмежаванае аўтарскае права"
#. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
+msgstr "Абнаўленні бяспекі Ubuntu 4.10"
#. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
msgid "Ubuntu 4.10 Updates"
-msgstr ""
+msgstr "Абнаўленні Ubuntu 4.10"
#. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../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
#, 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 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
#. Description
#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
#. Description
#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
#. Description
#: ../data/templates/Debian.info.in:83
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
msgid "Debian 3.1 'Sarge'"
-msgstr ""
+msgstr "Debian 3.1 'Sarge'"
#. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
msgid "Proposed updates"
-msgstr ""
+msgstr "Прапанаваныя абнаўленні"
#. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
msgid "Security updates"
-msgstr ""
+msgstr "Абнаўленні бяспекі"
#. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
msgid "Debian current stable release"
-msgstr ""
+msgstr "Цяперашняе стабільнае выданне Debian"
#. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr ""
+msgstr "Debian testing"
#. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr ""
+msgstr "Debian 'Sid' (unstable)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Праграмы, сумяшчальныя з DFSG з несвабоднымі залежнымі"
#. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
msgid "Non-DFSG-compatible Software"
-msgstr ""
+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 ""
+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 ""
+msgstr "Галоўны сервер"
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
msgid "Custom servers"
-msgstr ""
+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 ""
+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 ""
+msgstr "Загрузка файла %(current)li of %(total)li"
#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
+#: ../apt/progress/gtk2.py:340
msgid "Details"
-msgstr "Штодзённа"
+msgstr "Падрабязнасці"
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
msgid "Starting..."
-msgstr ""
+msgstr "Пачынаецца..."
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Скончана"
-#: ../apt/package.py:301
+#: ../apt/package.py:359
#, 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
+#: ../apt/package.py:1088 ../apt/package.py:1194
msgid "The list of changes is not available"
-msgstr ""
+msgstr "Недасяжны спіс зменаў"
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -389,110 +475,164 @@ 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:1053
-#, fuzzy
+#: ../apt/package.py:1207
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
-msgstr "Калі ласка, праверце вашае далучэньне да інтэрнэту."
+msgstr ""
+"Не ўдалося атрымаць спіс зменаў. \n"
+"Калі ласка, праверце вашае далучэнне да інтэрнэту."
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Спіс файлаў да '%s' не атрымалася прачытаць"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Спіс файлаў кіравання да '%s' не атрымалася прачытаць"
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
#, python-format
msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Залежнасць, якую не ўдаецца задаволіць: %s\n"
-#: ../apt/debfile.py:173
+#: ../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'"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%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'"
+
+#: ../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:325
+#: ../apt/debfile.py:464
msgid "A later version is already installed"
-msgstr ""
+msgstr "Ужо ўсталяваная апошняя версія"
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Не атрымалася задаволіць усе залежнасці (зламаны кэш)"
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, 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:484
+#: ../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:494
-#, fuzzy
+#: ../apt/debfile.py:700
msgid "An essential package would be removed"
-msgstr "Трэба было-б выдаліць абавязковы пакет"
+msgstr "Трэба было б выдаліць абавязковы пакет"
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
#, python-format
msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Скончана"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Hit "
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Ign "
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Err "
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Атрымаць:"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+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'\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 ""
+msgstr "Атрымана %sB з %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 ""
+msgstr "Калі ласка, устаўце дыск у прыладу і націсніце Enter"
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
msgid "Building data structures"
-msgstr ""
+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 <nikola.kasabov@gmail.com>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\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 <suzan@bengalinux.org>\n"
"Language-Team: Bengali <bn@li.org>\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
deleted file mode 100644
index a846d409..00000000
--- a/po/br.po
+++ /dev/null
@@ -1,494 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-05-19 02:42+0000\n"
-"Last-Translator: Oublieuse <oublieuse@gmail.com>\n"
-"Language-Team: Breton <br@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <irazuzta@gmail.com>\n"
"Language-Team: Catalan <tradgnome@softcatala.org>\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 <Dominik.Sauer@gmail.com>\n"
"Language-Team: Czech <cs@li.org>\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 <ostrowski.michal@gmail.com>\n"
"Language-Team: Kashubian <csb@li.org>\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 <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \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..5f3fb0fa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,16 +4,18 @@
# This file is distributed under the same license as the update-manager package.
# Initial version by an unknown artist.
# Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
+# Holger Wansing <linux@wansing-online.de>, 2012.
#
#
msgid ""
msgstr ""
"Project-Id-Version: python-apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-31 17:09+0100\n"
-"PO-Revision-Date: 2010-01-31 17:14+0100\n"
-"Last-Translator: Julian Andres Klode <jak@debian.org>\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 <linux@wansing-online.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,257 +28,327 @@ 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 "Ubuntu 12.04 »Precise Pangolin«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM mit 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 mit 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 mit 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 mit Ubuntu 10.10 »Maverick Meerkat«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Canonical-Partner"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+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 "Diese Software ist nicht Teil von Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Unabhängig"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Bereitgestellt von Fremd-Software-Entwicklern"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Software, die von Fremd-Software-Entwicklern angeboten wurde"
+
+#. 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«"
+msgstr "CD-ROM 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«"
+msgstr "CD-ROM 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«"
+msgstr "CD-ROM 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«"
+msgstr "CD-ROM 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«"
+msgstr "CD-ROM 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«"
+msgstr "CD-ROM 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"
-msgstr "Von Canonical unterstütze Open-Source-Software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Von Canonical unterstützte freie und quelloffene 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"
-msgstr "Von der Ubuntu-Gemeinde betreute Open-Source-Software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Von der Ubuntu-Gemeinde betreute freie und quelloffene 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«"
+msgstr "CD-ROM 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"
+msgstr "Nicht unterstützte 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«"
+msgstr "CD-ROM 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«"
+msgstr "CD-ROM 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:174
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"
@@ -288,61 +360,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 "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 Freigabe von Debian"
+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:146
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian »Sid« (unstable)"
+msgstr "Debian »Sid« (Unstable)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../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:152
+#: ../data/templates/Debian.info.in:178
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 +427,49 @@ 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"
+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"
+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..."
+msgstr "Starten ..."
-#: ../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"
@@ -401,10 +479,10 @@ 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:1105
+#: ../apt/package.py:1207
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -412,76 +490,129 @@ 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."
+msgstr "Die Liste der Dateien von »%s« konnte nicht gelesen werden."
-#: ../apt/debfile.py:138
+#: ../apt/debfile.py:93
+#, python-format
+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‹"
+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
+#, python-format
+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)"
-#: ../apt/debfile.py:308
+#. 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 ""
+"Beschädigt vorhandenes Paket »%(pkgname)s« wegen Konflikt: %(targetpkg)s "
+"(%(comptype)s %(targetver)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 ""
+"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 "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:314
+#: ../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: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)"
+msgstr ""
+"Es konnten nicht alle Abhängigkeiten erfüllt werden (Zwischenspeicher "
+"defekt)."
-#: ../apt/debfile.py:365
+#: ../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:473
+#: ../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 "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: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]"
+msgstr " [Verarbeiten]"
-#: ../apt/progress/text.py:213
+#: ../apt/progress/text.py:214
#, python-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -490,25 +621,25 @@ 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: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«"
+"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"
+"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..f5599eaf 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,14 +3,16 @@
# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER.
#
# Kostas Papadimas <pkst@gnome.org>, 2005, 2006.
+# Thomas Vasileiou <thomas-v@wildmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 04:13+0000\n"
-"Last-Translator: Kostas Papadimas <pkst@gmx.net>\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 <thomas-v@wildmail.com>\n"
"Language-Team: Greek <team@gnome.gr>\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,267 +25,327 @@ 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
-#, fuzzy
+#: ../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 "Cdrom με 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 "Cdrom με το 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 "Cdrom με το 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 "Cdrom με το 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 "Cdrom με Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
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
+#: ../data/templates/Ubuntu.info.in:652
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:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
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
+#: ../data/templates/Ubuntu.info.in:714
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:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
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
+#: ../data/templates/Ubuntu.info.in:777
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:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
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
+#: ../data/templates/Ubuntu.info.in:841
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:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
#. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
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:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
#. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
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: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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
msgid "Community-maintained"
-msgstr "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 TLS 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
msgstr "Λογισμικό ανοικτού κώδικα υποστηριζόμενο από την Canonical"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
msgid "Community-maintained (universe)"
-msgstr "Υποστηριζόμενα από την κοινότητα (Universe)"
+msgstr "Υποστηριζόμενα από την κοινότητα (universe)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "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 "Όχι-ελεύθερο (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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
msgid "Pre-released updates"
msgstr "Προτεινόμενες ενημερώσεις"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
msgid "Unsupported updates"
-msgstr "Backported ενημερώσεις"
+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 "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"
+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
-#, fuzzy
+#: ../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:518
+#: ../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:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
msgid "Officially supported"
-msgstr "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 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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
msgid "Community-maintained (Universe)"
-msgstr "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 "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"
@@ -295,68 +357,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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
#. Description
#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
#. Description
#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
#. Description
#: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
msgid "Debian 3.1 'Sarge'"
-msgstr "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
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
msgid "Security updates"
-msgstr "Σημαντικές ενημερώσεις ασφαλείας"
+msgstr "Ενημερώσεις ασφαλείας"
#. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
msgid "Debian current stable release"
-msgstr ""
+msgstr "Τρέχουσα σταθερή έκδοση Debian "
#. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
#. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
msgid "DFSG-compatible Software with Non-Free Dependencies"
msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις"
#. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
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 +424,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 ""
+msgstr "Εκκίνηση..."
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+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 "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη."
+msgstr "Η λίστα των αλλαγών δεν είναι διαθέσιμη."
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -413,8 +474,13 @@ 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:1053
+#: ../apt/package.py:1207
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -422,102 +488,151 @@ msgstr ""
"Αποτυχία λήψης της λίστας των αλλαγών.\n"
"Παρακαλώ ελέγξτε τη σύνδεση σας στο διαδίκτυο."
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Η λίστα των αρχείων για το '%s' δεν μπόρεσε να διαβαστεί"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Η λίστα των αρχείων ελέγχου για το '%s' δεν μπόρεσε να διαβαστεί"
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
#, python-format
msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Η εξάρτηση δεν ικανοποιείται: %s\n"
-#: ../apt/debfile.py:173
+#: ../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 ""
+"Παραβιάζει υπάρχον πακέτο '%(pkgname)s' εξάρτηση %(depname)s "
+"(%(deprelation)s %(depversion)s)"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 "Δεν βρέθηκε το πεδίο Αρχιτεκτονική στο πακέτο"
+
+#: ../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 ""
+msgstr "Μια πιο πρόσφατη έκδοση είναι ήδη εγκατεστημένη"
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Αποτυχία ικανοποίησης όλων των εξαρτήσεων (σπασμένη cache)"
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, 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:484
+#: ../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 ""
+"Εγκαταστήστε τις Εξαρτήσεις Μεταγλώττισης για το πηγαίο πακέτο '%s' που "
+"δομεί το %s\n"
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../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 ""
+msgstr "%c%s... Ολοκληρώθηκε"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Πιέστε"
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Αγν"
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Λαθ"
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Φέρε:"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+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'\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 ""
+msgstr "Μεταφέρθηκαν %sB σε %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 ""
+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 ""
+msgstr "Παρακαλώ τοποθετήστε ένα Δίσκο στον οδηγό και πατήστε enter"
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
msgid "Building data structures"
-msgstr ""
+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 <david@davidsatchell.net>\n"
"Language-Team: English (Australia) <en_AU@li.org>\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 <adamw@gnome.org>\n"
"Language-Team: Canadian English <adamw@gnome.org>\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 "<b>Details</b>"
-#: ../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
deleted file mode 100644
index aa451a85..00000000
--- a/po/en_GB.po
+++ /dev/null
@@ -1,524 +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 <morwen@evilmagic.org>, Bastien Nocera <hadess@hadess.net>, 2005.
-#
-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: 2006-10-16 04:14+0000\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
-"Language-Team: \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:13
-#, fuzzy
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 6.10 'Edgy Eft'"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
-msgid "Community-maintained"
-msgstr "Community maintained"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr "Restricted software"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Canonical supported Open Source software"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
-msgid "Community-maintained (universe)"
-msgstr "Community maintained (universe)"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Community maintained Open Source software"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr "Non-free drivers"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr "Proprietary drivers for devices"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr "Restricted software (Multiverse)"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr "Software restricted by copyright or legal issues"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-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
-msgid "Important security updates"
-msgstr "Important security updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr "Recommended updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
-msgid "Pre-released updates"
-msgstr "Proposed updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
-msgid "Unsupported updates"
-msgstr "Backported updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-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
-msgid "Officially supported"
-msgstr "Officially supported"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.04 Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.04 Backports"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
-msgid "Community-maintained (Universe)"
-msgstr "Community maintained (Universe)"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr "Non-free (Multiverse)"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr "No longer officially supported"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr "Restricted copyright"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 4.10 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 4.10 Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-#, fuzzy
-msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr "DFSG-compatible Software with Non-Free Dependencies"
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr "Non-DFSG-compatible Software"
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr "Main server"
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr "Custom servers"
-
-#: ../apt/progress/gtk2.py:259
-#, 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
-#, 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
-msgid "Details"
-msgstr "Details"
-
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
-msgid "Starting..."
-msgstr "_Settings"
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr "The list of changes is not available"
-
-#: ../apt/package.py:1047
-#, 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:1053
-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:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Can't install '%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "An essential package would have to be removed"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/eo.po b/po/eo.po
index dcac3593..3eceb847 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -12,17 +12,16 @@ msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-27 15:56+0200\n"
-"PO-Revision-Date: 2011-05-09 16:09+0200\n"
-"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\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 <michael.moroni@mailoo.org>\n"
"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\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
@@ -31,299 +30,329 @@ 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 "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "KD kun 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 "KD kun 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 "KD kun 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: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"
+msgstr "Programaro pakita de Canonical por siaj 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."
+msgstr "Ĉi tiu programaro 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"
+msgstr "Ofertitaj de eksteraj programistoj"
#. 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"
+msgstr "Programaro ofertita de eksteraj programistoj"
#. 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"
+msgstr "Prizorgata de komunumo"
#. 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"
-msgstr "Malfermitkoda programaro subtenata de Canonical"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Libera kaj 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)"
+msgstr "Prizorgata de komunumo (universo)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:591
-msgid "Community-maintained Open Source software"
-msgstr "Komunume prizorgata malfermitkoda programaro"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Libera kaj malfermitkoda programaro prizorgata de komunumo"
#. 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"
+msgstr "Programaro limigita pro 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"
+msgstr "Gravaj ĝisdatigoj pri sekureco"
#. 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"
+msgstr "Sekurecaj ĝisdatigoj de Ubuntu 5.10"
#. Description
-#: ../data/templates/Ubuntu.info.in:680
+#: ../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:685
+#: ../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: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:174
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"
+msgstr "Sekurecaj ĝisdatigoj de Ubuntu 5.04"
#. Description
-#: ../data/templates/Ubuntu.info.in:731
+#: ../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:736
+#: ../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: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)"
+msgstr "Prizorgata de komunumo (universo)"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:750
+#: ../data/templates/Ubuntu.info.in:1240
msgid "Non-free (Multiverse)"
-msgstr "Mallibere (Multiverse)"
+msgstr "Mallibera (multiverso)"
#. 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"
+msgstr "Sekurecaj ĝisdatigoj de Ubuntu 4.10"
#. Description
-#: ../data/templates/Ubuntu.info.in:773
+#: ../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:778
+#: ../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
@@ -333,61 +362,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 "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 "Debiana aktuala stabila eldono"
+msgstr "Aktuala stabila eldono de Debiano"
#. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr "Debiana testado"
+msgstr "Testado de Debiano"
#. Description
-#: ../data/templates/Debian.info.in:147
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debiano 'Sid' (nestabile)"
+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 "Ne-DFSG-kongruaj programaroj"
+msgstr "DFSG-nekongruaj 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 +429,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"
+msgstr "Elŝutanta dosieron %(current)li el %(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"
+msgstr "Elŝutanta dosieron %(current)li el %(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..."
+msgstr "Komencanta..."
-#: ../apt/progress/gtk2.py:436
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr "Komplete"
+msgstr "Kompleta"
-#: ../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."
+msgstr "Nevalida unikodaĵo en priskribo por '%s' (%s). Bonvole raportu."
-#: ../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"
+msgstr "La listo de ŝanĝoj ne disponeblas"
-#: ../apt/package.py:1177
+#: ../apt/package.py:1200
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -444,91 +478,92 @@ 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:1184
+#: ../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
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr "Listo de kontroldosieroj por '%s' ne legeblas"
-#: ../apt/debfile.py:167
+#: ../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:188
+#: ../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:327
+#: ../apt/debfile.py:373
#, python-format
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:343
+#: ../apt/debfile.py:389
#, python-format
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: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 ""
-"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:399
+#: ../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: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)"
+msgstr "Plenumado de ĉiuj dependecoj fiaskis (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"
+msgstr "'%s' ne instaleblas"
-#: ../apt/debfile.py:542
+#: ../apt/debfile.py:593
msgid ""
"Automatically decompressed:\n"
"\n"
@@ -536,23 +571,23 @@ 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"
+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"
#: ../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 "
@@ -568,11 +603,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
@@ -581,24 +616,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:149
+#: ../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"
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 <ricardo@iesdonana.org>\n"
"Language-Team: Spanish <traductores@gnome.org>\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
deleted file mode 100644
index d57a083d..00000000
--- a/po/et.po
+++ /dev/null
@@ -1,496 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-10-09 15:49+0000\n"
-"Last-Translator: margus723 <margus723@hot.ee>\n"
-"Language-Team: Estonian <et@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Iga päev"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Ei saa paigaldada '%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "Hädavajalik pakett tuleks eemaldada"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/eu.po b/po/eu.po
deleted file mode 100644
index 086cca4b..00000000
--- a/po/eu.po
+++ /dev/null
@@ -1,496 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-10-09 15:49+0000\n"
-"Last-Translator: Xabi Ezpeleta <xezpeleta@mendikute.com>\n"
-"Language-Team: Basque <eu@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Egunero"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Ezin da %s instalatu"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "Ezinbesteko pakete bat ezabatu beharko da"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/fa.po b/po/fa.po
deleted file mode 100644
index 86a3fd9e..00000000
--- a/po/fa.po
+++ /dev/null
@@ -1,495 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-10-09 15:49+0000\n"
-"Last-Translator: Pedram Ganjeh Hadidi <pedram.ganjeh-hadidi@students.jku."
-"at>\n"
-"Language-Team: Persian <fa@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/fi.po b/po/fi.po
index a1f68731..3f018385 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"
-"PO-Revision-Date: 2006-10-23 12:24+0000\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 <timo.jyrinki@iki.fi>\n"
"Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\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,327 @@ 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
-#, fuzzy
+#: ../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 "Ubuntu 12.04 \"Precise Pangolin\" -CD-levy"
+
+#. 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 "Ubuntu 11.10 \"Oneiric Ocelot\" -CD-levy"
+
+#. 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 "Ubuntu 11.04 \"Natty Narwhal\" -CD-levy"
+
+#. 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 "Ubuntu 10.10 \"Maverick Meerkat\" -CD-levy"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Canonicalin partnerit"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Canonicalin pakkaamia partnereiden sovelluksia"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Tämä ohjelma ei ole osa Ubuntua."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Riippumaton"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Muiden kehittäjien sovelluksia"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Kolmansien osapuolien tarjoamia sovelluksia."
+
+#. 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 "Ubuntu 10.04 \"Lucid Lynx\" -CD-levy"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
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
+#: ../data/templates/Ubuntu.info.in:652
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:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
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
+#: ../data/templates/Ubuntu.info.in:714
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:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
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
+#: ../data/templates/Ubuntu.info.in:777
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:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
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
+#: ../data/templates/Ubuntu.info.in:841
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:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgstr "Ubuntu 7.10 \"Gutsy Gibbon\""
#. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
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:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgstr "Ubuntu 7.04 \"Feisty Fawn\""
#. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
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: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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
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
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Canonicalin tukemat avoimen lähdekoodin ohjelmistot"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Canonicalin tukemat vapaat ja avoimen lähdekoodin ohjelmistot"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
msgid "Community-maintained (universe)"
msgstr "Yhteisön ylläpitämät (universe)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Yhteisön ylläpitämät avoimen lähdekoodin ohjelmistot"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Yhteisön ylläpitämät vapaat ja 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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
msgid "Pre-released updates"
-msgstr "Ehdotetut päivitykset"
+msgstr "Esijulkaistut päivitykset"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
msgid "Unsupported updates"
-msgstr "Takaisinsovitetut päivitykset"
+msgstr "Tukemattomat 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:174
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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
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"
@@ -294,69 +356,67 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 \"Wheezy\" "
#. Description
#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 \"Squeeze\" "
#. Description
#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 \"Lenny\" "
#. Description
#: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 \"Etch\""
+
+#. Description
+#: ../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
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
msgid "Security updates"
-msgstr "Tärkeät turvallisuuspäivitykset"
+msgstr "Turvallisuuspäivitykset"
#. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
msgid "Debian current stable release"
-msgstr ""
+msgstr "Debian stable (tämänhetkinen vakaa julkaisu)"
#. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr "Debian \"Etch\" (testattava)"
+msgstr "Debian testing (testattava)"
#. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
msgstr "Debian \"Sid\" (epävakaa)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../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:152
+#: ../data/templates/Debian.info.in:178
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 +424,50 @@ 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
-#, fuzzy
+#: ../apt/progress/gtk2.py:428
msgid "Starting..."
-msgstr "Asetukset"
+msgstr "Käynnistetään..."
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Valmis"
-#: ../apt/package.py:301
+#: ../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: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"
@@ -414,8 +475,12 @@ 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:1053
+#: ../apt/package.py:1207
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -423,102 +488,152 @@ 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"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Kohteen \"%s\" tiedostoluetteloa ei voi lukea"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Kohteen \"%s\" hallintatiedostoja ei voi lukea"
-#: ../apt/debfile.py:149
+#: ../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:173
+#: ../apt/debfile.py:232
#, python-format
msgid "Conflicts with the installed package '%s'"
+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
+#, python-format
+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)"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 "Ei Architecture-kenttää paketissa"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Väärä arkkitehtuuri \"%s\""
#. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
msgid "A later version is already installed"
-msgstr ""
+msgstr "Myöhempi versio on jo asennettu"
-#: ../apt/debfile.py:345
+#: ../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:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
msgid "Cannot install '%s'"
-msgstr "Ei voitu asentaa pakettia \"%s\""
+msgstr "Ei voi asentaa \"%s\""
-#: ../apt/debfile.py:484
+#: ../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 "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:494
-#, fuzzy
+#: ../apt/debfile.py:700
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 ""
+msgstr "%c%s... valmis"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Osuma "
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Ohi "
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Vir "
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Hae:"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+msgstr " [Työskennellään]"
-#: ../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 ""
+"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:216
+#: ../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:229
+#: ../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:241
+#: ../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:96
+#: ../apt/cache.py:157
msgid "Building data structures"
-msgstr ""
+msgstr "Kasataan tietorakenteita"
diff --git a/po/fr.po b/po/fr.po
index a12828ae..116dff6f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,21 +1,27 @@
# french translation of python-apt
# Copyright (C) 2007 Hugues NAULET <hnaulet@gmail.com>
+# Copyright (C) 2005, 2007-2010, 2012 Debian French l10n team <debian-l10n-french@lists.debian.org>
# This file is distributed under the same license as the python-apt package.
-# Jean Privat <privat@lirmm.fr>, 2005.
-# Vincent Carriere <carriere_vincent@yahoo.fr>, 2005
#
+# Jean Privat <privat@lirmm.fr>, 2005.
+# Vincent Carriere <carriere_vincent@yahoo.fr>, 2005.
+# Hugues NAULET <hnaulet@gmail.com>, 2007-2009.
+# Bruno Travouillon <debian@travouillon.fr>, 2010.
+# David Prévot <david@tilapin.org>, 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: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2007-06-25 12:12+0100\n"
-"Last-Translator: Hugues NAULET <hnaulet@gmail.com>\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 <david@tilapin.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\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
@@ -24,249 +30,329 @@ 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 "Ubuntu 12.04 « Precise Pangolin »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD contenant 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 contenant 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 contenant 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 contenant Ubuntu 10.10 « Maverick Meerkat »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Partenaires de Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Logiciel empaqueté par Canonical pour ses partenaires"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Ce logiciel ne fait pas partie d'Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Indépendant"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Fourni par des développeurs de logiciel tiers"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Logiciel offert par des développeurs de logiciel tiers."
+
+#. 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 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:31
+#: ../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:74
+#: ../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:92
+#: ../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:135
+#: ../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:153
+#: ../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:197
+#: ../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:215
+#: ../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:252
+#: ../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:270
+#: ../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:305
+#: ../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:323
+#: ../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:357
+#: ../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: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 »"
+msgstr "CD 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 »"
+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
+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
+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 »"
+msgstr "CD 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 »"
+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 »"
+msgstr "CD 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"
+msgstr "Rétroportages 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 »"
+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 »"
+msgstr "CD 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:174
msgid "Officially supported"
-msgstr "Supporté officiellement"
+msgstr "Officiellement pris en charge"
#. 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"
+msgstr "Rétroportages 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 »"
+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 »"
+msgstr "CD 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é"
+msgstr "Suivi 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"
+msgstr "Rétroportages pour Ubuntu 4.10"
#. ChangelogURI
#: ../data/templates/Debian.info.in.h:4
@@ -276,63 +362,68 @@ 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 »"
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 « Wheezy »"
#. Description
#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 5.0 « Lenny »"
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 « Squeeze »"
#. Description
#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 4.0 « Etch »"
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 « Lenny »"
#. Description
#: ../data/templates/Debian.info.in:83
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 « Etch »"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
msgid "Debian 3.1 'Sarge'"
-msgstr "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)"
+msgstr "Debian « Lenny » (testing)"
#. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian « Sid » (unstable)"
+msgstr "Debian « Sid » (unstable)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
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:152
+#: ../data/templates/Debian.info.in:178
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: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 +431,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
-#, fuzzy
+#: ../apt/progress/gtk2.py:428
msgid "Starting..."
-msgstr "Paramètres"
+msgstr "Démarrage…"
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Terminé"
-#: ../apt/package.py:301
+#: ../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: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"
@@ -390,8 +481,12 @@ 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:1053
+#: ../apt/package.py:1207
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -399,102 +494,159 @@ 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"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "La liste des fichiers pour « %s » ne peut pas être lue"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "La liste des fichiers de contrôle pour « %s » ne peut pas être lue"
-#: ../apt/debfile.py:149
+#: ../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:173
+#: ../apt/debfile.py:232
#, python-format
msgid "Conflicts with the installed package '%s'"
+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
+#, python-format
+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)"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 "Aucun champ Architecture dans ce paquet"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Architecture « %s » incorrecte"
#. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../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:345
+#: ../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:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, 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 "Conversion automatique en ASCII affichable :\n"
-#: ../apt/debfile.py:484
+#: ../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:494
-#, fuzzy
+#: ../apt/debfile.py:700
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:81
+#: ../apt/progress/text.py:82
#, python-format
msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s… Terminé"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Att "
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Ign "
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Err "
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Prendre :"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+msgstr " [En cours]"
-#: ../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 ""
+"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:216
+#: ../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:229
+#: ../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:241
+#: ../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:96
+#: ../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"
diff --git a/po/fur.po b/po/fur.po
deleted file mode 100644
index 68966ebb..00000000
--- a/po/fur.po
+++ /dev/null
@@ -1,495 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-08-25 05:55+0000\n"
-"Last-Translator: Marco <marcuz@linux.it>\n"
-"Language-Team: Friulian <fur@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Ogni dì"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <xil@det.uvigo.es>\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 <yanivabir@gmail.com>\n"
"Language-Team: Hebrew <he@li.org>\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
deleted file mode 100644
index 24836e22..00000000
--- a/po/hi.po
+++ /dev/null
@@ -1,495 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-08-01 15:30+0000\n"
-"Last-Translator: Gaurav Mishra <gauravtechie@gmail.com>\n"
-"Language-Team: Hindi <hi@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "प्रतिदिन"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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ć <ivoks@grad.hr>\n"
"Language-Team: Croatian <hr@li.org>\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..f775801e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,21 +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 <kelemeng@gnome.hu>, 2005.
+# Copyright (C) 2005, 2007, Free Software Foundation, Inc.
#
+# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2007.
msgid ""
msgstr ""
"Project-Id-Version: update-manager.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 04:03+0000\n"
-"Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\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 <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome@gnome.hu>\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
@@ -24,266 +25,327 @@ 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
-#, fuzzy
+#: ../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 "Az Ubuntu 12.04 „Precise Pangolin”-t tartalmazó CD-ROM"
+
+#. 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 "Az Ubuntu 11.10 „Oneiric Ocelot”-ot tartalmazó CD-ROM"
+
+#. 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 "Az Ubuntu 11.04 „Natty Narwhal”-t tartalmazó CD-ROM"
+
+#. 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 "Az Ubuntu 10.10 „Maverick Meerkat”-ot tartalmazó CD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Canonical partnerek"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "A Canonical által partnereinek csomagolt szoftverek"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Ezek a szoftverek nem részei az Ubuntunak."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Független"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Külső szoftverfejlesztők által biztosított"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Külső szoftverfejlesztők által biztosított szoftverek."
+
+#. 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 "Az Ubuntu 10.04 „Lucid Lynx”-et tartalmazó CD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
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
+#: ../data/templates/Ubuntu.info.in:652
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:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
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
+#: ../data/templates/Ubuntu.info.in:714
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:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
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
+#: ../data/templates/Ubuntu.info.in:777
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:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
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
+#: ../data/templates/Ubuntu.info.in:841
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:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
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:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
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:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
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:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
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:357
+#: ../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:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
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"
+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\""
+msgstr "Ubuntu 6.06 LTS „Dapper Drake”"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "A Canonical által támogatott nyílt forrású szoftverek"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "A Canonical által támogatott szabad és nyílt forrású szoftverek"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
msgid "Community-maintained (universe)"
msgstr "Közösségi karbantartású (universe)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Közösségi karbantartású nyílt forrású szoftverek"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "A közösség által karbantartott szabad é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"
+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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
msgid "Pre-released updates"
-msgstr "Javasolt frissítések"
+msgstr "Előzetesen kiadott frissítések"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
msgid "Unsupported updates"
-msgstr "Visszaportolt frissítések"
+msgstr "Nem támogatott 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"
+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\""
+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"
+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:174
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\""
+msgstr "Ubuntu 4.10 „Warty Warthog”"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
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"
+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"
@@ -295,68 +357,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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 „Wheezy” "
#. Description
#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 „Squeeze” "
#. Description
#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 „Lenny” "
#. Description
#: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 „Etch”"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
msgid "Debian 3.1 'Sarge'"
-msgstr "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
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
msgid "Security updates"
-msgstr "Fontos biztonsági frissítések"
+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 ""
+msgstr "Jelenlegi stabil Debian kiadás"
#. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr "Debian \"Etch\" (tesztelés alatt)"
+msgstr "Debian – tesztelés alatt"
#. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (instabil)"
+msgstr "Debian „Sid” (instabil)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../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:152
+#: ../data/templates/Debian.info.in:178
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 +424,50 @@ 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 "<b>Részletek</b>"
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
msgid "Starting..."
-msgstr ""
+msgstr "Indítás…"
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Kész"
-#: ../apt/package.py:301
+#: ../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: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"
@@ -414,8 +475,12 @@ 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:1053
+#: ../apt/package.py:1207
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -423,102 +488,160 @@ 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"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "„%s” fájljainak listája nem olvasható"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "„%s” vezérlőfájljainak listája nem olvasható"
-#: ../apt/debfile.py:149
+#: ../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:173
+#: ../apt/debfile.py:232
#, python-format
msgid "Conflicts with the installed package '%s'"
+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
+#, python-format
+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)"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 "A csomagban nincs Architecture mező"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Rossz architektúra: „%s”"
#. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
msgid "A later version is already installed"
-msgstr ""
+msgstr "Már telepítve van egy újabb verzió"
-#: ../apt/debfile.py:345
+#: ../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:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, 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:484
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+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:494
-#, fuzzy
+#: ../apt/debfile.py:700
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:81
+#: ../apt/progress/text.py:82
#, python-format
msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Kész"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Találat "
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Mellőz "
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Hiba "
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Letöltés:"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+msgstr " [Folyamatban]"
-#: ../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 ""
+"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:216
+#: ../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:229
+#: ../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:241
+#: ../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:96
+#: ../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"
diff --git a/po/id.po b/po/id.po
index d16e283f..8eb83d70 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,20 +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 <EMAIL@ADDRESS>, 2006.
+# This file is distributed under the same license as the python-apt package.
+# Andy Apdhani <imtheface@gmail.com>, 2006.
+# Andika Triwidada <andika@gmail.com>, 2012.
#
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 04:03+0000\n"
-"Last-Translator: Andy Apdhani <imtheface@gmail.com>\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 <andika@gmail.com>\n"
"Language-Team: Indonesian <id@li.org>\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
@@ -23,277 +27,329 @@ 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
-#, fuzzy
+#: ../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 "Cdrom dengan 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 "Cdrom dengan 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 "Cdrom dengan 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 "Cdrom dengan Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Partner Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+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 "Perangkat lunak ini bukan bagian dari Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Independen"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Disediakan oleh para pengembang perangkat lunak pihak ketiga"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Perangkat lunak ditawarkan oleh para pengembang pihak ketiga."
+
+#. 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 "Cdrom dengan Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
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:31
+#: ../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:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
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:92
+#: ../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:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
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:153
+#: ../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:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
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:215
+#: ../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:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
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:270
+#: ../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:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
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:323
+#: ../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:357
+#: ../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:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
msgid "Community-maintained"
-msgstr "Dikelola oleh komunitas (Universe)"
+msgstr "Dikelola oleh komunitas"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1022
msgid "Restricted software"
-msgstr "Tidak-bebas (Multiverse)"
+msgstr "Perangkat lunak terbatas"
#. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../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:409
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1072
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:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Dikelola oleh komunitas (Universe)"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Perangkat lunak open-source dan bebas yang didukung oleh Canonical"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
msgid "Community-maintained (universe)"
-msgstr "Dikelola oleh komunitas (Universe)"
+msgstr "Dikelola oleh komunitas (universe)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Dikelola oleh komunitas (Universe)"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Perangkat lunak open-source dan bebas yang dikelola oleh komunitas"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1080
msgid "Non-free drivers"
-msgstr "Tidak-bebas (Multiverse)"
+msgstr "Driver tidak-bebas"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Driver proprietary bagi perangkat"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1083
msgid "Restricted software (Multiverse)"
-msgstr "Tidak-bebas (Multiverse)"
+msgstr "Perangkat lunak terbatas (Multiverse)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../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:427
+#: ../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:439
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1107
msgid "Important security updates"
-msgstr "Pemutakhiran lewat Internet"
+msgstr "Pemutakhiran keamanan penting"
#. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
msgid "Recommended updates"
-msgstr ""
+msgstr "Pemutakhiran yang disarankan"
#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
msgid "Pre-released updates"
-msgstr "_Instal Update"
+msgstr "Pemutakhira prarilis"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
msgid "Unsupported updates"
-msgstr "_Instal Update"
+msgstr "Pemutakhiran yang tak didukung"
#. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../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:475
+#: ../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:487
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1164
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:492
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1169
msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 6.06 LTS Updates"
+msgstr "Pemutakhiran Ubuntu 5.10"
#. Description
-#: ../data/templates/Ubuntu.info.in:497
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1174
msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 6.06 LTS Backports"
+msgstr "Ubuntu 5.10 Backport"
#. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../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:518
+#: ../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:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
msgid "Officially supported"
-msgstr "Resmi disokong"
+msgstr "Resmi didukung"
#. Description
-#: ../data/templates/Ubuntu.info.in:530
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1216
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:535
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1221
msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 6.06 LTS Updates"
+msgstr "Pemutakhiran Ubuntu 5.04"
#. Description
-#: ../data/templates/Ubuntu.info.in:540
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1226
msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 6.06 LTS Backports"
+msgstr "Ubuntu 5.04 Backport"
#. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../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:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
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 ""
+msgstr "Cdrom dengan Ubuntu 4.10 'Warty Warthog'"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1250
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:565
+#: ../data/templates/Ubuntu.info.in:1252
msgid "Restricted copyright"
-msgstr "Hak cipta terlarang"
+msgstr "Hak cipta terbatas"
#. Description
-#: ../data/templates/Ubuntu.info.in:572
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1259
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:577
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1264
msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 6.06 LTS Updates"
+msgstr "Pemutakhiran Ubuntu 4.10"
#. Description
-#: ../data/templates/Ubuntu.info.in:582
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1269
msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 6.06 LTS Backports"
+msgstr "Ubuntu 4.10 Backport"
#. ChangelogURI
#: ../data/templates/Debian.info.in.h:4
@@ -303,121 +359,117 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
#. Description
#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
#. Description
#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
#. Description
#: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 'Sarge'"
#. Description
-#: ../data/templates/Debian.info.in:94
-#, fuzzy
+#: ../data/templates/Debian.info.in:119
msgid "Proposed updates"
-msgstr "_Instal Update"
+msgstr "Pemutakhiran yang diusulkan"
#. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
msgid "Security updates"
-msgstr "Pemutakhiran lewat Internet"
+msgstr "Pemutakhiran keamanan"
#. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
msgid "Debian current stable release"
-msgstr ""
+msgstr "Rilis stabil Debian saat ini"
#. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
#. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
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:152
+#: ../data/templates/Debian.info.in:178
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:208 ../aptsources/distro.py:423
+#: ../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
#. 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 ""
+msgstr "Server utama"
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
msgid "Custom servers"
-msgstr ""
+msgstr "Server gubahan"
-#: ../apt/progress/gtk2.py:259
-#, fuzzy, python-format
+#: ../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 "Mengunduh berkas %li dari %li dengan %s/s"
+msgstr "Mengunduh berkas %(current)li dari %(total)li dalam %(speed)s/dt"
-#: ../apt/progress/gtk2.py:265
-#, fuzzy, python-format
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
+#, 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:285
+#: ../apt/progress/gtk2.py:340
msgid "Details"
msgstr "Rincian"
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
msgid "Starting..."
-msgstr ""
+msgstr "Memulai..."
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Komplit"
-#: ../apt/package.py:301
+#: ../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:937 ../apt/package.py:1043
-#, fuzzy
+#: ../apt/package.py:1088 ../apt/package.py:1194
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:1047
+#: ../apt/package.py:1200
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -425,112 +477,162 @@ 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:1053
-#, fuzzy
+#: ../apt/package.py:1207
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:56
+#: ../apt/debfile.py:82
#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Senarai berkas bagi '%s' tak dapat dibaca"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Senarai berkas kendali bagi '%s' tak dapat dibaca"
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
#, python-format
msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Kebergantungan tak dapat dipenuhi: %s\n"
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
#, python-format
msgid "Conflicts with the installed package '%s'"
+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
+#, python-format
+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"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 "Tak ada ruas Architecture dalam paket"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Arsitektur '%s' salah"
#. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
msgid "A later version is already installed"
-msgstr ""
+msgstr "Versi lebih baru telah terpasang"
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Gagal memenuhi semua kebergantungan (singgahan rusak)"
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
msgid "Cannot install '%s'"
-msgstr "Tidak dapat menginstal '%s'"
+msgstr "Tak bisa memasang '%s'"
-#: ../apt/debfile.py:484
+#: ../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 "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:494
-#, fuzzy
+#: ../apt/debfile.py:700
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 ""
+msgstr "%c%s... Usai"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Hit "
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Ign "
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Err "
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Ambil:"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+msgstr " [Bekerja]"
-#: ../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 ""
+"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:216
+#: ../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:229
+#: ../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:241
+#: ../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:96
+#: ../apt/cache.py:157
msgid "Building data structures"
-msgstr ""
+msgstr "Membangun struktur data"
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 <elle.uca@libero.it>\n"
"Language-Team: Italian <it@li.org>\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 <kmuto@debian.org>\n"
"Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\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 <malxaz@gmail.com>\n"
"Language-Team: Georgian <geognome@googlegroups.com>\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 <eungkyu@gmail.com>\n"
"Language-Team: Korean <ko@li.org>\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 <rizoxerzi@gmail.com>\n"
"Language-Team: Kurdish <ku@li.org>\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 <mantas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\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 <orvils@gmail.com>\n"
"Language-Team: Latvian <locale@laka.lv>\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: Арангел Ангов <ufo@linux.net.mk>\n"
"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\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 "<b>Детали</b>"
-#: ../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
deleted file mode 100644
index a259fddd..00000000
--- a/po/mr.po
+++ /dev/null
@@ -1,494 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Marathi <mr@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/ms.po b/po/ms.po
deleted file mode 100644
index 4e0d1eed..00000000
--- a/po/ms.po
+++ /dev/null
@@ -1,497 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-10-16 04:04+0000\n"
-"Last-Translator: azlinux <azlinux@gmail.com>\n"
-"Language-Team: Malay <ms@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-#, fuzzy
-msgid "No longer officially supported"
-msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi."
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Harian"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Tidak dapat memasang '%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "Satu pakej yang perlu terpaksa dikeluarkan"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <hanspb@bluezone.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\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 <zaydeep@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\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 "<b>विवरणहरु</b>"
-#: ../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..c9995edf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,20 +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 <EMAIL@ADDRESS>, 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 <a.t.meinen@chello.nl>, 2006.
+# Jeroen Schot <schot@a-eskwadraat.nl, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: update-manager HEAD\n"
+"Project-Id-Version: python-apt 0.8.4+nmu1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-21 13:15+0000\n"
-"Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
-"Language-Team: Nederlands <vertaling@vrijschrift.org>\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 <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\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
@@ -23,267 +24,328 @@ 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
-#, fuzzy
+#: ../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 met 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 met 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 met 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 met Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Partners van Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+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 "Deze software is geen onderdeel van Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Onafhankelijk"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Aangeboden door externe ontwikkelaars"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Software die door externe ontwikkelaars wordt aangeboden."
+
+#. 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 met Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
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
+#: ../data/templates/Ubuntu.info.in:652
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:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
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
+#: ../data/templates/Ubuntu.info.in:714
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:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
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
+#: ../data/templates/Ubuntu.info.in:777
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:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
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
+#: ../data/templates/Ubuntu.info.in:841
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:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 veiligheidsupdates"
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
#. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
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:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 veiligheidsupdates"
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
#. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
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:357
+#: ../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:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
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'"
+msgstr "CD 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’"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Door Canonical beheerde Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Door Canonical ondersteunde vrije en opensourcesoftware"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
msgid "Community-maintained (universe)"
msgstr "Door de gemeenschap beheerd (universe)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Door de gemeenschap beheerde Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Door de gemeenschap beheerde vrije en opensourcesoftware"
#. 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’"
+msgstr "CD 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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
msgid "Pre-released updates"
msgstr "Voorgestelde updates"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
msgid "Unsupported updates"
-msgstr "Updates die van een nieuwere distributie afkomstig zijn (backports)"
+msgstr "Niet-ondersteunde 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 met Ubuntu 5.10 ‘Breezy Badger’"
+msgstr "CD 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’"
+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’"
+msgstr "CD 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:174
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’"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
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’"
+msgstr "CD 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"
@@ -295,68 +357,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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
#. Description
#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
#. Description
#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
#. Description
#: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
msgid "Debian 3.1 'Sarge'"
-msgstr "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
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
msgid "Security updates"
-msgstr "Belangrijke veiligheidsupdates"
+msgstr "veiligheidsupdates"
#. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
msgid "Debian current stable release"
-msgstr ""
+msgstr "Huidige stabiele uitgave van Debian"
#. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing (test)"
#. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (onstabiel)"
+msgstr "Debian 'Sid' (unstable/onstabiel)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../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:152
+#: ../data/templates/Debian.info.in:178
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 +424,49 @@ 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 ""
+msgstr "Opstarten..."
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Voltooid"
-#: ../apt/package.py:301
+#: ../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: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"
@@ -413,8 +474,12 @@ 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:1053
+#: ../apt/package.py:1207
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -422,102 +487,153 @@ 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"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "De lijst van bestanden voor '%s' kon niet gelezen worden"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "De lijst van bestanden voor '%s' kon niet gelezen worden"
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
#, python-format
msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Afhankelijkheid is niet vervulbaar: %s\n"
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
#, python-format
msgid "Conflicts with the installed package '%s'"
+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
+#, python-format
+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)"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 "Pakket heeft geen Architecture-veld"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Verkeerde architectuur '%s'"
#. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
msgid "A later version is already installed"
-msgstr ""
+msgstr "Er is al een nieuwere versie geïnstalleerd"
-#: ../apt/debfile.py:345
+#: ../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:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, 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 ""
+"Automatisch uitgepakt:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+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:494
-#, fuzzy
+#: ../apt/debfile.py:700
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 ""
+msgstr "%c%s... Klaar"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Geraakt "
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Genegeerd "
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Fout "
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Ophalen:"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+msgstr " [Bezig]"
-#: ../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 ""
+"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:216
+#: ../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:229
+#: ../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:241
+#: ../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:96
+#: ../apt/cache.py:157
msgid "Building data structures"
-msgstr ""
+msgstr "Opbouwen van pakketstructuren"
diff --git a/po/nn.po b/po/nn.po
deleted file mode 100644
index 1da62fa0..00000000
--- a/po/nn.po
+++ /dev/null
@@ -1,496 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-10-09 15:50+0000\n"
-"Last-Translator: Willy André Bergstrøm <root@willyandre.net>\n"
-"Language-Team: Norwegian Nynorsk <nn@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Kvar dag"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Kan ikkje installere '%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "Ein naudsynt pakke vil måtte fjernast"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <terance@lyse.net>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\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 "<b>Detaljer</b>"
-#: ../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) <yannick.marchegay@lokanova."
"com>\n"
"Language-Team: Occitan (post 1500) <oc@li.org>\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
deleted file mode 100644
index fc645ce8..00000000
--- a/po/pa.po
+++ /dev/null
@@ -1,500 +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 <amanpreetalam@yahoo.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pa\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 04:16+0000\n"
-"Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
-"Language-Team: Punjabi <fedora-transa-pa@redhat.com>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-#, fuzzy
-msgid "Important security updates"
-msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
-msgid "Pre-released updates"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
-msgid "Unsupported updates"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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 "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-
-#. 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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "<b>ਵੇਰਵਾ</b>"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <doza@sztorm.net>\n"
"Language-Team: Polish <translators@gnomepl.org>\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
deleted file mode 100644
index 711ca4fe..00000000
--- a/po/ps.po
+++ /dev/null
@@ -1,494 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pushto <ps@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <tiagosilva29@gmail.com>\n"
"Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\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..a19c5c2c 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 <secipolla@gmail.com>, 2010, 2011.
+# Sérgio Cipolla <secipolla@gmail.com>, 2010 - 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-28 13:01-0300\n"
-"PO-Revision-Date: 2011-05-28 13:25-0300\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 <secipolla@gmail.com>\n"
"Language-Team: \n"
"Language: \n"
@@ -25,298 +25,327 @@ 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 "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM com o 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 com o 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 com o 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: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"
-msgstr "Aplicativo de código aberto suportado pela Canonical"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Aplicativos livres de código aberto suportados 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"
-msgstr "Aplicativo de código aberto mantido pela comunidade"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Aplicativos livres de código aberto mantidos 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:174
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"
@@ -328,62 +357,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 "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"
#. 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 +424,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 +478,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 +491,74 @@ 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
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr "A lista de arquivos de controle 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 +566,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 +624,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/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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 ""
diff --git a/po/qu.po b/po/qu.po
deleted file mode 100644
index 30815be8..00000000
--- a/po/qu.po
+++ /dev/null
@@ -1,494 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-10-09 15:50+0000\n"
-"Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n"
-"Language-Team: Quechua <qu@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <spotirca@gmail.com>\n"
"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\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..aa8be8e4 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-25 14:42+0200\n"
"PO-Revision-Date: 2006-10-18 09:11+0000\n"
"Last-Translator: Igor Zubarev <igor4u@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\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,356 @@ 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 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Диск с Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Диск с Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Диск с Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Диск с 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
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+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:31
+#: ../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:74
+#: ../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:92
+#: ../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:135
+#: ../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:153
+#: ../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:197
+#: ../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:215
+#: ../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: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'"
+msgstr "Диск с Ubuntu 7.10 'Gutsy Gibbon'"
#. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../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:323
+#: ../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: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 "Предлагаемые обновления"
+msgstr "Пред-релизные обновления"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
#, fuzzy
msgid "Unsupported updates"
-msgstr "Обновления в бэкпортах"
+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:174
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 бэкпорты"
@@ -296,68 +387,73 @@ 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 3.1 \"Sarge\""
+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 3.1 \"Sarge\""
+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 3.1 \"Sarge\""
+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\""
+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 "Важные обновления безопасности"
+msgstr "Обновления безопасности"
#. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
msgid "Debian current stable release"
-msgstr ""
+msgstr "Текущий стабильный релиз Debian"
#. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
#, fuzzy
msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
#. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
#, fuzzy
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
msgid "DFSG-compatible Software with Non-Free Dependencies"
msgstr "DFSG-совместимое ПО с зависимостями от несвободного ПО"
#. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
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 +461,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 ""
+msgstr "Начинаем..."
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Завершено"
-#: ../apt/package.py:301
+#: ../apt/package.py:359
#, 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
+#: ../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,8 +510,12 @@ 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:1053
+#: ../apt/package.py:1207
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -423,81 +523,122 @@ msgstr ""
"Ошибка при загрузке списка изменений. \n"
"Пожалуйста, проверьте ваше соединение с Интернет."
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Список файлов для '%s' не может быть прочтен"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Список контролирующих файлов для '%s' не может быть прочтен"
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
#, python-format
msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Неразрешимая зависимость: %s\n"
-#: ../apt/debfile.py:173
+#: ../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 ""
+"Ломает в существующем пакете '%(pkgname)s' зависимость %(depname)s "
+"(%(deprelation)s %(depversion)s)"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 ""
+msgstr "Более поздняя версия уже установлена"
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Неудалось определить все зависимости (broken cache)"
-#: ../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 +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/rw.po b/po/rw.po
deleted file mode 100644
index fcc7d589..00000000
--- a/po/rw.po
+++ /dev/null
@@ -1,549 +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 <murf@e-tools.com>, 2005
-# Steve performed initial rough translation from compendium built from translations provided by the following translators:
-# Philibert Ndandali <ndandali@yahoo.fr>, 2005.
-# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
-# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
-# Carole Karema <karemacarole@hotmail.com>, 2005.
-# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
-# Augustin KIBERWA <akiberwa@yahoo.co.uk>, 2005.
-# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005..
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: update-manager HEAD\n"
-"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: Steve Murphy <murf@e-tools.com>\n"
-"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\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:13
-#, fuzzy
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-#, fuzzy
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "5"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-#, fuzzy
-msgid "Restricted software"
-msgstr "Kohereza Nta gukoresha bisesuye"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-#, fuzzy
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "5"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-#, fuzzy
-msgid "Non-free drivers"
-msgstr "Kigenga"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-#, fuzzy
-msgid "Restricted software (Multiverse)"
-msgstr "Kigenga"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-#, fuzzy
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-#, fuzzy
-msgid "Important security updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
-msgid "Pre-released updates"
-msgstr "Kwinjiza porogaramu"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
-msgid "Unsupported updates"
-msgstr "Kwinjiza porogaramu"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-#, fuzzy
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-#, fuzzy
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-#, fuzzy
-msgid "Ubuntu 5.10 Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-#, fuzzy
-msgid "Ubuntu 5.10 Backports"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-#, fuzzy
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-#, fuzzy
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "5"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-#, fuzzy
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-#, fuzzy
-msgid "Ubuntu 5.04 Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-#, fuzzy
-msgid "Ubuntu 5.04 Backports"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-#, fuzzy
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "5"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-#, fuzzy
-msgid "Non-free (Multiverse)"
-msgstr "Kigenga"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-#, fuzzy
-msgid "Restricted copyright"
-msgstr "Uburenganzira bw'umuhimbyi"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-#, fuzzy
-msgid "Ubuntu 4.10 Security Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-#, fuzzy
-msgid "Ubuntu 4.10 Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-#, 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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "<B B"
-
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
-msgid "Starting..."
-msgstr "Amagenamiterere"
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-#, fuzzy
-msgid "The list of changes is not available"
-msgstr "ni a Gishya Bya Bihari"
-
-#: ../apt/package.py:1047
-#, 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:1053
-#, fuzzy
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-"Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza"
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/sk.po b/po/sk.po
index eeac9dda..d01acebb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,16 +2,17 @@
# Copyright (C) 2006 Canonical Ltd, and Rosetta Contributors 2006
# This file is distributed under the same license as the update-manager package.
# Peter Chabada <sk-i18n_chabada_sk>, 2006.
-#
+# Ivan Masár <helix84@centrum.sk>, 2012.
#
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: 2006-10-16 04:17+0000\n"
-"Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n"
-"Language-Team: Slovak <sk-i18n@linux.sk>\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 <helix84@centrum.sk>\n"
+"Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,286 +25,329 @@ 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
-#, fuzzy
+#: ../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 s 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 s 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 s 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 s Ubuntu 10.10 „Maverick Meerkat“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Partneri Canonicalu"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+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 "Tento softvér nie je súčasťou Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Nezávislé"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Poskytované vývojármi tretích strán"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Softvér, ktorý ponúkajú vývojári tretích strán."
+
+#. 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 s Ubuntu 10.04 „Lucid Lynx“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
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:31
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:652
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:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
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:92
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:714
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:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
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:153
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:777
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:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
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:215
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:841
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:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
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:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
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:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
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:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
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:357
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1011
msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 - aktualizácie"
+msgstr "Ubuntu 6.10 „Edgy Eft“"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
msgid "Community-maintained"
-msgstr "Udržiavané komunitou (Universe)"
+msgstr "Udržiavané komunitou"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1022
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:375
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1030
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:409
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1072
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:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Udržiavané komunitou (Universe)"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Slobodný a open source softvér, ktorý podporuje Canonical"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
msgid "Community-maintained (universe)"
-msgstr "Udržiavané komunitou (Universe)"
+msgstr "Udržiavané komunitou (universe)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Udržiavané komunitou (Universe)"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Slobodný a open source softvér udržiavaný komunitou"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1080
msgid "Non-free drivers"
-msgstr "Neslobodné (Multiverse)"
+msgstr "Neslobodné ovládače"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../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:420
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1083
msgid "Restricted software (Multiverse)"
-msgstr "Neslobodné (Multiverse)"
+msgstr "Neslobodný softvér (Multiverse)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../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:427
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1091
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:439
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1107
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:444
+#: ../data/templates/Ubuntu.info.in:1112
msgid "Recommended updates"
-msgstr ""
+msgstr "Odporúčané aktualizácie"
#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
msgid "Pre-released updates"
-msgstr "Nainštalovať _aktualizácie"
+msgstr "Aktualizácie pred vydaním"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
msgid "Unsupported updates"
-msgstr "Nainštalovať _aktualizácie"
+msgstr "Nepodporované 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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1148
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: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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1185
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:518
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1200
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:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
msgid "Officially supported"
msgstr "Oficiálne podporované"
#. Description
-#: ../data/templates/Ubuntu.info.in:530
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1216
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:535
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1221
msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 - aktualizácie"
+msgstr "Ubuntu 5.04 - aktualizácie"
#. Description
-#: ../data/templates/Ubuntu.info.in:540
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1226
msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 - backporty"
+msgstr "Ubuntu 5.04 - backporty"
#. Description
-#: ../data/templates/Ubuntu.info.in:546
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1232
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:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1247
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:563
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1250
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: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
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1269
msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 - backporty"
+msgstr "Ubuntu 4.10 - backporty"
#. ChangelogURI
#: ../data/templates/Debian.info.in.h:4
@@ -313,70 +357,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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 „Wheezy“ "
#. Description
#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 „Squeeze“ "
#. Description
#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 „Lenny“ "
#. Description
#: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 „Etch“"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 „Sarge“"
#. Description
-#: ../data/templates/Debian.info.in:94
-#, fuzzy
+#: ../data/templates/Debian.info.in:119
msgid "Proposed updates"
-msgstr "Nainštalovať _aktualizácie"
+msgstr "Navrhované aktualizácie"
#. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
msgid "Security updates"
-msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
+msgstr "Bezpečnostné aktualizácie"
#. Description
-#: ../data/templates/Debian.info.in:108
-#, fuzzy
+#: ../data/templates/Debian.info.in:133
msgid "Debian current stable release"
-msgstr "Debian Unstable \"Sid\""
+msgstr "Aktuálne vydanie Debian stable"
#. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
#. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian „Sid“ (nestabilné)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../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:152
+#: ../data/templates/Debian.info.in:178
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 +424,48 @@ 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
-#, fuzzy
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
msgid "Main server"
-msgstr "Najbližší server"
+msgstr "Hlavný server"
-#: ../aptsources/distro.py:252
-#, fuzzy
+#: ../aptsources/distro.py:250
msgid "Custom servers"
-msgstr "Najbližší server"
+msgstr "Vlastné servery"
-#: ../apt/progress/gtk2.py:259
-#, fuzzy, python-format
+#: ../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 "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:265
-#, fuzzy, python-format
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
+#, 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:285
+#: ../apt/progress/gtk2.py:340
msgid "Details"
msgstr "Podrobnosti"
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
+#: ../apt/progress/gtk2.py:428
msgid "Starting..."
-msgstr "Nastavenia"
+msgstr "Spúšťa sa..."
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Hotovo"
-#: ../apt/package.py:301
+#: ../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:937 ../apt/package.py:1043
-#, fuzzy
+#: ../apt/package.py:1088 ../apt/package.py:1194
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:1047
+#: ../apt/package.py:1200
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -437,112 +473,166 @@ 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:1053
-#, fuzzy
+#: ../apt/package.py:1207
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:56
+#: ../apt/debfile.py:82
#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Zoznam súborov „%s“ nebolo možné načítať"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Zoznam riadiacich súborov „%s“ nebolo možné načítať"
-#: ../apt/debfile.py:149
+#: ../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:173
+#: ../apt/debfile.py:232
#, python-format
msgid "Conflicts with the installed package '%s'"
+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
+#, python-format
+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“"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 "Balíku chýba pole Architecture (architektúra)"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Nesprávna architektúra „%s“"
#. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
msgid "A later version is already installed"
-msgstr ""
+msgstr "Novšia verzia už je nainštalovaná"
-#: ../apt/debfile.py:345
+#: ../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:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
msgid "Cannot install '%s'"
-msgstr "Nemôžem inštalovať '%s'"
+msgstr "Nie je možné bainštalovať „%s“"
-#: ../apt/debfile.py:484
+#: ../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 "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:494
-#, fuzzy
+#: ../apt/debfile.py:700
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:81
+#: ../apt/progress/text.py:82
#, python-format
msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Hotovo"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Stiah "
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Ignor "
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Chyba "
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Získať:"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+msgstr " [Pracuje sa]"
-#: ../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 ""
+"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:216
+#: ../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:229
+#: ../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:241
+#: ../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:96
+#: ../apt/cache.py:157
msgid "Building data structures"
-msgstr ""
+msgstr "Zostavujú sa údajové štruktúry"
diff --git a/po/sl.po b/po/sl.po
index 323cf9ac..ce5d7081 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 <EMAIL@ADDRESS>, 2006.
+#
+# Matej Urbančič <mateju@svn.gnome.org>, 2006 - 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: python-apt-rosetta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 16:13+0100\n"
-"PO-Revision-Date: 2010-09-01 08:08+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č <mateju@svn.gnome.org>\n"
"Language-Team: Slovenian <sl@li.org>\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
@@ -25,299 +31,329 @@ 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 "xUbuntu 7.04 'Feisty Fawn'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Nosilec CD z Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "xUbuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Nosilec CD z Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "xUbuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Nosilec CD z 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: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 ""
+msgstr "Partnerske ustanove Canonical"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:45
+#: ../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:46
+#: ../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:53
+#: ../data/templates/Ubuntu.info.in:528
msgid "Independent"
-msgstr ""
+msgstr "Neodvisno"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:55
+#: ../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:56
+#: ../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: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
+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
+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:174
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"
@@ -329,61 +365,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 "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"
#. 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 +432,50 @@ 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"
+"Prejemanje datoteke %(current)li 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."
+msgstr "Prejemanje datoteke %(current)li 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."
+"Neveljaven znak unikod 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,31 +488,36 @@ 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."
msgstr ""
-"Prjemanje seznama sprememb je spodletelo.\n"
+"Prejemanje 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
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr "Nadzornega 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 +527,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,43 +536,39 @@ 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 "
"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:398
+#: ../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: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 +576,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"
+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."
+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 +628,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 <a.tirolli@hotmail.com>\n"
"Language-Team: Albanian <sq@li.org>\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..0726da4c 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-25 14:42+0200\n"
"PO-Revision-Date: 2006-10-16 04:17+0000\n"
"Last-Translator: Nikola Nenadic <nikola.nenadic@gmail.com>\n"
"Language-Team: Serbian <sr@li.org>\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,339 @@ 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 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Оптички диск са Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Оптички диск са 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Оптички диск са Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Оптички диск са 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
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Оптички диск са 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: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"
-msgstr "Canonical-подржава софтвер отвореног кода"
+#: ../data/templates/Ubuntu.info.in:1075
+#, fuzzy
+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"
-msgstr "Заједница урећује софтвер отвореног кода"
+#: ../data/templates/Ubuntu.info.in:1078
+#, fuzzy
+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 "Не слободни драјвери"
+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:174
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 "Не слободни драјвери"
+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,61 +370,68 @@ 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'"
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
#. Description
#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny'"
-msgstr "Debian 5.0 'Lenny'"
+#, fuzzy
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze'"
#. Description
#: ../data/templates/Debian.info.in:58
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny'"
+
+#. Description
+#: ../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:146
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
msgstr "Debian 'Sid' (нестабилно)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
msgid "DFSG-compatible Software with Non-Free Dependencies"
msgstr "DFSG-компитабилан са не слободним софтвером"
#. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
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 +439,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"
+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"
+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 "Крај"
+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 +492,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 +500,149 @@ 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 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 "Сукоби међу инсталираним пакетима"
+msgstr "Сукоби међу инсталираним пакетима '%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 ""
+"Прекид постојања пакета '%(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
+#, python-format
+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
+#, fuzzy, 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'. Али '%(targetpkg)s' га даје преко: '%(provides)s'"
+
+#: ../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 "Аутомацка декомпресија:\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: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 "УзимамЧ"
+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 <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\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
deleted file mode 100644
index 2189ffdc..00000000
--- a/po/ta.po
+++ /dev/null
@@ -1,495 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-10-16 04:06+0000\n"
-"Last-Translator: Raghavan <vijay.raghavan08@gmail.com>\n"
-"Language-Team: Tamil <ta@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "தினமும்"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "'%s' நிறுவமுடியவில்லை"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <roysheng@gmail.com>\n"
"Language-Team: Thai <th@li.org>\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..24260ca9 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
#
-#, fuzzy
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: 2006-09-16 15:44+0000\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 <ariel.betan@up.edu.ph>\n"
"Language-Team: Tagalog <tl@li.org>\n"
+"Language: tl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,255 +24,330 @@ 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 "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdrom na may 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 "Cdrom na may 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 "Cdrom na may 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 "Cdrom na may Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Mga Kasama ng Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+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 "Ang software na ito ay hindi bahagi ng Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Malaya"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Ipinamahagi ng mga third-party software developers"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Software na ibinigay mga third party developers "
+
+#. 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 "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:31
+#: ../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:74
+#: ../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:92
+#: ../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:135
+#: ../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:153
+#: ../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:197
+#: ../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:215
+#: ../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:252
+#: ../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:270
+#: ../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:305
+#: ../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:323
+#: ../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:357
+#: ../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:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
msgid "Community-maintained"
-msgstr "Inaalagaan ng kumunidad (Universe)"
+msgstr "Inaalagaan ng kumunidad"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
msgid "Restricted software"
-msgstr ""
+msgstr "Software na may mahigpit na gamit"
#. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../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:409
+#: ../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:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Malaya at bukas na software suportado ng Canonical"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
msgid "Community-maintained (universe)"
-msgstr "Inaalagaan ng kumunidad (Universe)"
+msgstr "Inaalagaan ng kumunidad (universe)"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Inaalagaan ng kumunidad (Universe)"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Malaya at bukas na software suportado ng Canonical"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
msgid "Non-free drivers"
-msgstr ""
+msgstr "Hindi malayang drivers"
#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../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:420
+#: ../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:421
+#: ../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:427
+#: ../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:439
+#: ../data/templates/Ubuntu.info.in:1107
msgid "Important security updates"
-msgstr ""
+msgstr "Mga mahalagang updates pang-seguridad"
#. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
msgid "Recommended updates"
-msgstr ""
+msgstr "Mga mungkahing updates"
#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
msgid "Pre-released updates"
-msgstr "Release Notes"
+msgstr "Mga updates bago ma-released"
#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
msgid "Unsupported updates"
-msgstr "Mga updates mula sa Internet"
+msgstr "Mga hindi suportadong updates"
#. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../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:475
+#: ../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:487
+#: ../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:492
+#: ../data/templates/Ubuntu.info.in:1169
msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
msgid "Ubuntu 5.10 Backports"
-msgstr ""
+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 ""
+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 ""
+msgstr "Cdrom na may 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:174
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 ""
+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 ""
+msgstr "Ubuntu 5.04 Updates"
#. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
msgid "Ubuntu 5.04 Backports"
-msgstr ""
+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 ""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
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 ""
+msgstr "Cdrom na may Ubuntu 4.10 'Warty Warthog'"
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
msgid "No longer officially supported"
-msgstr ""
+msgstr "Hindi na opisyal na sinusuportahan"
#. 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 ""
+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 ""
+msgstr "Ubuntu 4.10 Updates"
#. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../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
@@ -282,117 +357,116 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
#. Description
#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
#. Description
#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
#. Description
#: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
msgid "Debian 3.1 'Sarge'"
-msgstr "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 ""
+msgstr "Mga mungkahing updates"
#. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
msgid "Security updates"
-msgstr "Mga updates mula sa Internet"
+msgstr "Mga updates pang-seguridad"
#. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
msgid "Debian current stable release"
-msgstr ""
+msgstr "Kasalukuyang stable release ng Debian"
#. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
#. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
#. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../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:152
+#: ../data/templates/Debian.info.in:178
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 ""
+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
#. 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 ""
+msgstr "Pangunahing server"
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
msgid "Custom servers"
-msgstr ""
+msgstr "Pasadyang mga 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 ""
+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 ""
+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 "Mga Detalye"
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
msgid "Starting..."
-msgstr ""
+msgstr "Nagsisimula..."
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
msgid "Complete"
-msgstr ""
+msgstr "Kumpleto"
-#: ../apt/package.py:301
+#: ../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:937 ../apt/package.py:1043
+#: ../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:1047
+#: ../apt/package.py:1200
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -400,110 +474,166 @@ 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:1053
-#, fuzzy
+#: ../apt/package.py:1207
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:56
+#: ../apt/debfile.py:82
#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Ang talaan ng mga files para sa '%s' ay hindi mabasa"
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Ang talaan ng mga files na pang-kontrol para sa '%s' ay hindi mabasa"
-#: ../apt/debfile.py:149
+#: ../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:173
+#: ../apt/debfile.py:232
#, python-format
msgid "Conflicts with the installed package '%s'"
+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
+#, python-format
+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)"
-#: ../apt/debfile.py:319
+#. 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 "Wrong architecture '%s'"
+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
+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 "Walang Architecture field sa loob ng pakete"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Maling architecture '%s'"
#. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
msgid "A later version is already installed"
-msgstr ""
+msgstr "Mas naunang bersiyon ang kasalukuyang naka-install"
-#: ../apt/debfile.py:345
+#: ../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:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, 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 ""
+"Automatikong na decompressed:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+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:494
-#, fuzzy
+#: ../apt/debfile.py:700
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:81
+#: ../apt/progress/text.py:82
#, python-format
msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Tapos na"
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
msgid "Hit "
-msgstr ""
+msgstr "Hit "
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
msgid "Ign "
-msgstr ""
+msgstr "Ign "
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
msgid "Err "
-msgstr ""
+msgstr "Err "
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
msgid "Get:"
-msgstr ""
+msgstr "Kunin:"
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
msgid " [Working]"
-msgstr ""
+msgstr " [Nagtatrabaho]"
-#: ../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 ""
+"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:216
+#: ../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:229
+#: ../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:241
+#: ../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:96
+#: ../apt/cache.py:157
msgid "Building data structures"
-msgstr ""
+msgstr "Nagbubuo ng data structures"
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 <atillakaraman@gmail.com>\n"
"Language-Team: Turkish <tr@li.org>\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 <abram@email.ua>\n"
"Language-Team: Ukrainian <uk@li.org>\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 "<b>Оновлення через Інтернет</b>"
#. 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
deleted file mode 100644
index 5dc339e8..00000000
--- a/po/ur.po
+++ /dev/null
@@ -1,495 +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 <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-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: 2006-05-19 02:46+0000\n"
-"Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
-"Language-Team: Urdu <urd@li.org>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "روز"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <tttrung@hotmail.com>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\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 "<b>Chi tiết</b>"
-#: ../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
deleted file mode 100644
index bdf2a903..00000000
--- a/po/xh.po
+++ /dev/null
@@ -1,500 +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 <translations@canonical.com> 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: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-05 20:45+0000\n"
-"Last-Translator: Canonical Ltd <translations@canonical.com>\n"
-"Language-Team: Xhosa <xh-translate@ubuntu.com>\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:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-#, fuzzy
-msgid "Important security updates"
-msgstr "Bonisa izihlaziyo"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
-msgid "Pre-released updates"
-msgstr "Bonisa izihlaziyo"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
-msgid "Unsupported updates"
-msgstr "Bonisa izihlaziyo"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-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:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, 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:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-#, fuzzy
-msgid "The list of changes is not available"
-msgstr "Kukho i-%i yohlaziyo ekhoyo"
-
-#: ../apt/package.py:1047
-#, 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:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, 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:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-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 <rainofchaos@gmail.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.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 <abelcheung@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\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 <soc.scho@gmail.com>\n"
"Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\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 ""
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/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<pkgAcquire*>(NULL, type, fetcher);
if (progress != 0)
progress->setPyAcquire(FetcherObj);
// prepare our map of items.
- return FetcherObj;
+ return HandleErrors(FetcherObj);
}
/**
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;
}
/*}}}*/
diff --git a/python/tag.cc b/python/tag.cc
index 49f53c31..248d818d 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -38,6 +38,10 @@ using namespace std;
struct TagSecData : public CppPyObject<pkgTagSection>
{
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<pkgTagFile>
{
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<pkgTagSection>(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<pkgTagSection>(Self).Find(PyString_AsString(Arg),Start,Stop) == false)
+ if (GetCpp<pkgTagSection>(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<pkgTagSection>(Self).Find(Name,Start,Stop) == false)
@@ -256,7 +290,7 @@ static PyObject *TagSecStr(PyObject *Self)
const char *Start;
const char *Stop;
GetCpp<pkgTagSection>(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)
@@ -414,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();
@@ -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 != -1) {
+ 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/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 $*
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"""
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 <mvo@ubuntu.com>
+# Copyright (C) 2012 Canonical Ltd.
+# Author: Colin Watson <cjwatson@ubuntu.com>
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved.
"""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 <test@example.org>"
+ 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 <test@example.org>"
+ 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 <test@example.org>"
+ 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()
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
#