From 3b9c5cc2bdf1584525792aafe4e8f15d09951583 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Thu, 7 Oct 2010 14:50:25 +0200 Subject: * apt-pkg/deb/deblistparser.cc: - support ArmHardFloat port in CompleteArch, thanks to Sebastian Andrzej Siewior for the patch! --- apt-pkg/deb/deblistparser.cc | 1 + debian/changelog | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index da8b0271b..1b3bfd6ae 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -481,6 +481,7 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) */ static string CompleteArch(std::string& arch) { if (arch == "armel") return "linux-arm"; + if (arch == "armhf") return "linux-arm"; if (arch == "lpia") return "linux-i386"; if (arch == "powerpcspe") return "linux-powerpc"; if (arch == "uclibc-linux-armel") return "linux-arm"; diff --git a/debian/changelog b/debian/changelog index e7d784eb8..c7aead5bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,13 @@ apt (0.8.7) UNRELEASED; urgency=low * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog Closes: #599265 - -- Christian Perrier Tue, 05 Oct 2010 05:35:58 +0200 + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - support ArmHardFloat port in CompleteArch, thanks to Sebastian + Andrzej Siewior for the patch! + + + -- David Kalnischkies Thu, 07 Oct 2010 14:46:59 +0200 apt (0.8.6) unstable; urgency=low -- cgit v1.2.3 From 0c1a7101fda38ad9e43ef4c6757bfc9c0191a30c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 14 Oct 2010 00:06:02 +0200 Subject: * doc/apt.ent: - move some strings into apt-verbatim.ent to avoid showing them in apt-doc.pot as they are untranslatable anyway (e.g. manpage references) --- buildlib/po4a_manpage.mak | 7 +- debian/changelog | 10 +- doc/apt-cache.8.xml | 3 + doc/apt-cdrom.8.xml | 3 + doc/apt-config.8.xml | 3 + doc/apt-extracttemplates.1.xml | 3 + doc/apt-ftparchive.1.xml | 3 + doc/apt-get.8.xml | 3 + doc/apt-key.8.xml | 3 + doc/apt-mark.8.xml | 3 + doc/apt-secure.8.xml | 3 + doc/apt-sortpkgs.1.xml | 3 + doc/apt-verbatim.ent | 188 +++ doc/apt.conf.5.xml | 3 + doc/apt.ent | 192 +-- doc/apt_preferences.5.xml | 3 + doc/po/apt-doc.pot | 2165 ++++++++++++++------------------- doc/po/de.po | 2591 ++++++++++++++++------------------------ doc/po/es.po | 2377 +++++++++++++++--------------------- doc/po/fr.po | 2377 +++++++++++++++--------------------- doc/po/it.po | 2209 +++++++++++++++------------------- doc/po/ja.po | 2377 +++++++++++++++--------------------- doc/po/pl.po | 2375 +++++++++++++++--------------------- doc/po/pt.po | 2377 +++++++++++++++--------------------- doc/po/pt_BR.po | 2213 +++++++++++++++------------------- doc/sources.list.5.xml | 3 + 26 files changed, 8771 insertions(+), 12726 deletions(-) create mode 100644 doc/apt-verbatim.ent diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 11dc11d28..404bb57a5 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -11,7 +11,7 @@ # generate a list of accepted man page translations SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml)) -INCLUDES = apt.ent +INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC @@ -25,6 +25,9 @@ $(LOCAL)-LIST := $(SOURCE) doc: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) +apt-verbatim.ent: ../apt-verbatim.ent + cp ../apt-verbatim.ent . + $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? @@ -34,7 +37,7 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) # Clean rule .PHONY: veryclean/$(LOCAL) veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \ + -rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \ $(addsuffix .xml,$($(@F)-LIST)) \ offline.$(LC).sgml guide.$(LC).sgml diff --git a/debian/changelog b/debian/changelog index 9126e9dc3..1eab8cf7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,10 +5,10 @@ apt (0.8.7) UNRELEASED; urgency=low * Another typo fixed in French ("Anfin"). Thanks to bubulle * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog Closes: #599265 - + [ Michael Vogt ] * debian/apt.cron.daily: - - source /etc/default/locale (if available) so that the + - source /etc/default/locale (if available) so that the apt-get update cron job fetches the right translated package descriptions * fix test failure on amd64 @@ -30,9 +30,11 @@ apt (0.8.7) UNRELEASED; urgency=low * apt-pkg/deb/deblistparser.cc: - support ArmHardFloat port in CompleteArch, thanks to Sebastian Andrzej Siewior for the patch! + * doc/apt.ent: + - move some strings into apt-verbatim.ent to avoid showing them in + apt-doc.pot as they are untranslatable anyway (e.g. manpage references) - - -- David Kalnischkies Thu, 07 Oct 2010 14:46:59 +0200 + -- David Kalnischkies Thu, 14 Oct 2010 00:05:53 +0200 apt (0.8.6) unstable; urgency=low diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 9a63421a8..359d210ea 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 423569fc1..53ab392ab 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index d4d36891f..862a034a1 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 9f8a4056d..af4cacfce 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 549aa6a34..852da8ad1 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index abdec96c1..57306c03f 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 8f445b7f9..f1cc3ac02 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 8e07cd7d9..ec50d6f76 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 908fc342f..f345c3f89 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml index a71766984..f2bd3c3ea 100644 --- a/doc/apt-sortpkgs.1.xml +++ b/doc/apt-sortpkgs.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent new file mode 100644 index 000000000..8b3734f6c --- /dev/null +++ b/doc/apt-verbatim.ent @@ -0,0 +1,188 @@ + + + + + +&docdir;examples/configure-index.gz"> +/etc/apt.conf"> + + + + + + apt.conf + 5 + " +> + + + apt-get + 8 + " +> + + + apt-config + 8 + " +> + + + apt-cdrom + 8 + " +> + + + apt-cache + 8 + " +> + + + apt_preferences + 5 + " +> + + + apt-key + 8 + " +> + + + apt-secure + 8 + " +> + + + apt-ftparchive + 1 + " +> + + + + sources.list + 5 + " +> + + + reportbug + 1 + " +> + + + dpkg + 1 + " +> + + + dpkg-buildpackage + 1 + " +> + + + gzip + 1 + " +> + + + dpkg-scanpackages + 1 + " +> + + + dpkg-scansources + 1 + " +> + + + dselect + 1 + " +> + + + aptitude + 8 + " +> + + + synaptic + 8 + " +> + + + debsign + 1 + " +> + + + debsig-verify + 1 + " +> + + + gpg + 1 + " +> + + + wajig + 1 + " +> + + + + apt@packages.debian.org + +"> + + + Jason + Gunthorpe + + +"> + + + Mike + O'Connor + + +"> + + + Jason Gunthorpe + 1998-2001 + +"> + +Linux +"> + + + + + diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e37456d73..f00baacea 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt.ent b/doc/apt.ent index 0d037c8bb..fc745989f 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -1,153 +1,5 @@ - - - -&docdir;examples/configure-index.gz"> -/etc/apt.conf"> - - - - - - apt.conf - 5 - " -> - - - apt-get - 8 - " -> - - - apt-config - 8 - " -> - - - apt-cdrom - 8 - " -> - - - apt-cache - 8 - " -> - - - apt_preferences - 5 - " -> - - - apt-key - 8 - " -> - - - apt-secure - 8 - " -> - - - apt-ftparchive - 1 - " -> - - - - sources.list - 5 - " -> - - - reportbug - 1 - " -> - - - dpkg - 1 - " -> - - - dpkg-buildpackage - 1 - " -> - - - gzip - 1 - " -> - - - dpkg-scanpackages - 1 - " -> - - - dpkg-scansources - 1 - " -> - - - dselect - 1 - " -> - - - aptitude - 8 - " -> - - - synaptic - 8 - " -> - - - debsign - 1 - " -> - - - debsig-verify - 1 - " -> - - - gpg - 1 - " -> - - - wajig - 1 - " -> - @@ -159,30 +11,7 @@ 1998-2001 Jason Gunthorpe 28 October 2008 Linux - -"> - - - apt@packages.debian.org - -"> - - - Jason - Gunthorpe - - -"> - - - Mike - O'Connor - - "> "> -Linux -"> - - - Jason Gunthorpe - 1998-2001 - -"> - -Linux -"> - QA Page @@ -216,7 +30,7 @@ Bugs - APT bug page. + APT bug page. If you wish to report a bug in APT, please see /usr/share/doc/debian/bug-reporting.txt or the &reportbug; command. @@ -394,7 +208,3 @@ This is done on purpose, to avoid losing content when the translation is lagging behind the original content. "> - - - - diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index abcf56744..54c01100c 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 60c795481..8365c460f 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,13 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-08-23 18:46-0300\n" +"POT-Creation-Date: 2010-10-14 00:03+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #. type: TH #: apt.8:17 @@ -147,271 +148,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" " -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -426,55 +163,12 @@ msgid "" "Gunthorpe\n" " 28 October 2008\n" " Linux\n" -msgstr "" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug " -"page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -535,7 +207,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -549,7 +221,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -556,6 +171,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28. Oktober 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -726,7 +249,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -746,7 +269,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -588,6 +203,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 de Octubre de 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -758,7 +281,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -778,7 +301,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -564,6 +179,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 Octobre 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -734,7 +257,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -754,7 +277,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -428,55 +164,12 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" -msgstr "" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -536,7 +208,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -549,7 +221,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -576,6 +191,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" -" \n" -"\"> \n" -msgstr "" " \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -746,7 +269,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -766,7 +289,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -570,6 +185,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 października 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -741,7 +264,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -761,7 +284,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -558,6 +173,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 Outubro 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -728,7 +251,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -748,7 +271,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, fuzzy, no-wrap msgid "" "\n" @@ -444,6 +180,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" " \n" @@ -454,52 +192,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" -" \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -566,7 +238,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, fuzzy, no-wrap msgid "" "\n" @@ -584,7 +256,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" " - - - + + + -- cgit v1.2.3 From 8b35a3aca210c54dd86a2b1cb2b3dfb717c94205 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 15 Oct 2010 09:18:45 +0200 Subject: * doc/examples/apt-https-method-example.conf: - apply various typo fixes by Olly Betts, thanks! (Closes: #600249) --- debian/changelog | 4 +++- doc/examples/apt-https-method-example.conf | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3af649d6..7da80ca4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,8 +35,10 @@ apt (0.8.7) UNRELEASED; urgency=low apt-doc.pot as they are untranslatable anyway (e.g. manpage references) * doc/apt-verbatim.ent: - change the codenames to reflect the situation after squeeze release + * doc/examples/apt-https-method-example.conf: + - apply various typo fixes by Olly Betts, thanks! (Closes: #600249) - -- David Kalnischkies Thu, 14 Oct 2010 00:07:20 +0200 + -- David Kalnischkies Fri, 15 Oct 2010 09:15:53 +0200 apt (0.8.6) unstable; urgency=low diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf index cc7889044..a03766746 100644 --- a/doc/examples/apt-https-method-example.conf +++ b/doc/examples/apt-https-method-example.conf @@ -6,7 +6,7 @@ This example file starts with a common setup that voluntarily exhibits all available configurations knobs with simple comments. Extended comments on the behavior of the option is provided at the end for - better readibility. As a matter of fact, a common configuration file + better readability. As a matter of fact, a common configuration file will certainly contain far less elements and benefit of default values for many parameters. @@ -38,12 +38,12 @@ matches their respective DNS names. - We have CRL available for both dom1.tld and dom2.tld PKI, and intend to use them. - - It somtimes happens that we had other more generic https available + - It sometimes happens that we had other more generic https available repository to our list. We want the checks to be performed against a common list of anchors (like the one provided by ca-certificates package for instance) - The sample configuration below basically covers those simpe needs. + The sample configuration below basically covers those simple needs. */ @@ -168,12 +168,12 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; When the option is set to "SSLv3" to have apt propose SSLv3 (and associated sets of ciphersuites) instead of TLSv1 (the default) when performing the exchange. This prevents the server to select - TLSv1 and use associated cipheruites. You should probably not use + TLSv1 and use associated ciphersuites. You should probably not use this option except if you know exactly what you are doing. Note that the default setting does not guarantee that the server will not select SSLv3 (for ciphersuites and SSL/TLS version as - selectio is always done by the server, in the end). It only means + selection is always done by the server, in the end). It only means that apt will not advertise TLS support. Debug::Acquire::https "true"; -- cgit v1.2.3 From 915f0520645f68dda1aea1ddfd7e7a413e1f3e09 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 15 Oct 2010 17:54:36 +0200 Subject: add test case for having no indexes, and fix regression in that case --- apt-pkg/deb/debindexfile.cc | 44 +++++++++++++++++++++++++++++++++++--------- test/test-indexes.sh | 8 ++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index a89a2574f..af1209ccb 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -149,11 +149,20 @@ bool debSourcesIndex::Exists() const /* */ unsigned long debSourcesIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; - return f.Size(); + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); + + return size; } /*}}}*/ @@ -269,11 +278,20 @@ bool debPackagesIndex::Exists() const /* This is really only used for progress reporting. */ unsigned long debPackagesIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; - return f.Size(); + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); + + return size; } /*}}}*/ // PackagesIndex::Merge - Load the index file into a cache /*{{{*/ @@ -460,12 +478,20 @@ bool debTranslationsIndex::Exists() const /* This is really only used for progress reporting. */ unsigned long debTranslationsIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); - return f.Size(); + return size; } /*}}}*/ // TranslationsIndex::Merge - Load the index file into a cache /*{{{*/ diff --git a/test/test-indexes.sh b/test/test-indexes.sh index dad3e1fb2..17363718d 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -135,6 +135,14 @@ echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list echo "RootDir \"$WORKDIR\";" > apt_config export APT_CONFIG=`pwd`/apt_config +echo "==== no indexes ====" +echo '--- apt-get check works without indexes' +[ -z `$APT_GET check` ] +echo '--- apt-cache policy works without indexes' +$APT_CACHE policy bash >/dev/null +echo '--- apt-cache show works without indexes' +! LC_MESSAGES=C $APT_CACHE show bash 2>&1| grep -q 'E: No packages found' + echo "===== uncompressed indexes =====" check_update check_indexes -- cgit v1.2.3 From 95fe33dc131bee1a0917ba647e44855c10083ab5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 15 Oct 2010 18:28:03 +0200 Subject: releasing version 0.8.7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7da80ca4f..5ff165cfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.8.7) UNRELEASED; urgency=low +apt (0.8.7) unstable; urgency=low [ Manpages translations ] * Typo fixed in French (extra "Z"). Thanks to Florentin Duneau. @@ -38,7 +38,7 @@ apt (0.8.7) UNRELEASED; urgency=low * doc/examples/apt-https-method-example.conf: - apply various typo fixes by Olly Betts, thanks! (Closes: #600249) - -- David Kalnischkies Fri, 15 Oct 2010 09:15:53 +0200 + -- Michael Vogt Fri, 15 Oct 2010 18:16:10 +0200 apt (0.8.6) unstable; urgency=low -- cgit v1.2.3 From 4260fd3972cc0c01e6cbc825063c06311d440f9b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 21 Oct 2010 16:54:28 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - Add a FileFd::FileSize() method to get the size of the underlying file and not the size of the content in the file as FileFd::Size() does - the sizes can differ since the direct gzip integration * methods/{gzip,bzip2}.cc: - use FileSize() to determine if the file is invalid (Closes: #600852) --- apt-pkg/contrib/fileutl.cc | 18 ++- apt-pkg/contrib/fileutl.h | 1 + debian/changelog | 12 ++ methods/bzip2.cc | 2 +- methods/gzip.cc | 2 +- .../test-bug-595691-empty-and-broken-archive-files | 159 ++++++++++++++------- 6 files changed, 135 insertions(+), 59 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index cbf1d64a9..f4ab066d7 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -910,18 +910,24 @@ unsigned long FileFd::Tell() return Res; } /*}}}*/ -// FileFd::Size - Return the size of the file /*{{{*/ +// FileFd::FileSize - Return the size of the file /*{{{*/ // --------------------------------------------------------------------- /* */ -unsigned long FileFd::Size() +unsigned long FileFd::FileSize() { struct stat Buf; - unsigned long size; - off_t orig_pos; if (fstat(iFd,&Buf) != 0) return _error->Errno("fstat","Unable to determine the file size"); - size = Buf.st_size; + return Buf.st_size; +} + /*}}}*/ +// FileFd::Size - Return the size of the content in the file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +unsigned long FileFd::Size() +{ + unsigned long size = FileSize(); // only check gzsize if we are actually a gzip file, just checking for // "gz" is not sufficient as uncompressed files will be opened with @@ -931,7 +937,7 @@ unsigned long FileFd::Size() /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do * this ourselves; the original (uncompressed) file size is the last 32 * bits of the file */ - orig_pos = lseek(iFd, 0, SEEK_CUR); + off_t orig_pos = lseek(iFd, 0, SEEK_CUR); if (lseek(iFd, -4, SEEK_END) < 0) return _error->Errno("lseek","Unable to seek to end of gzipped file"); if (read(iFd, &size, 4) != 4) diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 419506273..1380f06b4 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -63,6 +63,7 @@ class FileFd bool Truncate(unsigned long To); unsigned long Tell(); unsigned long Size(); + unsigned long FileSize(); bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666); bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false); bool Close(); diff --git a/debian/changelog b/debian/changelog index 5ff165cfe..eb716b904 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.8.8) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/contrib/fileutl.cc: + - Add a FileFd::FileSize() method to get the size of the underlying + file and not the size of the content in the file as FileFd::Size() + does - the sizes can differ since the direct gzip integration + * methods/{gzip,bzip2}.cc: + - use FileSize() to determine if the file is invalid (Closes: #600852) + + -- David Kalnischkies Thu, 21 Oct 2010 16:53:10 +0200 + apt (0.8.7) unstable; urgency=low [ Manpages translations ] diff --git a/methods/bzip2.cc b/methods/bzip2.cc index c668141a2..ccc3669a2 100644 --- a/methods/bzip2.cc +++ b/methods/bzip2.cc @@ -57,7 +57,7 @@ bool Bzip2Method::Fetch(FetchItem *Itm) FileFd From(Path,FileFd::ReadOnly); // FIXME add an error message saying that empty files can't be valid archives - if(From.Size() == 0) + if(From.FileSize() == 0) return false; int GzOut[2]; diff --git a/methods/gzip.cc b/methods/gzip.cc index 22cae9424..f1c76066e 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -49,7 +49,7 @@ bool GzipMethod::Fetch(FetchItem *Itm) FileFd From(Path,FileFd::ReadOnlyGzip); // FIXME add an error message saying that empty files can't be valid archives - if(From.Size() == 0) + if(From.FileSize() == 0) return false; FileFd To(Itm->DestFile,FileFd::WriteAtomic); diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files index 2f127221a..11a5025d2 100755 --- a/test/integration/test-bug-595691-empty-and-broken-archive-files +++ b/test/integration/test-bug-595691-empty-and-broken-archive-files @@ -10,6 +10,7 @@ buildaptarchive setupflataptarchive testaptgetupdate() { + rm -rf rootdir/var/lib/apt rootdir/var/cache/apt aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true sed -i -e '/^Fetched / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff GIVEN="$1" @@ -23,69 +24,125 @@ testaptgetupdate() { rm testaptgetupdate.diff } -touch aptarchive/en.bz2 +createemptyarchive() { + find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete + if [ "en" = "$1" ]; then + echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS + fi + touch aptarchive/Packages + echo -n "" | $COMPRESSOR > aptarchive/${1}.$COMPRESS + aptftparchive release aptarchive/ > aptarchive/Release + signreleasefiles + rm -f aptarchive/Packages +} -testaptgetupdate "Ign file: Release.gpg -Ign file:$(readlink -f aptarchive)/ Translation-en -Get:1 file: Release [] -Reading package lists..." "empty file en.bz2 over file" +createemptyfile() { + find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete + if [ "en" = "$1" ]; then + echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS + fi + touch aptarchive/Packages aptarchive/${1}.$COMPRESS + aptftparchive release aptarchive/ > aptarchive/Release + signreleasefiles + rm -f aptarchive/Packages +} -rm aptarchive/en.bz2 -echo -n "" | bzip2 > aptarchive/en.bz2 +setupcompressor() { + COMPRESSOR="$1" + case $COMPRESSOR in + gzip) COMPRESS="gz";; + bzip2) COMPRESS="bz2";; + lzma) COMPRESS="lzma";; + esac + echo "Acquire::CompressionTypes::Order { \"${COMPRESS}\"; }; +Dir::Bin::gzip \"/does/not/exist\"; +Dir::Bin::bzip2 \"/does/not/exist\"; +Dir::Bin::lzma \"/does/not/exist\";" > rootdir/etc/apt/apt.conf.d/00compressor + if [ -e "/bin/${COMPRESSOR}" ]; then + echo "Dir::Bin::${COMPRESSOR} \"/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor + elif [ -e "/usr/bin/${COMPRESSOR}" ]; then + echo "Dir::Bin::${COMPRESSOR} \"/usr/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor + else + msgtest "Test for availability of compressor" "${COMPRESSOR}" + msgfail + exit 1 + fi +} -testaptgetupdate "Ign file: Release.gpg -Get:1 file: Release [] -Reading package lists..." "empty archive en.bz2 over file" +testoverfile() { + setupcompressor "$1" -rm aptarchive/en.bz2 + createemptyfile 'en' + testaptgetupdate "Get:1 file: Release.gpg [] +Get:2 file: Release [] +Ign file:$(readlink -f aptarchive)/ Translation-en +Reading package lists..." "empty file en.$COMPRESS over file" + + createemptyarchive 'en' + testaptgetupdate "Get:1 file: Release.gpg [] +Get:2 file: Release [] +Reading package lists..." "empty archive en.$COMPRESS over file" + + createemptyarchive 'Packages' + # FIXME: Why omits the file transport the Packages Get line? + #Get:3 file: Packages [] + testaptgetupdate "Ign file:$(readlink -f aptarchive)/ Translation-en +Get:1 file: Release.gpg [] +Get:2 file: Release [] +Reading package lists..." "empty archive Packages.$COMPRESS over file" + + createemptyfile 'Packages' + testaptgetupdate "Ign file:$(readlink -f aptarchive)/ Translation-en +Get:1 file: Release.gpg [] +Get:2 file: Release [] +Err file: Packages + Undetermined Error +W: Failed to fetch file:$(readlink -f aptarchive/Packages.$COMPRESS) Undetermined Error -# do the same again with http instead of file -changetowebserver +E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file" +} -touch aptarchive/en.bz2 +testoverhttp() { + setupcompressor "$1" -testaptgetupdate "Ign http://localhost Release.gpg -Get:1 http://localhost/ Translation-en -Get:2 http://localhost Release [] + createemptyfile 'en' + testaptgetupdate "Get:1 http://localhost Release.gpg [] +Get:2 http://localhost/ Translation-en +Get:3 http://localhost Release [] +Ign http://localhost/ Translation-en +Get:4 http://localhost Packages [] +Reading package lists..." "empty file en.$COMPRESS over http" + + createemptyarchive 'en' + testaptgetupdate "Get:1 http://localhost Release.gpg [] +Get:2 http://localhost/ Translation-en [] +Get:3 http://localhost Release [] +Get:4 http://localhost Packages [] +Reading package lists..." "empty archive en.$COMPRESS over http" + + createemptyarchive 'Packages' + testaptgetupdate "Get:1 http://localhost Release.gpg [] Ign http://localhost/ Translation-en -Get:3 http://localhost Packages [] -Reading package lists..." "empty file en.bz2 over http" - -rm aptarchive/en.bz2 -echo -n "" | bzip2 > aptarchive/en.bz2 - -testaptgetupdate "Ign http://localhost Release.gpg -Get:1 http://localhost/ Translation-en [] Get:2 http://localhost Release [] -Ign http://localhost Packages/DiffIndex Get:3 http://localhost Packages [] -Reading package lists..." "empty archive en.bz2 over http" - -rm aptarchive/en.bz2 - -rm aptarchive/Packages -touch aptarchive/Packages -buildaptarchivefromfiles - -testaptgetupdate "Ign http://localhost Release.gpg -Ign http://localhost/ Translation-en -Get:1 http://localhost Release [] -Ign http://localhost Packages/DiffIndex -Get:2 http://localhost Packages [] -Reading package lists..." "empty archive Packages over http" - -find aptarchive/ -name 'Packages*' -type f -delete -touch aptarchive/Packages.bz2 -aptftparchive release aptarchive/ > aptarchive/Release +Reading package lists..." "empty archive Packages.$COMPRESS over http" -#FIXME: we should response with a good error message instead -testaptgetupdate "Ign http://localhost Release.gpg + createemptyfile 'Packages' + #FIXME: we should response with a good error message instead + testaptgetupdate "Get:1 http://localhost Release.gpg [] Ign http://localhost/ Translation-en -Get:1 http://localhost Release [] -Ign http://localhost Packages/DiffIndex -Get:2 http://localhost Packages +Get:2 http://localhost Release [] +Get:3 http://localhost Packages Err http://localhost Packages Undetermined Error -W: Failed to fetch http://localhost:8080/Packages.bz2 Undetermined Error +W: Failed to fetch http://localhost:8080/Packages.$COMPRESS Undetermined Error + +E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http" +} + +for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverfile $COMPRESSOR; done + +# do the same again with http instead of file +changetowebserver -E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages over http" +for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverhttp $COMPRESSOR; done -- cgit v1.2.3 From 1c493315c5b1ba13cc68df85ba02fa06b13ad001 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 22 Oct 2010 19:10:49 +0200 Subject: =?UTF-8?q?dpkg=20doesn't=20like=20underscores=20in=20versions=20a?= =?UTF-8?q?nymore=20(=3Dit=20fails)=20so=20our=20behaviour=20can=20be=20un?= =?UTF-8?q?defined=E2=80=A6=20(or=20at=20least=20can't=20be=20tested=20aga?= =?UTF-8?q?inst=20dpkg)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/libapt/run-tests | 2 +- test/versions.lst | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test/libapt/run-tests b/test/libapt/run-tests index 0f55f7386..f5fc03446 100755 --- a/test/libapt/run-tests +++ b/test/libapt/run-tests @@ -4,7 +4,7 @@ set -e local DIR=$(readlink -f $(dirname $0)) echo "Compiling the tests …" test -d "$DIR/../../build/obj/test/libapt/" || mkdir -p "$DIR/../../build/obj/test/libapt/" -$(cd $DIR && make) +(cd $DIR && make) echo "Running all testcases …" LDPATH="$DIR/../../build/bin" EXT="_libapt_test" diff --git a/test/versions.lst b/test/versions.lst index 517214151..2d0967645 100644 --- a/test/versions.lst +++ b/test/versions.lst @@ -104,4 +104,3 @@ III-alpha9.8 III-alpha9.8-1.5 -1 1.4+OOo3.0.0~ 1.4+OOo3.0.0-4 -1 # another tilde check 2.4.7-1 2.4.7-z -1 # revision comparing 1.002-1+b2 1.00 1 # whatever... -2.2.4-47978_Debian_lenny 2.2.4-47978_Debian_lenny 0 # and underscore... -- cgit v1.2.3 From 4b625b95a04a9d73c6682a3f9354112a394bb674 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 26 Oct 2010 23:24:41 +0200 Subject: * apt-pkg/pkgcache.cc: - fallback always to a suitable description (Closes: #601016) --- apt-pkg/pkgcache.cc | 15 ++-- debian/changelog | 4 +- .../test-bug-601016-description-translation | 91 ++++++++++++++++++++++ 3 files changed, 102 insertions(+), 8 deletions(-) create mode 100755 test/integration/test-bug-601016-description-translation diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 324445fa7..616d400a2 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -891,18 +891,19 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const for (std::vector::const_iterator l = lang.begin(); l != lang.end(); l++) { - pkgCache::DescIterator DescDefault = DescriptionList(); - pkgCache::DescIterator Desc = DescDefault; - - for (; Desc.end() == false; Desc++) + pkgCache::DescIterator Desc = DescriptionList(); + for (; Desc.end() == false; ++Desc) if (*l == Desc.LanguageCode() || (*l == "en" && strcmp(Desc.LanguageCode(),"") == 0)) break; - if (Desc.end() == true) - Desc = DescDefault; + if (Desc.end() == true) + continue; return Desc; } - + for (pkgCache::DescIterator Desc = DescriptionList(); + Desc.end() == false; ++Desc) + if (strcmp(Desc.LanguageCode(), "") == 0) + return Desc; return DescriptionList(); }; diff --git a/debian/changelog b/debian/changelog index eb716b904..8ca3e164a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ apt (0.8.8) UNRELEASED; urgency=low does - the sizes can differ since the direct gzip integration * methods/{gzip,bzip2}.cc: - use FileSize() to determine if the file is invalid (Closes: #600852) + * apt-pkg/pkgcache.cc: + - fallback always to a suitable description (Closes: #601016) - -- David Kalnischkies Thu, 21 Oct 2010 16:53:10 +0200 + -- David Kalnischkies Tue, 26 Oct 2010 23:23:01 +0200 apt (0.8.7) unstable; urgency=low diff --git a/test/integration/test-bug-601016-description-translation b/test/integration/test-bug-601016-description-translation new file mode 100755 index 000000000..a31e42ee1 --- /dev/null +++ b/test/integration/test-bug-601016-description-translation @@ -0,0 +1,91 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture "i386" + +# we need a valid locale here, otherwise the language configuration +# will be overridden by LC_ALL=C +LOCALE="$(echo "$LANG" | cut -d'_' -f 1)" + +PACKAGESTANZA="Package: apt +Priority: important +Section: admin +Installed-Size: 5984 +Maintainer: APT Development Team +Architecture: i386 +Version: 0.8.7 +Filename: pool/main/a/apt/apt_0.8.7_i386.deb +Size: 2140230 +MD5sum: 74769bfbcef9ebc4fa74f7a5271b9c08 +Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c" + + +echo "$PACKAGESTANZA +Description: Advanced front-end for dpkg" > aptarchive/Packages + +echo "Package: apt +Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c +Description-${LOCALE}: Mächtige Oberfläche für dpkg + Das Paket bietet dem Nutzer technisch führende Methoden für den Zugriff + auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die + APT-Dselect-Methode. Beides sind einfache und sicherere Wege, + um Pakete zu installieren und Upgrades durchzuführen." | bzip2 > aptarchive/${LOCALE}.bz2 + +# the $LOCALE translation file will not be included as it is a flat archive it came from and therefore +# its name can not be guessed correctly… (in non-flat archives the files are called Translation-*) +echo 'APT::Cache::Generate "false";' > rootdir/etc/apt/apt.conf.d/00nogenerate + +NOLONGSTANZA="$PACKAGESTANZA +Description: Advanced front-end for dpkg +" + +ENGLISHSTANZA="$PACKAGESTANZA +Description: Advanced front-end for dpkg +" + +LOCALESTANZA="$PACKAGESTANZA +Description-${LOCALE}: Mächtige Oberfläche für dpkg + Das Paket bietet dem Nutzer technisch führende Methoden für den Zugriff + auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die + APT-Dselect-Methode. Beides sind einfache und sicherere Wege, + um Pakete zu installieren und Upgrades durchzuführen. +" + +testrun() { + echo "Acquire::Languages { \"${LOCALE}\"; \"en\"; };" > rootdir/etc/apt/apt.conf.d/00languages + export LC_ALL="" + setupaptarchive + testequal "$LOCALESTANZA" aptcache show apt -o Test=File-${LOCALE} + testequal "$NOLONGSTANZA" aptcache show apt -o Acquire::Languages="ww" -o Test=File-${LOCALE} + testequal "$LOCALESTANZA" aptcache show apt -o Acquire::Languages::="ww" -o Test=File-${LOCALE} + LC_ALL=C testequal "$ENGLISHSTANZA" aptcache show apt -o Test=File-${LOCALE} + export LC_ALL="" + echo "Acquire::Languages { \"ww\"; \"${LOCALE}\"; \"en\"; };" > rootdir/etc/apt/apt.conf.d/00languages + testequal "$LOCALESTANZA" aptcache show apt -o Test=File-ww-${LOCALE} + echo "Acquire::Languages { \"ww\"; \"en\"; };" > rootdir/etc/apt/apt.conf.d/00languages + testequal "$ENGLISHSTANZA" aptcache show apt -o Test=File-ww +} + +testrun + +echo "$PACKAGESTANZA +Description: Advanced front-end for dpkg" > aptarchive/Packages + +echo "Package: apt +Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c +Description-en: Advanced front-end for dpkg + This is Debian's next generation front-end for the dpkg package manager. + It provides the apt-get utility and APT dselect method that provides a + simpler, safer way to install and upgrade packages." | bzip2 > aptarchive/en.bz2 + +ENGLISHSTANZA="$PACKAGESTANZA +Description-en: Advanced front-end for dpkg + This is Debian's next generation front-end for the dpkg package manager. + It provides the apt-get utility and APT dselect method that provides a + simpler, safer way to install and upgrade packages. +" + +testrun -- cgit v1.2.3 From 71626337ad5fe00a5f9b753829445084e8f5e790 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 Oct 2010 21:50:47 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - ensure that history.log gets closed to avoid leaking a FD (closes: #601649) --- debian/changelog | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 437ded365..7707a5135 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.8.8) UNRELEASED; urgency=low +apt (0.8.8) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/contrib/fileutl.cc: @@ -10,7 +10,12 @@ apt (0.8.8) UNRELEASED; urgency=low * apt-pkg/pkgcache.cc: - fallback always to a suitable description (Closes: #601016) - -- David Kalnischkies Tue, 26 Oct 2010 23:23:01 +0200 + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - ensure that history.log gets closed to avoid leaking a FD + (closes: #601649) + + -- Michael Vogt Thu, 28 Oct 2010 21:22:21 +0200 apt (0.8.7) unstable; urgency=low @@ -29,9 +34,6 @@ apt (0.8.7) unstable; urgency=low * apt-pkg/deb/debsystem.cc: - fix issues with dir::state::status and dir::state::extended_states when alternative rootdirs are used - * apt-pkg/deb/dpkgpm.cc: - - ensure that history.log gets closed to avoid leaking a FD - (closes: #601649) [ Martin Pitt ] * apt-pkg/deb/debindexfile.cc: -- cgit v1.2.3 From ad3e5dc54d1eebca3edbad928a946c1b0a5e275a Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 30 Oct 2010 09:52:21 +0200 Subject: Fix "typos" in French manpages translations. Thanks to Cyril Brulebois for bashing me. --- debian/changelog | 7 +++++++ doc/po/fr.po | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7707a5135..bfe0ea6a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.8.9) UNRELEASED; urgency=low + + * Fix "typos" in French manpages translations. Thanks to + Cyril Brulebois for bashing me. + + -- Christian Perrier Sat, 30 Oct 2010 09:51:18 +0200 + apt (0.8.8) unstable; urgency=low [ David Kalnischkies ] diff --git a/doc/po/fr.po b/doc/po/fr.po index 12b02ac21..4204053dc 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-13 23:45+0300\n" -"PO-Revision-Date: 2010-10-06 22:33+0200\n" +"POT-Creation-Date: 2010-08-23 18:46-0300\n" +"PO-Revision-Date: 2010-10-30 09:41+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: \n" @@ -427,7 +427,7 @@ msgid "" " \n" "\">\n" msgstr "" -" /etc/apt/apt.conf.D/\n" +" /etc/apt/apt.conf.d/\n" " Fragments du fichier de configuration d'APT.\n" " Élément de configuration : Dir::Etc::Parts.\n" " \n" @@ -7652,7 +7652,7 @@ msgid "" msgstr "" "Le fichier d'APT, /etc/apt/preferences et les fichiers " "fragments situés dans le dossier /etc/apt/preferences.d/, peuvent être utilisé pour choisir la version des paquets que l'on " +"filename>, peuvent être utilisés pour choisir la version des paquets que l'on " "veut installer." #. type: Content of: -- cgit v1.2.3 From c1c49795f4ba33e56b5b741f07bba362f4d54c2e Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 30 Oct 2010 22:42:39 +0200 Subject: Drop useless untranslatable sections from apt.8 --- debian/changelog | 1 + doc/apt.8 | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bfe0ea6a3..6e0ec7137 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.8.9) UNRELEASED; urgency=low * Fix "typos" in French manpages translations. Thanks to Cyril Brulebois for bashing me. + * Drop useless untranslatable sections from apt.8 -- Christian Perrier Sat, 30 Oct 2010 09:51:18 +0200 diff --git a/doc/apt.8 b/doc/apt.8 index 78e4f0a70..e7ca8c44b 100644 --- a/doc/apt.8 +++ b/doc/apt.8 @@ -28,10 +28,6 @@ for the command line or for the X Window System. Some options are only implemented in .BR apt-get (8) though. -.SH OPTIONS -None. -.SH FILES -None. .SH SEE ALSO .BR apt-cache (8), .BR apt-get (8), -- cgit v1.2.3 From 037454791fe7e59b33531b640ac0aced3b2ba6d7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 6 Nov 2010 12:50:49 +0100 Subject: * apt-pkg/aptconfiguration.cc: - respect the none-force even in LANG=C (Closes: #602573) --- apt-pkg/aptconfiguration.cc | 3 ++- debian/changelog | 7 ++++++- test/libapt/getlanguages_test.cc | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 44f1f318a..5cc9277e4 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -168,7 +168,8 @@ std::vector const Configuration::getLanguages(bool const &All, // first cornercase: LANG=C, so we use only "en" Translation if (envLong == "C") { - codes.push_back("en"); + if (_config->Find("Acquire::Languages","") != "none") + codes.push_back("en"); allCodes = codes; allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); if (All == true) diff --git a/debian/changelog b/debian/changelog index 6e0ec7137..ae547bcff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ apt (0.8.9) UNRELEASED; urgency=low + [ Christian Perrier ] * Fix "typos" in French manpages translations. Thanks to Cyril Brulebois for bashing me. * Drop useless untranslatable sections from apt.8 - -- Christian Perrier Sat, 30 Oct 2010 09:51:18 +0200 + [ David Kalnischkies ] + * apt-pkg/aptconfiguration.cc: + - respect the none-force even in LANG=C (Closes: #602573) + + -- David Kalnischkies Sat, 06 Nov 2010 12:50:20 +0100 apt (0.8.8) unstable; urgency=low diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index 9a8910b58..14f1af185 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -85,6 +85,12 @@ int main(int argc,char *argv[]) equals(vec.size(), 1); equals(vec[0], "en"); + _config->Set("Acquire::Languages", "none"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 0); + _config->Set("Acquire::Languages", ""); + _config->Set("Acquire::Languages::1", "environment"); _config->Set("Acquire::Languages::2", "en"); env[0] = "de_DE.UTF-8"; -- cgit v1.2.3 From 543b0abfa5466274f5dcbe943b63633189acd887 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 6 Nov 2010 15:02:27 +0100 Subject: * apt-pkg/orderlist.cc: - try fixing before removing even if the fix is hidden in a provides, hidden in the #590438 testcase --- apt-pkg/orderlist.cc | 34 +++++++++++++++++----- debian/changelog | 3 ++ ...g-590438-broken-provides-thanks-to-remove-order | 4 +-- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 602b63d3b..a53854a26 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -967,13 +967,33 @@ bool pkgOrderList::DepRemove(DepIterator D) // start again in the or group and find something which will serve as replacement for (; F.end() == false && F != S; ++F) { - if (F.TargetPkg() == D.TargetPkg() || - IsFlag(F.TargetPkg(), InList) == false || - VisitNode(F.TargetPkg()) == false) - continue; - Flag(F.TargetPkg(), Immediate); - tryFixDeps = false; - break; + if (IsFlag(F.TargetPkg(), InList) == true && + IsFlag(F.TargetPkg(), AddPending) == false && + Cache[F.TargetPkg()].InstallVer != 0 && + VisitNode(F.TargetPkg()) == true) + { + Flag(F.TargetPkg(), Immediate); + tryFixDeps = false; + break; + } + else if (F.TargetPkg()->ProvidesList != 0) + { + pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList(); + for (; Prv.end() == false; ++Prv) + { + if (IsFlag(Prv.OwnerPkg(), InList) == true && + IsFlag(Prv.OwnerPkg(), AddPending) == false && + Cache[Prv.OwnerPkg()].InstallVer != 0 && + VisitNode(Prv.OwnerPkg()) == true) + { + Flag(Prv.OwnerPkg(), Immediate); + tryFixDeps = false; + break; + } + } + if (Prv.end() == false) + break; + } } if (tryFixDeps == false) break; diff --git a/debian/changelog b/debian/changelog index ae547bcff..510bc453c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ apt (0.8.9) UNRELEASED; urgency=low [ David Kalnischkies ] * apt-pkg/aptconfiguration.cc: - respect the none-force even in LANG=C (Closes: #602573) + * apt-pkg/orderlist.cc: + - try fixing before removing even if the fix is hidden in + a provides, hidden in the #590438 testcase -- David Kalnischkies Sat, 06 Nov 2010 12:50:20 +0100 diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order index 3be0bec48..0f6493948 100755 --- a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order +++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order @@ -25,7 +25,7 @@ MD5sum: 8489687ce10e656babd467c9ee389349 Description-de: Verschiedene Dateien für das Basis-System von Debian" predependsgawk() { -# rm rootdir/var/cache/apt/*.bin + rm rootdir/var/cache/apt/*.bin cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status echo "$pkgbasefile Pre-Depends: $1 @@ -57,7 +57,7 @@ predependsgawk "awk | aawk" predependsgawk "awk" predependsgawk2() { -# rm rootdir/var/cache/apt/*.bin + rm rootdir/var/cache/apt/*.bin cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status echo "$pkgbasefile Pre-Depends: $1 -- cgit v1.2.3 From eb3947c6510042c054a319d8053821faf7244dea Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 9 Nov 2010 14:18:19 +0100 Subject: evaluate Acquire::Languages= before LANG= (Closes: #602573) --- apt-pkg/aptconfiguration.cc | 82 ++++++++++++++++++++-------------------- debian/changelog | 4 +- test/libapt/getlanguages_test.cc | 18 +++++++++ 3 files changed, 62 insertions(+), 42 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 5cc9277e4..52f54073c 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -166,18 +166,6 @@ std::vector const Configuration::getLanguages(bool const &All, string const envShort = envLong.substr(0,lenShort); bool envLongIncluded = true; - // first cornercase: LANG=C, so we use only "en" Translation - if (envLong == "C") { - if (_config->Find("Acquire::Languages","") != "none") - codes.push_back("en"); - allCodes = codes; - allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); - if (All == true) - return allCodes; - else - return codes; - } - // to save the servers from unneeded queries, we only try also long codes // for languages it is realistic to have a long code translation file… // TODO: Improve translation acquire system to drop them dynamic @@ -218,37 +206,41 @@ std::vector const Configuration::getLanguages(bool const &All, // It is very likely we will need to environment codes later, // so let us generate them now from LC_MESSAGES and LANGUAGE std::vector environment; - // take care of LC_MESSAGES - if (envLongIncluded == false) - environment.push_back(envLong); - environment.push_back(envShort); - // take care of LANGUAGE - const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE"); - string envLang = Locale == 0 ? language_env : *(Locale+1); - if (envLang.empty() == false) { - std::vector env = VectorizeString(envLang,':'); - short addedLangs = 0; // add a maximum of 3 fallbacks from the environment - for (std::vector::const_iterator e = env.begin(); - e != env.end() && addedLangs < 3; ++e) { - if (unlikely(e->empty() == true) || *e == "en") - continue; - if (*e == envLong || *e == envShort) - continue; - if (std::find(environment.begin(), environment.end(), *e) != environment.end()) - continue; - if (e->find('_') != string::npos) { - // Drop LongCodes here - ShortCodes are also included - string const shorty = e->substr(0, e->find('_')); - char const **n = needLong; - for (; *n != NULL; ++n) - if (shorty == *n) - break; - if (*n == NULL) + if (envShort != "C") { + // take care of LC_MESSAGES + if (envLongIncluded == false) + environment.push_back(envLong); + environment.push_back(envShort); + // take care of LANGUAGE + const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE"); + string envLang = Locale == 0 ? language_env : *(Locale+1); + if (envLang.empty() == false) { + std::vector env = VectorizeString(envLang,':'); + short addedLangs = 0; // add a maximum of 3 fallbacks from the environment + for (std::vector::const_iterator e = env.begin(); + e != env.end() && addedLangs < 3; ++e) { + if (unlikely(e->empty() == true) || *e == "en") + continue; + if (*e == envLong || *e == envShort) + continue; + if (std::find(environment.begin(), environment.end(), *e) != environment.end()) continue; + if (e->find('_') != string::npos) { + // Drop LongCodes here - ShortCodes are also included + string const shorty = e->substr(0, e->find('_')); + char const **n = needLong; + for (; *n != NULL; ++n) + if (shorty == *n) + break; + if (*n == NULL) + continue; + } + ++addedLangs; + environment.push_back(*e); } - ++addedLangs; - environment.push_back(*e); } + } else { + environment.push_back("en"); } // Support settings like Acquire::Translation=none on the command line to @@ -270,6 +262,16 @@ std::vector const Configuration::getLanguages(bool const &All, return codes; } + // cornercase: LANG=C, so we use only "en" Translation + if (envShort == "C") { + allCodes = codes = environment; + allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); + if (All == true) + return allCodes; + else + return codes; + } + std::vector const lang = _config->FindVector("Acquire::Languages"); // the default setting -> "environment, en" if (lang.empty() == true) { diff --git a/debian/changelog b/debian/changelog index 510bc453c..b103a3276 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,12 +7,12 @@ apt (0.8.9) UNRELEASED; urgency=low [ David Kalnischkies ] * apt-pkg/aptconfiguration.cc: - - respect the none-force even in LANG=C (Closes: #602573) + - evaluate Acquire::Languages= before LANG= (Closes: #602573) * apt-pkg/orderlist.cc: - try fixing before removing even if the fix is hidden in a provides, hidden in the #590438 testcase - -- David Kalnischkies Sat, 06 Nov 2010 12:50:20 +0100 + -- David Kalnischkies Tue, 09 Nov 2010 14:16:41 +0100 apt (0.8.8) unstable; urgency=low diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index 14f1af185..3559aae0c 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -89,6 +89,24 @@ int main(int argc,char *argv[]) env[0] = "C"; vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 0); + + _config->Set("Acquire::Languages", "environment"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 1); + equals(vec[0], "en"); + + _config->Set("Acquire::Languages", "de"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 1); + equals(vec[0], "de"); + + _config->Set("Acquire::Languages", "fr"); + env[0] = "ast_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 1); + equals(vec[0], "fr"); _config->Set("Acquire::Languages", ""); _config->Set("Acquire::Languages::1", "environment"); -- cgit v1.2.3 From a3f1a6ccd29480ae45e0a82871b05e009741d7fa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Nov 2010 12:24:48 +0100 Subject: * apt-pkg/algorithms.cc: - if the package was explicitly marked as ToRemove don't consider it as a candidate for FixByInstall --- apt-pkg/algorithms.cc | 1 + debian/changelog | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 961f5c2fa..9abb7a947 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1062,6 +1062,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) else if (TryFixByInstall == true && Start.TargetPkg()->CurrentVer == 0 && Cache[Start.TargetPkg()].Delete() == false && + (Flags[Start.TargetPkg()->ID] & ToRemove) != ToRemove && Cache.GetCandidateVer(Start.TargetPkg()).end() == false) { /* Before removing or keeping the package with the broken dependency diff --git a/debian/changelog b/debian/changelog index b103a3276..57b32f8f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,11 @@ apt (0.8.9) UNRELEASED; urgency=low * apt-pkg/orderlist.cc: - try fixing before removing even if the fix is hidden in a provides, hidden in the #590438 testcase + * apt-pkg/algorithms.cc: + - if the package was explicitly marked as ToRemove don't + consider it as a candidate for FixByInstall - -- David Kalnischkies Tue, 09 Nov 2010 14:16:41 +0100 + -- David Kalnischkies Wed, 10 Nov 2010 12:23:29 +0100 apt (0.8.8) unstable; urgency=low -- cgit v1.2.3 From edbda33bdef6a480fcfcb5d6b9a219c10cbeaaba Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Nov 2010 13:26:37 +0100 Subject: * apt-pkg/depcache.cc: - don't install previously not installed providers in a try to statisfy a "Breaks: provides" dependency by upgrade --- apt-pkg/depcache.cc | 7 +++- debian/changelog | 5 ++- test/integration/Packages-xorg-break-providers | 52 ++++++++++++++++++++++++++ test/integration/status-xorg-break-providers | 22 +++++++++++ test/integration/test-xorg-break-providers | 43 +++++++++++++++++++++ 5 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 test/integration/Packages-xorg-break-providers create mode 100644 test/integration/status-xorg-break-providers create mode 100755 test/integration/test-xorg-break-providers diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 0b5d6d8e6..23abc76c1 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1444,8 +1444,11 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, VerIterator Ver(*this,*I); PkgIterator Pkg = Ver.ParentPkg(); - - + /* The List includes all packages providing this dependency, + even providers which are not installed, so skip them. */ + if (PkgState[Pkg->ID].InstallVer == 0) + continue; + if (PkgState[Pkg->ID].CandidateVer != *I && Start->Type == Dep::DpkgBreaks) MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); diff --git a/debian/changelog b/debian/changelog index 57b32f8f6..52581d8c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,11 @@ apt (0.8.9) UNRELEASED; urgency=low * apt-pkg/algorithms.cc: - if the package was explicitly marked as ToRemove don't consider it as a candidate for FixByInstall + * apt-pkg/depcache.cc: + - don't install previously not installed providers in a try + to statisfy a "Breaks: provides" dependency by upgrade - -- David Kalnischkies Wed, 10 Nov 2010 12:23:29 +0100 + -- David Kalnischkies Wed, 10 Nov 2010 13:22:39 +0100 apt (0.8.8) unstable; urgency=low diff --git a/test/integration/Packages-xorg-break-providers b/test/integration/Packages-xorg-break-providers new file mode 100644 index 000000000..f6e1d81f9 --- /dev/null +++ b/test/integration/Packages-xorg-break-providers @@ -0,0 +1,52 @@ +Package: xserver-xorg-video-intel +Priority: optional +Section: x11 +Installed-Size: 1292 +Maintainer: Debian X Strike Force +Architecture: i386 +Version: 2:2.13.901-2 +Provides: xserver-xorg-video-8 +Filename: pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.13.901-2_i386.deb +Size: 586964 +MD5sum: 72527f4b2c9d734e53202736e3177865 +Description: X.Org X server -- Intel i8xx, i9xx display driver + +Package: xserver-xorg-video-vesa +Priority: optional +Section: x11 +Installed-Size: 104 +Maintainer: Debian X Strike Force +Architecture: i386 +Version: 1:2.3.0-4 +Provides: xserver-xorg-video-8 +Filename: pool/main/x/xserver-xorg-video-vesa/xserver-xorg-video-vesa_2.3.0-4_i386.deb +Size: 27158 +MD5sum: 77bf2935c40b3b7739d431930e53d185 +Description: X.Org X server -- VESA display driver + +Package: xserver-xorg-video-vesa +Priority: optional +Section: x11 +Installed-Size: 104 +Maintainer: Debian X Strike Force +Architecture: i386 +Version: 1:2.3.0-3 +Provides: xserver-xorg-video-6 +Filename: pool/main/x/xserver-xorg-video-vesa/xserver-xorg-video-vesa_2.3.0-3_i386.deb +Size: 27122 +MD5sum: 0cd97be927c7d75f2a7230739f8f866c +Description: X.Org X server -- VESA display driver + +Package: xserver-xorg-core +Priority: optional +Section: x11 +Installed-Size: 4436 +Maintainer: Debian X Strike Force +Architecture: i386 +Source: xorg-server +Version: 2:1.7.7-8 +Breaks: xserver-xorg-video-6 +Filename: pool/main/x/xorg-server/xserver-xorg-core_1.7.7-8_i386.deb +Size: 2405050 +MD5sum: 976ddb13473e52903dd839d1f7ec390b +Description: Xorg X server - core server diff --git a/test/integration/status-xorg-break-providers b/test/integration/status-xorg-break-providers new file mode 100644 index 000000000..c6373518f --- /dev/null +++ b/test/integration/status-xorg-break-providers @@ -0,0 +1,22 @@ +Package: xserver-xorg-core +Status: install ok installed +Priority: optional +Section: x11 +Installed-Size: 4436 +Maintainer: Debian X Strike Force +Architecture: i386 +Source: xorg-server +Version: 2:1.7.7-8 +Breaks: xserver-xorg-video-5 +Description: Xorg X server - core server + +Package: xserver-xorg-video-intel +Status: install ok installed +Priority: optional +Section: x11 +Installed-Size: 1268 +Maintainer: Debian X Strike Force +Architecture: i386 +Version: 2:2.13.0-2 +Provides: xserver-xorg-video-6 +Description: X.Org X server -- Intel i8xx, i9xx display driver diff --git a/test/integration/test-xorg-break-providers b/test/integration/test-xorg-break-providers new file mode 100755 index 000000000..139d2c915 --- /dev/null +++ b/test/integration/test-xorg-break-providers @@ -0,0 +1,43 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture "i386" +setupaptarchive + +# the new xserver-xorg-core breaks xserver-xorg-video-6 +# which both -intel (installed) and -vesa (not installed) +# provided in their old version. +# The test ensures that only -intel will be upgraded +# (together with -core of course) and -vesa not touched. + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + xserver-xorg-video-intel +The following packages will be upgraded: + xserver-xorg-core xserver-xorg-video-intel +2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Need to get 0 B/2992 kB of archives. +After this operation, 24.6 kB of additional disk space will be used. +E: Trivial Only specified but this is not a trivial operation.' aptget install xserver-xorg-core --trivial-only + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be upgraded: + xserver-xorg-core xserver-xorg-video-intel +2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Need to get 0 B/2992 kB of archives. +After this operation, 24.6 kB of additional disk space will be used. +E: Trivial Only specified but this is not a trivial operation.' aptget upgrade --trivial-only + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be upgraded: + xserver-xorg-core xserver-xorg-video-intel +2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Need to get 0 B/2992 kB of archives. +After this operation, 24.6 kB of additional disk space will be used. +E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only -- cgit v1.2.3 From 3cf1e4b50a9bb439c4f54a631cfebbb6c4d1ea7d Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 13 Nov 2010 13:26:31 +0100 Subject: =?UTF-8?q?Slovenian=20update=20by=20Andrej=20=C5=BDnidar=C5=A1i?= =?UTF-8?q?=C4=8D=20and=20Rosetta=20Slovenian=20team?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 3 + po/sl.po | 1576 ++++++++++++++++++++++++++---------------------------- 2 files changed, 774 insertions(+), 805 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52581d8c9..d0bfaa389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ apt (0.8.9) UNRELEASED; urgency=low Cyril Brulebois for bashing me. * Drop useless untranslatable sections from apt.8 + [ Programs translations ] + * Slovenian update by Andrej Žnidaršič and Rosetta Slovenian team + [ David Kalnischkies ] * apt-pkg/aptconfiguration.cc: - evaluate Acquire::Languages= before LANG= (Closes: #602573) diff --git a/po/sl.po b/po/sl.po index 9b23a5142..8fcad1f86 100644 --- a/po/sl.po +++ b/po/sl.po @@ -5,69 +5,73 @@ msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-28 17:23+0200\n" -"PO-Revision-Date: 2005-02-16 22:18+0100\n" -"Last-Translator: Jure Cuhalev \n" +"PO-Revision-Date: 2010-09-05 20:35+0100\n" +"Last-Translator: Andrej ®nidarąič \n" "Language-Team: Slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\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-09-04 12:16+0000\n" +"X-Generator: Launchpad (build Unknown)\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" #: cmdline/apt-cache.cc:156 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Paket %s razliica %s ima nereene odvisnosti:\n" +msgstr "Paket %s različica %s ima nereąene odvisnosti:\n" #: cmdline/apt-cache.cc:284 msgid "Total package names: " -msgstr "Vseh imen paketov:" +msgstr "Vseh imen paketov: " #: cmdline/apt-cache.cc:286 -#, fuzzy msgid "Total package structures: " -msgstr "Vseh imen paketov:" +msgstr "Skupno struktur paketov" #: cmdline/apt-cache.cc:326 msgid " Normal packages: " -msgstr " Navadni paketi:" +msgstr " Običajni paketi: " #: cmdline/apt-cache.cc:327 msgid " Pure virtual packages: " -msgstr " isti navidezni paketi:" +msgstr " Čisti navidezni paketi: " #: cmdline/apt-cache.cc:328 msgid " Single virtual packages: " -msgstr " Posamezni navidezni paketi:" +msgstr " Posamezni navidezni paketi: " #: cmdline/apt-cache.cc:329 msgid " Mixed virtual packages: " -msgstr " Meani navidezni paketi:" +msgstr " Meąani navidezni paketi: " #: cmdline/apt-cache.cc:330 msgid " Missing: " -msgstr " Manjka: " +msgstr " Manjka: " #: cmdline/apt-cache.cc:332 msgid "Total distinct versions: " -msgstr "Vseh razliic:" +msgstr "Vseh različic: " #: cmdline/apt-cache.cc:334 -#, fuzzy msgid "Total distinct descriptions: " -msgstr "Vseh razliic:" +msgstr "Skupno različnih opisov:" #: cmdline/apt-cache.cc:336 msgid "Total dependencies: " -msgstr "Vseh odvisnosti:" +msgstr "Vseh odvisnosti: " #: cmdline/apt-cache.cc:339 msgid "Total ver/file relations: " -msgstr "Vseh povezava Raz/Dat:" +msgstr "Vseh povezav Raz/Dat: " #: cmdline/apt-cache.cc:341 -#, fuzzy msgid "Total Desc/File relations: " -msgstr "Vseh povezava Raz/Dat:" +msgstr "Skupno razmerij opisov/datotek:" #: cmdline/apt-cache.cc:343 msgid "Total Provides mappings: " @@ -75,11 +79,11 @@ msgstr "Vseh dobljenih preslikav: " #: cmdline/apt-cache.cc:355 msgid "Total globbed strings: " -msgstr "Vseh razirjenih nizov: " +msgstr "Vseh raząirjenih nizov: " #: cmdline/apt-cache.cc:369 msgid "Total dependency version space: " -msgstr "Celotna velikost z odvisnostmi: " +msgstr "Celotna velikost z odvisnostmi različice: " #: cmdline/apt-cache.cc:374 msgid "Total slack space: " @@ -87,35 +91,34 @@ msgstr "Celotna ohlapna velikost: " #: cmdline/apt-cache.cc:382 msgid "Total space accounted for: " -msgstr "Celotna velikost, izraunana za: " +msgstr "Celotna velikost, izračunana za: " #: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194 #, c-format msgid "Package file %s is out of sync." -msgstr "Paketna datoteka %s ni usklajena." +msgstr "Datoteka paketa %s ni usklajena." #: cmdline/apt-cache.cc:1273 -#, fuzzy msgid "You must give at least one search pattern" -msgstr "Podati morate natanno en vzorec" +msgstr "Podati morate vsaj en iskalni vzorec" #: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431 #: cmdline/apt-cache.cc:1508 msgid "No packages found" -msgstr "Nobena datoteka ni bila najdena" +msgstr "Nobena paket ni bil najden" #: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440 #, c-format msgid "Unable to locate package %s" -msgstr "Ne najdem paketa %s" +msgstr "Ni mogoče najti paketa %s" #: cmdline/apt-cache.cc:1533 msgid "Package files:" -msgstr "Paketne datoteke:" +msgstr "Datoteke paketa:" #: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Predpomnilnik ni usklajen, x-ref paketne datotek ni mogo" +msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogoč" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1554 @@ -124,15 +127,15 @@ msgstr "Pripeti paketi:" #: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618 msgid "(not found)" -msgstr "(ni najden)" +msgstr "(ni najdeno)" #: cmdline/apt-cache.cc:1575 msgid " Installed: " -msgstr " Nameen: " +msgstr " Nameąčen: " #: cmdline/apt-cache.cc:1576 msgid " Candidate: " -msgstr " Kandidat:" +msgstr " Kandidat: " #: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608 msgid "(none)" @@ -140,22 +143,21 @@ msgstr "(brez)" #: cmdline/apt-cache.cc:1615 msgid " Package pin: " -msgstr " Zaponka paketa:" +msgstr " Bucika paketa:" #. Show the priority tables #: cmdline/apt-cache.cc:1624 msgid " Version table:" -msgstr " Tabela razliic:" +msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 #: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144 -#, fuzzy, c-format +#, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s za %s %s preveden na %s %s\n" +msgstr "%s %s za %s preveden na %s %s\n" #: cmdline/apt-cache.cc:1745 -#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -194,62 +196,59 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"Uporaba: apt-cache [monosti] ukaz\n" -" apt-cache [monosti] add dat1 [dat2 ...]\n" -" apt-cache [monosti] showpkg pak1 [pak2 ...]\n" -" apt-cache [monosti] showsrc pak1 [pak2 ...]\n" +"Uporaba: apt-cache [moľnosti] ukaz\n" +" apt-cache [moľnosti] add datoteka1 [datoteka2 ...]\n" +" apt-cache [moľnosti] showpkg paket1 [paket2 ...]\n" +" apt-cache [moľnosti] showsrc paket 1 [paket2 ...]\n" "\n" -"apt-cache je orodje za upravljanje binarnih datotek v APT-jevem\n" -"pomnilniku in za pridobivanje informacij o njih\n" +"apt-cache je orodje nizke ravni, ki se uporablja za upravljanje APT-ovih\n" +"binarnih datotek predpomnilnika in za poizvedbo podatkov iz njih\n" "\n" -"Ukazi:\n" -" add - Doda paketno datoteko v izvorni pomnilnik\n" -" gencaches - Zgradi paket in izvorni pomnilnik\n" -" showpkg - Prikae osnovne informacije o paketu\n" -" showsrc - Prikae izvorne zapise\n" -" stats - Prikae osnovno statistiko\n" -" dump - Prikae celotno datoteko v jedrnati obliki\n" -" dumpavail - Razpololjivo datoteko izpie v stdout\n" -" unmet - Prikae nereene odvisnosti\n" -" search - Poie vzorec v seznamu paketov\n" -" show - Prikae berljiv zapis o paketu\n" -" depends - Prikae grobe informacije o odvisnostih paketa\n" -" rdepends - Prikae informacije o odvisnostih paketa za nazaj\n" -" pkgnames - Prikae seznam vsem paketov\n" -" dotty - Ustvari grafe paketov za GraphViz\n" -" xvcg - Ustvari grafe paketov za xvcg\n" -" policy - Prikae politiko nastavitev\n" +"Ukazi: add - dodat datoteko paketa v predpomnilnik vira\n" +" gencaches - izgradi tako paket kot izvorni predpomnilnik\n" +" showpkg - pokaľe nekaj sploąnih podatkov za posamezen paket\n" +" showsrc - pokaľe zapise vira\n" +" stats - pokaľe nekaj osnovne statistike\n" +" dump - pokaľe celotno datoteko v obliki terse\n" +" dumpavail - izpiąe razpoloľljivo datoteko na standardni izhod\n" +" unmet - pokaľe nerazreąene odvisnosti\n" +" search - iąče seznam paketov za vzorec logičnega izraza\n" +" show - iąče berljiv zapis paketa\n" +" showauto - pokaľe seznam samodejno nameąčenih paketov\n" +" depends - pokaľe surove podatke odvisnosti za paket\n" +" rdepends - pokaľe obratne podatke odvisnosti za paket\n" +" pkgnames - naąteje imena vseh paketov na sistemu\n" +" dotty - ustvari grafe paketov za GraphViz\n" +" xvcg - ustvari grafe paketov za xvcg\n" +" policy - pokaľe nastavitve pravil\n" "\n" -"Monosti:\n" -" -h To besedilo.\n" -" -p=? Pomnilnik paketov.\n" -" -s=? Pomnilnik virov.\n" -" -q Onemogoi kazalec napredka.\n" -" -i Prikae samo pomembne odvisnosti za nereen ukaz.\n" -" -c=? Prebere podano datoteko z nastavitvami\n" -" -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" -"Za ve informacij si oglejte strani man apt-cache(8) in apt.conf(5).\n" +"Moľnosti:\n" +" -h to besedilo pomoči\n" +" -p=? predpomnilnik paketa\n" +" -s=? predpomnilnik vira\n" +" -q onemogoči pokazatelj napredka\n" +" -i pokaľe le pomembne odvisnosti za ukaz unmet.\n" +" -c=? prebere podano datoteko nastavitev\n" +" -o=? nastavi poljubno moľnost nastavitev, na primer -o dir::cache=/tmp\n" +"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt-conf" +"(5).\n" #: cmdline/apt-cdrom.cc:77 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "" +msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'" #: cmdline/apt-cdrom.cc:92 -#, fuzzy msgid "Please insert a Disc in the drive and press enter" -msgstr "" -"Sprememba medija: vstavite disk z oznako\n" -" '%s'\n" -"v enoto '%s' in pritisnite enter\n" +msgstr "Vstavite disk v pogon in pritisnite vnosno tipko" #: cmdline/apt-cdrom.cc:127 -#, fuzzy, c-format +#, c-format msgid "Failed to mount '%s' to '%s'" -msgstr "Ni mogoe preimenovati %s v %s" +msgstr "Priklapljanje '%s' na '%s' je spodletelo" #: cmdline/apt-cdrom.cc:162 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "Ponovi to opravilo za preostanek CD-jev v vaąi zbirki." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -270,18 +269,19 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Uporaba: apt-config [monosti] ukaz\n" +"Uporaba: apt-config [moľnosti] ukaz\n" "\n" "apt-config je preprosto orodje za branje nastavitvene datoteke APT\n" "\n" "Ukazi:\n" -" shell - Lupinski nain\n" -" dump - Prikae nastavitve\n" +" shell - Lupinski način\n" +" dump - Prikaľe nastavitve\n" "\n" -"Monosti:\n" -" -h To besedilo.\n" +"Moľnosti:\n" +" -h To besedilo pomoči.\n" " -c=? Prebere podano datoteko z nastavitvami\n" -" -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" +" -o=? Nastavi poljubno nastavitveno moľnost, na primer. -o dir::cache=/" +"tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -303,50 +303,50 @@ msgid "" msgstr "" "Uporaba: apt-extracttemplates dat1 [dat2 ...]\n" "\n" -"apt-extracttemplates je orodje za pridobivanje informacij o\n" +"apt-extracttemplates je orodje za pridobivanje podatkov o\n" "nastavitvah in predlogah debianovih paketov\n" "\n" -"Monosti:\n" -" -h To besedilo\n" -" -t Nastavi zaasni imenik\n" +"Moľnosti:\n" +" -h To besedilo pomoči\n" +" -t Nastavi začasno mapo\n" " -c=? Prebere podano datoteko z nastavitvami\n" -" -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" +" -o=? Nastavi poljubno nastavitveno moľnost, na primer. -o dir::cache=/" +"tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171 #, c-format msgid "Unable to write to %s" -msgstr "Ni mogoe pisati na %s" +msgstr "Ni mogoče pisati na %s" #: cmdline/apt-extracttemplates.cc:309 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Ni mogoe ugotoviti razliice debconfa. Je sploh nameen?" +msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameąčen?" #: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347 msgid "Package extension list is too long" -msgstr "Seznam raziritev paketov je predolg" +msgstr "Seznam raząiritev paketov je predolg" #: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189 #: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262 #: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298 #, c-format msgid "Error processing directory %s" -msgstr "Napaka pri obdelavi imenika %s" +msgstr "Napaka med obdelavo mape %s" #: ftparchive/apt-ftparchive.cc:260 msgid "Source extension list is too long" -msgstr "Seznam raziritev virov je predolg" +msgstr "Seznam raząiritev virov je predolg" #: ftparchive/apt-ftparchive.cc:377 msgid "Error writing header to contents file" -msgstr "Napaka pri pisanju glave v vsebinsko datoteko" +msgstr "Napaka med pisanjem glave v datoteko vsebine" #: ftparchive/apt-ftparchive.cc:407 #, c-format msgid "Error processing contents %s" -msgstr "Napaka pri obdelavi vsebine %s" +msgstr "Napaka med obdelavo vsebine %s" #: ftparchive/apt-ftparchive.cc:595 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -387,44 +387,44 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Uporaba: apt-ftparchive [monosti] ukaz\n" -"Ukazi: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" +"Uporaba: apt-ftparchive [moľnosti] ukaz\n" +"Ukazi: packages, binarypath [datoteka prepisa [predpona poti]]\n" +" sources srcpath [datoteka prepisa [predpona poti]]\n" +" contents path\n" +" release path\n" +" generate config [skupine]\n" +" clean config\n" "\n" -"apt-ftparchive ustvari kazalo Debianovih arhivov. Podpira tevilne\n" -"sloge ustvarjanja, od popolnoma samodejnih do enakovrednih zamenjav\n" +"apt-ftparchive ustvari datoteke kazala za arhive Debian. Podpira\n" +"več slogov ustvarjanja od popolnoma samodejnih do funkcionalnih zamenjav\n" "za dpkg-scanpackages in dpkg-scansources\n" "\n" -"apt-ftparchive ustvari paketne datoteke z drevesa .deb-ov. Paketna\n" -"datoteka hrani vsebino vseh nadzornih polj vsakega paketa in tudi\n" -"razpreno kodo MD5 ter velikost datoteke. Prekrivna datoteka\n" -"lahko vsili vrednost Prioriteta in Odsek.\n" +"apt-ftparchive ustvari datoteke paketov iz drevesa .debs. Datoteka\n" +"paketa vsebuje vsebino vseh nadzornih polj iz vsakega paketa kot tudi\n" +"razprąilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n" +"vrednosti Prednosti in Odseka.\n" "\n" -"Podobno apt-ftparchive ustvari tudi izvorne datoteke iz .dsc-jev.\n" -"Monost --source-override lahko nastavi prekrivno datoteko.\n" +"Podobno apt-ftparchive ustvari datoteke paketov iz drevesa .dscs.\n" +"Moľnost --source-override je mogoče uporabiti za navedbo datoteke prepisa " +"src\n" "\n" -"Ukaz 'paketi' in 'izvorne datoteke' se uporablja v korenu drevesa.\n" -"BinarnaPot mora kazati na osnovo rekurzivnega iskanja, prekrivna\n" -"datoteka pa naj vsebuje prekrivne zastavice. Predponapoti se\n" -"doda poljem z imeni datotek, e je podana. Primer uporabe iz\n" -"Debianovega arhiva:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" +"Ukaza 'packages' in 'sources' je treba zagnati v korenu drevesa.\n" +"BinaryPath bi morala kazati na osnovno mapo rekurzivnega iskanja in\n" +"datoteka prepisa bi morala vsebovati zastavice prepisa Predpona je pripeta\n" +"v polja imena datoteke, če je prisotna. Primer uporabe iz arhiva Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" "\n" -"Monosti:\n" -" -h To besedilo\n" -" --md5 Nadzoruje ustvarjanje MD5\n" -" -s=? Prekrivna datoteka izvorne datoteke\n" -" -q Tiho\n" -" -d=? Izbere poljubno pomnilniko zbirko\n" -" --no-delink Omogoi razhroevalni nain z razvezovanjem\n" -" --contents Nadzoruje ustvarjanje vsebinskih datotek\n" -" -c=? Prebere podano datoteko z nastavitvami\n" -" -o=? Nastavi poljubno nastavitveno monost" +"Moľnosti:\n" +" -h To besedilo pomoči\n" +" --md5 ustvarjanje nadzorne vsote MD5\n" +" -s=? datoteka prepisa vira\n" +" -q tiho\n" +" -d=? izbere izbirno podatkovno zbirko pomnilnika\n" +" --no-delink omogoči način razhroąčevanja razvezovanja\n" +" --contents nadzira ustvarjanje datoteke vsebine\n" +" -c=? prebere to nastavitveno datoteko\n" +" -o=? nastavi poljubno moľnost nastavitve" #: ftparchive/apt-ftparchive.cc:801 msgid "No selections matched" @@ -433,34 +433,35 @@ msgstr "Nobena izbira se ne ujema" #: ftparchive/apt-ftparchive.cc:879 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Nekatere datoteke manjkajo v skupini paketnih datotek '%s'" +msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'" #: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "ZP je pokvarjena, datoteka je preimenovana v %s.old" +msgstr "PZ je pokvarjena, datoteka je preimenovana v %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "ZP je stara, poskuam nadgraditi %s" +msgstr "PZ je star, poskuąanje nadgradnje %s" #: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" +"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejąe različice apt, podatkovno zbirko odstranite in jo znova ustvarite." #: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Ni mogoe odprti datoteke ZP %s: %s" +msgstr "Ni mogoče odprti datoteke PZ %s: %s" #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" -msgstr "Napaka pri postavitvi %s" +msgstr "Napaka med določitvijo %s" #: ftparchive/cachedb.cc:242 msgid "Archive has no control record" @@ -468,17 +469,17 @@ msgstr "Arhiv nima nadzornega zapisa" #: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" -msgstr "Ni mogoe najti kazalca" +msgstr "Ni mogoče najti kazalke" #: ftparchive/writer.cc:73 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "O: ni mogoe brati imenika %s\n" +msgstr "O: ni mogoče brati mape %s\n" #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to stat %s\n" -msgstr "O: Ni mogoe nastaviti %s\n" +msgstr "O: Ni mogoče določiti %s\n" #: ftparchive/writer.cc:134 msgid "E: " @@ -490,46 +491,46 @@ msgstr "O: " #: ftparchive/writer.cc:143 msgid "E: Errors apply to file " -msgstr "N: Napake se sklicujejo na datoteko" +msgstr "N: Napake se sklicujejo na datoteko " #: ftparchive/writer.cc:161 ftparchive/writer.cc:193 #, c-format msgid "Failed to resolve %s" -msgstr "Ni mogoe razreiti %s" +msgstr "Ni mogoče razreąiti %s" #: ftparchive/writer.cc:174 msgid "Tree walking failed" -msgstr "Hoja drevesa ni uspela" +msgstr "Hoja drevesa je spodletela" #: ftparchive/writer.cc:201 #, c-format msgid "Failed to open %s" -msgstr "Ni mogoe odprti %s" +msgstr "Ni mogoče odprti %s" #: ftparchive/writer.cc:260 #, c-format msgid " DeLink %s [%s]\n" -msgstr " RazVei %s [%s]\n" +msgstr " RazVeľi %s [%s]\n" #: ftparchive/writer.cc:268 #, c-format msgid "Failed to readlink %s" -msgstr "Napaka pri branju povezave %s" +msgstr "Napaka med branjem povezave %s" #: ftparchive/writer.cc:272 #, c-format msgid "Failed to unlink %s" -msgstr "Napaka pri odvezovanju %s" +msgstr "Napaka med odvezovanjem %s" #: ftparchive/writer.cc:279 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Napaka pri povezovanju %s z %s" +msgstr "*** Napaka med povezovanju %s z %s" #: ftparchive/writer.cc:289 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " Doseena meja RazVezovanja %sB.\n" +msgstr " Doseľena meja RazVezovanja %sB.\n" #: ftparchive/writer.cc:393 msgid "Archive had no package field" @@ -538,56 +539,56 @@ msgstr "Arhiv ni imel polja s paketom" #: ftparchive/writer.cc:401 ftparchive/writer.cc:688 #, c-format msgid " %s has no override entry\n" -msgstr " %s nima prekrivnega vnosa\n" +msgstr " %s nima prepisanega vnosa\n" #: ftparchive/writer.cc:464 ftparchive/writer.cc:793 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " Vzdrevalec %s je %s in ne %s\n" +msgstr " Vzdrľevalec %s je %s in ne %s\n" #: ftparchive/writer.cc:698 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s nima prekrivnega vnosa\n" +msgstr " %s nima izvornega vnosa prepisa\n" #: ftparchive/writer.cc:702 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s nima prekrivnega vnosa\n" +msgstr " %s nima tudi binarnega vnosa prepisa\n" #: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Notranja napaka. Ni mogoe najti lana %s." +msgstr "Notranja napaka. Ni mogoče najti člana %s." #: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Napaka pri dodeljevanju prostora" +msgstr "realloc - Napaka med dodeljevanjem pomnilnika" #: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" -msgstr "Ne morem odpreti %s" +msgstr "Ni mogoče odpreti %s" #: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Napano prekrivanje %s vrstica %lu #1" +msgstr "Napačno oblikovana prepisana vrstica %s %lu #1" #: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Napano prekrivanje %s vrstica %lu #2" +msgstr "Napačno oblikovana prepisana vrstica %s %lu #2" #: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Napano prekrivanje %s vrstica %lu #3" +msgstr "Napačno oblikovanje prepisane vrstice %s %lu #3" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Napaka pri branju prekrite datoteke %s" +msgstr "Napaka med branjem preprisane datoteke %s" #: ftparchive/multicompress.cc:72 #, c-format @@ -601,7 +602,7 @@ msgstr "Stisnjen izhod %s potrebuje niz stiskanja" #: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Ustvarjanje pipe IPC podprocesa ni uspelo" +msgstr "Ustvarjanje cevi IPC podopravila ni uspelo" #: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" @@ -613,42 +614,42 @@ msgstr "Vejitev ni uspela" #: ftparchive/multicompress.cc:212 msgid "Compress child" -msgstr "Otrok stiskanja" +msgstr "Podrejeni predmet stiskanja" #: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "Notranja napaka. Ni mogoe ustvariti %s" +msgstr "Notranja napaka. Ni mogoče ustvariti %s" #: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Ni mogoe ustvariti podprocesa IPD" +msgstr "Ni mogoče ustvariti podopravila IPD" #: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Ni mogoe izvesti stiskanja" +msgstr "Ni mogoče izvesti stiskanja " #: ftparchive/multicompress.cc:360 msgid "decompressor" -msgstr "program za dekompresijo" +msgstr "program za raząirjanje" #: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "IO podprocesa/datoteke je spodletel" +msgstr "VI podopravila/datoteke je spodletel" #: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Med raunanjem MD5 ni mogoe brati" +msgstr "Med računanjem MD5 ni mogoče brati" #: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "Napaka pri odvezovanju %s" +msgstr "Napaka med odvezovanjem %s" #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" -msgstr "Ni mogoe preimenovati %s v %s" +msgstr "Ni mogoče preimenovati %s v %s" #: cmdline/apt-get.cc:135 msgid "Y" @@ -657,21 +658,21 @@ msgstr "Y" #: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29 #, c-format msgid "Regex compilation error - %s" -msgstr "Napaka pri prevajanju regex - %s" +msgstr "Napaka med prevajanjem logičnega izraza - %s" #: cmdline/apt-get.cc:252 msgid "The following packages have unmet dependencies:" -msgstr "Naslednji paketi imajo nereene odvisnosti:" +msgstr "Naslednji paketi imajo nereąene odvisnosti:" #: cmdline/apt-get.cc:342 #, c-format msgid "but %s is installed" -msgstr "vendar je paket %s nameen" +msgstr "vendar je paket %s nameąčen" #: cmdline/apt-get.cc:344 #, c-format msgid "but %s is to be installed" -msgstr "vendar bo paket %s nameen" +msgstr "vendar bo paket %s nameąčen" #: cmdline/apt-get.cc:351 msgid "but it is not installable" @@ -683,11 +684,11 @@ msgstr "vendar je navidezen paket" #: cmdline/apt-get.cc:356 msgid "but it is not installed" -msgstr "vendar ni nameen" +msgstr "vendar ni nameąčen" #: cmdline/apt-get.cc:356 msgid "but it is not going to be installed" -msgstr "vendar ne bo nameen" +msgstr "vendar ne bo nameąčen" #: cmdline/apt-get.cc:361 msgid " or" @@ -695,15 +696,15 @@ msgstr " ali" #: cmdline/apt-get.cc:392 msgid "The following NEW packages will be installed:" -msgstr "Naslednji NOVI paketi bodo nameeni:" +msgstr "Naslednji NOVI paketi bodo nameąčeni:" #: cmdline/apt-get.cc:420 msgid "The following packages will be REMOVED:" -msgstr "Naslednji novi paketi bodo ODSTRANJENI:" +msgstr "Naslednji paketi bodo ODSTRANJENI:" #: cmdline/apt-get.cc:442 msgid "The following packages have been kept back:" -msgstr "Naslednji paketi so bili zadrani:" +msgstr "Naslednji paketi so bili zadrľani:" #: cmdline/apt-get.cc:465 msgid "The following packages will be upgraded:" @@ -715,7 +716,7 @@ msgstr "Naslednji paketi bodo POSTARANI:" #: cmdline/apt-get.cc:508 msgid "The following held packages will be changed:" -msgstr "Naslednji zadrani paketi bodo spremenjeni:" +msgstr "Naslednji zadrľani paketi bodo spremenjeni:" #: cmdline/apt-get.cc:561 #, c-format @@ -723,18 +724,17 @@ msgid "%s (due to %s) " msgstr "%s (zaradi %s) " #: cmdline/apt-get.cc:569 -#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n" -"To NI priporoljivo, razen e natanno veste, kaj ponete." +"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" +"Tega NE storite, razen če ne veste natanko kaj počenjate!" #: cmdline/apt-get.cc:603 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu nadgrajenih, %lu na novo nameenih, " +msgstr "%lu nadgrajenih, %lu na novo nameąčenih, " #: cmdline/apt-get.cc:607 #, c-format @@ -754,22 +754,22 @@ msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" #: cmdline/apt-get.cc:615 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu ne popolnoma nameenih ali odstranjenih.\n" +msgstr "%lu ne popolnoma nameąčenih ali odstranjenih.\n" #: cmdline/apt-get.cc:635 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for task '%s'\n" -msgstr "Opomba: izbran %s namesto regex '%s'\n" +msgstr "Izbiranje '%s' za nalogo '%s'\n" #: cmdline/apt-get.cc:641 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for regex '%s'\n" -msgstr "Opomba: izbran %s namesto regex '%s'\n" +msgstr "Izbiranje '%s' za logični izraz '%s'\n" #: cmdline/apt-get.cc:648 -#, fuzzy, c-format +#, c-format msgid "Selected version '%s' (%s) for '%s'\n" -msgstr "Izbrana razliica %s (%s) za %s\n" +msgstr "Izbrana različica '%s' (%s) za '%s'\n" #: cmdline/apt-get.cc:658 #, c-format @@ -778,16 +778,15 @@ msgstr "Paket %s je navidezen in ga je priskrbel:\n" #: cmdline/apt-get.cc:669 msgid " [Installed]" -msgstr " [Nameeno]" +msgstr " [Nameąčeno]" #: cmdline/apt-get.cc:678 -#, fuzzy msgid " [Not candidate version]" -msgstr "Razliice kandidatov" +msgstr "[Ni različica kandidata]" #: cmdline/apt-get.cc:680 msgid "You should explicitly select one to install." -msgstr "Sami izberite paket, ki ga elite namestiti." +msgstr "Sami izberite paket, ki ga ľelite namestiti." #: cmdline/apt-get.cc:683 #, c-format @@ -796,58 +795,58 @@ msgid "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"Paket %s nima navedene razliice, vendar se nek drug paket nanaa nanj.\n" +"Paket %s nima navedene različice, vendar se nanj nanaąa nek drug paket.\n" "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" #: cmdline/apt-get.cc:701 msgid "However the following packages replace it:" -msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" +msgstr "Vendar ga naslednji paketi nadomestijo:" #: cmdline/apt-get.cc:713 -#, fuzzy, c-format +#, c-format msgid "Package '%s' has no installation candidate" -msgstr "Paket %s nima kandidata za namestitev" +msgstr "Paket '%s' nima namestitvenega kandidata" #: cmdline/apt-get.cc:724 #, c-format msgid "Virtual packages like '%s' can't be removed\n" -msgstr "" +msgstr "Navideznih paketov kot je '%s' ni mogoče odstraniti\n" #: cmdline/apt-get.cc:755 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' instead of '%s'\n" -msgstr "Opomba: izbran %s namesto %s \n" +msgstr "Izbiranje '%s' namesto '%s'\n" #: cmdline/apt-get.cc:785 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "%s preskoen, ker je e nameen in ne potrebuje nadgradnje.\n" +msgstr "%s je preskočen, ker je ľe nameąčen in ne potrebuje nadgradnje.\n" #: cmdline/apt-get.cc:789 -#, fuzzy, c-format +#, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -msgstr "%s preskoen, ker je e nameen in ne potrebuje nadgradnje.\n" +msgstr "Preskok %s, ni nameąčen in zahtevane so le nadgradnje.\n" #: cmdline/apt-get.cc:799 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Ponovna namestitev %s ni mona, ker ni moen prenos.\n" +msgstr "Ponovna namestitev %s ni moľna, ker prejem ni moľen.\n" #: cmdline/apt-get.cc:804 #, c-format msgid "%s is already the newest version.\n" -msgstr "Najnoveja razliica %s je e nameena.\n" +msgstr "Najnovejąa različica %s je ľe nameąčena.\n" #: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992 -#, fuzzy, c-format +#, c-format msgid "%s set to manually installed.\n" -msgstr "vendar bo paket %s nameen" +msgstr "%s je bil nastavljen na ročno nameąčen.\n" #: cmdline/apt-get.cc:863 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Paket %s ni nameen, zato ni odstranjen\n" +msgstr "Paket %s ni nameąčen, zato ni odstranjen\n" #: cmdline/apt-get.cc:938 msgid "Correcting dependencies..." @@ -859,11 +858,11 @@ msgstr " spodletelo." #: cmdline/apt-get.cc:944 msgid "Unable to correct dependencies" -msgstr "Ni mogoe popraviti odvisnosti" +msgstr "Ni mogoče popraviti odvisnosti" #: cmdline/apt-get.cc:947 msgid "Unable to minimize the upgrade set" -msgstr "Ni mogoe pomanjati zbirke za nadgradnjo" +msgstr "Ni mogoče pomanjąati zbirke za nadgradnjo" #: cmdline/apt-get.cc:949 msgid " Done" @@ -871,48 +870,47 @@ msgstr " Opravljeno" #: cmdline/apt-get.cc:953 msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "e elite popraviti napake, poskusite pognati 'apt-get -f install'." +msgstr "Če ľelite popraviti napake, poskusite pognati 'apt-get -f install'." #: cmdline/apt-get.cc:956 msgid "Unmet dependencies. Try using -f." -msgstr "Nereene odvisnosti. Poskusite uporabiti -f." +msgstr "Nereąene odvisnosti. Poskusite uporabiti -f." #: cmdline/apt-get.cc:981 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "POZORO: Naslednjih paketov ni bilo mogoe avtenticirati!" +msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!" #: cmdline/apt-get.cc:985 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Opozorilo overitve je bilo prepisano.\n" #: cmdline/apt-get.cc:992 msgid "Install these packages without verification [y/N]? " -msgstr "Namestim te pakete brez prevejanje [y/N]? " +msgstr "Ali ľelite te pakete namestiti brez prevejanja [y/N]? " #: cmdline/apt-get.cc:994 msgid "Some packages could not be authenticated" -msgstr "Nisem uspel avtenticirati nekaterih paketkov" +msgstr "Nekaterih paketkov bi bilo mogoče overiti" #: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166 msgid "There are problems and -y was used without --force-yes" -msgstr "Prilo je do teav in -y je bil uporabljen brez --force-yes" +msgstr "Priąlo je do teľav in -y je bil uporabljen brez --force-yes" #: cmdline/apt-get.cc:1044 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!" #: cmdline/apt-get.cc:1053 msgid "Packages need to be removed but remove is disabled." -msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." +msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno." #: cmdline/apt-get.cc:1064 -#, fuzzy msgid "Internal error, Ordering didn't finish" -msgstr "Notranja napaka pri dodajanju odklona" +msgstr "Notranja napaka, Urejanje se ni končalo" #: cmdline/apt-get.cc:1104 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "Kako čudno .. Velikosti se ne ujemata, poąljite sporočilo na apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -931,45 +929,45 @@ msgstr "Potrebno je dobiti %sB arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB #: cmdline/apt-get.cc:1123 -#, fuzzy, c-format +#, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" +msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB #: cmdline/apt-get.cc:1128 -#, fuzzy, c-format +#, c-format msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" +msgstr "Po tem opravilu bo sproąčenega %sB prostora na disku.\n" #: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332 #: cmdline/apt-get.cc:2335 -#, fuzzy, c-format +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Nimate dovolj prostora na %s" +msgstr "Ni mogoče določiti prostega prostora v %s" #: cmdline/apt-get.cc:1156 #, c-format msgid "You don't have enough free space in %s." -msgstr "V %s je premalo prostora." +msgstr "Na %s je premalo prostora." #: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Izbrana je monost Samo preprosto, a to opravilo ni preprosto." +msgstr "Navedena je moľnost Samo preprosto, a to opravilo ni preprosto." #: cmdline/apt-get.cc:1174 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" #: cmdline/apt-get.cc:1176 -#, fuzzy, c-format +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Obstaja monost, da pokodujete va sistem.\n" -"Za nadaljevanje vnesite frazo '%s'\n" +"Naredili boste nekaj, kar je morda lahko ąkodljivo.\n" +"Za nadaljevanje vtipkajte frazo '%s'\n" " ?] " #: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201 @@ -978,27 +976,27 @@ msgstr "Prekini." #: cmdline/apt-get.cc:1197 msgid "Do you want to continue [Y/n]? " -msgstr "Ali elite nadaljevati [Y/n]? " +msgstr "Ali ľelite nadaljevati [Y/n]? " #: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Ni mogoe dobiti %s %s\n" +msgstr "Ni mogoče dobiti %s %s\n" #: cmdline/apt-get.cc:1287 msgid "Some files failed to download" -msgstr "Prenos nekaterih datotek ni uspel" +msgstr "Prejem nekaterih datotek ni uspel" #: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401 msgid "Download complete and in download only mode" -msgstr "Prenos dokonan in uporabljen nain samo prenos" +msgstr "Prejem je dokončan in uporabljen je način samo prejema" #: cmdline/apt-get.cc:1294 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Nekaterih arhivov ni mogoe dobiti. Poskusite uporabiti apt-get update ali --" +"Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." #: cmdline/apt-get.cc:1298 @@ -1007,7 +1005,7 @@ msgstr "--fix-missing in izmenjava medija trenutno nista podprta" #: cmdline/apt-get.cc:1303 msgid "Unable to correct missing packages." -msgstr "Ni mogoe popraviti manjkajoih paketov." +msgstr "Ni mogoče popraviti manjkajočih paketov." #: cmdline/apt-get.cc:1304 msgid "Aborting install." @@ -1021,63 +1019,81 @@ msgid_plural "" "The following packages disappeared from your system as\n" "all files have been overwritten by other packages:" msgstr[0] "" +"Naslednji paketi so izginili z vaąega sistema, ker so vse\n" +"datoteke prepisali drugi paketi:" msgstr[1] "" +"Naslednji paketi je izginil z vaąega sistema, ker so vse\n" +"datoteke prepisali drugi paketi:" +msgstr[2] "" +"Naslednja paketa sta izginila z vaąega sistema, ker so vse\n" +"datoteke prepisali drugi paketi:" +msgstr[3] "" +"Naslednji paketi so izginili z vaąega sistema, ker so vse\n" +"datoteke prepisali drugi paketi:" #: cmdline/apt-get.cc:1336 msgid "Note: This is done automatic and on purpose by dpkg." -msgstr "" +msgstr "Opomba: To je dpkg storil samodejno in namenoma." #: cmdline/apt-get.cc:1466 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" -msgstr "" +msgstr "Prezri nerazpoloľljiv cilj izdaje '%s' paketa '%s'" #: cmdline/apt-get.cc:1498 -#, fuzzy, c-format +#, c-format msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "Ni mogoe doloiti seznama izvornih paketov %s" +msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n" #. if (VerTag.empty() == false && Last == 0) #: cmdline/apt-get.cc:1536 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" +msgstr "Prezri nerazpoloľljivo različico '%s' paketa '%s'" #: cmdline/apt-get.cc:1552 msgid "The update command takes no arguments" -msgstr "Ukaz update ne potrebuje argumentov" +msgstr "Ukaz update ne sprejema argumentov" #: cmdline/apt-get.cc:1618 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" +"Program ne bi smel brisati stvari, ni mogoče zagnati " +"SamodejnegaOdstranjevalnika" #: cmdline/apt-get.cc:1666 -#, fuzzy msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" "The following packages were automatically installed and are no longer " "required:" -msgstr[0] "Naslednji NOVI paketi bodo nameeni:" -msgstr[1] "Naslednji NOVI paketi bodo nameeni:" +msgstr[0] "Naslednji paketi so bili samodejno nameąčeni in niso več zahtevani:" +msgstr[1] "Naslednji paket je bil samodejno nameąčen in ni več zahtevan:" +msgstr[2] "Naslednja paketa sta bila samodejno nameąčena in nista več zahtevana:" +msgstr[3] "Naslednji paketi so bili samodejno nameąčeni in niso več zahtevani:" #: cmdline/apt-get.cc:1670 -#, fuzzy, c-format +#, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" -msgstr[0] "Naslednji NOVI paketi bodo nameeni:" -msgstr[1] "Naslednji NOVI paketi bodo nameeni:" +msgstr[0] "%lu paketov je bilo samodejno nameąčenih in niso več zahtevane.\n" +msgstr[1] "%lu paket je bil samodejno nameąčen in ni bil več zahtevan.\n" +msgstr[2] "%lu paketa sta bila samodejno nameąčena in nista več zahtevana.\n" +msgstr[3] "%lu paketi so bili samodejno nameąčeni in niso več zahtevani.\n" #: cmdline/apt-get.cc:1672 msgid "Use 'apt-get autoremove' to remove them." -msgstr "" +msgstr "Uporabite 'apt-get autoremove' za njihovo odstranitev. " #: cmdline/apt-get.cc:1677 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" +"Videti je, da je SamodejniOdstranjevalnik nekaj uničil, kar se ne bi smelo " +"zgoditi\n" +"Poąljite poročilo o hroąču v apt. " #. #. if (Packages == 1) @@ -1091,12 +1107,11 @@ msgstr "" #. #: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822 msgid "The following information may help to resolve the situation:" -msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" +msgstr "Naslednji podatki vam bodo morda pomagali reąiti teľavo:" #: cmdline/apt-get.cc:1684 -#, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Notranja napaka zaradi AllUpgrade." +msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari" #: cmdline/apt-get.cc:1703 msgid "Internal error, AllUpgrade broke stuff" @@ -1104,15 +1119,14 @@ msgstr "Notranja napaka zaradi AllUpgrade." #: cmdline/apt-get.cc:1792 msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" +msgstr "" +"Poskusite zagnati 'apt-get -f install', če ľelite popraviti naslednje:" #: cmdline/apt-get.cc:1795 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." -msgstr "" -"Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " -"podajte reitev)." +msgstr "Nereąene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali navedite reąitev)." #: cmdline/apt-get.cc:1807 msgid "" @@ -1121,9 +1135,10 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"Nekaterih paketov ni mogoe namestiti. To lahko pomeni, da ste zahtevali\n" -"nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " -"paketi e niso ustvarjeni ali preneeni iz Prihajajoe." +"Nekaterih paketov ni mogoče namestiti. To lahko pomeni, da ste zahtevali\n" +"nemogoč poloľaj, če uporabljate nestabilno izdajo pa\n" +", da nekateri zahtevani paketi ąe niso ustvarjeni ali premaknjeni\n" +" iz Prihajajočega." #: cmdline/apt-get.cc:1825 msgid "Broken packages" @@ -1131,7 +1146,7 @@ msgstr "Pokvarjeni paketi" #: cmdline/apt-get.cc:1854 msgid "The following extra packages will be installed:" -msgstr "Naslednji dodatni paketi bodo nameeni:" +msgstr "Naslednji dodatni paketi bodo nameąčeni:" #: cmdline/apt-get.cc:1944 msgid "Suggested packages:" @@ -1139,21 +1154,21 @@ msgstr "Predlagani paketi:" #: cmdline/apt-get.cc:1945 msgid "Recommended packages:" -msgstr "Priporoeni paketi:" +msgstr "Priporočeni paketi:" #: cmdline/apt-get.cc:1987 #, c-format msgid "Couldn't find package %s" -msgstr "Ni mogoe najti paketa %s" +msgstr "Ni mogoče najti paketa %s" #: cmdline/apt-get.cc:1994 -#, fuzzy, c-format +#, c-format msgid "%s set to automatically installed.\n" -msgstr "vendar bo paket %s nameen" +msgstr "%s je nastavljen na samodejno nameąčen.\n" #: cmdline/apt-get.cc:2015 msgid "Calculating upgrade... " -msgstr "Preraunavanje nadgradnje ... " +msgstr "Preračunavanje nadgradnje ... " #: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" @@ -1164,23 +1179,22 @@ msgid "Done" msgstr "Opravljeno" #: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098 -#, fuzzy msgid "Internal error, problem resolver broke stuff" -msgstr "Notranja napaka zaradi AllUpgrade." +msgstr "Notranja napaka, reąevalnik teľav je pokvaril stvari" #: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155 msgid "Unable to lock the download directory" -msgstr "Ni mogoe zakleniti imenika za prenose" +msgstr "Ni mogoče zakleniti mape prejemov" #: cmdline/apt-get.cc:2198 msgid "Must specify at least one package to fetch source for" msgstr "" -"Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo" +"Potrebno je navesti vsaj en paket, za katerega ľelite dobiti izvorno kodo" #: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519 #, c-format msgid "Unable to find a source package for %s" -msgstr "Izvornega paketa za %s ni mogoe najti" +msgstr "Izvornega paketa za %s ni mogoče najti" #: cmdline/apt-get.cc:2254 #, c-format @@ -1188,6 +1202,8 @@ msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" +"OPOMBA: pakiranje '%s' vzdrľevano v sistemu nadzora različice '%s' na:\n" +"%s\n" #: cmdline/apt-get.cc:2259 #, c-format @@ -1196,11 +1212,14 @@ msgid "" "bzr get %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" +"Uporabite:\n" +"bzr get %s\n" +"za pridobivanje zadnjih (morda neizdanih) posodobitev paketa.\n" #: cmdline/apt-get.cc:2310 -#, fuzzy, c-format +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" +msgstr "Preskok ľe prejete datoteke '%s'\n" #: cmdline/apt-get.cc:2345 #, c-format @@ -1228,12 +1247,12 @@ msgstr "Dobi vir %s\n" #: cmdline/apt-get.cc:2397 msgid "Failed to fetch some archives." -msgstr "Nekaterih arhivov ni mogoe dobiti." +msgstr "Nekaterih arhivov ni mogoče pridobiti." #: cmdline/apt-get.cc:2427 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" +msgstr "Odpakiranje ľe odpakiranih izvornih paketov v %s je bilo preskočeno\n" #: cmdline/apt-get.cc:2439 #, c-format @@ -1243,7 +1262,7 @@ msgstr "Ukaz odpakiranja '%s' ni uspel.\n" #: cmdline/apt-get.cc:2440 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Izberite, če je paket 'dpkg-dev' nameąčen.\n" #: cmdline/apt-get.cc:2457 #, c-format @@ -1252,18 +1271,18 @@ msgstr "Ukaz gradnje '%s' ni uspel.\n" #: cmdline/apt-get.cc:2477 msgid "Child process failed" -msgstr "Otroki proces ni uspel" +msgstr "Podrejeno opravilo ni uspelo" #: cmdline/apt-get.cc:2493 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti " +"Potrebno je navesti vsaj en paket, za katerega ľelite preveriti odvisnosti " "za gradnjo" #: cmdline/apt-get.cc:2524 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" +msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" #: cmdline/apt-get.cc:2544 #, c-format @@ -1275,7 +1294,7 @@ msgstr "%s nima odvisnosti za gradnjo.\n" msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" +msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" #: cmdline/apt-get.cc:2648 #, c-format @@ -1283,35 +1302,33 @@ msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " -"more zadostiti zahtevi po razliici" +"%s odvisnosti za %s ni mogoče zadostiti, ker nobena različica paketa %s ne " +"more zadostiti zahtevi po različici" #: cmdline/apt-get.cc:2684 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "" -"Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" +msgstr "Ni mogoče zadostiti %s odvisnosti za %s. Nameąčen paket %s je preveč nov" #: cmdline/apt-get.cc:2711 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" +msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s" #: cmdline/apt-get.cc:2727 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." +msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti." #: cmdline/apt-get.cc:2732 msgid "Failed to process build dependencies" -msgstr "Obdelava odvisnosti za gradnjo ni uspela" +msgstr "Obdelava odvisnosti za gradnjo je spodletela" #: cmdline/apt-get.cc:2763 msgid "Supported modules:" msgstr "Podprti moduli:" #: cmdline/apt-get.cc:2804 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1356,44 +1373,46 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Uporaba: apt-get [monosti] ukaz\n" -" apt-get [monosti] install|remove pak1 [pak2 ...]\n" -" apt-get [monosti] source pak1 [pak2 ...]\n" +"Uporaba: apt-get [moľnosti] ukaz\n" +" apt-get [moľnosti] install|remove paket1 [paket2 ...]\n" +" apt-get [moľnosti] source paket1 [paket2 ...]\n" "\n" -"apt-get je preprost vmesnik ukazne vrstice za prenaanje in\n" -"nameanje paketov. Najpogosteje uporabljena ukaza sta update\n" +"apt-get je enostaven vmesnik ukazne vrstice za prejemanje in\n" +"nameąčanje paketov. Najpogosteje uporabljana ukaza sta update\n" "in install.\n" "\n" "Ukazi:\n" -" update - Posodobi seznam paketov\n" -" upgrade - Izvedi nadgradnjo\n" -" install - Namesti nove pakete (pak je libc6 in ne libc6.deb)\n" -" remove - Odstrani pakete\n" -" source - Prenesi izvorne arhive\n" -" build-dep - Nastavi odvisnosti za gradnjo za izvorne pakete\n" -" dist-upgrade - Nadgradnja distribucije, glejte apt-get(8)\n" -" dselect-upgrade - Sledi izbiram dselecta\n" -" clean - Odstrani preneene datoteke z arhivi\n" -" autoclean - Odstrani stare preneene datoteke z arhivi\n" -" check - Preveri, da ni nobene pokvarjene odvisnosti\n" +" update - pridobi nov seznam paketov\n" +" upgrade - izvede nadgradnjo install - namesti nove pakete (paket je libc6 " +"ne libc6.deb)\n" +" remove - odstrani pakete\n" +" autoremove - samodejno odstrani vse neuporabljene pakete\n" +" purge - odstrani pakete in nastavitvene datoteke\n" +" source - prejme izvorne arhive\n" +" build-deb - nastavi odvisnosti gradnje za izvorne pakete\n" +" dist-upgrade - nadgradi distribucijo, oglejte si apt-get(8)\n" +" dselect-upgrade - sledi naslednjim izbiram\n" +" clean - izbriąe prejete datoteke arhivov\n" +" markauto - označi dane pakete kot samodejno nameąčene\n" +" unmarkauto - odstrani dane pakete kot ročno nameąčene\n" "\n" -"Monosti:\n" -" -h To besedilo.\n" -" -q Dnevniki izpis - brez kazalca napredka\n" -" -qq Brez izpisa, razen napak\n" -" -d Samo prenos - NE namesti in odpakira arhivov\n" -" -s Brez dejanj. Izvede simulacijo urejanja\n" -" -y Privzame Da za vse poizvedbe in ne sprauje\n" -" -f Poskusi nadaljevati, e preskus celovitosti spodleti\n" -" -m Poskusi nadaljevati, e ni mogoe najti arhivov\n" -" -u Prikae tudi seznam nadgrajenih paketov\n" -" -b Ko dobi izvoren paket, ga zgradi\n" -" -V Prikae podrobne tevilke razliic\n" -" -c=? Prebere podano datoteko z nastavitvami\n" -" -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" -"Za ve informacij in monosti si oglejte strani man apt-get(8),\n" -"sources.list(5) in apt.conf(5).\n" -" APT ima mo Super Krave.\n" +"Moľnosti:\n" +" -h to besedilo pomoči\n" +" -q beleľljiv izhod - brez pokazatelja napredka\n" +" -qq brez izhoda razen za napake\n" +" -d le prejme - NE namesti ali razpakira arhivov\n" +" -s izvede simulacijo ukaza.\n" +" -y predpostavi y za vsa vpraąanja in ne spraąuje\n" +" -f poskuąa popraviti sistem s pokvarjenimi odvisnostmi\n" +" -m poskuąa nadaljevati, če arhivov ni mogoče najti\n" +" -u pokaľe tudi seznam nadgrajenih paketov\n" +" -b izgradi izvorni paket po njegovem pridobivanju\n" +" -V pokaľe podroben izpis ątevila različice\n" +" -c=? prebere to nastavitveno datoteko\n" +" -o=? nastavi poljubno nastavitveno moľnost, na primer -0 dir::cache=/tmp\n" +"Oglejte si strani apt-get(8), sources.list(5) in priročnik apt.conf(5)\n" +" za več podrobnosti in moľnosti.\n" +" Ta APT ima moči Super Krav.\n" #: cmdline/apt-get.cc:2960 msgid "" @@ -1402,6 +1421,10 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" +"OPOMBA: To je samo simulacija!\n" +" apt-get za pravo izvajanje potrebuje privilegije skrbnika.\n" +" Zaklepanje je onemogočeno, zato se ne zanaąajte\n" +" na pomembnost trenutnega pravega stanja!" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1413,7 +1436,7 @@ msgstr "Dobi:" #: cmdline/acqprogress.cc:110 msgid "Ign " -msgstr "Prz " +msgstr "Prezri" #: cmdline/acqprogress.cc:114 msgid "Err " @@ -1422,12 +1445,12 @@ msgstr "Nap " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Dobljenih %sB v %s (%sB/s)\n" +msgstr "Pridobljenih %sB v %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Delam]" +msgstr " [Delo]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1438,7 +1461,7 @@ msgid "" msgstr "" "Sprememba medija: vstavite disk z oznako\n" " '%s'\n" -"v enoto '%s' in pritisnite enter\n" +"v enoto '%s' in pritisnite vnosno tipko\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1457,63 +1480,60 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Uporaba: apt-sortpkgs [monosti] dat1 [dat2 ...]\n" +"Uporaba: apt-sortpkgs [moľnosti] dat1 [dat2 ...]\n" "\n" -"apt-sortpkgs je preprosto orodje za razvranje paketnih datotek. Monost -" -"s\n" -"doloa vrsto datoteke.\n" +"apt-sortpkgs je preprosto orodje za razvrąčanje paketnih datotek. Moľnost -s\n" +"določa vrsto datoteke.\n" "\n" -"Monosti:\n" -" -h To besedilo\n" -" -s Uporabi razvranje izvornih datotek\n" +"Moľnosti:\n" +" -h to besedilo pomoči\n" +" -s uporabi razvrąčanje izvornih datotek\n" " -c=? Prebere podano datoteko z nastavitvami\n" -" -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" +" -o=? Nastavi poljubno nastavitveno moľnost, npr. -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Napana privzeta nastavitev!" +msgstr "Napačna privzeta nastavitev!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 #: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Za nadaljevanje pritisnite enter." +msgstr "Za nadaljevanje pritisnite vnosno tipko." #: dselect/install:91 msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "" +msgstr "Ali ľelite izbrisati vse predhodno prejete datoteke .deb?" #: dselect/install:101 -#, fuzzy msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Med odpakiranjem je prilo do napak. Nastavil bom" +msgstr "Med raząirajanjem je priąlo do nekaterih napak. Paketi, ki so bili nameąčeni" #: dselect/install:102 -#, fuzzy msgid "will be configured. This may result in duplicate errors" -msgstr "pakete, ki so bili nameeni. To lahko privede do dvojnih napak" +msgstr "bodo bili nastavljeni. To lahko povzroči podvojene napake" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -"ali do napak zaradi manjkajoih odvisnosti. To je v redu, pomembne so samo " +"ali do napak zaradi manjkajočih odvisnosti. To je v redu, pomembne so samo " "napake" #: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "nad tem sporoilom. Popravite jih in poenite Namest[I]tev e enkrat" +msgstr "nad tem sporočilom. Popravite jih in poľenite Namest[I]tev ąe enkrat" #: dselect/update:30 msgid "Merging available information" -msgstr "Spajanje informacij na voljo" +msgstr "Zdruľevanje razpoloľljivih podaktov" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Ni mogoe ustvariti pip" +msgstr "Ni mogoče ustvariti pip" #: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Ni mogoe izvesti gzip" +msgstr "Ni mogoče izvesti gzip " #: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" @@ -1521,29 +1541,29 @@ msgstr "Pokvarjen arhiv" #: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Kontrolna vsota tar ni uspela, arhiv je pokvarjen" +msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen" #: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Neznan tip glave TAR %u, lan %s" +msgstr "Neznana vrsta glave TAR %u, član %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" -msgstr "Napaen podpis arhiva" +msgstr "Neveljaven podpis arhiva" #: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Napaka pri branju glave lana arhiva" +msgstr "Napaka med branjem glave člana arhiva" #: apt-inst/contrib/arfile.cc:90 -#, fuzzy, c-format +#, c-format msgid "Invalid archive member header %s" -msgstr "Napana glava lana arhiva" +msgstr "Neveljavna glava arhiva člana %s" #: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "Napana glava lana arhiva" +msgstr "Neveljavna glava člana arhiva" #: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" @@ -1551,19 +1571,19 @@ msgstr "Arhiv je prekratek" #: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Glav arhiva ni mogoe brati" +msgstr "Glav arhiva ni mogoče brati" #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "DropNode je poklical stabilno povezano vozlie" +msgstr "DropNode je poklical stabilno povezano vozliąče" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Ni mogoe najti razprenega elementa!" +msgstr "Ni mogoče najti razprąenega elementa!" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "Ni mogoe dodeliti odklona" +msgstr "Ni mogoče dodeliti odklona" #: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" @@ -1572,12 +1592,12 @@ msgstr "Notranja napaka v AddDiversion" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Poskuam prepisati odklon, %s -> %s in %s/%s" +msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s" #: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Dvojni setevek odklona %s -> %s" +msgstr "Dvojni seątevek odklona %s -> %s" #: apt-inst/filelist.cc:549 #, c-format @@ -1585,14 +1605,14 @@ msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" #: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Napaka pri pisanju datoteke %s" +msgstr "Zapisovanje datoteke %s je spodletelo" #: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Napaka pri zapiranju datoteke %s" +msgstr "Napaka med zapiranjem datoteke %s" #: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format @@ -1602,17 +1622,17 @@ msgstr "Pot %s je predolga" #: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "Odpakiranje %s ve kot enkrat" +msgstr "Odpakiranje %s več kot enkrat" #: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "Imenik %s je odklonjen" +msgstr "Mapa %s je odklonjena" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paket poskua pisati v taro odklona %s/%s" +msgstr "Paket poskuąa pisati v tarčo odklona %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" @@ -1621,11 +1641,11 @@ msgstr "Pot odklona je predloga" #: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "Imenik %s je bil zamenjan z ne-imenikom" +msgstr "Mapa %s je bil zamenjana z ne-mapo" #: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Iskanje vozlia v njegovem razprenem vedru ni uspelo" +msgstr "Iskanje vozliąča v njegovem razprąenem vedru ni uspelo" #: apt-inst/extract.cc:284 msgid "The path is too long" @@ -1634,7 +1654,7 @@ msgstr "Pot je predolga" #: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Prepii zadetek paketa brez vnosa razliice za %s" +msgstr "Prepiąi zadetek paketa brez vnosa različice za %s" #: apt-inst/extract.cc:431 #, c-format @@ -1650,12 +1670,12 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" #: methods/mirror.cc:87 #, c-format msgid "Unable to read %s" -msgstr "Ni mogoe brati %s" +msgstr "Ni mogoče brati %s" #: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Ni mogoe doloiti %s" +msgstr "Ni mogoče določiti %s" #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format @@ -1665,16 +1685,16 @@ msgstr "Odstranitev %s ni uspela" #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" -msgstr "Ni mogoe ustvariti %s" +msgstr "Ni mogoče ustvariti %s" #: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Doloitev %sinfo ni uspela" +msgstr "Določitev %sinfo ni uspela" #: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Podatki in zaasni imeniki morajo biti v istem datotenem sistemu" +msgstr "Podatki in začasne mape morajo biti na istem datotečnem sistemu" #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070 #: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180 @@ -1685,12 +1705,12 @@ msgstr "Branje seznama paketov" #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Premik v skrbnikov imenik %sinfo ni uspel" +msgstr "Sprememba v skrbnikovo mapo %sinfo ni uspela" #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 #: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" -msgstr "Notranja napaka pri sprejemanju imena paketa" +msgstr "Notranja napaka med dobivanjem imena paketa" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" @@ -1703,8 +1723,8 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Odpiranje datoteke s seznamom '%sinfo/%s' ni uspelo. e ne morete povrniti " -"datoteke, jo izpraznite in takoj ponovno namestite enako razliico paketa!" +"Odpiranje datoteke s seznamom '%sinfo/%s' ni uspelo. Če ne morete obnoviti " +"datoteke, jo izpraznite in takoj znova namestite enako različico paketa!" #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format @@ -1713,7 +1733,7 @@ msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo" #: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" -msgstr "Notranja napaka pri sprejemanju vozlia" +msgstr "Notranja napaka med dobivanjem vozliąča" #: apt-inst/deb/dpkgdb.cc:305 #, c-format @@ -1728,175 +1748,172 @@ msgstr "Datoteka z odklonom je pokvarjena" #: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Napana vrstica v datoteki z odklonom: %s" +msgstr "Neveljavna vrstica v datoteki z odklonom: %s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "Notranja napaka pri dodajanju odklona" +msgstr "Notranja napaka med dodajanjem odklona" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Najprej se mora izvesti predpomnilnik paketov" +msgstr "Najprej se mora začeti predpomnilnik paketov" #: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Napaka pri iskanju paketa: glava, odmik %lu" +msgstr "Napaka med iskanjem paketa: glava, odmik %lu" #: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Napana izbira ConfFile v datoteki stanja. Odmik %lu" +msgstr "Napačna izbira ConfFile v datoteki stanja. Odmik %lu" #: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Napaka pri razlenjevanju MD5. Odmik %lu" +msgstr "Napaka med razčlenjevanjem MD5. Odmik %lu" #: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "To ni veljaven arhiv DEB. Manjka lan '%s'." +msgstr "To ni veljaven arhiv DEB. Manjka član '%s'." #: apt-inst/deb/debfile.cc:50 -#, fuzzy, c-format +#, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "To ni veljaven arhiv DEB. Manjka lan '%s' ali '%s'." +msgstr "To ni veljaven arhiv DEB, nima člana '%s', '%s' ali '%s'" #: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Ni mogoe spremeniti v %s" +msgstr "Ni mogoče spremeniti v %s" #: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" -msgstr "Notranja napaka. Ni mogoe najti lana." +msgstr "Notranja napaka. Ni mogoče najti člana." #: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Ni mogoe najti veljavne nadzorne datoteka" +msgstr "Ni mogoče najti veljavne nadzorne datoteke" #: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "Nadzorne datoteke ni mogoe razleniti" +msgstr "Nadzorne datoteke ni mogoče razčleniti" #: methods/bzip2.cc:65 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Ni mogoe odprti %s" +msgstr "Ni mogoče odprti cevi za %s" #: methods/bzip2.cc:109 #, c-format msgid "Read error from %s process" -msgstr "Napaka pri branju iz procesa %s" +msgstr "Napaka med branjem iz opravila %s" #: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43 #: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486 #: methods/rred.cc:495 msgid "Failed to stat" -msgstr "Doloitev ni uspela" +msgstr "Določitev ni uspela" #: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99 #: methods/rred.cc:492 msgid "Failed to set modification time" -msgstr "Nastavitev asa spremembe ni uspela" +msgstr "Nastavitev časa spremembe je spodletela" #: methods/cdrom.cc:199 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Ni mogoe brati zbirke %s na CD-ROM-u" +msgstr "Ni mogoče brati podatkovne zbirke %s na CD-ROM-u" #: methods/cdrom.cc:208 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -"Uporabite apt-cdrom, e elite, da APT prepozna CD. apt-get update ne more " -"sam dodati novih CD-jev" +"Uporabite apt-cdrom, če ľelite, da APT prepozna CD. apt-get update ne more " +"sam dodati novih CD-ROM-ov" #: methods/cdrom.cc:218 msgid "Wrong CD-ROM" -msgstr "Napaen C" +msgstr "Napačen CD-ROM" #: methods/cdrom.cc:245 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Ni mogoe odklopiti CD-ROM-a v %s, ker je morda e v uporabi." +msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda ąe v uporabi." #: methods/cdrom.cc:250 -#, fuzzy msgid "Disk not found." -msgstr "Datoteke ni mogoe najti" +msgstr "Diska ni mogoče najti." #: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Datoteke ni mogoe najti" +msgstr "Datoteke ni mogoče najti" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "Napaen URI. Lokalni URI-ji se morajo zaeti z /" +msgstr "Neveljaven URI. Krajevni URI-ji se morajo začeti z //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:168 msgid "Logging in" -msgstr "Prijavljam se" +msgstr "Prijavljanje" #: methods/ftp.cc:174 msgid "Unable to determine the peer name" -msgstr "Ni mogoe ugotoviti imena gostitelja" +msgstr "Ni mogoče ugotoviti imena gostitelja" #: methods/ftp.cc:179 msgid "Unable to determine the local name" -msgstr "Ni mogoe ugotoviti lokalnega imena" +msgstr "Ni mogoče določiti krajevnega imena" #: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Strenik je zavrnil nao povezavo in sporoil: %s" +msgstr "Streľnik je zavrnil povezavo in sporočil: %s" #: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" -msgstr "USER ni uspel, strenik je odgovoril: %s" +msgstr "USER je spodletel, streľnik je odgovoril: %s" #: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS ni uspel, strenik je odgovoril: %s" +msgstr "PASS je spodletel, streľnik je odgovoril: %s" #: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." -msgstr "" -"Naveden je bil proxy-strenik, ne pa tudi prijavna skripta. Acquire::ftp::" -"ProxyLogin je prazen." +msgstr "Naveden je bil posredniąki streľnik, ne pa tudi prijavni skript. Acquire::ftp::ProxyLogin je prazen." #: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Ukaz prijavne skripte '%s' ni uspel, strenik je odgovoril: %s" +msgstr "Ukaz prijavne skripte '%s' ni uspel, streľnik je odgovoril: %s" #: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" -msgstr "TYPE ni uspel, strenik je odgovoril: %s" +msgstr "TYPE je spodletel, streľnik je odgovoril: %s" #: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Povezava potekla" +msgstr "Povezava je zakasnela" #: methods/ftp.cc:341 msgid "Server closed the connection" -msgstr "Strenik je zaprl povezavo" +msgstr "Streľnik je zaprl povezavo" #: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190 msgid "Read error" -msgstr "Napaka pri branju" +msgstr "Napaka branja" #: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "Odgovor je prekorail vmesnik." +msgstr "Odgovor je prekoračil predpomnilnik." #: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" @@ -1904,75 +1921,75 @@ msgstr "Okvara protokola" #: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232 msgid "Write error" -msgstr "Napaka pri pisanju" +msgstr "Napaka pisanja" #: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 msgid "Could not create a socket" -msgstr "Ni mogoe ustvariti vtinice" +msgstr "Ni mogoče ustvariti vtiča" #: methods/ftp.cc:703 msgid "Could not connect data socket, connection timed out" -msgstr "Ni mogoe priklopiti podatkovne vtinice. Povezava potekla." +msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela." #: methods/ftp.cc:709 msgid "Could not connect passive socket." -msgstr "Ni mogoe priklopiti pasivne vtinice." +msgstr "Ni mogoče povezat pasivnega vtiča." #: methods/ftp.cc:727 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo ni mogel dobiti posluajoe vtinice" +msgstr "getaddrinfo ni mogel dobiti posluąajočega vtiča" #: methods/ftp.cc:741 msgid "Could not bind a socket" -msgstr "Ni mogoe povezati vtinice" +msgstr "Ni mogoče povezati vtiča" #: methods/ftp.cc:745 msgid "Could not listen on the socket" -msgstr "Ni mogoe posluati na vtinici" +msgstr "Ni mogoče posluąati na vtiču" #: methods/ftp.cc:752 msgid "Could not determine the socket's name" -msgstr "Ni mogoe ugotoviti imena vtinice" +msgstr "Ni mogoče določiti imena vtiča" #: methods/ftp.cc:784 msgid "Unable to send PORT command" -msgstr "Ni mogoe poslati ukaza PORT" +msgstr "Ni mogoče poslati ukaza PORT" #: methods/ftp.cc:794 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "Neznan naslov druine %u (AF_*)" +msgstr "Neznan naslov druľine %u (AF_*)" #: methods/ftp.cc:803 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT ni uspel, strenik je odgovoril: %s" +msgstr "EPRT ni uspel, streľnik je odgovoril: %s" #: methods/ftp.cc:823 msgid "Data socket connect timed out" -msgstr "Povezava podatkovne vtinice potekla" +msgstr "Povezava podatkovne vtičnice je zakasnela" #: methods/ftp.cc:830 msgid "Unable to accept connection" -msgstr "Ni mogoe sprejeti povezave" +msgstr "Ni mogoče sprejeti povezave" #: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302 msgid "Problem hashing file" -msgstr "Teava pri razprevanju datoteke" +msgstr "Teľava med razprąevanjem datoteke" #: methods/ftp.cc:882 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Ni mogoe dobiti datoteke, strenik je odgovoril '%s'" +msgstr "Ni mogoče pridobiti datoteke, streľnik je odgovoril '%s'" #: methods/ftp.cc:897 methods/rsh.cc:321 msgid "Data socket timed out" -msgstr "Podatkovna vtinica je potekla" +msgstr "Podatkovna vtič je potekel" #: methods/ftp.cc:927 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Prenos podatkov ni uspel, strenik je odgovoril '%s'" +msgstr "Prenos podatkov ni uspel, streľnik je odgovoril '%s'" #. Get the files information #: methods/ftp.cc:1004 @@ -1981,7 +1998,7 @@ msgstr "Poizvedba" #: methods/ftp.cc:1116 msgid "Unable to invoke " -msgstr "Ni mogoe zagnati " +msgstr "Ni mogoče klicati " #: methods/connect.cc:71 #, c-format @@ -1996,87 +2013,88 @@ msgstr "[IP: %s %s]" #: methods/connect.cc:89 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Ni mogoe ustvariti vtinice za %s (f=%u t=%u p=%u)" +msgstr "Ni mogoče ustvariti vtiča za %s (f=%u t=%u p=%u)" #: methods/connect.cc:95 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Ni mogoe zaeti povezave z %s:%s (%s)." +msgstr "Ni mogoče začeti povezave z %s:%s (%s)." #: methods/connect.cc:103 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Ni se mogoe povezati z %s:%s (%s). Povezava potekla." +msgstr "Ni se mogoče povezati z %s:%s (%s). Povezava je zakasnela." #: methods/connect.cc:121 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Ni se mogoe povezati z %s:%s (%s)." +msgstr "Ni se mogoče povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going #: methods/connect.cc:149 methods/rsh.cc:424 #, c-format msgid "Connecting to %s" -msgstr "Povezujem se z %s" +msgstr "Povezovanje z %s" #: methods/connect.cc:168 methods/connect.cc:187 #, c-format msgid "Could not resolve '%s'" -msgstr "Ni mogoe razreiti '%s'" +msgstr "Ni mogoče razreąiti '%s'" #: methods/connect.cc:193 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Zaasna napaka pri razreevanju '%s'" +msgstr "Začasna napaka med razreąevanjem '%s'" #: methods/connect.cc:196 -#, fuzzy, c-format +#, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "Prilo je do napake pri razreevanju '%s:%s' (%i)" +msgstr "Nekaj čudnega se je zgodilo med razreąevanjem '%s:%s' (%i - %s)" #: methods/connect.cc:243 -#, fuzzy, c-format +#, c-format msgid "Unable to connect to %s:%s:" -msgstr "Ni se mogoe povezati z %s %s:" +msgstr "Ni se mogoče povezati z %s:%s:" #. TRANSLATOR: %s is the trusted keyring parts directory #: methods/gpgv.cc:71 -#, fuzzy, c-format +#, c-format msgid "No keyring installed in %s." -msgstr "Prekinjanje namestitve." +msgstr "V %s ni nameąčenih zbirk ključev." #: methods/gpgv.cc:163 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!" #: methods/gpgv.cc:168 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Najden je bil vsaj en neveljaven podpis." #: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" -msgstr "" +msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameąčen?)" #: methods/gpgv.cc:177 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Neznana napaka med izvajanjem gpgv" #: methods/gpgv.cc:211 methods/gpgv.cc:218 -#, fuzzy msgid "The following signatures were invalid:\n" -msgstr "Naslednji dodatni paketi bodo nameeni:" +msgstr "Naslednji podpisi so bili neveljavni:\n" #: methods/gpgv.cc:225 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n" #: methods/http.cc:385 msgid "Waiting for headers" -msgstr "akanje na glave" +msgstr "Čakanje na glave" #: methods/http.cc:531 #, c-format @@ -2085,23 +2103,23 @@ msgstr "Dobljena je ena vrstica glave preko %u znakov" #: methods/http.cc:539 msgid "Bad header line" -msgstr "Napana vrstica glave" +msgstr "Neveljavna vrstica glave" #: methods/http.cc:564 methods/http.cc:571 msgid "The HTTP server sent an invalid reply header" -msgstr "Strenik HTTP je poslal napano glavo odgovora" +msgstr "Streľnik HTTP je poslal neveljavno glavo odgovora" #: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine" +msgstr "Streľnik HTTP je poslal glavo z neveljavno dolľino vsebine" #: methods/http.cc:615 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine" +msgstr "Streľnik HTTP je poslal glavo z neveljavnim obsegom vsebine" #: methods/http.cc:617 msgid "This HTTP server has broken range support" -msgstr "Ta strenik HTTP ima pokvarjen obseg podpore" +msgstr "Ta streľnik HTTP ima pokvarjen obseg podpore" #: methods/http.cc:641 msgid "Unknown date format" @@ -2113,36 +2131,35 @@ msgstr "Izbira ni uspela" #: methods/http.cc:804 msgid "Connection timed out" -msgstr "as za povezavo se je iztekel" +msgstr "Povezava je zakasnela" #: methods/http.cc:827 msgid "Error writing to output file" -msgstr "Napaka pri pisanju v izhodno datoteko" +msgstr "Napaka med pisanjem v izhodno datoteko" #: methods/http.cc:858 msgid "Error writing to file" -msgstr "Napaka pri pisanju v datoteko" +msgstr "Napaka med pisanjem v datoteko" #: methods/http.cc:886 msgid "Error writing to the file" -msgstr "Napaka pri pisanju v datoteko" +msgstr "Napaka med pisanjem v datoteko" #: methods/http.cc:900 msgid "Error reading from server. Remote end closed connection" -msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " +msgstr "Napaka med branjem s streľnika. Oddaljeni del je zaprl povezavo" #: methods/http.cc:902 msgid "Error reading from server" -msgstr "Napaka pri branju s strenika" +msgstr "Napaka med branjem s streľnika" #: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281 -#, fuzzy msgid "Failed to truncate file" -msgstr "Napaka pri pisanju datoteke %s" +msgstr "Ni mogoče obrezati datoteke" #: methods/http.cc:1160 msgid "Bad header data" -msgstr "Napani podatki glave" +msgstr "Slabi podatki glave" #: methods/http.cc:1177 methods/http.cc:1232 msgid "Connection failed" @@ -2154,27 +2171,25 @@ msgstr "Notranja napaka" #: apt-pkg/contrib/mmap.cc:77 msgid "Can't mmap an empty file" -msgstr "mmap prazne datoteke ni mogo" +msgstr "mmap prazne datoteke ni mogoč" #: apt-pkg/contrib/mmap.cc:89 -#, fuzzy, c-format +#, c-format msgid "Couldn't duplicate file descriptor %i" -msgstr "Ni mogoe odprti %s" +msgstr "Ni mogoče podvojiti opisnika datotek %i" #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Ni mogoe narediti mmap %lu bajtov" +msgstr "Ni mogoče narediti mmap %lu bajtov" #: apt-pkg/contrib/mmap.cc:124 -#, fuzzy msgid "Unable to close mmap" -msgstr "Ne morem odpreti %s" +msgstr "Ni mogoče zapreti mmap" #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 -#, fuzzy msgid "Unable to synchronize mmap" -msgstr "Ni mogoe zagnati " +msgstr "Ni mogoče uskladiti mmap" #: apt-pkg/contrib/mmap.cc:300 #, c-format @@ -2182,6 +2197,8 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Omejitev-" +"Predpomnilnika. Trenutna vrednost: %lu. (man 5 apt.conf)" #: apt-pkg/contrib/mmap.cc:399 #, c-format @@ -2189,45 +2206,47 @@ msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" +"Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov ľe doseľena." #: apt-pkg/contrib/mmap.cc:402 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" +"Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno." #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:371 #, c-format msgid "%lid %lih %limin %lis" -msgstr "" +msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:378 #, c-format msgid "%lih %limin %lis" -msgstr "" +msgstr "%lih %limin %lis" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:385 #, c-format msgid "%limin %lis" -msgstr "" +msgstr "%limin %lis" #. s means seconds #: apt-pkg/contrib/strutl.cc:390 #, c-format msgid "%lis" -msgstr "" +msgstr "%lis" #: apt-pkg/contrib/strutl.cc:1119 #, c-format msgid "Selection %s not found" -msgstr "Izbira %s ni mogoe najti" +msgstr "Izbire %s ni mogoče najti" #: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Ne-prepoznan tip okrajave: '%c'" +msgstr "Neprepoznana vrsta okrająave: '%c'" #: apt-pkg/contrib/configuration.cc:510 #, c-format @@ -2237,33 +2256,33 @@ msgstr "Odpiranje nastavitvene datoteke %s" #: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Skladenjska napaka %s:%u: Blok se zane brez imena." +msgstr "Skladenjska napaka %s:%u: Blok se začne brez imena." #: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Skladenjska napaka %s:%u: Nepravilna znaka." +msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka." #: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo." +msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo." #: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju." +"Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnji ravni." #: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Skladenjska napaka %s:%u: Preve ugnezdenih vkljuitev." +msgstr "Skladenjska napaka %s:%u: Preveč vgnezdenih vključitev" #: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Skladenjska napaka %s:%u: Vkljuen od tu." +msgstr "Skladenjska napaka %s:%u: Vključeno od tu" #: apt-pkg/contrib/configuration.cc:774 #, c-format @@ -2271,15 +2290,15 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" #: apt-pkg/contrib/configuration.cc:777 -#, fuzzy, c-format +#, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju." +"Skladenjska napaka %s:%u: počisti ukaz zahteva drevo moľnosti kot argument" #: apt-pkg/contrib/configuration.cc:827 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke" +msgstr "Skladenjska napaka %s:%u: Dodatna krama na koncu datoteke" #: apt-pkg/contrib/progress.cc:153 #, c-format @@ -2289,79 +2308,79 @@ msgstr "%c%s ... Napaka!" #: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" -msgstr "%c%s... Narejeno" +msgstr "%c%s ... Narejeno" #: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Monost ukazne vrstice '%c' [iz %s] ni poznana." +msgstr "Moľnost ukazne vrstice '%c' [iz %s] ni poznana." #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 #: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" -msgstr "Ne razumem monosti ukazne vrstice %s" +msgstr "Moľnosti ukazne vrstice %s ni mogoče razumeti" #: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "Monost ukazne vrstice %s ni boolean" +msgstr "Moľnost ukazne vrstice %s ni boolova vrednost" #: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 #, c-format msgid "Option %s requires an argument." -msgstr "Monost %s zahteva argument." +msgstr "Moľnost %s zahteva argument." #: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "Monost %s: Podrobnosti predmeta za nastavitve potrebujejo =." +msgstr "Moľnost %s: Določilo predmeta nastavitve zahtevajo =." #: apt-pkg/contrib/cmndline.cc:236 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Monost %s zahteva celotevilski argument, ne '%s'" +msgstr "Moľnost %s zahteva celoątevilski argument, ne '%s'" #: apt-pkg/contrib/cmndline.cc:267 #, c-format msgid "Option '%s' is too long" -msgstr "Monost '%s' je predolga" +msgstr "Moľnost '%s' je predolga" #: apt-pkg/contrib/cmndline.cc:300 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Pomena %s ni mogoe razumeti, poskusite pravilno ali napano." +msgstr "Pomena %s ni mogoče razumeti, poskusite pravilno ali napačno." #: apt-pkg/contrib/cmndline.cc:350 #, c-format msgid "Invalid operation %s" -msgstr "Napana operacija %s" +msgstr "Neveljavno opravilo %s" #: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Ni mogoe doloiti priklopne toke %s" +msgstr "Ni mogoče določiti priklopne točke %s" #: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 #: methods/mirror.cc:93 #, c-format msgid "Unable to change to %s" -msgstr "Ni mogoe spremeniti v %s" +msgstr "Ni mogoče spremeniti v %s" #: apt-pkg/contrib/cdromutl.cc:217 msgid "Failed to stat the cdrom" -msgstr "Ni mogoe doloiti CD-ROM-a" +msgstr "Ni mogoče določiti CD-ROM-a" #: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s" +msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s" #: apt-pkg/contrib/fileutl.cc:159 #, c-format msgid "Could not open lock file %s" -msgstr "Ni mogoe odprti zaklenjene datoteke %s" +msgstr "Ni mogoče odprti zaklenjene datoteke %s" #: apt-pkg/contrib/fileutl.cc:177 #, c-format @@ -2371,76 +2390,76 @@ msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" #: apt-pkg/contrib/fileutl.cc:181 #, c-format msgid "Could not get lock %s" -msgstr "Ni mogoe dobiti zaklenjene datoteke %s" +msgstr "Ni mogoče zakleniti datoteke %s" #: apt-pkg/contrib/fileutl.cc:643 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "akal, a %s ni bil tam" +msgstr "Program je čakal na %s a ga ni bilo tam" #: apt-pkg/contrib/fileutl.cc:655 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Napaka pri razlenjenosti podprocesa %s." +msgstr "Pod-opravilo %s je prejelo segmentacijsko napako." #: apt-pkg/contrib/fileutl.cc:657 -#, fuzzy, c-format +#, c-format msgid "Sub-process %s received signal %u." -msgstr "Napaka pri razlenjenosti podprocesa %s." +msgstr "Pod-opravilo %s je prejelo signal %u." #: apt-pkg/contrib/fileutl.cc:661 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Podproces %s je vrnil kodo napake (%u)" +msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)" #: apt-pkg/contrib/fileutl.cc:663 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Podproces %s se je nepriakovano zakljuil" +msgstr "Pod-opravilo %s se je nepričakovano zaključilo" #: apt-pkg/contrib/fileutl.cc:728 #, c-format msgid "Could not open file %s" -msgstr "Ne morem odpreti datoteke %s" +msgstr "Ni mogoče odpreti datoteke %s" #: apt-pkg/contrib/fileutl.cc:745 -#, fuzzy, c-format +#, c-format msgid "Could not open file descriptor %d" -msgstr "Ni mogoe odprti %s" +msgstr "Ni mogoče odpreti opisnika datotek %d" #: apt-pkg/contrib/fileutl.cc:805 #, c-format msgid "read, still have %lu to read but none left" -msgstr "berem, e vedno %lu za branje, a nobeden ostal" +msgstr "branje, ąe vedno %lu za branje, a nobeden ni ostal" #: apt-pkg/contrib/fileutl.cc:838 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "piem, e vedno %lu za pisanje, a ni mogoe" +msgstr "pisanje, ąe vedno %lu za pisanje, a ni mogoče" #: apt-pkg/contrib/fileutl.cc:937 -#, fuzzy, c-format +#, c-format msgid "Problem closing the gzip file %s" -msgstr "Teava pri zapiranju datoteke" +msgstr "Teľava med zapiranjem gzip datoteke %s" #: apt-pkg/contrib/fileutl.cc:940 -#, fuzzy, c-format +#, c-format msgid "Problem closing the file %s" -msgstr "Teava pri zapiranju datoteke" +msgstr "Teľava med zapiranjem datoteke %s" #: apt-pkg/contrib/fileutl.cc:945 -#, fuzzy, c-format +#, c-format msgid "Problem renaming the file %s to %s" -msgstr "Teava pri usklajevanju datoteke" +msgstr "Teľava med preimenovanje datoteke %s v %s" #: apt-pkg/contrib/fileutl.cc:956 -#, fuzzy, c-format +#, c-format msgid "Problem unlinking the file %s" -msgstr "Teava pri odvezovanju datoteke" +msgstr "Teľava med razvezovanjem datoteke %s" #: apt-pkg/contrib/fileutl.cc:969 msgid "Problem syncing the file" -msgstr "Teava pri usklajevanju datoteke" +msgstr "Teľava med usklajevanjem datoteke" #: apt-pkg/pkgcache.cc:145 msgid "Empty package cache" @@ -2452,16 +2471,16 @@ msgstr "Datoteka s predpomnilnikom paketov je pokvarjena" #: apt-pkg/pkgcache.cc:156 msgid "The package cache file is an incompatible version" -msgstr "Razliica datoteke s predpomnilnikom paketov ni ustrezna" +msgstr "Različica datoteke s predpomnilnikom paketov ni zdruľljiva" #: apt-pkg/pkgcache.cc:161 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Ta APT ne podpira sistema razliic '%s'" +msgstr "Ta APT ne podpira sistema različic '%s'" #: apt-pkg/pkgcache.cc:166 msgid "The package cache was built for a different architecture" -msgstr "Predpomnilnik paketov je bil zgrajen za drugano arhitekturo" +msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo" #: apt-pkg/pkgcache.cc:293 msgid "Depends" @@ -2469,15 +2488,15 @@ msgstr "Odvisen od" #: apt-pkg/pkgcache.cc:293 msgid "PreDepends" -msgstr "Predodvisnost" +msgstr "Predodvisen od" #: apt-pkg/pkgcache.cc:293 msgid "Suggests" -msgstr "Priporoa" +msgstr "Priporoča" #: apt-pkg/pkgcache.cc:294 msgid "Recommends" -msgstr "Priporoa" +msgstr "Priporoča" #: apt-pkg/pkgcache.cc:294 msgid "Conflicts" @@ -2489,15 +2508,15 @@ msgstr "Zamenja" #: apt-pkg/pkgcache.cc:295 msgid "Obsoletes" -msgstr "Zastarani" +msgstr "Zastara" #: apt-pkg/pkgcache.cc:295 msgid "Breaks" -msgstr "" +msgstr "Pokvari" #: apt-pkg/pkgcache.cc:295 msgid "Enhances" -msgstr "" +msgstr "Izboljąa" #: apt-pkg/pkgcache.cc:306 msgid "important" @@ -2505,11 +2524,11 @@ msgstr "pomembno" #: apt-pkg/pkgcache.cc:306 msgid "required" -msgstr "obvezno" +msgstr "zahtevano" #: apt-pkg/pkgcache.cc:306 msgid "standard" -msgstr "standardno" +msgstr "običajni" #: apt-pkg/pkgcache.cc:307 msgid "optional" @@ -2525,96 +2544,102 @@ msgstr "Gradnja drevesa odvisnosti" #: apt-pkg/depcache.cc:125 msgid "Candidate versions" -msgstr "Razliice kandidatov" +msgstr "Različice kandidatov" #: apt-pkg/depcache.cc:154 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" #: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211 -#, fuzzy msgid "Reading state information" -msgstr "Spajanje informacij na voljo" +msgstr "Branje podatkov o stanju" #: apt-pkg/depcache.cc:236 -#, fuzzy, c-format +#, c-format msgid "Failed to open StateFile %s" -msgstr "Ni mogoe odprti %s" +msgstr "Odpiranje DatotekeStanja %s je spodletelo" #: apt-pkg/depcache.cc:242 -#, fuzzy, c-format +#, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Napaka pri pisanju datoteke %s" +msgstr "Pisanje začasne DatotekeStanja %s je spodletelo" #: apt-pkg/depcache.cc:921 #, c-format msgid "Internal error, group '%s' has no installable pseudo package" -msgstr "" +msgstr "Notranja napaka, skupina '%s' nima namestljivega psevdo paketa" #: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Ni mogoe razleniti paketne datoteke %s (1)" +msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" #: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Ni mogoe razleniti paketne datoteke %s (2)" +msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" #: apt-pkg/sourcelist.cc:92 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" +msgstr "" +"Slabo oblikovana vrstica %lu na seznamu virov %s ([moľnosti] ni mogoče " +"razčleniti)" #: apt-pkg/sourcelist.cc:95 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Napana vrstica %lu v seznamu virov %s (distribucija)" +msgstr "" +"Slabo oblikovana vrstica %lu na seznamu virov %s ([moľnost] prekratka)" #: apt-pkg/sourcelist.cc:106 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" +msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)" #: apt-pkg/sourcelist.cc:112 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" +msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)" #: apt-pkg/sourcelist.cc:115 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" +msgstr "" +"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima " +"vrednosti)" #: apt-pkg/sourcelist.cc:128 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Napana vrstica %lu v seznamu virov %s (URI)" +msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)" #: apt-pkg/sourcelist.cc:130 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Napana vrstica %lu v seznamu virov %s (distribucija)" +msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)" #: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev URI)" +msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" #: apt-pkg/sourcelist.cc:139 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Napana vrstica %lu v seznamu virov %s (absolutna distribucija)" +msgstr "" +"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)" #: apt-pkg/sourcelist.cc:146 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" +msgstr "" +"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)" #: apt-pkg/sourcelist.cc:244 #, c-format msgid "Opening %s" -msgstr "Odpiram %s" +msgstr "Odpiranje %s" #: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438 #, c-format @@ -2624,19 +2649,18 @@ msgstr "Vrstica %u v seznamu virov %s je predolga." #: apt-pkg/sourcelist.cc:281 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Napana vrstica %u v seznamu virov %s (vrsta)" +msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" #: apt-pkg/sourcelist.cc:285 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" +msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana " #: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616 -#, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" -msgstr "" +msgstr "Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod APT::Takojąnja-nastavitev za podrobnosti. (%d)" #: apt-pkg/packagemanager.cc:452 #, c-format @@ -2645,16 +2669,17 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Ta krog namestitve zahteva zaasno odstranitev kljunega paketa %s zaradi " -"zanke spora/predodvisnosti. To je ponavadi slabo, toda e zares elite " -"odstranitev, vkljuite monost APT::Force-LoopBreak." +"Ta krog namestitve zahteva začasno odstranitev ključnega paketa %s zaradi " +"zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares ľelite " +"nadaljevati, vključite moľnost APT::Force-LoopBreak." #: apt-pkg/packagemanager.cc:495 -#, c-format msgid "" "Could not perform immediate configuration on already unpacked '%s'. Please " "see man 5 apt.conf under APT::Immediate-Configure for details." msgstr "" +"Ni mogoče izvesti takojąnje nastavitve ľe razpakiranega '%s'. Oglejte si man 5 apt.conf pod APT::" +"Takojąnja-Nastavitev za podrobnosti" #: apt-pkg/pkgrecords.cc:32 #, c-format @@ -2665,73 +2690,67 @@ msgstr "Vrsta datoteke s kazalom '%s' ni podprta" #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Paket %s mora biti ponovno nameen, vendar ne morem najti arhiva zanj." +msgstr "Paket %s mora biti znova nameąčen, vendar ni mogoče najti arhiva zanj." #: apt-pkg/algorithms.cc:1210 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -msgstr "" -"Napaka. pkgProblemResolver::Napake pri razreitvi, ki so jih morda " -"povzroili zadrani paketi." +msgstr "Napaka. pkgProblemResolver::Napake pri razreąitvi, ki so jih morda povzročili zadrľani paketi." #: apt-pkg/algorithms.cc:1212 msgid "Unable to correct problems, you have held broken packages." -msgstr "Ni mogoe popraviti teav. Imate zadrane pakete." +msgstr "Ni mogoče popraviti teľav. Imate pokvarjene pakete." #: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so " -"uporabljena stareja." +"Nekaterih kazal ni mogoče prejeti, zato so prezrta, ali pa so uporabljena " +"starejąa." #: apt-pkg/acquire.cc:79 -#, fuzzy, c-format +#, c-format msgid "List directory %spartial is missing." -msgstr "Manjka imenik s seznami %spartial." +msgstr "Mapa seznama %spartial manjka." #: apt-pkg/acquire.cc:83 -#, fuzzy, c-format +#, c-format msgid "Archives directory %spartial is missing." -msgstr "Manjka imenik z arhivi %spartial." +msgstr "Mapa arhivov %spartial manjka." #: apt-pkg/acquire.cc:91 -#, fuzzy, c-format +#, c-format msgid "Unable to lock directory %s" -msgstr "Imenika seznamov ni mogoe zakleniti" +msgstr "Mape %s ni mogoče zakleniti" #. only show the ETA if it makes sense #. two days #: apt-pkg/acquire.cc:857 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +msgstr "Pridobivanje datoteke %li od %li (%s preostalo)" #: apt-pkg/acquire.cc:859 -#, fuzzy, c-format +#, c-format msgid "Retrieving file %li of %li" -msgstr "Branje seznama datotek" +msgstr "Pridobivanje datoteke %li od %li" #: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." -msgstr "Ni mogoe najti gonilnika metod %s." +msgstr "Gonilnika načinov %s ni mogoče najti." #: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" -msgstr "Metoda %s se ni zaela pravilno" +msgstr "Način %s se ni začel pravilno" #: apt-pkg/acquire-worker.cc:413 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Sprememba medija: vstavite disk z oznako\n" -" '%s'\n" -"v enoto '%s' in pritisnite enter\n" +msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko." #: apt-pkg/init.cc:143 #, c-format @@ -2740,12 +2759,12 @@ msgstr "Paketni sistem '%s' ni podprt" #: apt-pkg/init.cc:159 msgid "Unable to determine a suitable packaging system type" -msgstr "Ni mogoe ugotoviti ustrezne vrste paketnega sistema" +msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema" #: apt-pkg/clean.cc:56 #, c-format msgid "Unable to stat %s." -msgstr "Ni mogoe doloiti %s." +msgstr "Ni mogoče določiti %s." #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" @@ -2753,111 +2772,110 @@ msgstr "V sources.list morate vstaviti URI-je z viri" #: apt-pkg/cachefile.cc:84 msgid "The package lists or status file could not be parsed or opened." -msgstr "Ni mogoe odprti ali razleniti seznama paketov ali datoteke stanja." +msgstr "Ni mogoče odprti ali razčleniti seznama paketov ali datoteke stanja." #: apt-pkg/cachefile.cc:88 msgid "You may want to run apt-get update to correct these problems" -msgstr "e elite odpraviti teave, poskusite zagnati apt-get update." +msgstr "Za odpravljanje teľav poskusite zagnati apt-get update." #: apt-pkg/cachefile.cc:106 msgid "The list of sources could not be read." -msgstr "Seznama virov ni mogoe brati." +msgstr "Seznama virov ni mogoče brati." #: apt-pkg/policy.cc:344 -#, fuzzy, c-format +#, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Napaen zapis v datoteki z nastavitvami. Ni glave paketa" +msgstr "Neveljaven zapis v datoteki moľnosti %s, ni glave paketa" #: apt-pkg/policy.cc:366 #, c-format msgid "Did not understand pin type %s" -msgstr "Ni mogoe razumeti vrste zaponke %s" +msgstr "Ni mogoče razumeti vrste bucike %s" #: apt-pkg/policy.cc:374 msgid "No priority (or zero) specified for pin" -msgstr "Prioriteta zaponke ni doloena ali pa je ni." +msgstr "Prednost bucike ni navedena ali pa je nič." #: apt-pkg/pkgcachegen.cc:80 msgid "Cache has an incompatible versioning system" -msgstr "Predpomnilnik ima neustrezen sistem razliic" +msgstr "Predpomnilnik ima neustrezen sistem različic" #: apt-pkg/pkgcachegen.cc:198 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Prilo je do napake pri obdelavi %s (Nov paket)" +msgstr "Priąlo je do napake med obdelavo %s (Nov paket)" #: apt-pkg/pkgcachegen.cc:215 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 1)" +msgstr "Priąlo je do napake med obdelavo %s (Uporabi paket 1)" #: apt-pkg/pkgcachegen.cc:253 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" +msgstr "Med obdelovanjem %s je priąlo do napake (NovOpisDatoteke1)" #: apt-pkg/pkgcachegen.cc:285 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 2)" +msgstr "Priąlo je do napake med obdelavo %s (Uporabi paket 2)" #: apt-pkg/pkgcachegen.cc:289 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" +msgstr "Priąlo je do napake med obdelavo %s (Nova različica datoteke 1)" #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316 #: apt-pkg/pkgcachegen.cc:324 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion%d)" -msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 1)" +msgstr "Med obdelovanjem %s je priąlo do napake (NovaRazličica%d)" #: apt-pkg/pkgcachegen.cc:320 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 3)" +msgstr "Priąlo je do napake med obdelavo %s (Uporabi paket 3)" #: apt-pkg/pkgcachegen.cc:353 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" +msgstr "Med obdelovanjem %s je priąlo do napake (NovOpisDatoteke2)" #: apt-pkg/pkgcachegen.cc:360 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Uau, presegli ste tevilo imen paketov, ki jih zmore APT." +msgstr "Čestitamo, presegli ste ątevilo imen paketov, ki jih zmore APT." #: apt-pkg/pkgcachegen.cc:363 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Uau, presegli ste tevilo razliic, ki jih zmore APT." +msgstr "Čestitamo, presegli ste ątevilo različic, ki jih zmore APT." #: apt-pkg/pkgcachegen.cc:366 -#, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Uau, presegli ste tevilo razliic, ki jih zmore APT." +msgstr "Čestitamo, presegli ste ątevilo opisov, ki jih je zmoľen APT." #: apt-pkg/pkgcachegen.cc:369 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Uau, presegli ste tevilo odvisnosti, ki jih zmore APT." +msgstr "Čestitamo, presegli ste ątevilo odvisnosti, ki jih zmore APT." #: apt-pkg/pkgcachegen.cc:398 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Prilo je do napake pri obdelavi %s (Najdi paket)" +msgstr "Priąlo je do napake med obdelavo %s (Najdi paket)" #: apt-pkg/pkgcachegen.cc:412 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Prilo je do napake pri obdelavi %s (Zberi dobavitelje datotek)" +msgstr "Priąlo je do napake med obdelavo %s (Zberi dobavitelje datotek)" #: apt-pkg/pkgcachegen.cc:418 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "Paketa %s %s ni bilo mogoe najti med obdelavo odvisnosti" +msgstr "Paketa %s %s ni bilo mogoče najti med obdelavo odvisnosti datotek" #: apt-pkg/pkgcachegen.cc:982 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Ni mogoe doloiti seznama izvornih paketov %s" +msgstr "Ni mogoče določiti seznama izvornih paketov %s" #: apt-pkg/pkgcachegen.cc:1087 msgid "Collecting File Provides" @@ -2865,12 +2883,12 @@ msgstr "Zbiranje dobaviteljev datotek" #: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272 msgid "IO Error saving source cache" -msgstr "Napaka IO pri shranjevanju predpomnilnika virov" +msgstr "Napaka VI med shranjevanjem predpomnilnika virov" #: apt-pkg/acquire-item.cc:136 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "preimenovanje spodletelo, %s (%s -> %s)." +msgstr "preimenovanje je spodletelo, %s (%s -> %s)." #: apt-pkg/acquire-item.cc:484 msgid "MD5Sum mismatch" @@ -2878,13 +2896,12 @@ msgstr "Neujemanje vsote MD5" #: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574 #: apt-pkg/acquire-item.cc:1717 -#, fuzzy msgid "Hash Sum mismatch" -msgstr "Neujemanje vsote MD5" +msgstr "Neujemanje vsote razprąil" #: apt-pkg/acquire-item.cc:1244 msgid "There is no public key available for the following key IDs:\n" -msgstr "" +msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formated in the same way as in @@ -2892,24 +2909,25 @@ msgstr "" #: apt-pkg/acquire-item.cc:1281 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" -msgstr "" +msgstr "Datoteka Release je potekla, prezrtje %s (neveljavno od %s)" #: apt-pkg/acquire-item.cc:1302 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "" +msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" #: apt-pkg/acquire-item.cc:1328 -#, c-format msgid "" "A error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" +"Med preverjanjem podpisa je priąlo do napake. Skladiąče ni posodobljeno. Uporabljene bodo predhodne datoteke kazala . Napaka GPG: " +"%s: %s\n" #: apt-pkg/acquire-item.cc:1337 #, c-format msgid "GPG error: %s: %s" -msgstr "" +msgstr "Napaka GPG: %s: %s" #: apt-pkg/acquire-item.cc:1365 #, c-format @@ -2917,8 +2935,8 @@ msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " -"popraviti ta paket (zaradi manjkajoega arhiva)." +"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " +"popraviti ta paket (zaradi manjkajočega arhiva)." #: apt-pkg/acquire-item.cc:1424 #, c-format @@ -2926,7 +2944,7 @@ msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " +"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket." #: apt-pkg/acquire-item.cc:1479 @@ -2934,7 +2952,7 @@ msgstr "" msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " +"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket " "%s." #: apt-pkg/acquire-item.cc:1566 @@ -2942,34 +2960,34 @@ msgid "Size mismatch" msgstr "Neujemanje velikosti" #: apt-pkg/indexrecords.cc:53 -#, fuzzy, c-format +#, c-format msgid "Unable to parse Release file %s" -msgstr "Ni mogoe razleniti paketne datoteke %s (1)" +msgstr "Ni mogoče razčleniti Release datoteke %s" #: apt-pkg/indexrecords.cc:60 -#, fuzzy, c-format +#, c-format msgid "No sections in Release file %s" -msgstr "Opomba: izbran %s namesto %s \n" +msgstr "Ni izbir v Release datoteki %s " #: apt-pkg/indexrecords.cc:94 #, c-format msgid "No Hash entry in Release file %s" -msgstr "" +msgstr "Ni vnosa razprąila v Release datoteki %s" #: apt-pkg/indexrecords.cc:107 -#, fuzzy, c-format +#, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Napana vrstica v datoteki z odklonom: %s" +msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s" #: apt-pkg/indexrecords.cc:122 -#, fuzzy, c-format +#, c-format msgid "Invalid 'Date' entry in Release file %s" -msgstr "Ni mogoe razleniti paketne datoteke %s (1)" +msgstr "Neveljavne vnos 'Datum' v Release datoteki %s" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Ponudnikov blok %s ne vsebuje podpisa" +msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa" #: apt-pkg/cdrom.cc:518 #, c-format @@ -2977,66 +2995,69 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Uporabljam CD-ROM priklopno toko %s\n" -"Priklapljam CD-ROM\n" +"Uporabljanje CD-ROM-ove priklopne točke %s\n" +"Priklapljanje CD-ROM-a\n" #: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 msgid "Identifying.. " -msgstr "Identificiram.." +msgstr "Identificiranje ... " #: apt-pkg/cdrom.cc:552 #, c-format msgid "Stored label: %s\n" -msgstr "Shranjena oznaka: %s \n" +msgstr "Shranjena oznaka: %s\n" #: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 -#, fuzzy msgid "Unmounting CD-ROM...\n" -msgstr "Odklapljam CD-ROM..." +msgstr "Odklapljanje CD-ROM-a ...\n" #: apt-pkg/cdrom.cc:578 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Uporabljam CD-ROM priklopno toko %s\n" +msgstr "Uporabljanje CD-ROM-ove priklopne točke %s\n" #: apt-pkg/cdrom.cc:596 msgid "Unmounting CD-ROM\n" -msgstr "Odklapljam CD-ROM\n" +msgstr "Odklapljanje CD-ROM-a\n" #: apt-pkg/cdrom.cc:600 msgid "Waiting for disc...\n" -msgstr "akam na medij...\n" +msgstr "Čakanje na disk ...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:608 msgid "Mounting CD-ROM...\n" -msgstr "Priklapljam CD-ROM...\n" +msgstr "Priklapljanje CD-ROM-a ...\n" #: apt-pkg/cdrom.cc:626 msgid "Scanning disc for index files..\n" -msgstr "Preverjam medij za datoteke s kazalom..\n" +msgstr "Preiskovanje diska za datoteke kazala ..\n" #: apt-pkg/cdrom.cc:666 -#, fuzzy, c-format +#, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" -msgstr "Nael sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n" +msgstr "" +"Najdenih je bilo %zu kazal paketov, %zu kazal virov, %zu kazalov prevodov in " +"%zu podpisov\n" #: apt-pkg/cdrom.cc:677 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" +"Nobenih datotek paketov ni mogoče najti, morda to ni disk Debian ali pa je " +"arhitektura napačna?" #: apt-pkg/cdrom.cc:703 -#, fuzzy, c-format +#, c-format msgid "Found label '%s'\n" -msgstr "Shranjena oznaka: %s \n" +msgstr "Najdena je bila oznaka '%s'\n" #: apt-pkg/cdrom.cc:732 msgid "That is not a valid name, try again.\n" -msgstr "To ni veljavno ime, poskusite e enkrat.\n" +msgstr "To ni veljavno ime, poskusite znova.\n" #: apt-pkg/cdrom.cc:748 #, c-format @@ -3044,82 +3065,82 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Ta medij se imenuje: \n" +"Ta disk se imenuje: \n" "'%s'\n" #: apt-pkg/cdrom.cc:752 msgid "Copying package lists..." -msgstr "Kopiranje seznama paketov..." +msgstr "Kopiranje seznama paketov ..." #: apt-pkg/cdrom.cc:778 msgid "Writing new source list\n" -msgstr "Piem nov seznam virov\n" +msgstr "Pisanje novega seznama virov\n" #: apt-pkg/cdrom.cc:787 msgid "Source list entries for this disc are:\n" -msgstr "Izvorni vnosi za ta medij so:\n" +msgstr "Izvorni vnosi za ta disk so:\n" #: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908 #, c-format msgid "Wrote %i records.\n" -msgstr "Zapisal %i zapisov.\n" +msgstr "Zapisanih je bilo %i zapisov.\n" #: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "Zapisal %i zapisov z %i manjkajoimi datotekami.\n" +msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n" #: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "Zapisal %i zapisov z %i neujemajoimi datotekami.\n" +msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n" #: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Zapisal %i zapisov z %i manjkajoimi datotekami in %i neujemajoimi " -"datotekami.\n" +"Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami in %i " +"neujemajočimi datotekami.\n" #: apt-pkg/indexcopy.cc:537 -#, fuzzy, c-format +#, c-format msgid "Skipping nonexistent file %s" -msgstr "Odpiranje nastavitvene datoteke %s" +msgstr "Preskok neobstoječe datoteke %s" #: apt-pkg/indexcopy.cc:543 #, c-format msgid "Can't find authentication record for: %s" -msgstr "" +msgstr "Ni mogoče najti zapisa overitve za: %s" #: apt-pkg/indexcopy.cc:549 -#, fuzzy, c-format +#, c-format msgid "Hash mismatch for: %s" -msgstr "Neujemanje vsote MD5" +msgstr "Neujemanje razprąila za: %s" #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Izdaje '%s' za '%s' ni mogoe najti" +msgstr "Izdaje '%s' za '%s' ni mogoče najti" #: apt-pkg/cacheset.cc:340 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Razliice '%s' za '%s' ni mogoe najti" +msgstr "Različice '%s' za '%s' ni mogoče najti" #: apt-pkg/cacheset.cc:447 -#, fuzzy, c-format +#, c-format msgid "Couldn't find task '%s'" -msgstr "Ni mogoe najti paketa %s" +msgstr "Ni mogoče najti naloge '%s'" #: apt-pkg/cacheset.cc:454 -#, fuzzy, c-format +#, c-format msgid "Couldn't find any package by regex '%s'" -msgstr "Ni mogoe najti paketa %s" +msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" #: apt-pkg/cacheset.cc:467 #, c-format msgid "Can't select versions from package '%s' as it purely virtual" -msgstr "" +msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen" #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 #, c-format @@ -3127,154 +3148,166 @@ msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" +"Ni mogoče izbrati nameąčene različice ali različice kandidata iz paketa '%s', saj nima nobenega od " +"njiju" #: apt-pkg/cacheset.cc:491 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +msgstr "Ni mogoče izbrati najnovejąe različice iz paketa '%s', saj je popolnoma navidezen " #: apt-pkg/cacheset.cc:499 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" +msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata" #: apt-pkg/cacheset.cc:507 #, c-format msgid "Can't select installed version from package %s as it is not installed" -msgstr "" +msgstr "Ni mogoče izbrati nameąčene različice iz paketa %s, saj ni nameąčen" #: apt-pkg/deb/dpkgpm.cc:52 -#, fuzzy, c-format +#, c-format msgid "Installing %s" -msgstr " Nameen: " +msgstr "Nameąčanje %s" #: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Povezujem se z %s" +msgstr "Nastavljanje %s" #: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Odpiram %s" +msgstr "Odstranjevanje %s" #: apt-pkg/deb/dpkgpm.cc:55 -#, fuzzy, c-format +#, c-format msgid "Completely removing %s" -msgstr "Odstranitev %s ni uspela" +msgstr "%s je bil popolnoma odstranjen" #: apt-pkg/deb/dpkgpm.cc:56 #, c-format msgid "Noting disappearance of %s" -msgstr "" +msgstr "%s je izginil" #: apt-pkg/deb/dpkgpm.cc:57 #, c-format msgid "Running post-installation trigger %s" -msgstr "" +msgstr "Poganjanje sproľilca po namestitvi %s" #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc:646 -#, fuzzy, c-format +#, c-format msgid "Directory '%s' missing" -msgstr "Manjka imenik s seznami %spartial." +msgstr "Mapa '%s' manjka" #: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674 -#, fuzzy, c-format +#, c-format msgid "Could not open file '%s'" -msgstr "Ne morem odpreti datoteke %s" +msgstr "Ni mogoče odpreti datoteke '%s'" #: apt-pkg/deb/dpkgpm.cc:815 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Odpiram %s" +msgstr "Pripravljanje %s" #: apt-pkg/deb/dpkgpm.cc:816 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Odpiram %s" +msgstr "Raząirjanje %s" #: apt-pkg/deb/dpkgpm.cc:821 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Odpiranje nastavitvene datoteke %s" +msgstr "Pripravljanje na nastavljanje %s" #: apt-pkg/deb/dpkgpm.cc:823 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Nameen: " +msgstr "%s je bil nameąčen" #: apt-pkg/deb/dpkgpm.cc:828 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Pripravljanje na odstranitev %s" #: apt-pkg/deb/dpkgpm.cc:830 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Priporoa" +msgstr "%s je bil odstranjen" #: apt-pkg/deb/dpkgpm.cc:835 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Odpiranje nastavitvene datoteke %s" +msgstr "Pripravljanje na popolno odstranitev %s" #: apt-pkg/deb/dpkgpm.cc:836 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Odstranitev %s ni uspela" +msgstr "%s je bil popolnoma odstranjen" #: apt-pkg/deb/dpkgpm.cc:1042 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +"Ni mogoče pisati dnevnika, openpty() je spodletelo (/dev/pts ni " +"prklopljen?)\n" #: apt-pkg/deb/dpkgpm.cc:1073 msgid "Running dpkg" -msgstr "" +msgstr "Poganjanje dpkg" #: apt-pkg/deb/dpkgpm.cc:1276 msgid "No apport report written because MaxReports is reached already" -msgstr "" +msgstr "Poročilo apport ni bilo napisano, ker je bilo ątevilo MaxReports ľe doseľeno" #. check if its not a follow up error #: apt-pkg/deb/dpkgpm.cc:1281 msgid "dependency problems - leaving unconfigured" -msgstr "" +msgstr "teľave odvisnosti - puąčanje nenastavljenega" #: apt-pkg/deb/dpkgpm.cc:1283 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" +"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na " +"navezujočo napako iz predhodne napake." #: apt-pkg/deb/dpkgpm.cc:1289 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" +"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " +"polnega diska" #: apt-pkg/deb/dpkgpm.cc:1295 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" +"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " +"zaradi pomanjkanja pomnilnika" #: apt-pkg/deb/dpkgpm.cc:1302 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" +"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " +"dpkg V/I" #: apt-pkg/deb/debsystem.cc:69 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" -msgstr "" +msgstr "Skrbniąke mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?" #: apt-pkg/deb/debsystem.cc:72 -#, fuzzy, c-format +#, c-format msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Imenika seznamov ni mogoe zakleniti" +msgstr "Skrbniąke mape (%s) ni mogoče zakleniti. Ali ste skrbnik?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a @@ -3282,23 +3315,23 @@ msgstr "Imenika seznamov ni mogo #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'." #: apt-pkg/deb/debsystem.cc:106 msgid "Not locked" -msgstr "" +msgstr "Ni zaklenjeno" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:200 #, c-format msgid "No mirror file '%s' found " -msgstr "" +msgstr "Datoteke zrcalnih streľnikov '%s' ni mogoče najti" #: methods/mirror.cc:343 #, c-format msgid "[Mirror: %s]" -msgstr "" +msgstr "[Zrcalni streľnik: %s]" #: methods/rred.cc:465 #, c-format @@ -3306,6 +3339,8 @@ msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" +"%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je " +"videti pokvarjen" #: methods/rred.cc:470 #, c-format @@ -3313,84 +3348,15 @@ msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" +"%s ni mogoče zakrpati z mmap (toda napaka ni specifična za mmap) - popravek " +"je videti pokvarjen." #: methods/rsh.cc:329 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" #~ msgid "Error occurred while processing %s (NewVersion2)" -#~ msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 2)" +#~ msgstr "Priąlo je do napake pri obdelavi %s (Nova različica 2)" #~ msgid "Malformed line %u in source list %s (vendor id)" -#~ msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)" - -#, fuzzy -#~ msgid "Couldn't access keyring: '%s'" -#~ msgstr "Ni mogoe razreiti '%s'" - -#, fuzzy -#~ msgid "Could not patch file" -#~ msgstr "Ne morem odpreti datoteke %s" - -#~ msgid " %4i %s\n" -#~ msgstr " %4i %s\n" - -#~ msgid "%4i %s\n" -#~ msgstr "%4i %s\n" - -#, fuzzy -#~ msgid "Processing triggers for %s" -#~ msgstr "Napaka pri obdelavi imenika %s" - -#~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." -#~ msgstr "" -#~ "Ker ste zahtevali samo eno opravilo, je zelo verjetno, da se paketa\n" -#~ "preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n" -#~ "o tem paketu." - -#, fuzzy -#~ msgid "Line %d too long (max %lu)" -#~ msgstr "Vrstica %d je predolga (najve %d)" - -#, fuzzy -#~ msgid "Line %d too long (max %d)" -#~ msgstr "Vrstica %d je predolga (najve %d)" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" - -#, fuzzy -#~ msgid "Stored label: %s \n" -#~ msgstr "Shranjena oznaka: %s \n" - -#, fuzzy -#~ msgid "" -#~ "Found %i package indexes, %i source indexes, %i translation indexes and " -#~ "%i signatures\n" -#~ msgstr "" -#~ "Nael sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n" - -#, fuzzy -#~ msgid "openpty failed\n" -#~ msgstr "Izbira ni uspela" - -#~ msgid "File date has changed %s" -#~ msgstr "Datum datoteke se je spremenil %s" - -#~ msgid "Reading file list" -#~ msgstr "Branje seznama datotek" - -#, fuzzy -#~ msgid "Could not execute " -#~ msgstr "Ni mogoe dobiti zaklenjene datoteke %s" - -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Neznan ID ponudnika '%s' v vrstici %u v seznamu virov %s" +#~ msgstr "Napačna vrstica %u v seznamu virov %s (ID ponudnika)" -- cgit v1.2.3