From: Michael Vogt Date: Fri, 29 Jun 2012 13:34:12 +0000 (+0200) Subject: merged from the debian-sid branch X-Git-Tag: 0.9.13.exp1ubuntu1~59 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7ac4503f3e0ccf0fbad592179331c0f1bba427a5?hp=--cc merged from the debian-sid branch --- 7ac4503f3e0ccf0fbad592179331c0f1bba427a5 diff --cc debian/changelog index f50bac52d,1505aad53..2f6dbbd28 --- a/debian/changelog +++ b/debian/changelog @@@ -1,41 -1,61 +1,105 @@@ ++apt (0.9.7.1ubuntu1) quantal; urgency=low ++ ++ * merged from the debian-sid branch ++ ++ -- Michael Vogt Fri, 29 Jun 2012 15:33:42 +0200 ++ + apt (0.9.7.1) unstable; urgency=low + + [ Program translation updates ] + * Bulgarian (Damyan Ivanov) (Closes: #678983) + * Hungarian (Gabor Kelemen) + * Italian (Milo Casagrande) + * Slovenian (Andrej Znidarsic) + * German (Holger Wansing) (Closes: #679314) + * Slovak (Ivan Masár) (Closes: #679448) + + [ David Kalnischkies ] + * cmdline/apt-internal-solver.cc, cmdline/apt-mark.cc: + - typo fixes and unfuzzy translations + * debian/control: + - libapt-{pkg,inst} packages should be in section 'libs' instead + of 'admin' as by ftp-master override request in #677596 + - demote debiandoc-sgml to Build-Depends-Indep + * doc/makefile: + - separate translation building of debiandoc from manpages + so that we don't need to build debiandoc for binary packages + + -- Michael Vogt Fri, 29 Jun 2012 14:26:32 +0200 + + apt (0.9.7) unstable; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/contrib/mmap.cc: + - Fix the Fallback option to work correctly, by not calling + realloc() on a map mapped by mmap(), and by using malloc + and friends instead of new[]. + - Zero out the new memory allocated with realloc(). + + [ Daniel Hartwig ] + * apt-pkg/pkgcachegen.cc: + - always reset _error->StackCount in MakeStatusCache (Closes: #677175) + + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - ensure that mixed positive/negative architecture wildcards + are handled in the same way as dpkg handles them + - use PackageArchitectureMatchesSpecification filter + * apt-pkg/cachefilter.cc: + - add PackageArchitectureMatchesSpecification (Closes: #672603) + * apt-pkg/cacheset.cc: + - add PackageContainerInterface::FromGroup to support + architecture specifications with wildcards on the commandline + * apt-pkg/pkgcache.cc: + - do a string comparision for architecture checking in IsMultiArchImplicit + as 'unique' strings in the pkgcache aren't unique (Closes: #677454) + * buildlib/configure.mak: + - print a message detailing how to get config.guess and config.sub + in case they are not in /usr/share/misc (Closes: #677312) + * cmdline/apt-get.cc: + - print a friendly message in 'download' if a package can't be + downloaded (Closes: #677887) + + -- Michael Vogt Tue, 19 Jun 2012 16:42:43 +0200 + +apt (0.9.6ubuntu3) quantal; urgency=low + + * SECURITY UPDATE: Disable apt-key net-update for now, as validation + code is still insecure + - cmdline/apt-key: exit 1 immediately in net_update() + - CVE-2012-0954 + - LP: #1013639 + + -- Jamie Strandboge Fri, 15 Jun 2012 08:03:17 -0500 + +apt (0.9.6ubuntu2) quantal; urgency=low + + * adjust apt-key to ensure no collisions on subkeys too. Patch thanks to + Marc Deslauriers. (LP: #1013128) + + -- Jamie Strandboge Thu, 14 Jun 2012 11:29:48 -0500 + +apt (0.9.6ubuntu1) quantal; urgency=low + + [ Michael Vogt ] + * merged from Debian, remaining changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + - APT::pkgPackageManager::MaxLoopCount set to 5000 + - apport pkgfailure handling + - ubuntu changelog download handling + - patch for apt cross-building, see http://bugs.debian.org/666772 + + [ Steve Langasek ] + * Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu, + removed in previous LTS. + * prepare-release: declare the packages needed as source build deps. + + -- Steve Langasek Mon, 11 Jun 2012 22:36:16 +0000 + apt (0.9.6) unstable; urgency=low [ David Kalnischkies ] diff --cc debian/control index 4bdd3ce70,ec0d817fb..b793d3f04 --- a/debian/control +++ b/debian/control @@@ -8,13 -7,13 +8,13 @@@ Uploaders: Michael Vogt Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, - gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + gettext:any (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, - po4a (>= 0.34-2), autotools-dev, autoconf, automake, debiandoc-sgml - Build-Depends-Indep: doxygen + po4a (>= 0.34-2), autotools-dev, autoconf, automake + Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ +Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu +Vcs-Browser: http://code.launchpad.net/apt/ubuntu Package: apt Architecture: any diff --cc po/ast.po index 0b3e4693e,070ffb525..a508c43c0 --- a/po/ast.po +++ b/po/ast.po @@@ -3455,6 -3461,6 +3455,31 @@@ msgstr " msgid "Not locked" msgstr "Non bloquiáu" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates ye un preséu pa sacar información de\n" ++#~ "configuración y plantíes de paquetes de debian.\n" ++#~ "\n" ++#~ "Opciones:\n" ++#~ "-h Esti testu d'aida.\n" ++#~ "-t Define'l direutoriu temporal\n" ++#~ "-c=? Llei esti ficheru de configuración\n" ++#~ "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" ++#~ "tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Nun ye a desaniciar %s" diff --cc po/bg.po index 0dfead8eb,f967cbc71..f62442728 --- a/po/bg.po +++ b/po/bg.po @@@ -10,8 -10,8 +10,8 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-27 11:17+0200\n" +"POT-Creation-Date: 2012-06-26 13:47+0200\n" - "PO-Revision-Date: 2010-08-27 22:33+0300\n" + "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@@ -111,9 -111,9 +111,9 @@@ msgstr "Трябва да Ð²ÑŠÐ²ÐµÐ´ÐµÑ #: cmdline/apt-cache.cc:1357 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." - msgstr "" + msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея." -#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508 +#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" @@@ -296,9 -292,9 +292,9 @@@ msgstr "Y #: cmdline/apt-get.cc:140 msgid "N" - msgstr "" + msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@@ -846,12 -845,17 +845,12 @@@ msgstr "Вътрешна грешка, msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:2386 -#, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" - -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2381 #, c-format msgid "Downloading %s %s" - msgstr "" + msgstr "Изтегляне на %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2439 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" @@@ -870,8 -874,8 +869,8 @@@ msgstr " "адрес:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2501 - #, fuzzy, c-format + #, c-format msgid "" "Please use:\n" "bzr branch %s\n" @@@ -951,8 -955,10 +950,10 @@@ msgid " "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" + "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" + "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" @@@ -963,16 -969,16 +964,16 @@@ msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:2997 +#: cmdline/apt-get.cc:2985 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" - "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " - "не може да бъде намерен" + "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " + "за пакети „%s“" -#: cmdline/apt-get.cc:3015 +#: cmdline/apt-get.cc:3003 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -988,26 -994,25 +989,25 @@@ msgstr " "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:3077 +#: cmdline/apt-get.cc:3065 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" - "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже няма " - "налични версии на пакета %s, които могат да удовлетворят изискването за " - "версия" + "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " + "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:3083 +#: cmdline/apt-get.cc:3071 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " - "не може да бъде намерен" + "няма подходящи версии" -#: cmdline/apt-get.cc:3106 +#: cmdline/apt-get.cc:3094 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" @@@ -1021,17 -1026,16 +1021,16 @@@ msgstr "Зависимостите зРmsgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232 +#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220 - #, fuzzy, c-format + #, c-format msgid "Changelog for %s (%s)" - msgstr "Свързване с %s (%s)" + msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:3355 +#: cmdline/apt-get.cc:3346 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:3396 +#: cmdline/apt-get.cc:3387 - #, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1171,32 -1175,32 +1170,32 @@@ msgstr " "в устройството „%s“ и натиснете „Enter“\n" #: cmdline/apt-mark.cc:55 - #, fuzzy, c-format + #, c-format msgid "%s can not be marked as it is not installed.\n" - msgstr "но той не е инсталиран" + msgstr "Пакетът „%s“ не може да бъде маркиран, защото не е инсталиран.\n" #: cmdline/apt-mark.cc:61 - #, fuzzy, c-format + #, c-format msgid "%s was already set to manually installed.\n" - msgstr "%s е отбелязан като ръчно инсталиран.\n" + msgstr "Пакетът „%s“ вече е отбелязан като ръчно инсталиран.\n" #: cmdline/apt-mark.cc:63 - #, fuzzy, c-format + #, c-format msgid "%s was already set to automatically installed.\n" - msgstr "%s е отбелязан като автоматично инсталиран.\n" + msgstr "Пакетът „%s“ вече е отбелязан като автоматично инсталиран.\n" #: cmdline/apt-mark.cc:228 - #, fuzzy, c-format + #, c-format msgid "%s was already set on hold.\n" - msgstr "%s вече е най-новата версия.\n" + msgstr "Пакетът „%s“ вече е задуржан.\n" #: cmdline/apt-mark.cc:230 - #, fuzzy, c-format + #, c-format msgid "%s was already not hold.\n" - msgstr "%s вече е най-новата версия.\n" + msgstr "Пакетът „%s“ вече е задържан.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" @@@ -3315,9 -3353,9 +3321,9 @@@ msgstr " #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" - msgstr "" + msgstr "Изпълняване на външна програма за удовлетворяване на зависимости" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Installing %s" msgstr "Инсталиране на %s" @@@ -3408,11 -3446,11 +3414,11 @@@ msgstr " msgid "Running dpkg" msgstr "Изпълняване на dpkg" -#: apt-pkg/deb/dpkgpm.cc:1411 +#: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" - msgstr "" + msgstr "Операцията е прекъсната" -#: apt-pkg/deb/dpkgpm.cc:1473 +#: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" msgstr "" "Поради достигане на максималния брой доклади (MaxReports) не е записан нов " @@@ -3492,6 -3521,6 +3498,72 @@@ msgstr " msgid "Not locked" msgstr "Без заключване" ++#~ msgid "Can't find a source to download version '%s' of '%s'" ++#~ msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" ++ ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Употреба: apt-mark [опции] {auto|manual} пкт1 [пкт2 …]\n" ++#~ "\n" ++#~ "apt-mark предоставя команден интерфейс за маркиране на пакети\n" ++#~ "като инсталирани ръчно или автоматично. Предлага се и показване\n" ++#~ "на текущата маркировка.\n" ++#~ "\n" ++#~ "Команди:\n" ++#~ " auto — Маркиране на пакети като инсталирани автоматично\n" ++#~ " manual — Маркиране на пакети като инсталирани ръчно\n" ++#~ "\n" ++#~ "Опции:\n" ++#~ " -h Тази помощна информация\n" ++#~ " -q Изход без информация за напредъка, подходящ за съхраняване\n" ++#~ " -qq Без изход, освен при грешки\n" ++#~ " -s Симулация. Само се извежда какво би било направено\n" ++#~ " -f Четене/запис на информацията за маркировката от указания файл\n" ++#~ " -c=? Указване на файл с настройки\n" ++#~ " -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n" ++#~ "За повече информация прегледайте ръководствата apt-mark(8) и apt.conf(5)." ++ ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Употреба: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver е интерфейс към вградения в APT механизъм за " ++#~ "удовлетворяване на зависимости\n" ++#~ "\n" ++#~ "Опции:\n" ++#~ " -h Този помощен текст\n" ++#~ " -q Изход, подходящ за журнал — без индикатор на напредъка\n" ++#~ " -c=? Указване на файл с настройки\n" ++#~ " -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Неуспех при премахването на %s" diff --cc po/ca.po index 814f723dc,283af2e4f..7842a42e3 --- a/po/ca.po +++ b/po/ca.po @@@ -3512,6 -3517,6 +3512,72 @@@ msgstr " msgid "Not locked" msgstr "No blocat" ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Forma d'ús: apt-mark [opcions] {auto|manual} paq1 [paq2 …]\n" ++#~ "\n" ++#~ "apt-mark és una interfície simple de la línia d'ordres per a marcar\n" ++#~ "paquets com a instaŀlats automàticament o manual. També pot llistar\n" ++#~ "les marques.\n" ++#~ "\n" ++#~ "Ordres:\n" ++#~ "\n" ++#~ " auto - Marca els paquets donats com a instaŀlats automàticament\n" ++#~ " manual - Marca els paquets donats com a instaŀlats manualment\n" ++#~ "\n" ++#~ "Opcions:\n" ++#~ " -h Aquest text d'ajuda.\n" ++#~ " -q Sortida enregistrable - sense indicador de progrés\n" ++#~ " -qq Sense sortida, llevat dels errors\n" ++#~ " -s No actues. Mostra només què es faria.\n" ++#~ " -f Llegeix/escriu les marques auto/manual emprant el fitxer donat\n" ++#~ " -c=? Llegeix aquest fitxer de configuració\n" ++#~ " -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" ++#~ "Vegeu les pàgines de manual apt-mark(8) i apt.conf(5) per a més " ++#~ "informació." ++ ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n" ++#~ "\n" ++#~ "apt-extracttemplates és una eina per a extreure informació de\n" ++#~ "configuració i plantilles dels paquets debian\n" ++#~ "\n" ++#~ "Opcions:\n" ++#~ " -h Aquest text d'ajuda.\n" ++#~ " -t Estableix el directori temporal\n" ++#~ " -c=? Llegeix aquest fitxer de configuració\n" ++#~ " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "No es pot suprimir %s" diff --cc po/cs.po index f0c8d4864,203eaeaf3..4c4cf67c7 --- a/po/cs.po +++ b/po/cs.po @@@ -3418,6 -3422,6 +3418,30 @@@ msgstr "dpkg byl přeruÅ¡en, pro nápra msgid "Not locked" msgstr "Není uzamčen" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Použití: apt-extracttemplates soubor1 [soubor2 …]\n" ++#~ "\n" ++#~ "apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a " ++#~ "Å¡ablony\n" ++#~ "\n" ++#~ "Volby:\n" ++#~ " -h Tato nápověda.\n" ++#~ " -t Nastaví dočasný adresář\n" ++#~ " -c=? Načte tento konfigurační soubor\n" ++#~ " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Selhalo odstranění %s" diff --cc po/cy.po index 6be74a95e,ec5d59a2b..4a14f126a --- a/po/cy.po +++ b/po/cy.po @@@ -3482,6 -3491,6 +3482,31 @@@ msgstr " msgid "Not locked" msgstr "" ++# FIXME: "debian" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" ++#~ "\n" ++#~ "Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" ++#~ "templed o becynnau Debian.\n" ++#~ "\n" ++#~ "Opsiynnau:\n" ++#~ " -h Dangos y testun cymorth hwn\n" ++#~ " -t Gosod y cyfeiriadur dros dro\n" ++#~ " -c=? Darllen y ffeil cyfluniad hwn\n" ++#~ " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Methwyd dileu %s" diff --cc po/da.po index 49cffd479,d1293d3e5..6fee76e3f --- a/po/da.po +++ b/po/da.po @@@ -867,18 -872,18 +867,18 @@@ msgstr " "BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' pÃ¥:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2501 - #, fuzzy, c-format + #, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Brug venligst:\n" - "bzr get %s\n" + "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2554 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" @@@ -3478,6 -3471,6 +3478,71 @@@ msgstr "dpkg blev afbrudt, du skal manu msgid "Not locked" msgstr "Ikke lÃ¥st" ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n" ++#~ "\n" ++#~ "apt-mark er en simpel kommandolinjegrænseflade for markering af pakker\n" ++#~ "som manuelt eller automatisk installeret. Programmet kan ogsÃ¥ vise\n" ++#~ "markeringerne.\n" ++#~ "\n" ++#~ "Kommandoer:\n" ++#~ " auto - Marker de givne pakker som automatisk installeret\n" ++#~ " manual - Marker de givne pakker som manuelt installeret\n" ++#~ "\n" ++#~ "Tilvalg:\n" ++#~ " -h Denne hjælpetekst.\n" ++#~ " -q Logbar uddata - ingen statusindikator\n" ++#~ " -qq Ingen uddata undtagen for fejl\n" ++#~ " -s Ingen handling. Viser kun hvad der ville blive udført.\n" ++#~ " -f læs/skriv auto/manuel markering i den givne fil\n" ++#~ " -c=? Læs denne konfigurationsfil\n" ++#~ " -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/" ++#~ "tmp\n" ++#~ "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information." ++ ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Brug: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n" ++#~ "interne som en ekstern problemløser for APT-familien for fejlsøgning\n" ++#~ "eller lignende\n" ++#~ "\n" ++#~ "Tilvalg:\n" ++#~ " -h Denne hjælpetekst.\n" ++#~ " -q Logbare uddata - ingen statusindikator\n" ++#~ " -c=? Læs denne konfigurationsfil\n" ++#~ " -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Kunne ikke slette %s" diff --cc po/de.po index d98ff15ef,cb35a3acd..219c84dbc --- a/po/de.po +++ b/po/de.po @@@ -10,8 -10,8 +10,8 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-27 11:17+0200\n" +"POT-Creation-Date: 2012-06-26 13:47+0200\n" - "PO-Revision-Date: 2012-05-12 23:00+0200\n" + "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" "Language: \n" @@@ -886,8 -894,8 +887,8 @@@ msgstr " "auf:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2501 - #, fuzzy, c-format + #, c-format msgid "" "Please use:\n" "bzr branch %s\n" @@@ -3589,6 -3583,6 +3590,78 @@@ msgstr " msgid "Not locked" msgstr "Nicht gesperrt" ++#~ msgid "Can't find a source to download version '%s' of '%s'" ++#~ msgstr "" ++#~ "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " ++#~ "herunterzuladen." ++ ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Aufruf: apt-mark [Optionen] {auto|manual} paket1 [paket2 ...]\n" ++#~ "\n" ++#~ "apt-mark ist ein einfaches Befehlszeilenprogramm, um Pakete als manuell\n" ++#~ "oder automatisch installiert zu markieren. Diese Markierungen können " ++#~ "auch\n" ++#~ "aufgelistet werden.\n" ++#~ "\n" ++#~ "Befehle:\n" ++#~ " auto – das angegebene Paket als »Automatisch installiert« markieren\n" ++#~ " manual – das angegebene Paket als »Manuell installiert« markieren\n" ++#~ "\n" ++#~ "Optionen:\n" ++#~ " -h dieser Hilfetext\n" ++#~ " -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" ++#~ " -qq keine Ausgabe, außer bei Fehlern\n" ++#~ " -s nichts tun, nur eine Simulation der Aktionen durchführen\n" ++#~ " -f Autom./Manuell-Markierung in der angegebenen Datei lesen/" ++#~ "schreiben\n" ++#~ " -c=? Diese Konfigurationsdatei benutzen\n" ++#~ " -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" ++#~ "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n" ++#~ "weitergehender Informationen und Optionen." ++ ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Aufruf: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n" ++#~ "Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n" ++#~ "Fehlersuche oder ähnlichem.\n" ++#~ "\n" ++#~ "Optionen:\n" ++#~ " -h dieser Hilfetext\n" ++#~ " -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" ++#~ " -c=? Diese Konfigurationsdatei benutzen\n" ++#~ " -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "%s konnte nicht entfernt werden." diff --cc po/dz.po index 38cce8462,6f815804c..2ed296324 --- a/po/dz.po +++ b/po/dz.po @@@ -3409,6 -3417,6 +3409,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n" ++#~ "རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n" ++#~ "གདམ་ཁ་ཚུ།\n" ++#~ " -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n" ++#~ " -t འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n" ++#~ " -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" ++#~ " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/" ++#~ "tmp་བཟུམ།\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "%s་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" diff --cc po/el.po index 96f0bc099,62bb87650..99456f2d8 --- a/po/el.po +++ b/po/el.po @@@ -3447,6 -3455,6 +3447,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n" ++#~ "\n" ++#~ "το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n" ++#~ "και πρότυπα από πακέτα debian\n" ++#~ "\n" ++#~ "Επιλογές:\n" ++#~ " -h Το παρόν κείμενο βοήθειας\n" ++#~ " -t Καθορισμός προσωρινού καταλόγου\n" ++#~ " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" ++#~ " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Αποτυχία διαγραφής του %s" diff --cc po/es.po index 16ffcb03f,11295cdae..b80fa0ed2 --- a/po/es.po +++ b/po/es.po @@@ -3559,6 -3565,6 +3559,31 @@@ msgstr " msgid "Not locked" msgstr "No bloqueado" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Uso: apt-extracttemplates archivo1 [archivo2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates es una herramienta para extraer información de\n" ++#~ "configuración y plantillas de paquetes de debian.\n" ++#~ "\n" ++#~ "Opciones:\n" ++#~ " -h Este texto de ayuda.\n" ++#~ " -t Define el directorio temporal\n" ++#~ " -c=? Lee este archivo de configuración\n" ++#~ " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" ++#~ "cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "No pude borrar %s" diff --cc po/eu.po index 3f0aa3abb,3d3a15b46..8fb3553de --- a/po/eu.po +++ b/po/eu.po @@@ -3409,6 -3417,6 +3409,32 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates debian-eko paketeen konfigurazioaren eta " ++#~ "txantiloien\n" ++#~ "informazioa ateratzeko tresna bat da\n" ++#~ "\n" ++#~ "Aukerak:\n" ++#~ " -h Laguntza testu hau\n" ++#~ " -t Ezarri aldi baterako direktorioa\n" ++#~ " -c=? Irakurri konfigurazio fitxategi hau\n" ++#~ " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/" ++#~ "tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Huts egin du %s kentzean" diff --cc po/fi.po index f05b63bdd,f0f9a97c6..dbd70495d --- a/po/fi.po +++ b/po/fi.po @@@ -3402,6 -3410,6 +3402,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates on työkalu asetus- ja mallitietojen \n" ++#~ "poimintaan debian-paketeista\n" ++#~ "\n" ++#~ "Valitsimet:\n" ++#~ " -h Tämä ohje\n" ++#~ " -t Aseta väliaikaisten tiedostojen kansio\n" ++#~ " -c=? Lue tämä asetustiedosto\n" ++#~ " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Tiedoston %s poistaminen ei onnistunut" diff --cc po/fr.po index d781d3179,b20036cbe..8c1ec034c --- a/po/fr.po +++ b/po/fr.po @@@ -8,11 -8,11 +8,11 @@@ msgid " msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-27 11:17+0200\n" +"POT-Creation-Date: 2012-06-26 13:47+0200\n" - "PO-Revision-Date: 2012-06-02 18:42+0200\n" + "PO-Revision-Date: 2012-06-25 19:58+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" - "Language: \n" + "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@@ -890,8 -898,8 +891,8 @@@ msgstr " "suivi de versions « %s » à l'adresse :\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2501 - #, fuzzy, c-format + #, c-format msgid "" "Please use:\n" "bzr branch %s\n" @@@ -3557,6 -3590,6 +3558,80 @@@ msgstr " msgid "Not locked" msgstr "Non verrouillé" ++#~ msgid "Can't find a source to download version '%s' of '%s'" ++#~ msgstr "" ++#~ "Impossible de trouver une source de téléchargement de la version « %s » " ++#~ "de « %s »" ++ ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Utilisation: apt-mark [options] {auto|manual} paquet 1 [paquet2 ...]\n" ++#~ "\n" ++#~ "apt-mark est une interface simple, en ligne de commande, qui permet\n" ++#~ "de marquer des paquets comme installés manuellement ou automatiquement.\n" ++#~ "Cette commande permet également d'afficher cet état.\n" ++#~ "\n" ++#~ "Commandes :\n" ++#~ " auto - marquer les paquets indiqués comme installés automatiquement\n" ++#~ " manual - marquer les paquets indiqués comme installés manuellement\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h Affiche la présente aide.\n" ++#~ " -q Affichage journalisable - pas de barre de progression\n" ++#~ " -qq Pas d'affichage à part les erreurs\n" ++#~ " -s Mode simulation : aucune action effectuée.\n" ++#~ " Affiche simplement ce qui serait effectué.\n" ++#~ " -f lecture/écriture des états dans le fichier indiqué\n" ++#~ " -c=? lecture du fichier de configuration indiqué\n" ++#~ " -o=? utilisation d'une option de configuration,\n" ++#~ " p. ex. -o dir::cache=/tmp\n" ++#~ "Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n" ++#~ "pour plus d'informations." ++ ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Utilisation: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver est une interface en ligne de commande\n" ++#~ "permettant d'utiliser la résolution interne d'apt de manière externe\n" ++#~ "avec les outils de la famille d'APT à des fins de déboguage ou\n" ++#~ "équivalent.\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h La présente aide.\n" ++#~ " -q Affichage journalisable - pas de barre de progression\n" ++#~ " -c=? lecture du fichier de configuration indiqué\n" ++#~ " -o=? utilisation d'une option de configuration,\n" ++#~ " p. ex. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Impossible de supprimer %s" diff --cc po/gl.po index 57b95123a,574e44c5a..755cc24c9 --- a/po/gl.po +++ b/po/gl.po @@@ -3501,6 -3507,6 +3501,31 @@@ msgstr " msgid "Not locked" msgstr "Non está bloqueado" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Uso: apt-extracttemplates fich1 [fich2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates é unha ferramenta para extraer información\n" ++#~ "de configuración e patróns dos paquetes debian\n" ++#~ "\n" ++#~ "Opcións:\n" ++#~ " -h Este texto de axuda\n" ++#~ " -t Estabelece o directorio temporal\n" ++#~ " -c=? Le este ficheiro de configuración\n" ++#~ " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::" ++#~ "cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Non foi posíbel retirar %s" diff --cc po/hu.po index 8a33f247c,f25d00c12..c7d81e592 --- a/po/hu.po +++ b/po/hu.po @@@ -7,8 -7,8 +7,8 @@@ msgid " msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-27 11:17+0200\n" +"POT-Creation-Date: 2012-06-26 13:47+0200\n" - "PO-Revision-Date: 2012-01-06 22:03+0100\n" + "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "Language: hu\n" @@@ -865,18 -870,18 +865,18 @@@ msgstr " "karbantartva:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2501 - #, fuzzy, c-format + #, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Használja a következő parancsot:\n" - "bzr get %s\n" + "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2554 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött „%s” fájl kihagyása\n" @@@ -3431,11 -3430,11 +3431,11 @@@ msgstr " msgid "Running dpkg" msgstr "A dpkg futtatása" -#: apt-pkg/deb/dpkgpm.cc:1411 +#: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" - msgstr "" + msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" -#: apt-pkg/deb/dpkgpm.cc:1473 +#: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve" @@@ -3511,6 -3502,6 +3511,76 @@@ msgstr " msgid "Not locked" msgstr "Nincs zárolva" ++#~ msgid "Can't find a source to download version '%s' of '%s'" ++#~ msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" ++ ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 ...]\n" ++#~ "\n" ++#~ "Az apt-mark egy egyszerű parancssori felület csomagok megjelölésére\n" ++#~ "kézileg vagy automatikusan telepítettként. Képes felsorolni a jelöléseket " ++#~ "is.\n" ++#~ "\n" ++#~ "Parancsok:\n" ++#~ " auto -Az adott csomagok megjelölése automatikusan telepítettként\n" ++#~ " manual - Az adott csomagok megjelölése kézzel telepítettként\n" ++#~ "\n" ++#~ "Kapcsolók:\n" ++#~ " -h Ez a súgó szöveg.\n" ++#~ " -q Naplózható kimenet - nincs folyamatjelző\n" ++#~ " -qq Nincs kimenet, kivéve a hibákat\n" ++#~ " -s Szimulációs mód. Csak kiírja, mi történne.\n" ++#~ " -f auto/kézi megjelölés olvasása/írása az adott fájlból/fájlba\n" ++#~ " -c=? Ezt a konfigurációs fájlt olvassa be\n" ++#~ " -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/" ++#~ "tmp\n" ++#~ "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n" ++#~ "információkért." ++ ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Használat: apt-internal-solver\n" ++#~ "\n" ++#~ "Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n" ++#~ "feloldóként használható az APT családhoz hibakeresési vagy hasonló " ++#~ "céllal\n" ++#~ "\n" ++#~ "Kapcsolók:\n" ++#~ " -h Ez a súgó szöveg.\n" ++#~ " -q Naplózható kimenet - nincs folyamatjelző\n" ++#~ " -c=? Ezt a konfigurációs fájlt olvassa be\n" ++#~ " -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/" ++#~ "tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "%s eltávolítása sikertelen" diff --cc po/it.po index 32093bdec,d616c84a9..aea198ba5 --- a/po/it.po +++ b/po/it.po @@@ -8,8 -8,8 +8,8 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-27 11:17+0200\n" +"POT-Creation-Date: 2012-06-26 13:47+0200\n" - "PO-Revision-Date: 2011-05-16 21:38+0200\n" + "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" @@@ -111,8 -111,9 +111,9 @@@ msgstr "È necessario specificare almen #: cmdline/apt-cache.cc:1357 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" + "Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto." -#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508 +#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" @@@ -294,9 -293,9 +293,9 @@@ msgstr "S #: cmdline/apt-get.cc:140 msgid "N" - msgstr "" + msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" @@@ -879,19 -887,19 +881,19 @@@ msgstr " "all'interno del sistema di controllo della versione \"%s\" presso:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2501 - #, fuzzy, c-format + #, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" - "Usare:\n" - "bzr get %s\n" - "per recuperare gli ultimi (e probabilmente non rilasciati) aggiornamenti del " + "Utilizzare:\n" + "bzr branch %s\n" + "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2554 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" @@@ -960,8 -968,10 +962,10 @@@ msgid " "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" + "Informazioni sull'architettura non disponibili per %s. Consultare apt.conf" + "(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" @@@ -971,16 -981,16 +975,16 @@@ msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:2997 +#: cmdline/apt-get.cc:2985 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" - "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " - "non può essere trovato" + "La dipendenza %s per %s non può essere soddisfatta perché %s non è " + "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:3015 +#: cmdline/apt-get.cc:3003 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -996,25 -1006,25 +1000,25 @@@ msgstr " "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " "è troppo recente" -#: cmdline/apt-get.cc:3077 +#: cmdline/apt-get.cc:3065 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" - "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione " - "del pacchetto %s può soddisfare le richieste di versione" + "La dipendenza %s per %s non può essere soddisfatta perché la versione " + "candidata del pacchetto %s non può soddisfare i requisiti di versione" -#: cmdline/apt-get.cc:3083 +#: cmdline/apt-get.cc:3071 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" - "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " - "non può essere trovato" + "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " + "non ha una versione candidata" -#: cmdline/apt-get.cc:3106 +#: cmdline/apt-get.cc:3094 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" @@@ -1037,8 -1047,7 +1041,7 @@@ msgstr "Changelog per %s (%s) msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:3396 +#: cmdline/apt-get.cc:3387 - #, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1181,32 -1188,32 +1182,32 @@@ msgstr " "nell'unità \"%s\" e premere Invio\n" #: cmdline/apt-mark.cc:55 - #, fuzzy, c-format + #, c-format msgid "%s can not be marked as it is not installed.\n" - msgstr "ma non è installato" + msgstr "%s non può essere segnato perché non è installato.\n" #: cmdline/apt-mark.cc:61 - #, fuzzy, c-format + #, c-format msgid "%s was already set to manually installed.\n" - msgstr "È stato impostato %s per l'installazione manuale.\n" + msgstr "%s è già stato impostato come installato manualmente.\n" #: cmdline/apt-mark.cc:63 - #, fuzzy, c-format + #, c-format msgid "%s was already set to automatically installed.\n" - msgstr "%s impostato automaticamente come installato.\n" + msgstr "%s è già stato impostato come installato automaticamente.\n" #: cmdline/apt-mark.cc:228 - #, fuzzy, c-format + #, c-format msgid "%s was already set on hold.\n" - msgstr "%s è già alla versione più recente.\n" + msgstr "%s è già stato impostato come bloccato.\n" #: cmdline/apt-mark.cc:230 - #, fuzzy, c-format + #, c-format msgid "%s was already not hold.\n" - msgstr "%s è già alla versione più recente.\n" + msgstr "%s era già non bloccato.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa di %s ma non era presente" @@@ -3354,9 -3393,9 +3358,9 @@@ msgstr "Il solver esterno è terminato #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" - msgstr "" + msgstr "Esecuzione solver esterno" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Installing %s" msgstr "Installazione di %s" @@@ -3447,11 -3486,11 +3451,11 @@@ msgstr " msgid "Running dpkg" msgstr "Esecuzione di dpkg" -#: apt-pkg/deb/dpkgpm.cc:1411 +#: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" - msgstr "" + msgstr "L'operazione è stata interrotta prima di essere completata" -#: apt-pkg/deb/dpkgpm.cc:1473 +#: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" msgstr "" "Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " @@@ -3486,16 -3525,7 +3490,15 @@@ msgstr " "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore di memoria esaurita" -#: apt-pkg/deb/dpkgpm.cc:1499 +#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505 - #, fuzzy +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" - "Segnalazione apport non scritta poiché il messaggio di errore indica un " - "errore per disco pieno." ++"Non è stata scritta alcuna segnalazione di apport poiché il messaggio di " ++"errore indica la presenza di un problema nel sistema locale" + +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@@ -3532,6 -3562,6 +3535,76 @@@ msgstr " msgid "Not locked" msgstr "Non bloccato" ++#~ msgid "Can't find a source to download version '%s' of '%s'" ++#~ msgstr "" ++#~ "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s" ++#~ "\"" ++ ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Uso: apt-mark [OPZIONI] {auto|manual} PKG1 [PKG2 ...]\n" ++#~ "\n" ++#~ "apt-mark è una semplice interfaccia a riga di comando per segnalare i " ++#~ "pacchetti\n" ++#~ "come installati manualmente o automaticamente. Può anche elencare le \n" ++#~ "segnalazioni.\n" ++#~ "\n" ++#~ "Comandi:\n" ++#~ " auto Segna i pacchetti forniti come installati automaticamente\n" ++#~ " manual Segna i pacchetti forniti come installati manualmente\n" ++#~ "\n" ++#~ "Opzioni:\n" ++#~ " -h Mostra questo aiuto\n" ++#~ " -q Output registrabile, nessun indicatore di avanzamento\n" ++#~ " -qq Nessun output eccetto gli errori\n" ++#~ " -s Nessuna azione, stampa solamente cosa verrebbe fatto\n" ++#~ " -f Legge/Scrivere la segnalazione nel file fornito\n" ++#~ " -c=? Legge come configurazione il file specificato\n" ++#~ " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n" ++#~ "Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n" ++#~ "apt.conf(5)." ++ ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Uso: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n" ++#~ "come resolver esterno per il debugging degli strumenti APT\n" ++#~ "\n" ++#~ "Opzioni:\n" ++#~ " -h Mostra questo aiuto\n" ++#~ " -q Output registrabile, nessun indicatore di avanzamento\n" ++#~ " -c=? Legge come configurazione il file specificato\n" ++#~ " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Rimozione di %s non riuscita" @@@ -3607,9 -3637,13 +3680,6 @@@ #~ msgid "Got a single header line over %u chars" #~ msgstr "Ricevuta una singola riga header su %u caratteri" - #~ msgid "Note: This is done automatic and on purpose by dpkg." - #~ msgstr "Nota: questo viene svolto automaticamente da dpkg." -#~ msgid "" -#~ "No apport report written because the error message indicates an issue on " -#~ "the local system" -#~ msgstr "" -#~ "Non è stata scritta alcuna segnalazione di apport poiché il messaggio di " -#~ "errore indica la presenza di un problema nel sistema locale" -- #~ msgid "Malformed override %s line %lu #1" #~ msgstr "Override non corretto: file %s riga %lu #1" diff --cc po/ja.po index e79fd3b1b,95aca1619..df0ad0eb1 --- a/po/ja.po +++ b/po/ja.po @@@ -3474,6 -3479,6 +3474,30 @@@ msgstr " msgid "Not locked" msgstr "ロックされていません" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n" ++#~ "抽出するためのツールです\n" ++#~ "\n" ++#~ "オプション:\n" ++#~ " -h このヘルプを表示する\n" ++#~ " -t 一時ディレクトリを指定する\n" ++#~ " -c=? 指定した設定ファイルを読み込む\n" ++#~ " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "%s の削除に失敗しました" diff --cc po/km.po index 9d90fa527,6c2ea5275..db3469f13 --- a/po/km.po +++ b/po/km.po @@@ -3368,6 -3376,6 +3368,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n" ++#~ "ពី​កញ្ចប់​​ដេបៀន \n" ++#~ "\n" ++#~ "ជម្រើស ៖ ​\n" ++#~ " -h អត្ថបទ​ជំនួយ​\n" ++#~ " -t កំណត់​ថត​បណ្ដោះ​អាសន្ន\n" ++#~ " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" ++#~ " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "បរាជ័យក្នុងការយក %s ចេញ" diff --cc po/ko.po index 6fbc6df8c,04565c043..ed424be9f --- a/po/ko.po +++ b/po/ko.po @@@ -3411,6 -3417,6 +3411,30 @@@ msgstr " msgid "Not locked" msgstr "잠기지 않음" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "사용법: apt-extracttemplates 파일1 [파일2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n" ++#~ "도구입니다\n" ++#~ "\n" ++#~ "옵션:\n" ++#~ " -h 이 도움말\n" ++#~ " -t 임시 디렉토리 설정\n" ++#~ " -c=? 설정 파일을 읽습니다\n" ++#~ " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "%s을(를) 지우는데 실패했습니다" diff --cc po/ku.po index ab3701a13,975fd9608..25ddfdd2e --- a/po/ku.po +++ b/po/ku.po @@@ -3193,6 -3203,6 +3193,32 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Bikaranîn: apt-config [vebijark] ferman\n" ++#~ "apt-config, amûra xwendina dosyeya mîhengên APTê ye\n" ++#~ "\n" ++#~ "Ferman\n" ++#~ " shell - moda shell\n" ++#~ " dump - Mîhengan nîşan dide\n" ++#~ "\n" ++#~ "Vebijark:\n" ++#~ " -h Ev dosyeya alîkariyê ye.\n" ++#~ " -c=? Dosyeya mîhengan nîşan dide\n" ++#~ " -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar " ++#~ "bike. mînak -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Rakirina %s biserneket" diff --cc po/lt.po index 87c6a78f6,d3d28c856..cfb35964e --- a/po/lt.po +++ b/po/lt.po @@@ -3293,6 -3302,6 +3293,31 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates tai įrankis skirtas konfigÅ«racijų, bei Å¡ablonų " ++#~ "informacijos iÅ¡skleidimui\n" ++#~ "iÅ¡ debian paketų\n" ++#~ "\n" ++#~ "Parametrai:\n" ++#~ " -h Å is pagalbos tekstas\n" ++#~ " -t Nustatyti laikinąjį aplanką\n" ++#~ " -c=? Nuskaityti šį konfigÅ«racijų failą\n" ++#~ " -o=? Nustatyti savarankiÅ¡kas nuostatas, pvz.: -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Nepavyko paÅ¡alinti %s" diff --cc po/mr.po index a2b4506dc,fe19ac652..b46f755ff --- a/po/mr.po +++ b/po/mr.po @@@ -3381,6 -3389,6 +3381,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n" ++#~ " \n" ++#~ "ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n" ++#~ "डेबियन पॅकेजेस मधून \n" ++#~ "\n" ++#~ "पर्याय : \n" ++#~ " -h हा साह्याकारी मजकूर \n" ++#~ " -t टेंप डिर निर्धारित करा \n" ++#~ " -c=? ही संरचना संचिका वाचा \n" ++#~ " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "%s कायमचे काढून टाकण्यास असमर्थ" diff --cc po/nb.po index 129cda544,8b9d98123..8e53f0b0c --- a/po/nb.po +++ b/po/nb.po @@@ -3440,6 -3446,6 +3440,31 @@@ msgstr "dpkg ble avbrutt. Du mÃ¥ kjør msgid "Not locked" msgstr "Ikke lÃ¥st" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Bruk: apt-extracttemplates fil1 [fil2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates er et verktøy til Ã¥ hente ut informasjon om " ++#~ "innstillinger\n" ++#~ "og maler fra debianpakker.\n" ++#~ "\n" ++#~ "Innstillinger:\n" ++#~ " -h Denne hjelpeteksten\n" ++#~ " -t Lag en midlertidig mappe\n" ++#~ " -c=? Les denne innstillingsfila.\n" ++#~ " -o=? Sett en vilkÃ¥rlig innstilling, f.eks. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Klarte ikke Ã¥ fjerne %s" diff --cc po/ne.po index 52a33f147,2761f0b2a..e30dbd594 --- a/po/ne.po +++ b/po/ne.po @@@ -3372,6 -3380,6 +3372,31 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "उपयोग: apt-extracttemplates file1 [file2 ...]\n" ++#~ "\n" ++#~ " apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण " ++#~ "हो\n" ++#~ "\n" ++#~ "\n" ++#~ "विकल्पहरू:\n" ++#~ " -h यो मद्दत पाठ\n" ++#~ " -t टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n" ++#~ " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" ++#~ " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "%s लाई फेरी सार्न असफल भयो" diff --cc po/nl.po index 8aaed290d,114bee569..66419cc6a --- a/po/nl.po +++ b/po/nl.po @@@ -3502,6 -3508,6 +3502,31 @@@ msgstr " msgid "Not locked" msgstr "Niet vergrendeld" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates is een programma om configuratie- en " ++#~ "sjablooninformatie\n" ++#~ "uit Debian pakketten te halen.\n" ++#~ "\n" ++#~ "Opties:\n" ++#~ " -h Deze hulptekst.\n" ++#~ " -t Stel de tijdelijke map in.\n" ++#~ " -c=? Lees dit configuratiebestand.\n" ++#~ " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Verwijderen van %s is mislukt" diff --cc po/nn.po index 9075891cd,170c65c2b..22f414ceb --- a/po/nn.po +++ b/po/nn.po @@@ -3391,6 -3399,6 +3391,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Bruk: apt-extracttemplates fil1 [fil2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates er eit verktøy for å henta ut informasjon om\n" ++#~ "oppsett og malar frå Debian-pakkar.\n" ++#~ "\n" ++#~ "Val:\n" ++#~ " -h Vis denne hjelpeteksten\n" ++#~ " -t Vel mellombels katalog\n" ++#~ " -c=? Les denne innstillingsfila.\n" ++#~ " -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Klarte ikkje fjerna %s" diff --cc po/pl.po index 5ded9e404,61f20d2bb..e45a1fceb --- a/po/pl.po +++ b/po/pl.po @@@ -3528,6 -3533,6 +3528,72 @@@ msgstr " msgid "Not locked" msgstr "Niezablokowany" ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Użycie: apt-mark [opcje] {auto|manual} pakiet1 [pakiet2 ...]\n" ++#~ "\n" ++#~ "apt-mark jest prostym poleceniem wiersza poleceń do oznaczania pakietów\n" ++#~ "jako zainstalowane automatycznie lub ręcznie. Może także służyć\n" ++#~ "do wyświetlania stanu oznaczeń.\n" ++#~ "\n" ++#~ "Polecenia:\n" ++#~ " auto - Oznacza dany pakiet jako zainstalowany automatycznie\n" ++#~ " manual - Oznacza dany pakiet jako zainstalowany ręcznie\n" ++#~ "\n" ++#~ "Opcje:\n" ++#~ " -h Ten tekst pomocy\n" ++#~ " -q Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu " ++#~ "działania)\n" ++#~ " -qq Nie wypisuje nic oprócz komunikatów błędów\n" ++#~ " -s Symulacja - wyświetla jedynie co powinno zostać zrobione\n" ++#~ " -f zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n" ++#~ " -c=? Czyta wskazany plik konfiguracyjny.\n" ++#~ " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" ++#~ "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n" ++#~ "i apt.conf(5), aby uzyskać więcej informacji." ++ ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Użycie: apt-extracttemplates plik1 [plik2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates to narzędzie służące do pobierania informacji\n" ++#~ "i konfiguracji i szablonach z pakietów Debiana.\n" ++#~ "\n" ++#~ "Opcje:\n" ++#~ " -h Ten tekst pomocy.\n" ++#~ " -t Ustawia katalog tymczasowy\n" ++#~ " -c=? Czyta wskazany plik konfiguracyjny.\n" ++#~ " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Nie udało się usunąć %s" diff --cc po/pt.po index d99d23ccc,cd1547e7a..597026007 --- a/po/pt.po +++ b/po/pt.po @@@ -3491,6 -3497,6 +3491,31 @@@ msgstr " msgid "Not locked" msgstr "Sem acesso exclusivo" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n" ++#~ "\n" ++#~ "O apt-extracttemplates é uma ferramenta para extrair configuração\n" ++#~ "e informação de template de pacotes debian.\n" ++#~ "\n" ++#~ "Opções:\n" ++#~ " -h Este texto de ajuda\n" ++#~ " -t Definir o directório temporário\n" ++#~ " -c=? Ler este ficheiro de configuração\n" ++#~ " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" ++#~ "tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Falhou remover %s" diff --cc po/pt_BR.po index 63b8e9d9d,930ec79a3..8ffb22550 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@@ -3439,6 -3448,6 +3439,32 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n" ++#~ "\n" ++#~ "O apt-extracttemplates é uma ferramenta para extrair informações de " ++#~ "modelo\n" ++#~ "(\"template\") e configuração de pacotes debian.\n" ++#~ "\n" ++#~ "Opções:\n" ++#~ " -h Este texto de ajuda\n" ++#~ " -t Define o diretório temporário\n" ++#~ " -c=? Lê o arquivo de configuração especificado.\n" ++#~ " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" ++#~ "tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Falhou ao remover %s" diff --cc po/ro.po index de6fe781a,e1556214a..456fea358 --- a/po/ro.po +++ b/po/ro.po @@@ -3447,6 -3455,6 +3447,31 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates este o unealtă pentru extragerea informațiilor \n" ++#~ "de configurare și a șabloanelor dintr-un pachet Debian\n" ++#~ "\n" ++#~ "Opțiuni\n" ++#~ " -h Acest text de ajutor.\n" ++#~ " -t Impune directorul temporar\n" ++#~ " -c=? Citește acest fișier de configurare\n" ++#~ " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/" ++#~ "tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Eșec la ștergerea lui %s" diff --cc po/ru.po index 523c751b4,d66fe2456..1cd7e7772 --- a/po/ru.po +++ b/po/ru.po @@@ -3530,6 -3534,6 +3530,73 @@@ msgstr " msgid "Not locked" msgstr "Не заблокирован" ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Использование: apt-mark [параметры] {auto|manual} пакет1 [пакет2…]\n" ++#~ "\n" ++#~ "apt-mark — простая программа с интерфейсом командной строки\n" ++#~ "для отметки пакетов, что они установлены вручную или автоматически.\n" ++#~ "Также может показывать списки помеченных пакетов.\n" ++#~ "\n" ++#~ "Команды:\n" ++#~ " auto - пометить указанные пакеты, как установленные автоматически\n" ++#~ " manual - пометить указанные пакеты, как установленные вручную\n" ++#~ "\n" ++#~ "Параметры:\n" ++#~ " -h эта справка\n" ++#~ " -q показывать сообщения о работе, не выводить индикатор хода работы\n" ++#~ " -qq показывать только сообщения об ошибках\n" ++#~ " -s не выполнять действия на самом деле, только имитация работы\n" ++#~ " -f читать/писать данные о пометках в заданный файл\n" ++#~ " -c=? читать указанный файл настройки\n" ++#~ " -o=? задать значение произвольному параметру настройки,\n" ++#~ " например, -o dir::cache=/tmp\n" ++#~ "В справочных страницах apt-mark(8) и apt.conf(5)\n" ++#~ "содержится подробная информация и описание параметров." ++ ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Использование: apt-extracttemplates файл1 [файл2…]\n" ++#~ "\n" ++#~ "apt-extracttemplates извлекает из пакетов Debian данные config и " ++#~ "template\n" ++#~ "\n" ++#~ "Параметры:\n" ++#~ " -h Этот текст\n" ++#~ " -t Задать каталог для временных файлов\n" ++#~ " -c=? Читать указанный файл настройки\n" ++#~ " -o=? Задать значение произвольной настройке, например, -o dir::cache=/" ++#~ "tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Не удалось удалить %s" diff --cc po/sk.po index 859fbf110,803fab0d5..a18dbedee --- a/po/sk.po +++ b/po/sk.po @@@ -10,8 -10,8 +10,8 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-27 11:17+0200\n" +"POT-Creation-Date: 2012-06-26 13:47+0200\n" - "PO-Revision-Date: 2011-12-22 14:58+0100\n" + "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" "Language: sk\n" @@@ -291,9 -291,9 +291,9 @@@ msgstr "Y #: cmdline/apt-get.cc:140 msgid "N" - msgstr "" + msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@@ -872,8 -878,8 +873,8 @@@ msgstr " "adrese:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2501 - #, fuzzy, c-format + #, c-format msgid "" "Please use:\n" "bzr branch %s\n" @@@ -3298,9 -3311,9 +3298,9 @@@ msgstr "Externý rieÅ¡iteľ zlyhal bez #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" - msgstr "" + msgstr "SpustiÅ¥ externého rieÅ¡iteľa" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Installing %s" msgstr "InÅ¡taluje sa %s" @@@ -3391,11 -3404,11 +3391,11 @@@ msgstr " msgid "Running dpkg" msgstr "Spúšťa sa dpkg" -#: apt-pkg/deb/dpkgpm.cc:1411 +#: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" - msgstr "" + msgstr "Operácia bola preruÅ¡ená predtým, než sa stihla dokončiÅ¥" -#: apt-pkg/deb/dpkgpm.cc:1473 +#: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports" @@@ -3467,6 -3471,6 +3467,73 @@@ msgstr "dpkg bol preruÅ¡ený, musíte r msgid "Not locked" msgstr "Nie je zamknuté" ++#~ msgid "Can't find a source to download version '%s' of '%s'" ++#~ msgstr "Nie je možné nájsÅ¥ zdroj na stiahnutie verzie „%s“ balíka „%s“" ++ ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Použitie: apt-mark [voľby] {auto|manual} balík1 [balík2 ...]\n" ++#~ "\n" ++#~ "apt-mark je jednoduché rozhranie príkazového riadka na označovanie\n" ++#~ "balíkov ako manuálne alebo automaticky nainÅ¡talované.\n" ++#~ "Tiež dokáže označenia vypisovaÅ¥.\n" ++#~ "\n" ++#~ "Príkazy:\n" ++#~ " auto - Označí uvedené balíky ako automaticky nainÅ¡talované\n" ++#~ " manual - Označí uvedené balíky ako manuálne nainÅ¡talované\n" ++#~ "\n" ++#~ "Voľby:\n" ++#~ " -h Tento text pomocníka.\n" ++#~ " -q Výstup vhodný do záznamu - bez indikátora priebehu\n" ++#~ " -qq NevypisovaÅ¥ nič, len chyby\n" ++#~ " -s NevykonávaÅ¥ zmeny. Iba vypísaÅ¥, čo by sa urobilo.\n" ++#~ " -f čítanie/zápis označenia auto/manálne v uvedenom súbore\n" ++#~ " -c=? NačítaÅ¥ tento konfiguračný súbor\n" ++#~ " -o=? NastaviÅ¥ ľubovoľný konfiguračnú voľbu, napr. -o dir::cache=/tmp\n" ++#~ "ĎalÅ¡ie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf" ++#~ "(5)." ++ ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Použitie: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n" ++#~ "rieÅ¡iteľa ako vonkajší pre rodinu APT na ladenie a pod.\n" ++#~ "\n" ++#~ "Voľby:\n" ++#~ " -h Tento pomocník.\n" ++#~ " -q Výstup vhodný do záznamu - bez indikátora priebehu\n" ++#~ " -c=? Načíta tento konfiguračný súbor\n" ++#~ " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Odstránenie %s zlyhalo" diff --cc po/sl.po index 1d22f1946,7bf3076be..0c0877856 --- a/po/sl.po +++ b/po/sl.po @@@ -4,8 -4,8 +4,8 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-27 11:17+0200\n" +"POT-Creation-Date: 2012-06-26 13:47+0200\n" - "PO-Revision-Date: 2011-03-06 15:47+0000\n" + "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" "Language: sl\n" @@@ -110,9 -110,9 +110,9 @@@ msgstr "Podati morate vsaj en iskalni v #: cmdline/apt-cache.cc:1357 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." - msgstr "" + msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'." -#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508 +#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462 #, c-format msgid "Unable to locate package %s" msgstr "Ni mogoče najti paketa %s" @@@ -291,9 -289,9 +289,9 @@@ msgstr "Y #: cmdline/apt-get.cc:140 msgid "N" - msgstr "" + msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" @@@ -874,18 -879,18 +874,18 @@@ msgstr " "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2501 - #, fuzzy, c-format + #, c-format msgid "" "Please use:\n" "bzr branch %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" + "bzr branch %s\n" + "za pridobitev zadnjih (morda Å¡e neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2554 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" @@@ -954,8 -959,10 +954,10 @@@ msgid " "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" + "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " + "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" @@@ -965,14 -972,15 +967,15 @@@ msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2997 +#: cmdline/apt-get.cc:2985 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" - msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" + msgstr "" + "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:3015 +#: cmdline/apt-get.cc:3003 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -985,23 -993,25 +988,25 @@@ msgid "Failed to satisfy %s dependency msgstr "" "Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov" -#: cmdline/apt-get.cc:3077 +#: cmdline/apt-get.cc:3065 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" - "%s odvisnosti za %s ni mogoče zadostiti, ker nobena različica paketa %s ne " - "more zadostiti zahtevi po različici" + "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " + "%s ne more zadostiti zahtev različice" -#: cmdline/apt-get.cc:3083 +#: cmdline/apt-get.cc:3071 - #, fuzzy, c-format + #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" - msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" + msgstr "" + "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " + "%s nima različice kandidata" -#: cmdline/apt-get.cc:3106 +#: cmdline/apt-get.cc:3094 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s" @@@ -1024,8 -1034,7 +1029,7 @@@ msgstr "Dnevnik sprememb za %s (%s) msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:3396 +#: cmdline/apt-get.cc:3387 - #, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1071,50 -1080,48 +1075,48 @@@ " This APT has Super Cow Powers.\n" msgstr "" "Uporaba: apt-get [možnosti] ukaz\n" - " apt-get [možnosti] install|remove pak1 [pak2 ...]\n" - " apt-get [možnosti] source pak1 [pak2 ...]\n" + " apt-get [možnosti] install|remove paket1 [paket2 ...]\n" + " apt-get [možnosti] source paket1 [paket2 ...]\n" "\n" - "apt-get je enostaven vmesnik ukazne vrstice za prejemanje\n" - "in nameščanje paketov. Najpogosteje uporabljena ukaza\n" - "sta update in install.\n" + "apt-get je enostaven vmesnik ukazne vrstice za prejem in nameščanje\n" + "paketov. Najbolj pogosto uporabljana ukaza sta update in install.\n" "\n" "Ukazi:\n" - " update - pridobi sezname novih paketov\n" - " upgrade - izvede nadgradnjo\n" - " 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 arhive izvorne kode\n" - " dist-upgrade - nadgradnja distrbucije, oglejte si apt-get(8)\n" - " dselect-upgrade - sledi izbiram dselect\n" - " clean - izbriÅ¡i prejete datoteke arhiva\n" - " autoclean - izbriÅ¡e stare prejete datoteke arhiva\n" - " check - preveri, da ni zlomljenih odvisnosti\n" - " markauto - označi dane pakete kot samodejno nameščene\n" - " unmarkauto - označi dane pakete kot ročno nameščene\n" - " changelog - prejme in prikaže dnevnik sprememb za dani paket\n" - " download - prejme binarni paket v trenutno mapo\n" + " update - Pridobi nove sezname paketov\n" + " upgrade - Izvedix nadgradnjo\n" + " 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 - Prejmi arhive izvorne kode\n" + " build-dep - Nastavi odvisnosti gradnje za paket izvorne kode\n" + " dist-upgrade - Nadgradnja distribucije, oglejte si apt-get(8)\n" + " dselect-upgrade - Sledi izbiri dselect\n" + " clean - IzbriÅ¡i prejete datoteke arhivov\n" + " autoclean - IzbriÅ¡e stare prejete datoteke arhivov\n" + " check - Preveri, da ni pokvarjenih odvisnosti\n" + " changelog - Prejmi in prikaže dnevnik sprememb za dani paket\n" + " download - Prejmi binarni paket v trenutno mapo\n" "\n" "Možnosti:\n" - " -h to besedilo pomoči.\n" - " -q beležljiv izhod - brez indikatorja napredka\n" - " -qq ni izhoda razen napak\n" - " -d le prejmi - NE namesti ali odpakiraj arhivov\n" - " -s izvedi simulacijo ukaza\n" - " -y predpostavi Yes za vsa vpraÅ¡anja in ne postavljaj vpraÅ¡anj\n" - " -f poskusi popraviti sistem z zlomljenimi odvisnostmi\n" - " -m poskusi nadaljevati, če arhivov ni mogoče najti\n" - " -u pokaži tudi seznam nadgrajenih paketov\n" - " -b izgradi izvorni paket po njegovem pridobivanju\n" - " -V pokaže podrobno izpisane Å¡tevilke različic\n" - " -c=? prebere to nastavitveno datoteko\n" - " -o=? nastavi poljubno nastavitveno možnost, na primer dir::cache=/temo\n" - "Za več podrobnosti in možnosti si oglejte priročnike apt-get(8),\n" - "sources.list(5) in apt.conf(5).\n" - " Ta APT ima zmožnosti Super krave.\n" + " -h To besedilo pomoči.\n" + " -q Izhod se beleži - brez kazalnika napredka\n" + " -qq Ni izhoda razen napak\n" + " -d Le prejmi - NE nameščaj ali odpakiraj arhivov\n" + " -s Ne naredi ničesar. Izvedi simulacijo ukaza\n" + " -y Predpostavi Da vsem poizvedbam in ne pozivaj\n" + " -f Poskusi popraviti sistem s pokvarjenimi odvisnostmi\n" + " -m Poskusi nadaljevati, če arhivov ni mogoče najti\n" + " -u Pokaži tudi seznam nadgrajenih paketov\n" + " -b Po pridobitvi izgradi izvorni paket\n" + " -V Pokaži podrobne Å¡tevilke različic\n" + " -c=? Preberi to nastavitveno datoteko\n" + " -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/tmp\n" + "Za več podrobnosti in možnosti si oglejte strani priročnikov apt-get(8),\n" + " sources.list(5) in apt.conf(5). \n" + " Ta APT ima moči super krav.\n" -#: cmdline/apt-get.cc:3561 +#: cmdline/apt-get.cc:3552 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@@ -1164,32 -1171,32 +1166,32 @@@ msgstr " "v enoto '%s' in pritisnite vnosno tipko\n" #: cmdline/apt-mark.cc:55 - #, fuzzy, c-format + #, c-format msgid "%s can not be marked as it is not installed.\n" - msgstr "vendar ni nameščen" + msgstr "paket %s ne more biti označen, ker ni nameščen.\n" #: cmdline/apt-mark.cc:61 - #, fuzzy, c-format + #, c-format msgid "%s was already set to manually installed.\n" - msgstr "%s je bil nastavljen na ročno nameščen.\n" + msgstr "paket %s je bil že nastavljen na ročno nameščen.\n" #: cmdline/apt-mark.cc:63 - #, fuzzy, c-format + #, c-format msgid "%s was already set to automatically installed.\n" - msgstr "%s je nastavljen na samodejno nameščen.\n" + msgstr "paket %s je bil že nastavljen kot samodejno nameščen.\n" #: cmdline/apt-mark.cc:228 - #, fuzzy, c-format + #, c-format msgid "%s was already set on hold.\n" - msgstr "NajnovejÅ¡a različica %s je že nameščena.\n" + msgstr "paket %s je bil že nastavljen kot na čakanju.\n" #: cmdline/apt-mark.cc:230 - #, fuzzy, c-format + #, c-format msgid "%s was already not hold.\n" - msgstr "NajnovejÅ¡a različica %s je že nameščena.\n" + msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Program je čakal na %s a ga ni bilo tam" @@@ -3278,9 -3315,9 +3283,9 @@@ msgstr "Zunanji reÅ¡evalnik je spodlete #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" - msgstr "" + msgstr "Izvedi zunanji reÅ¡evalnik" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Installing %s" msgstr "Nameščanje %s" @@@ -3371,11 -3408,11 +3376,11 @@@ msgstr " msgid "Running dpkg" msgstr "Poganjanje dpkg" -#: apt-pkg/deb/dpkgpm.cc:1411 +#: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" - msgstr "" + msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" -#: apt-pkg/deb/dpkgpm.cc:1473 +#: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" msgstr "" "Poročilo apport ni bilo napisano, ker je bilo Å¡tevilo MaxReports že doseženo" @@@ -3409,16 -3446,7 +3414,15 @@@ msgstr " "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "zaradi pomanjkanja pomnilnika" -#: apt-pkg/deb/dpkgpm.cc:1499 +#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505 - #, fuzzy +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" - "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " - "polnega diska" ++"Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo " ++"na krajevnem sistemu" + +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@@ -3450,6 -3478,6 +3454,74 @@@ msgstr "dpkg je bil prekinjen. Za popra msgid "Not locked" msgstr "Ni zaklenjeno" ++#~ msgid "Can't find a source to download version '%s' of '%s'" ++#~ msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" ++ ++#~ msgid "" ++#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" ++#~ "\n" ++#~ "apt-mark is a simple command line interface for marking packages\n" ++#~ "as manually or automatically installed. It can also list marks.\n" ++#~ "\n" ++#~ "Commands:\n" ++#~ " auto - Mark the given packages as automatically installed\n" ++#~ " manual - Mark the given packages as manually installed\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -qq No output except for errors\n" ++#~ " -s No-act. Just prints what would be done.\n" ++#~ " -f read/write auto/manual marking in the given file\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." ++#~ msgstr "" ++#~ "Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n" ++#~ "\n" ++#~ "apt-mark je enostaven vmesnik ukazne vrstice za označevanje paketov\n" ++#~ "kot ročno ali samodejno nameščenih. Oznake lahko tudi izpiÅ¡e.\n" ++#~ "\n" ++#~ "Ukazi:\n" ++#~ " auto - Označi dane pakete kot samodejno nameščene\n" ++#~ " manual - Označi dane pakete kot ročno nameščene\n" ++#~ "\n" ++#~ "Možnosti:\n" ++#~ " -h To besedilo pomoči.\n" ++#~ " -q Izhod se beleži - brez kazalnika napredka\n" ++#~ " -qq Brez izhoda razen napak\n" ++#~ " -s Ne naredi ničesar. Samo napiÅ¡e kaj bi bilo narejeno.\n" ++#~ " -f Prebere/zapiÅ¡e oznako ročno/samodejno za dano datoteko\n" ++#~ " -c=? Prebere to nastavitveno datoteko\n" ++#~ " -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/" ++#~ "tmp\n" ++#~ "Za več podrobnosti si oglejte strani priročnika apt-mark(8) in apt-conf" ++#~ "(5)." ++ ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Uporaba: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n" ++#~ "reÅ¡evalnika kot zunanji reÅ¡evalnik za družino APT za razhroščevanje ali " ++#~ "podobno.\n" ++#~ "\n" ++#~ "Možnosti:\n" ++#~ " -h To besedilo pomoči\n" ++#~ " -q Izhod se beleži - ni kazalnika napredka\n" ++#~ " -c=? Prebere to nastavitveno datoteko\n" ++#~ " -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Odstranitev %s ni uspela" @@@ -3525,9 -3553,13 +3597,6 @@@ #~ msgid "Got a single header line over %u chars" #~ msgstr "Dobljena je ena vrstica glave preko %u znakov" - #~ msgid "Note: This is done automatic and on purpose by dpkg." - #~ msgstr "Opomba: To je dpkg storil samodejno in namenoma." -#~ msgid "" -#~ "No apport report written because the error message indicates an issue on " -#~ "the local system" -#~ msgstr "" -#~ "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na " -#~ "težavo na krajevnem sistemu" -- #~ msgid "Malformed override %s line %lu #1" #~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #1" diff --cc po/sv.po index e0b1629c8,b860d1874..0231d484c --- a/po/sv.po +++ b/po/sv.po @@@ -3471,6 -3476,6 +3471,31 @@@ msgstr " #: apt-pkg/deb/debsystem.cc:121 msgid "Not locked" msgstr "Inte lÃ¥st" ++ ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Användning: apt-extracttemplates fil1 [fil2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" ++#~ "och mallinformation frÃ¥n paket\n" ++#~ "\n" ++#~ "Flaggor:\n" ++#~ " -h Denna hjälptext.\n" ++#~ " -t Ställ in temporärkatalogen.\n" ++#~ " -c=? Läs denna konfigurationsfil.\n" ++#~ " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/" ++#~ "tmp\n" #~ msgid "Failed to remove %s" #~ msgstr "Misslyckades med att ta bort %s" diff --cc po/th.po index b5c6d74b1,f1c75bcfa..b3cc1ca2b --- a/po/th.po +++ b/po/th.po @@@ -3353,6 -3361,6 +3353,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "วิธีใช้: apt-extracttemplates file1 [file2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n" ++#~ "ออกมาจากแพกเกจเดเบียน\n" ++#~ "\n" ++#~ "ตัวเลือก:\n" ++#~ " -h แสดงข้อความช่วยเหลือนี้\n" ++#~ " -t กำหนดไดเรกทอรีทำงานชั่วคราว\n" ++#~ " -c=? อ่านแฟ้มค่าตั้งนี้\n" ++#~ " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "ไม่สามารถลบ %s" diff --cc po/tl.po index 019996d18,666d3245c..0d6a3a758 --- a/po/tl.po +++ b/po/tl.po @@@ -3430,6 -3438,6 +3430,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n" ++#~ "\n" ++#~ "Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" ++#~ "sa pagkaayos at template mula sa mga paketeng debian\n" ++#~ "\n" ++#~ "Mga opsyon:\n" ++#~ " -h Itong tulong na ito\n" ++#~ " -t Itakda ang dir na pansamantala\n" ++#~ " -c=? Basahin ang talaksang pagkaayos na ito\n" ++#~ " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Bigo sa pagtanggal ng %s" diff --cc po/uk.po index cdda6c50c,3ce9dbc9f..52b5be7d7 --- a/po/uk.po +++ b/po/uk.po @@@ -3441,6 -3449,6 +3441,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Використання: apt-extracttemplates file1 [file2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n" ++#~ "і файли-шаблони\n" ++#~ "\n" ++#~ "Опції:\n" ++#~ " -h Цей текст\n" ++#~ " -t Встановити теку для тимчасових файлів\n" ++#~ " -c=? Читати зазначений конфігураційний файл\n" ++#~ " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Невдача видалення %s" diff --cc po/vi.po index e86dd0853,034c5d612..27b530561 --- a/po/vi.po +++ b/po/vi.po @@@ -3476,6 -3487,6 +3476,35 @@@ msgstr " msgid "Not locked" msgstr "Không phải bị khoá" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "Cách sá»­ dụng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" ++#~ "\n" ++#~ "[extract: \t\trút;\n" ++#~ "templates: \tnhững biểu mẫu]\n" ++#~ "\n" ++#~ "apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" ++#~ "\tvà biểu mẫu đều từ gói Debian\n" ++#~ "\n" ++#~ "Tùy chọn:\n" ++#~ " -h \t\t_Trợ giúp_ này\n" ++#~ " -t \t\tLập thư muc tạm thời\n" ++#~ "\t\t[temp, tmp: viết tắt cho từ « temporary »: tạm thời]\n" ++#~ " -c=? \t\tĐọc tập tin cấu hình này\n" ++#~ " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp " ++#~ "»\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "Việc gỡ bỏ %s bị lỗi" diff --cc po/zh_CN.po index 126829e77,2b1a86636..f5bbae1fd --- a/po/zh_CN.po +++ b/po/zh_CN.po @@@ -3367,6 -3374,6 +3367,30 @@@ msgstr "dpkg è¢«ä¸­æ–­ï¼Œæ‚¨å¿…é¡»æ‰‹å· msgid "Not locked" msgstr "未锁定" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "用法: apt-extracttemplates 文件甲 [文件乙 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n" ++#~ "信息的工具\n" ++#~ "\n" ++#~ "选项:\n" ++#~ " -h 本帮助文本\n" ++#~ " -t 设置 temp 目录\n" ++#~ " -c=? 读指定的配置文件\n" ++#~ " -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "无法卸载 %s" diff --cc po/zh_TW.po index 5eea15299,573c48b1c..0c66dec64 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@@ -3352,6 -3360,6 +3352,30 @@@ msgstr " msgid "Not locked" msgstr "" ++#, fuzzy ++#~ msgid "" ++#~ "Usage: apt-internal-solver\n" ++#~ "\n" ++#~ "apt-internal-solver is an interface to use the current internal\n" ++#~ "like an external resolver for the APT family for debugging or alike\n" ++#~ "\n" ++#~ "Options:\n" ++#~ " -h This help text.\n" ++#~ " -q Loggable output - no progress indicator\n" ++#~ " -c=? Read this configuration file\n" ++#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" ++#~ msgstr "" ++#~ "用法:apt-extracttemplates 檔案1 [檔案2 ...]\n" ++#~ "\n" ++#~ "apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n" ++#~ "的工具\n" ++#~ "\n" ++#~ "選項\n" ++#~ " -h 本幫助訊息。\n" ++#~ " -t 指定暫存目錄\n" ++#~ " -c=? 讀取指定的設定檔\n" ++#~ " -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n" ++ #~ msgid "Failed to remove %s" #~ msgstr "無法移除 %s"