From 17180890a58365d717a8f79d2e60f5af4f829eef Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Fri, 8 Feb 2008 22:34:51 +0100 Subject: [PATCH 01/17] makepkg : set sane umask before source extraction. This fixes FS#9242 and FS#9362. Set umask before the sources are extracted, and after the /etc/profile.d/* files are sourced in handledeps. This sourcing of profile.d files is why umask was moved to the build function in the first place, as can be seen in commit ac965ed401. Signed-off-by: Chantry Xavier --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cecda1d2..090ba5df 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -675,9 +675,6 @@ run_build() { msg "$(gettext "Starting build()...")" cd "$srcdir" - # ensure we have a sane umask set - umask 0022 - # ensure all necessary build variables are exported export CFLAGS CXXFLAGS MAKEFLAGS CHOST @@ -1417,6 +1414,9 @@ else warning "$(gettext "pacman was not found in PATH; skipping dependency checks.")" fi +# ensure we have a sane umask set +umask 0022 + # get back to our src directory so we can begin with sources mkdir -p "$srcdir" cd "$srcdir" From 7586072beb8fde6631fe43a2eee5ca76255055d0 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Sat, 9 Feb 2008 17:51:05 +0100 Subject: [PATCH 02/17] Fixes file relocation pactests This patch fixes upgrade040.py and upgrade041.py (041 now fails!): * the old pactests didn't check the existence of the relocated file * upgrade041.py was broken due to a typo (missing comma) New upgrade046.py pactest was added (derived from the fixed upgrade041.py). This fails because the file relocation check is _hacked_ to conflict.c, and _alpm_db_find_fileconflicts is not called in case of --force. Signed-off-by: Nagy Gabor Signed-off-by: Chantry Xavier --- pactest/tests/upgrade040.py | 1 + pactest/tests/upgrade041.py | 3 ++- pactest/tests/upgrade046.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pactest/tests/upgrade046.py diff --git a/pactest/tests/upgrade040.py b/pactest/tests/upgrade040.py index bc40f337..e17c7176 100644 --- a/pactest/tests/upgrade040.py +++ b/pactest/tests/upgrade040.py @@ -27,4 +27,5 @@ for p in p1, p2: self.addrule("PKG_EXIST=%s" % p.name) self.addrule("FILE_MODIFIED=bin/dummy") self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_EXIST=usr/share/file") self.addrule("FILE_MODIFIED=usr/share/file") diff --git a/pactest/tests/upgrade041.py b/pactest/tests/upgrade041.py index 347c2c4b..20da4f14 100644 --- a/pactest/tests/upgrade041.py +++ b/pactest/tests/upgrade041.py @@ -4,7 +4,7 @@ lp1 = pmpkg("dummy") lp1.files = ["bin/dummy"] lp2 = pmpkg("foobar") -lp2.files = ["bin/foobar" +lp2.files = ["bin/foobar", "usr/share/file"] for p in lp1, lp2: @@ -27,4 +27,5 @@ for p in p1, p2: self.addrule("PKG_EXIST=%s" % p.name) self.addrule("FILE_MODIFIED=bin/dummy") self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_EXIST=usr/share/file") self.addrule("FILE_MODIFIED=usr/share/file") diff --git a/pactest/tests/upgrade046.py b/pactest/tests/upgrade046.py new file mode 100644 index 00000000..60164b72 --- /dev/null +++ b/pactest/tests/upgrade046.py @@ -0,0 +1,31 @@ +self.description = "File relocation between two packages (reverse order, --force)" + +lp1 = pmpkg("dummy") +lp1.files = ["bin/dummy"] + +lp2 = pmpkg("foobar") +lp2.files = ["bin/foobar", + "usr/share/file"] + +for p in lp1, lp2: + self.addpkg2db("local", p) + +p1 = pmpkg("dummy") +p1.files = ["bin/dummy", + "usr/share/file"] + +p2 = pmpkg("foobar") +p2.files = ["bin/foobar"] + +for p in p1, p2: + self.addpkg(p) + +self.args = "-Uf %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=0") +for p in p1, p2: + self.addrule("PKG_EXIST=%s" % p.name) +self.addrule("FILE_MODIFIED=bin/dummy") +self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_EXIST=usr/share/file") +self.addrule("FILE_MODIFIED=usr/share/file") From fbf3beb8d281e85c69f1683df2d9c7b2fb5c1ab7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 11 Feb 2008 09:51:34 -0600 Subject: [PATCH 03/17] ensure chk_fileconflicts reads entire file list If the end of the pB list was reached before the end of pA, we failed to read any remaining files from the pA list. Add an additional loop to ensure all entries of pA are added to the return list regardless of whether we have reached the end of pB. This new loop also eliminates the now-unnecessary check for a null pB, as we need to ensure we are excluding directories in the resulting output anyway. Signed-off-by: Dan McGee --- lib/libalpm/conflict.c | 14 ++++++++++---- pactest/tests/upgrade011.py | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 pactest/tests/upgrade011.py diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index c093705a..3442902c 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -251,10 +251,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) alpm_list_t *ret = NULL; alpm_list_t *pA = filesA, *pB = filesB; - if(pB == NULL) { - return(alpm_list_strdup(pA)); - } - + /* if both filesA and filesB have entries, do this loop */ while(pA && pB) { const char *strA = pA->data; const char *strB = pB->data; @@ -279,6 +276,15 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) } } } + /* ensure we have completely emptied pA */ + while(pA) { + const char *strA = pA->data; + /* skip directories */ + if(strA[strlen(strA)-1] != '/') { + ret = alpm_list_add(ret, strdup(strA)); + } + pA = pA->next; + } return(ret); } diff --git a/pactest/tests/upgrade011.py b/pactest/tests/upgrade011.py new file mode 100644 index 00000000..d8ed8734 --- /dev/null +++ b/pactest/tests/upgrade011.py @@ -0,0 +1,16 @@ +self.description = "Upgrade a package with a filesystem conflict" + +p = pmpkg("dummy", "2.0-1") +p.files = ["bin/dummy", "usr/share/file"] +self.addpkg(p) + +lp = pmpkg("dummy", "1.0-1") +lp.files = ["bin/dummy"] +self.addpkg2db("local", lp) + +self.filesystem = ["usr/share/file"] + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=dummy|1.0-1") From 9bf487b2ff0a3f56bd8e2159a7688264950f3a02 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 11 Feb 2008 19:36:12 -0600 Subject: [PATCH 04/17] Move some translations to their generic language code For our Czech, Polish, and Russian translations, they do not need to be at the more specific 'lang_COUNTRY' code, but can live at just plain 'lang'. This follows the pattern of most other translated programs out there as Roman pointed out on IRC. ru_RU: 2 (pacman and libalpm) ru: 128 for him, 131 for me (everything else) Signed-off-by: Dan McGee --- TRANSLATORS | 6 +++--- lib/libalpm/po/LINGUAS | 6 +++--- lib/libalpm/po/{cs_CZ.po => cs.po} | 0 lib/libalpm/po/{pl_PL.po => pl.po} | 0 lib/libalpm/po/{ru_RU.po => ru.po} | 0 po/LINGUAS | 6 +++--- po/{cs_CZ.po => cs.po} | 0 po/{pl_PL.po => pl.po} | 0 po/{ru_RU.po => ru.po} | 0 9 files changed, 9 insertions(+), 9 deletions(-) rename lib/libalpm/po/{cs_CZ.po => cs.po} (100%) rename lib/libalpm/po/{pl_PL.po => pl.po} (100%) rename lib/libalpm/po/{ru_RU.po => ru.po} (100%) rename po/{cs_CZ.po => cs.po} (100%) rename po/{pl_PL.po => pl.po} (100%) rename po/{ru_RU.po => ru.po} (100%) diff --git a/TRANSLATORS b/TRANSLATORS index d9dea891..249665dd 100644 --- a/TRANSLATORS +++ b/TRANSLATORS @@ -12,7 +12,7 @@ your language to the mix. * indicates the last active translator. -Czech (cs_CZ): +Czech (cs): * Vojtěch Gondžala German (de): * Matthias Gorissen @@ -30,7 +30,7 @@ Italian (it): * Giovanni 'voidnull' Scafora Alessio 'mOLOk' Bolognino Lorenzo '^zanDarK' Masini -Polish (pl_PL): +Polish (pl): * Mateusz Jędrasik Brazilian Portuguese (pt_BR): * João Felipe Santos @@ -38,6 +38,6 @@ Brazilian Portuguese (pt_BR): Hugo Doria Lincoln de Sousa Leandro Inácio -Russian (ru_RU): +Russian (ru): Vladimir Bayrakovskiy <4rayven@gmail.com> diff --git a/lib/libalpm/po/LINGUAS b/lib/libalpm/po/LINGUAS index bf816118..955e1fdb 100644 --- a/lib/libalpm/po/LINGUAS +++ b/lib/libalpm/po/LINGUAS @@ -1,11 +1,11 @@ # Set of available languages. -cs_CZ +cs de en_GB es fr hu it -pl_PL +pl pt_BR -ru_RU +ru diff --git a/lib/libalpm/po/cs_CZ.po b/lib/libalpm/po/cs.po similarity index 100% rename from lib/libalpm/po/cs_CZ.po rename to lib/libalpm/po/cs.po diff --git a/lib/libalpm/po/pl_PL.po b/lib/libalpm/po/pl.po similarity index 100% rename from lib/libalpm/po/pl_PL.po rename to lib/libalpm/po/pl.po diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru.po similarity index 100% rename from lib/libalpm/po/ru_RU.po rename to lib/libalpm/po/ru.po diff --git a/po/LINGUAS b/po/LINGUAS index bf816118..955e1fdb 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,11 +1,11 @@ # Set of available languages. -cs_CZ +cs de en_GB es fr hu it -pl_PL +pl pt_BR -ru_RU +ru diff --git a/po/cs_CZ.po b/po/cs.po similarity index 100% rename from po/cs_CZ.po rename to po/cs.po diff --git a/po/pl_PL.po b/po/pl.po similarity index 100% rename from po/pl_PL.po rename to po/pl.po diff --git a/po/ru_RU.po b/po/ru.po similarity index 100% rename from po/ru_RU.po rename to po/ru.po From 8068a14c5217989a25a03fa1677086c086ad90d6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 11 Feb 2008 20:15:44 -0600 Subject: [PATCH 05/17] setlibpaths(): remove a stray set_option line For some reason, we set our dbpath to the logfile path, which was completely broken, and we didn't even check the return value coming back (which of course was -1 meaning the set failed). Add some comments so people can understand what is going on here now too. Signed-off-by: Dan McGee --- src/pacman/pacman.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 27130254..377ea3fe 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -227,11 +227,11 @@ static void cleanup(int signum) exit(signum); } -/** Sets all libalpm required paths in one go. Called after the command line and - * inital config file parsing. Once this is complete, we can see if any paths were - * defined. If a rootdir was defined and nothing else, we want all of our paths to - * live under the rootdir that was specified. Safe to call multiple times (will only - * do anything the first time). +/** Sets all libalpm required paths in one go. Called after the command line + * and inital config file parsing. Once this is complete, we can see if any + * paths were defined. If a rootdir was defined and nothing else, we want all + * of our paths to live under the rootdir that was specified. Safe to call + * multiple times (will only do anything the first time). */ static void setlibpaths(void) { @@ -240,6 +240,8 @@ static void setlibpaths(void) int ret = 0; pm_printf(PM_LOG_DEBUG, "setlibpaths() called\n"); + /* Configure root path first. If it is set and dbpath/logfile were not + * set, then set those as well to reside under the root. */ if(config->rootdir) { char path[PATH_MAX]; ret = alpm_option_set_root(config->rootdir); @@ -254,10 +256,12 @@ static void setlibpaths(void) } if(!config->logfile) { snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE); - ret = alpm_option_set_dbpath(path); config->logfile = strdup(path); } } + /* Set other paths if they were configured. Note that unless rootdir + * was left undefined, these two paths (dbpath and logfile) will have + * been set locally above, so the if cases below will now trigger. */ if(config->dbpath) { ret = alpm_option_set_dbpath(config->dbpath); if(ret != 0) { From f4ac63ab43a277cdc6a409c0bd6f0d04c1791882 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 7 Feb 2008 20:33:11 -0600 Subject: [PATCH 06/17] Update NEWS in prep for 3.1.2 release Signed-off-by: Dan McGee --- NEWS | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/NEWS b/NEWS index 71f56f5b..451cd519 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,18 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.1.2 - updates to proto.install, add ChangeLog.proto (FS#7231) + - add 'force' option to packages, and have repo-add respect it + - mark gensync and updatesync as deprecated + - fix pacman -Qo behavior on symlinks (FS#9473) + - fix segfault on a broken symlinks in backup code (FS#9235) + - fix chk_fileconflicts brokenness, ensure it reads entire list + - minor documentation and message updates + - moved some translations to their more generic lang codes + - makepkg: + - check to ensure we have non-URL sources (FS#9208) + - ensure we strip binaries in /opt/ dirs (FS#9342) + - check for VCS executable before using (FS#9230) + - set sane umask before source extraction (FS#9242, FS#9362) 3.1.1 - fix versioned provisions handling- use '=' instead of ' ' which differs from original spec but better in long run (FS#9171) - rename query --orphans to --unrequired (FS#9144) From e8d665fbf7792ce6d8cae85d05d880fbed310b83 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 9 Feb 2008 10:42:08 -0600 Subject: [PATCH 07/17] Update translation files in prep for 3.1.2 release For 7 message changes, this commit is far too large... Signed-off-by: Dan McGee --- po/cs_CZ.po | 683 +++++++++++++++------------- po/de.po | 1182 +++++++++++++++++++++++++------------------------ po/en_GB.po | 1039 +++++++++++++++++++++---------------------- po/es.po | 629 +++++++++++++------------- po/fr.po | 570 ++++++++++++------------ po/hu.po | 587 ++++++++++++------------ po/it.po | 567 ++++++++++++------------ po/pacman.pot | 539 +++++++++++----------- po/pl_PL.po | 596 +++++++++++++------------ po/pt_BR.po | 569 ++++++++++++------------ po/ru_RU.po | 573 ++++++++++++------------ 11 files changed, 3838 insertions(+), 3696 deletions(-) diff --git a/po/cs_CZ.po b/po/cs_CZ.po index c6b03fcf..b85f596e 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs_CZ\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-01-14 23:03-0600\n" +"POT-Creation-Date: 2008-02-09 10:41-0600\n" "PO-Revision-Date: 2008-01-18 22:42+0100\n" "Last-Translator: Vojtěch Gondžala \n" "Language-Team: Čeština\n" @@ -21,8 +21,8 @@ msgstr "" msgid "failed to release transaction (%s)\n" msgstr "selhalo dokončení transakce (%s)\n" -#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63 -#: src/pacman/sync.c:784 +#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63 +#: src/pacman/sync.c:781 msgid "no targets specified (use -h for help)\n" msgstr "nebyly specifikovány cíle (použijte -h pro nápovědu)\n" @@ -45,43 +45,43 @@ msgstr "" msgid "loading package data... " msgstr "načítám informace o balíčku... " -#: src/pacman/add.c:118 +#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570 #, c-format -msgid "error: failed to add target '%s' (%s)" -msgstr "chyba: selhalo přidání cíle '%s' (%s)" +msgid "error: '%s': %s\n" +msgstr "chyba: '%s': %s\n" -#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176 +#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176 #: src/pacman/sync.c:194 #, c-format msgid "done.\n" msgstr "hotovo.\n" -#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646 +#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643 #, c-format msgid "error: failed to prepare transaction (%s)\n" msgstr "chyba: selhala příprava transakce (%s)\n" -#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655 +#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652 #, c-format msgid ":: %s: requires %s\n" msgstr ":: %s: vyžaduje %s\n" -#: src/pacman/add.c:149 +#: src/pacman/add.c:150 src/pacman/sync.c:660 #, c-format -msgid ":: %s: conflicts with %s" -msgstr ":: %s: je v konfliktní s %s" +msgid ":: %s: conflicts with %s\n" +msgstr ":: %s: konfliktní s %s\n" -#: src/pacman/add.c:158 src/pacman/sync.c:718 +#: src/pacman/add.c:159 src/pacman/sync.c:715 #, c-format msgid "%s exists in both '%s' and '%s'\n" msgstr "%s se nachází v '%s' a '%s'\n" -#: src/pacman/add.c:164 src/pacman/sync.c:724 +#: src/pacman/add.c:165 src/pacman/sync.c:721 #, c-format msgid "%s: %s exists in filesystem\n" msgstr "%s: %s již existuje v souborovém systému\n" -#: src/pacman/add.c:170 +#: src/pacman/add.c:171 #, c-format msgid "" "\n" @@ -90,7 +90,7 @@ msgstr "" "\n" "vyskytla se chyba, žádné balíčky nebyly aktualizovány.\n" -#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709 +#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706 #, c-format msgid "error: failed to commit transaction (%s)\n" msgstr "chyba: selhalo provádění transakce (%s)\n" @@ -170,7 +170,9 @@ msgstr ":: Získávám balíčky z %s...\n" msgid "" ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/" "n] " -msgstr ":: %s vyžaduje instalaci %s z IgnorePkg/IgnoreGroup. I přesto instalovat? [A/n] " +msgstr "" +":: %s vyžaduje instalaci %s z IgnorePkg/IgnoreGroup. I přesto instalovat? [A/" +"n] " #: src/pacman/callback.c:270 #, c-format @@ -188,10 +190,8 @@ msgid ":: Replace %s with %s/%s? [Y/n] " msgstr ":: Nahradit %s za %s/%s? [A/n] " #: src/pacman/callback.c:288 -#, c-format -msgid "" -"Replacing %s with %s/%s\n" -"." +#, fuzzy, c-format +msgid "Replacing %s with %s/%s\n" msgstr "" "Nahrazuji %s za %s/%s\n" "." @@ -413,7 +413,8 @@ msgstr "" #: src/pacman/pacman.c:81 src/pacman/pacman.c:95 src/pacman/pacman.c:117 #, c-format msgid " --asdeps install packages as non-explicitly installed\n" -msgstr " --asdeps nainstaluje balíčky jako nevýslovně instalované\n" +msgstr "" +" --asdeps nainstaluje balíčky jako nevýslovně instalované\n" #: src/pacman/pacman.c:82 src/pacman/pacman.c:88 src/pacman/pacman.c:96 #: src/pacman/pacman.c:119 @@ -424,17 +425,22 @@ msgstr " -d, --nodeps přeskočí kontrolu závislostí\n" #: src/pacman/pacman.c:83 src/pacman/pacman.c:97 src/pacman/pacman.c:121 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr " -f, --force vynucená instalace, přepíše konfliktní soubory\n" +msgstr "" +" -f, --force vynucená instalace, přepíše konfliktní soubory\n" #: src/pacman/pacman.c:87 #, c-format -msgid " -c, --cascade remove packages and all packages that depend on them\n" -msgstr " -c, --cascade odstraní balíčky a všechny, které na nich závisí\n" +msgid "" +" -c, --cascade remove packages and all packages that depend on them\n" +msgstr "" +" -c, --cascade odstraní balíčky a všechny, které na nich závisí\n" #: src/pacman/pacman.c:89 #, c-format -msgid " -k, --dbonly only remove database entry, do not remove files\n" -msgstr " -k, --dbonly odstraní jen záznam v databázi, neodstraní soubory\n" +msgid "" +" -k, --dbonly only remove database entry, do not remove files\n" +msgstr "" +" -k, --dbonly odstraní jen záznam v databázi, neodstraní soubory\n" #: src/pacman/pacman.c:90 #, c-format @@ -443,8 +449,11 @@ msgstr " -n, --nosave odstraní také konfigurační soubory\n" #: src/pacman/pacman.c:91 #, c-format -msgid " -s, --recursive remove dependencies also (that won't break packages)\n" -msgstr " -s, --recursive odstraní také závislosti (pokud nepoškodí jiné balíčky)\n" +msgid "" +" -s, --recursive remove dependencies also (that won't break packages)\n" +msgstr "" +" -s, --recursive odstraní také závislosti (pokud nepoškodí jiné " +"balíčky)\n" #: src/pacman/pacman.c:101 #, c-format @@ -454,7 +463,8 @@ msgstr " -c, --changelog zobrazí seznam změn balíčku\n" #: src/pacman/pacman.c:102 #, c-format msgid " -d, --deps list all packages installed as dependencies\n" -msgstr " -d, --deps seznam všech balíčků instalovaných jako závislosti\n" +msgstr "" +" -d, --deps seznam všech balíčků instalovaných jako závislosti\n" #: src/pacman/pacman.c:103 #, c-format @@ -468,8 +478,10 @@ msgstr " -g, --groups zobrazí všechny balíčky ve skupině\n" #: src/pacman/pacman.c:105 #, c-format -msgid " -i, --info view package information (-ii for backup files)\n" -msgstr " -i, --info zobrazí informace o balíčku (-ii zálohované soubory)\n" +msgid "" +" -i, --info view package information (-ii for backup files)\n" +msgstr "" +" -i, --info zobrazí informace o balíčku (-ii zálohované soubory)\n" #: src/pacman/pacman.c:106 #, c-format @@ -478,9 +490,11 @@ msgstr " -l, --list seznam souborů v balíčku\n" #: src/pacman/pacman.c:107 #, c-format -msgid " -m, --foreign list installed packages not found in sync db(s)\n" +msgid "" +" -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" -" -m, --foreign seznam nainstalovaných balíčků, které nebyly nalezeny\n" +" -m, --foreign seznam nainstalovaných balíčků, které nebyly " +"nalezeny\n" " v synchronizované databázi\n" #: src/pacman/pacman.c:108 @@ -512,7 +526,8 @@ msgstr "" #: src/pacman/pacman.c:112 #, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr " -u, --upgrades seznam všech balíčků, které mohou být aktualizovány\n" +msgstr "" +" -u, --upgrades seznam všech balíčků, které mohou být aktualizovány\n" #: src/pacman/pacman.c:113 #, c-format @@ -524,7 +539,8 @@ msgstr " -q, --quiet zobrazit méně informací při dotazu a hledán msgid "" " -c, --clean remove old packages from cache directory (-cc for " "all)\n" -msgstr " -c, --clean odstraní staré balíčky z keše (-cc pro všechny)\n" +msgstr "" +" -c, --clean odstraní staré balíčky z keše (-cc pro všechny)\n" #: src/pacman/pacman.c:120 #, c-format @@ -548,11 +564,13 @@ msgstr "" msgid "" " -p, --print-uris print out URIs for given packages and their " "dependencies\n" -msgstr " -p, --print-uris vypíše URI požadovaného balíčku a jeho závislostí\n" +msgstr "" +" -p, --print-uris vypíše URI požadovaného balíčku a jeho závislostí\n" #: src/pacman/pacman.c:126 #, c-format -msgid " -s, --search search remote repositories for matching strings\n" +msgid "" +" -s, --search search remote repositories for matching strings\n" msgstr "" " -s, --search \n" " vyhledá balíčky v repositářích odpovídající řetězci\n" @@ -567,17 +585,22 @@ msgstr " -u, --sysupgrade aktualizuje všechny zastaralé balíčky\n" msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" -msgstr " -w, --downloadonly stáhne balíčky, ale nenainstaluje/neaktualizuje je\n" +msgstr "" +" -w, --downloadonly stáhne balíčky, ale nenainstaluje/neaktualizuje je\n" #: src/pacman/pacman.c:129 #, c-format -msgid " -y, --refresh download fresh package databases from the server\n" +msgid "" +" -y, --refresh download fresh package databases from the server\n" msgstr " -y, --refresh stáhne aktuální databázi balíčků ze serveru\n" #: src/pacman/pacman.c:130 #, c-format -msgid " --needed only upgrade outdated or not yet installed packages\n" -msgstr " --needed aktualizuje jen zastaralé nebo nenainstalované balíčky\n" +msgid "" +" --needed only upgrade outdated or not yet installed packages\n" +msgstr "" +" --needed aktualizuje jen zastaralé nebo nenainstalované " +"balíčky\n" #: src/pacman/pacman.c:131 #, c-format @@ -621,12 +644,14 @@ msgstr " --noconfirm neptat se na žádná potvrzení\n" #: src/pacman/pacman.c:139 #, c-format -msgid " --noprogressbar do not show a progress bar when downloading files\n" +msgid "" +" --noprogressbar do not show a progress bar when downloading files\n" msgstr " --noprogressbar nezobrazovat průběh stahování souborů\n" #: src/pacman/pacman.c:140 #, c-format -msgid " --noscriptlet do not execute the install scriptlet if one exists\n" +msgid "" +" --noscriptlet do not execute the install scriptlet if one exists\n" msgstr " --noscriptlet nespouštět instalační skripty\n" #: src/pacman/pacman.c:141 @@ -702,12 +727,16 @@ msgstr "konfigurační soubor %s, řádek %d: chybné jméno sekce.\n" #: src/pacman/pacman.c:600 #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" -msgstr "konfigurační soubor %s, řádek %d: chybná syntaxe konfiguračního souboru, chybí hodnota.\n" +msgstr "" +"konfigurační soubor %s, řádek %d: chybná syntaxe konfiguračního souboru, " +"chybí hodnota.\n" #: src/pacman/pacman.c:610 #, c-format msgid "config file %s, line %d: All directives must belong to a section.\n" -msgstr "konfigurační soubor %s, řádek %d: Všechny direktivy musí náležet nějaké sekci.\n" +msgstr "" +"konfigurační soubor %s, řádek %d: Všechny direktivy musí náležet nějaké " +"sekci.\n" #: src/pacman/pacman.c:638 src/pacman/pacman.c:692 src/pacman/pacman.c:707 #, c-format @@ -737,51 +766,51 @@ msgstr "nebyla specifikována operace (použijte -h pro nápovědu)\n" msgid "error: no file was specified for --owns\n" msgstr "chyba: nebyl určen soubor pro --owns\n" -#: src/pacman/query.c:78 +#: src/pacman/query.c:79 #, c-format msgid "error: failed to read file '%s': %s\n" msgstr "chyba: selhalo čtení souboru '%s': %s\n" -#: src/pacman/query.c:85 +#: src/pacman/query.c:86 #, c-format msgid "error: cannot determine ownership of a directory\n" msgstr "chyba: nelze určit vlastnictví adresáře\n" -#: src/pacman/query.c:93 +#: src/pacman/query.c:97 #, c-format msgid "error: cannot determine real path for '%s': %s\n" msgstr "chyba: nelze určit skutečnou cestu pro '%s': %s\n" -#: src/pacman/query.c:115 +#: src/pacman/query.c:122 #, c-format msgid "%s is owned by %s %s\n" msgstr "%s je vlastněn %s %s\n" -#: src/pacman/query.c:123 +#: src/pacman/query.c:130 #, c-format msgid "error: No package owns %s\n" msgstr "chyba: Žádný balíček nevlastní %s\n" -#: src/pacman/query.c:219 +#: src/pacman/query.c:226 #, c-format msgid "error: group \"%s\" was not found\n" msgstr "chyba: skupina \"%s\" nenalezena\n" -#: src/pacman/query.c:230 +#: src/pacman/query.c:237 #, c-format msgid "Checking for package upgrades... \n" msgstr "Zjišťuji aktualizace balíčků... \n" -#: src/pacman/query.c:241 +#: src/pacman/query.c:248 #, c-format msgid "no upgrades found.\n" msgstr "žádné aktualizace nebyly nalezeny.\n" -#: src/pacman/query.c:353 src/pacman/sync.c:774 +#: src/pacman/query.c:360 src/pacman/sync.c:771 msgid "no usable package repositories configured.\n" msgstr "nejsou nastaveny žádné použitelné repositáře.\n" -#: src/pacman/query.c:397 +#: src/pacman/query.c:404 #, c-format msgid "error: package \"%s\" not found\n" msgstr "chyba: balíček \"%s\" nenalezen\n" @@ -800,17 +829,12 @@ msgstr " Odstranit celý obsah? [A/n] " msgid ":: Remove %s from group %s? [Y/n] " msgstr ":: Odstranit %s ze skupiny %s? [A/n] " -#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543 +#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540 #, c-format msgid "error: failed to init transaction (%s)\n" msgstr "chyba: selhala příprava transakce (%s)\n" -#: src/pacman/remove.c:111 -#, c-format -msgid "error: failed to add target '%s' (%s)\n" -msgstr "chyba: selhalo přidání cíle '%s' (%s)\n" - -#: src/pacman/remove.c:155 src/pacman/util.c:460 +#: src/pacman/remove.c:155 src/pacman/util.c:488 msgid "Targets:" msgstr "Cíle:" @@ -941,167 +965,140 @@ msgstr ":: Spouštím aktualizaci systému...\n" #: src/pacman/sync.c:529 #, c-format -msgid "" -":: pacman has detected a newer version of itself.\n" -":: It is recommended that you upgrade pacman by itself\n" -":: using 'pacman -S pacman', and then rerun the current\n" -":: operation. If you wish to continue the operation and\n" -":: not upgrade pacman separately, answer no.\n" +msgid ":: pacman has detected a newer version of itself.\n" msgstr "" -":: pacman zjistil svoji novější verzi. Je doporučena jeho" -":: aktualizace použitím 'pacman -S pacman' a poté znovu\n" -":: spustit aktuální operaci. Pokud chcete pokračovat v této\n" -":: operaci a neaktualizovat pacmana zvlášť, odpovězte ne.\n" -#: src/pacman/sync.c:534 -msgid ":: Cancel current operation? [Y/n] " -msgstr ":: Zrušit aktuální operaci? [A/n] " +#: src/pacman/sync.c:530 +msgid "" +":: Do you want to cancel the current operation\n" +":: and install the new pacman version now? [Y/n] " +msgstr "" -#: src/pacman/sync.c:536 src/pacman/sync.c:751 +#: src/pacman/sync.c:533 src/pacman/sync.c:748 #, c-format msgid "error: failed to release transaction (%s)\n" msgstr "chyba: selhalo uveřejnění transakce (%s)\n" -#: src/pacman/sync.c:548 +#: src/pacman/sync.c:545 #, c-format msgid "error: pacman: %s\n" msgstr "chyba: pacman: %s\n" -#: src/pacman/sync.c:573 -#, c-format -msgid "error: '%s': %s\n" -msgstr "chyba: '%s': %s\n" - -#: src/pacman/sync.c:587 +#: src/pacman/sync.c:584 #, c-format msgid ":: group %s (including ignored packages):\n" msgstr ":: skupina %s (včetně ignorovaných balíčků):\n" -#: src/pacman/sync.c:592 +#: src/pacman/sync.c:589 msgid ":: Install whole content? [Y/n] " msgstr ":: Instalovat celý obsah? [A/n] " -#: src/pacman/sync.c:599 +#: src/pacman/sync.c:596 #, c-format msgid ":: Install %s from group %s? [Y/n] " msgstr ":: Instalovat %s ze skupiny %s? [A/n] " -#: src/pacman/sync.c:620 +#: src/pacman/sync.c:617 #, c-format msgid "Warning: %s provides %s\n" msgstr "Varování: %s poskytuje %s\n" -#: src/pacman/sync.c:624 +#: src/pacman/sync.c:621 #, c-format msgid "error: several packages provide %s, please specify one :\n" msgstr "chyba: více balíčků poskytuje %s, vyberte jeden z nich:\n" -#: src/pacman/sync.c:635 +#: src/pacman/sync.c:632 #, c-format msgid "error: '%s': not found in sync db\n" msgstr "chyba: '%s': nenalezen v synchronizované databázi\n" -#: src/pacman/sync.c:663 -#, c-format -msgid ":: %s: conflicts with %s\n" -msgstr ":: %s: konfliktní s %s\n" - -#: src/pacman/sync.c:677 +#: src/pacman/sync.c:674 #, c-format msgid " local database is up to date\n" msgstr " lokální databáze je aktuální\n" -#: src/pacman/sync.c:689 +#: src/pacman/sync.c:686 #, c-format msgid "Beginning download...\n" msgstr "Zahajuji stahování...\n" -#: src/pacman/sync.c:692 +#: src/pacman/sync.c:689 msgid "Proceed with download? [Y/n] " msgstr "Pokračovat ve stahování? [A/n] " -#: src/pacman/sync.c:696 +#: src/pacman/sync.c:693 #, c-format msgid "Beginning upgrade process...\n" msgstr "Zahajuji proces aktualizace...\n" -#: src/pacman/sync.c:699 +#: src/pacman/sync.c:696 msgid "Proceed with installation? [Y/n] " msgstr "Pokračovat v instalaci? [A/n] " -#: src/pacman/sync.c:740 +#: src/pacman/sync.c:737 #, c-format msgid "Errors occurred, no packages were upgraded.\n" msgstr "Zjištěny chyby, žádné balíčky nebyly aktualizovány.\n" -#: src/pacman/util.c:354 src/pacman/util.c:386 +#: src/pacman/util.c:382 src/pacman/util.c:414 #, c-format msgid "None\n" msgstr "Nic\n" -#: src/pacman/util.c:452 +#: src/pacman/util.c:480 msgid "Remove:" msgstr "Odstranit:" -#: src/pacman/util.c:456 +#: src/pacman/util.c:484 #, c-format msgid "Total Removed Size: %.2f MB\n" msgstr "Celková uvolněná velikost: %.2f MB\n" -#: src/pacman/util.c:463 +#: src/pacman/util.c:491 #, c-format msgid "Total Download Size: %.2f MB\n" msgstr "Celková velikost stahování: %.2f MB\n" -#: src/pacman/util.c:467 +#: src/pacman/util.c:495 #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Celková velikost instalace: %.2f MB\n" -#: src/pacman/util.c:494 +#: src/pacman/util.c:522 msgid "Y" msgstr "A" -#: src/pacman/util.c:494 +#: src/pacman/util.c:522 msgid "YES" msgstr "Ano" -#: src/pacman/util.c:543 -#, c-format -msgid "debug: %s" -msgstr "ladění: %s" - -#: src/pacman/util.c:546 +#: src/pacman/util.c:574 #, c-format msgid "error: %s" msgstr "chyba: %s" -#: src/pacman/util.c:549 +#: src/pacman/util.c:577 #, c-format msgid "warning: %s" msgstr "varování: %s" -#: src/pacman/util.c:552 +#: src/pacman/util.c:580 #, c-format msgid "function: %s" msgstr "funkce: %s" -#: src/pacman/util.c:590 -#, c-format -msgid "debug: " -msgstr "ladění: " - -#: src/pacman/util.c:593 +#: src/pacman/util.c:621 #, c-format msgid "error: " msgstr "chyba: " -#: src/pacman/util.c:596 +#: src/pacman/util.c:624 #, c-format msgid "warning: " msgstr "varování: " -#: src/pacman/util.c:601 +#: src/pacman/util.c:629 #, c-format msgid "function: " msgstr "funkce: " @@ -1110,7 +1107,14 @@ msgstr "funkce: " msgid "Usage: %s [package_directory]" msgstr "Použití: %s [adresář_s_balíčky]" -#: scripts/gensync.sh.in:33 +#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122 +#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122 +msgid "" +"NOTE: this script is DEPRECATED. It will be removed in the next major" +"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n" +msgstr "" + +#: scripts/gensync.sh.in:36 msgid "" "gensync will generate a sync database by reading all PKGBUILD files\\nfrom " ". gensync builds the database in a temporary directory\\nand then " @@ -1120,7 +1124,7 @@ msgstr "" "gensync sestaví databázi do dočasného adresáře\\na ta je zkomprimována do " ".\\n\\n" -#: scripts/gensync.sh.in:37 +#: scripts/gensync.sh.in:40 msgid "" "gensync will calculate md5sums of packages in the same directory as" "\\n, unless an alternate [package_directory] is specified.\\n\\n" @@ -1128,7 +1132,7 @@ msgstr "" "gensync spočítá kontrolní MD5 součet balíčků ve stejném adresáři jako" "\\n, pokud není specifikován [adresář_s_balíčky].\\n\\n" -#: scripts/gensync.sh.in:40 +#: scripts/gensync.sh.in:43 msgid "" "note: The name is important. It must be of the form\\n " "{treename}.db.tar.gz where {treename} is the name of the custom\\n " @@ -1142,12 +1146,12 @@ msgstr "" "Generovaná databáze musí být umístěna ve stejném adresáři jako její vlastní" "\\n balíčky (také se nastavuje v /etc/pacman.conf)\\n\\n" -#: scripts/gensync.sh.in:46 +#: scripts/gensync.sh.in:49 msgid "Example: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz" msgstr "Příklad: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz" -#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091 -#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64 +#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107 +#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63 msgid "" "Copyright (C) 2002-2007 Judd Vinet .\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -1157,37 +1161,37 @@ msgstr "" "svobodný software; více o podmínkách použití naleznete ve zdrojovém kódu." "\\nZe zákona nejsou poskytovány ŽÁDNÉ ZÁRUKY." -#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98 +#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101 msgid "%s not found. Can not continue." msgstr "%s nenalezen. Nelze pokračovat." -#: scripts/gensync.sh.in:117 +#: scripts/gensync.sh.in:120 msgid "invalid root dir: %s" msgstr "neplatný kořenový adresář: %s" -#: scripts/gensync.sh.in:119 +#: scripts/gensync.sh.in:126 msgid "gensync: building database entries, generating md5sums..." msgstr "gensync: sestavování položek databáze, generování MD5 součtů..." -#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126 +#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133 msgid "failed to parse %s" msgstr "selhalo zpracování %s" -#: scripts/gensync.sh.in:139 +#: scripts/gensync.sh.in:146 msgid "could not find %s-%s-%s-%s%s - skipping" msgstr "nemohu nalézt %s-%s-%s-%s%s - přeskakuji" -#: scripts/gensync.sh.in:149 +#: scripts/gensync.sh.in:156 msgid "creating repo DB..." msgstr "vytvářím databázi repositáře..." #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102 -#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43 +#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42 msgid "WARNING:" msgstr "VAROVÁNÍ:" #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111 -#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48 +#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47 msgid "ERROR:" msgstr "CHYBA:" @@ -1207,18 +1211,19 @@ msgstr "Nahraďte 'no' za '!': %s -> %s." #: scripts/makepkg.sh.in:197 msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'." -msgstr "Volba 'keepdocs' nemusí fungovat jak je zamýšleno. Nahraďte ji volbou 'docs'." +msgstr "" +"Volba 'keepdocs' nemusí fungovat jak je zamýšleno. Nahraďte ji volbou 'docs'." #: scripts/makepkg.sh.in:285 msgid "There is no agent set up to handle %s URLs. Check %s." msgstr "Použitý agent neumí zacházet s %s URL. Zkontrolujte %s." #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295 -#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476 -#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610 -#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700 -#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108 -#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425 +#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482 +#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616 +#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706 +#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124 +#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441 msgid "Aborting..." msgstr "Ruším..." @@ -1278,535 +1283,548 @@ msgstr "%s nalezen v adresáři kde se provádí sestavení" msgid "Using cached copy of %s" msgstr "Používám kopii %s z keše" -#: scripts/makepkg.sh.in:470 +#: scripts/makepkg.sh.in:469 +msgid "%s was not found in the build directory and is not a URL." +msgstr "" + +#: scripts/makepkg.sh.in:476 msgid "Downloading %s..." msgstr "Stahuji %s..." -#: scripts/makepkg.sh.in:475 +#: scripts/makepkg.sh.in:481 msgid "Failure while downloading %s" msgstr "Selhání při stahování %s" -#: scripts/makepkg.sh.in:486 +#: scripts/makepkg.sh.in:492 msgid "Generating checksums for source files..." msgstr "Generuji kontrolní součty zdrojových souborů..." -#: scripts/makepkg.sh.in:495 +#: scripts/makepkg.sh.in:501 msgid "Invalid integrity algorithm '%s' specified." msgstr "Zadán chybný algoritmus '%s' pro kontrolu integrity." -#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552 +#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558 msgid "Cannot find the '%s' program." msgstr "Nemohu nalézt program '%s'." -#: scripts/makepkg.sh.in:521 +#: scripts/makepkg.sh.in:527 msgid "Unable to find source file %s to generate checksum." msgstr "Nelze nalézt zdrojový soubor %s pro výpočet kontrolního součtu." -#: scripts/makepkg.sh.in:547 +#: scripts/makepkg.sh.in:553 msgid "Invalid integrity algorithm '%s' specified" msgstr "Zadán chybný algoritmus '%s' pro kontrolu integrity" -#: scripts/makepkg.sh.in:558 +#: scripts/makepkg.sh.in:564 msgid "Validating source files with %s..." msgstr "Kontroluji zdrojové soubory pomocí %s..." -#: scripts/makepkg.sh.in:568 +#: scripts/makepkg.sh.in:574 msgid "NOT FOUND" msgstr "NENALEZEN" -#: scripts/makepkg.sh.in:577 +#: scripts/makepkg.sh.in:583 msgid "Passed" msgstr "V pořádku" -#: scripts/makepkg.sh.in:579 +#: scripts/makepkg.sh.in:585 msgid "FAILED" msgstr "SELHALO" -#: scripts/makepkg.sh.in:587 +#: scripts/makepkg.sh.in:593 msgid "One or more files did not pass the validity check!" msgstr "Jeden nebo více souborů neprošlo kontrolou validity!" -#: scripts/makepkg.sh.in:591 +#: scripts/makepkg.sh.in:597 msgid "Integrity checks (%s) are missing or incomplete." msgstr "Kontrola integrity (%s) nenalezena nebo není kompletní." -#: scripts/makepkg.sh.in:597 +#: scripts/makepkg.sh.in:603 msgid "Extracting Sources..." msgstr "Rozbaluji zdrojové soubory..." -#: scripts/makepkg.sh.in:609 +#: scripts/makepkg.sh.in:615 msgid "Unable to find source file %s for extraction." msgstr "Nenalezen zdrojový soubor %s pro rozbalení." -#: scripts/makepkg.sh.in:637 +#: scripts/makepkg.sh.in:643 msgid "Failed to extract %s" msgstr "Selhalo rozbalení %s" -#: scripts/makepkg.sh.in:669 +#: scripts/makepkg.sh.in:675 msgid "Starting build()..." msgstr "Startuji build()..." -#: scripts/makepkg.sh.in:699 +#: scripts/makepkg.sh.in:705 msgid "Build Failed." msgstr "Sestavení selhalo." -#: scripts/makepkg.sh.in:708 +#: scripts/makepkg.sh.in:714 msgid "Tidying install..." msgstr "Uklízím instalaci..." -#: scripts/makepkg.sh.in:711 +#: scripts/makepkg.sh.in:717 msgid "Removing info/doc files..." msgstr "Odstraňuji info/doc soubory..." -#: scripts/makepkg.sh.in:716 +#: scripts/makepkg.sh.in:722 msgid "Compressing man pages..." msgstr "Komprimuji man stránky..." -#: scripts/makepkg.sh.in:750 +#: scripts/makepkg.sh.in:756 msgid "Stripping debugging symbols from binaries and libraries..." msgstr "Odstraňuji ladící informace z binárních souborů a knihoven..." -#: scripts/makepkg.sh.in:762 +#: scripts/makepkg.sh.in:768 msgid "Removing libtool .la files..." msgstr "Odstraňuji libtool .la soubory..." -#: scripts/makepkg.sh.in:767 +#: scripts/makepkg.sh.in:773 msgid "Removing empty directories..." msgstr "Odstraňuji prázdné adresáře..." -#: scripts/makepkg.sh.in:774 +#: scripts/makepkg.sh.in:780 msgid "Missing pkg/ directory." msgstr "Nenalezen pkg/ adresář." -#: scripts/makepkg.sh.in:780 +#: scripts/makepkg.sh.in:786 msgid "Creating package..." msgstr "Vytvářím balíček..." -#: scripts/makepkg.sh.in:791 +#: scripts/makepkg.sh.in:797 msgid "Generating .PKGINFO file..." msgstr "Vytvářím .PKGINFO soubor..." -#: scripts/makepkg.sh.in:837 +#: scripts/makepkg.sh.in:846 msgid "Please add a license line to your %s!" msgstr "Prosím přidejte informace o licenci do vašeho %s!" -#: scripts/makepkg.sh.in:838 +#: scripts/makepkg.sh.in:847 msgid "Example for GPL'ed software: license=('GPL')." msgstr "Například pro GPL software: license=('GPL')." -#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941 +#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950 msgid "Adding install script..." msgstr "Přidávám instalační skripty..." -#: scripts/makepkg.sh.in:853 +#: scripts/makepkg.sh.in:862 msgid "Adding package changelog..." msgstr "Přidávám seznam změn balíčku..." -#: scripts/makepkg.sh.in:859 +#: scripts/makepkg.sh.in:868 msgid "Compressing package..." msgstr "Zabaluji balíček..." -#: scripts/makepkg.sh.in:864 +#: scripts/makepkg.sh.in:873 msgid "Failed to create package file." msgstr "Selhalo vytvoření balíčku." -#: scripts/makepkg.sh.in:873 +#: scripts/makepkg.sh.in:882 msgid "Cannot find the xdelta binary! Is xdelta installed?" msgstr "Nemohu nalézt příkaz xdelta! Je xdelta nainstalován?" -#: scripts/makepkg.sh.in:903 +#: scripts/makepkg.sh.in:912 msgid "Making delta from version %s..." msgstr "Vytvářím rozdílovou verzi z %s..." -#: scripts/makepkg.sh.in:917 +#: scripts/makepkg.sh.in:926 msgid "Recreating package tarball from delta to match md5 signatures" msgstr "Znovu vytvářím celý archív z rozdílu pro kontrolu MD5 podpisů" -#: scripts/makepkg.sh.in:918 +#: scripts/makepkg.sh.in:927 msgid "NOTE: the delta should ONLY be distributed with this tarball" msgstr "POZNÁMKA: tento rozdíl může být distribuován JEN s tímto archívem" -#: scripts/makepkg.sh.in:922 +#: scripts/makepkg.sh.in:931 msgid "Could not generate the package from the delta." msgstr "Nemohu vygenerovat balíček z tohoto rozdílu." -#: scripts/makepkg.sh.in:926 +#: scripts/makepkg.sh.in:935 msgid "Delta was not able to be created." msgstr "Nebylo možné vytvořit rozdíl." -#: scripts/makepkg.sh.in:929 +#: scripts/makepkg.sh.in:938 msgid "No previous version found, skipping xdelta." msgstr "Žádná předchozí verze nebyla nalezena, přeskakuji xdelta." -#: scripts/makepkg.sh.in:935 +#: scripts/makepkg.sh.in:944 msgid "Creating source package..." msgstr "Vytvářím zdrojový balíček..." -#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949 -#: scripts/makepkg.sh.in:956 +#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958 +#: scripts/makepkg.sh.in:965 msgid "Adding %s..." msgstr "Přidávám %s..." -#: scripts/makepkg.sh.in:944 +#: scripts/makepkg.sh.in:953 msgid "Install script %s not found." msgstr "instalační skript %s nebyl nalezen." -#: scripts/makepkg.sh.in:964 +#: scripts/makepkg.sh.in:973 msgid "Compressing source package..." msgstr "Komprimuji zdrojový balíček..." -#: scripts/makepkg.sh.in:966 +#: scripts/makepkg.sh.in:975 msgid "Failed to create source package file." msgstr "Selhalo vytváření zdrojového balíčku." -#: scripts/makepkg.sh.in:994 +#: scripts/makepkg.sh.in:1005 msgid "Determining latest darcs revision..." msgstr "Určuji poslední darcs revizi..." -#: scripts/makepkg.sh.in:997 +#: scripts/makepkg.sh.in:1009 msgid "Determining latest cvs revision..." msgstr "Určuji poslední cvs revizi..." -#: scripts/makepkg.sh.in:1000 +#: scripts/makepkg.sh.in:1013 msgid "Determining latest git revision..." msgstr "Určuji poslední git revizi..." -#: scripts/makepkg.sh.in:1003 +#: scripts/makepkg.sh.in:1017 msgid "Determining latest svn revision..." msgstr "Určuji poslední svn revizi..." -#: scripts/makepkg.sh.in:1006 +#: scripts/makepkg.sh.in:1021 msgid "Determining latest bzr revision..." msgstr "Určuji poslední bzr revizi..." -#: scripts/makepkg.sh.in:1009 +#: scripts/makepkg.sh.in:1025 msgid "Determining latest hg revision..." msgstr "Určuji poslední hg revizi..." -#: scripts/makepkg.sh.in:1024 +#: scripts/makepkg.sh.in:1040 msgid "Version found: %s" msgstr "Nalezena verze: %s" -#: scripts/makepkg.sh.in:1055 +#: scripts/makepkg.sh.in:1071 msgid "Usage: %s [options]" msgstr "Použití: %s [volby]" -#: scripts/makepkg.sh.in:1057 +#: scripts/makepkg.sh.in:1073 msgid "Options:" msgstr "Volby:" -#: scripts/makepkg.sh.in:1058 +#: scripts/makepkg.sh.in:1074 msgid " -A, --ignorearch Ignore incomplete arch field in %s" msgstr " -A, --ignorearch Ignoruje nekompletní pole arch v %s" -#: scripts/makepkg.sh.in:1059 +#: scripts/makepkg.sh.in:1075 msgid " -b, --builddeps Build missing dependencies from source" msgstr " -b, --builddeps Sestaví chybějící závislosti ze zdrojových souborů" -#: scripts/makepkg.sh.in:1060 +#: scripts/makepkg.sh.in:1076 msgid " -c, --clean Clean up work files after build" msgstr " -c, --clean Pročistí pracovní soubory po sestavení" -#: scripts/makepkg.sh.in:1061 +#: scripts/makepkg.sh.in:1077 msgid " -C, --cleancache Clean up source files from the cache" msgstr " -C, --cleancache Pročistí zdrojové soubory z keše" -#: scripts/makepkg.sh.in:1062 +#: scripts/makepkg.sh.in:1078 msgid " -d, --nodeps Skip all dependency checks" msgstr " -d, --nodeps Přeskočí všechny kontroly závislostí" -#: scripts/makepkg.sh.in:1063 +#: scripts/makepkg.sh.in:1079 msgid " -e, --noextract Do not extract source files (use existing src/ dir)" -msgstr " -e, --noextract Nerozbalovat zdrojové soubory (použije se existující src/ adresář)" +msgstr "" +" -e, --noextract Nerozbalovat zdrojové soubory (použije se existující src/ " +"adresář)" -#: scripts/makepkg.sh.in:1064 +#: scripts/makepkg.sh.in:1080 msgid " -f, --force Overwrite existing package" msgstr " -f, --force Přepsat existující balíček" -#: scripts/makepkg.sh.in:1065 +#: scripts/makepkg.sh.in:1081 msgid " -g, --geninteg Generate integrity checks for source files" msgstr " -g, --geninteg Vygeneruje kontrolní součty zdrojových souborů" -#: scripts/makepkg.sh.in:1066 +#: scripts/makepkg.sh.in:1082 msgid " -h, --help This help" msgstr " -h, --help Vypíše tuto nápovědu" -#: scripts/makepkg.sh.in:1067 +#: scripts/makepkg.sh.in:1083 msgid " -i, --install Install package after successful build" msgstr " -i, --install Nainstaluje balíček po úspěšném sestavení" -#: scripts/makepkg.sh.in:1068 +#: scripts/makepkg.sh.in:1084 msgid " -L, --log Log package build process" msgstr " -L, --log Zaznamenat proces sestavení balíčku" -#: scripts/makepkg.sh.in:1069 +#: scripts/makepkg.sh.in:1085 msgid " -m, --nocolor Disable colorized output messages" msgstr " -m, --nocolor Zakáže barevný výstup zpráv" -#: scripts/makepkg.sh.in:1070 +#: scripts/makepkg.sh.in:1086 msgid " -o, --nobuild Download and extract files only" msgstr " -o, --nobuild Pouze stáhne a rozbalí soubory" -#: scripts/makepkg.sh.in:1071 +#: scripts/makepkg.sh.in:1087 msgid " -p Use an alternate build script (instead of '%s')" msgstr " -p Použije alternativní build skript (namísto '%s')" -#: scripts/makepkg.sh.in:1072 -msgid " -r, --rmdeps Remove installed dependencies after a successful build" -msgstr " -r, --rmdeps Odstraní nainstalované závislosti po úspěšném sestavení" +#: scripts/makepkg.sh.in:1088 +msgid "" +" -r, --rmdeps Remove installed dependencies after a successful build" +msgstr "" +" -r, --rmdeps Odstraní nainstalované závislosti po úspěšném sestavení" -#: scripts/makepkg.sh.in:1074 +#: scripts/makepkg.sh.in:1090 msgid " -R, --repackage Repackage contents of pkg/ without building" msgstr " -R, --repackage Znovu zabalí obsah pkg/ bez sestavování" -#: scripts/makepkg.sh.in:1075 +#: scripts/makepkg.sh.in:1091 msgid " -s, --syncdeps Install missing dependencies with pacman" msgstr " -s, --syncdeps Nainstaluje chybějící závislosti pomocí pacman" -#: scripts/makepkg.sh.in:1076 +#: scripts/makepkg.sh.in:1092 msgid " --asroot Allow makepkg to run as root user" msgstr " --asroot Umožňuje spustit makepkg pod právy uživatele root" -#: scripts/makepkg.sh.in:1077 +#: scripts/makepkg.sh.in:1093 msgid "" " --holdver Prevent automatic version bumping for development " "PKGBUILDs" -msgstr " --holdver Zabrání automatickému zvýšení verze u vyvíjených PKGBUILDů" +msgstr "" +" --holdver Zabrání automatickému zvýšení verze u vyvíjených PKGBUILDů" -#: scripts/makepkg.sh.in:1078 +#: scripts/makepkg.sh.in:1094 msgid " --source Do not build package; generate a source-only tarball" -msgstr " --source Nesestavovat balíček, vygenerovat jen zdrojový archiv" +msgstr "" +" --source Nesestavovat balíček, vygenerovat jen zdrojový archiv" -#: scripts/makepkg.sh.in:1080 +#: scripts/makepkg.sh.in:1096 msgid "These options can be passed to pacman:" msgstr "Tyto volby se předají pacmanovi:" -#: scripts/makepkg.sh.in:1082 +#: scripts/makepkg.sh.in:1098 msgid "" " --noconfirm Do not ask for confirmation when resolving " "dependencies" msgstr " --noconfirm Nedotazovat se na potvrzení" -#: scripts/makepkg.sh.in:1083 -msgid " --noprogressbar Do not show a progress bar when downloading files" +#: scripts/makepkg.sh.in:1099 +msgid "" +" --noprogressbar Do not show a progress bar when downloading files" msgstr " --noprogressbar Nezobrazovat průběh stahování souborů" -#: scripts/makepkg.sh.in:1085 +#: scripts/makepkg.sh.in:1101 msgid "If -p is not specified, makepkg will look for '%s'" msgstr "Když není zadáno -p, makepkg bude hledat '%s'" -#: scripts/makepkg.sh.in:1107 +#: scripts/makepkg.sh.in:1123 msgid "%s not found." msgstr "%s nebyl nalezen." -#: scripts/makepkg.sh.in:1169 +#: scripts/makepkg.sh.in:1185 msgid "Sudo is used by default now. The --usesudo option is deprecated!" msgstr "Sudo je nyní používáno jako výchozí. Volba --usesudo je zavržena!" -#: scripts/makepkg.sh.in:1184 -msgid "--" -msgstr "--" +#: scripts/makepkg.sh.in:1200 +msgid "\\0--holdver and --forcever cannot both be specified" +msgstr "" -#: scripts/makepkg.sh.in:1191 +#: scripts/makepkg.sh.in:1207 msgid "Cleaning up ALL files from %s." msgstr "Odstraňuji VŠECHNY soubory z %s." -#: scripts/makepkg.sh.in:1192 +#: scripts/makepkg.sh.in:1208 msgid " Are you sure you wish to do this? [Y/n] " msgstr " Jste si jistý, že víte co děláte? [A/n] " -#: scripts/makepkg.sh.in:1198 +#: scripts/makepkg.sh.in:1214 msgid "Problem removing files; you may not have correct permissions in %s" msgstr "Problém s odstraněním souborů, možná nemáte správná oprávnění v %s" -#: scripts/makepkg.sh.in:1202 +#: scripts/makepkg.sh.in:1218 msgid "Source cache cleaned." msgstr "Keš zdrojových souborů vyčištěna." -#: scripts/makepkg.sh.in:1207 +#: scripts/makepkg.sh.in:1223 msgid "No files have been removed." msgstr "Žádné soubory nebyly odstraněny." -#: scripts/makepkg.sh.in:1212 +#: scripts/makepkg.sh.in:1228 msgid "Source destination must be defined in makepkg.conf." msgstr "V makepkg.conf musí být specifikováno umístění zdrojových souborů." -#: scripts/makepkg.sh.in:1213 +#: scripts/makepkg.sh.in:1229 msgid "In addition, please run makepkg -C outside of your cache directory." msgstr "Dodatek: prosím spusťte makepkg -C mino váš adresář s keší." -#: scripts/makepkg.sh.in:1219 +#: scripts/makepkg.sh.in:1235 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s." msgstr "Není definován BUILDSCRIPT! Zjistěte, zda máte aktuální %s." -#: scripts/makepkg.sh.in:1226 +#: scripts/makepkg.sh.in:1242 msgid "Running makepkg as root is a BAD idea and can cause" msgstr "Spouštění makepkg jako root je ŠPATNÝ nápad a může způsobit" -#: scripts/makepkg.sh.in:1227 +#: scripts/makepkg.sh.in:1243 msgid "permanent, catastrophic damage to your system. If you" msgstr "trvalé a katastrofální poškození vašeho systému. Pokud" -#: scripts/makepkg.sh.in:1228 +#: scripts/makepkg.sh.in:1244 msgid "wish to run as root, please use the --asroot option." msgstr "jej chcete spustit jako root, použijte volbu --asroot." -#: scripts/makepkg.sh.in:1232 +#: scripts/makepkg.sh.in:1248 msgid "The --asroot option is meant for the root user only." msgstr "Volba --asroot je určena jen pro uživatele root." -#: scripts/makepkg.sh.in:1233 +#: scripts/makepkg.sh.in:1249 msgid "Please rerun makepkg without the --asroot flag." msgstr "Prosím spusťte makepkg znovu bez volby --asroot." -#: scripts/makepkg.sh.in:1237 +#: scripts/makepkg.sh.in:1253 msgid "Fakeroot must be installed if using the 'fakeroot' option" msgstr "Nainstalujte si fakeroot, pokud chcete používat volbu 'fakeroot'" -#: scripts/makepkg.sh.in:1238 +#: scripts/makepkg.sh.in:1254 msgid "in the BUILDENV array in %s." msgstr "v poli BUILDENV v %s." -#: scripts/makepkg.sh.in:1242 +#: scripts/makepkg.sh.in:1258 msgid "Running makepkg as an unprivileged user will result in non-root" msgstr "Spuštění makepkg jako neprivilegovaný uživatel může mít za následek" -#: scripts/makepkg.sh.in:1243 +#: scripts/makepkg.sh.in:1259 msgid "ownership of the packaged files. Try using the fakeroot environment by" msgstr "" "vlastnění souborů v balíčku někým jiným než rootem. Používejte fakeroot " "prostředí" -#: scripts/makepkg.sh.in:1244 +#: scripts/makepkg.sh.in:1260 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf." msgstr "přidáním 'fakeroot' do BUILDENV pole v makepkg.conf." -#: scripts/makepkg.sh.in:1249 +#: scripts/makepkg.sh.in:1265 msgid "Do not use the '-F' option. This option is only for use by makepkg." msgstr "Nepoužívejte volbu '-F'. Tato volba je použitelná jen pro makepkg." -#: scripts/makepkg.sh.in:1258 +#: scripts/makepkg.sh.in:1274 msgid "Cannot find the sudo binary! Is sudo installed?" msgstr "Nemohu nalézt příkaz sudo! Je sudo nainstalován?" -#: scripts/makepkg.sh.in:1259 +#: scripts/makepkg.sh.in:1275 msgid "Missing dependencies cannot be installed or removed as a normal user" -msgstr "Chybějící závislosti nelze nainstalovat nebo odstranit pod běžným uživatelem" +msgstr "" +"Chybějící závislosti nelze nainstalovat nebo odstranit pod běžným uživatelem" -#: scripts/makepkg.sh.in:1260 +#: scripts/makepkg.sh.in:1276 msgid "without sudo; install and configure sudo to auto-resolve dependencies." -msgstr "bez sudo; nainstalujte a nastavte sudo pro automatické zjišťování závislostí." +msgstr "" +"bez sudo; nainstalujte a nastavte sudo pro automatické zjišťování závislostí." -#: scripts/makepkg.sh.in:1270 +#: scripts/makepkg.sh.in:1286 msgid "%s does not exist." msgstr "%s neexistuje." -#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289 -#: scripts/makepkg.sh.in:1293 +#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305 +#: scripts/makepkg.sh.in:1309 msgid "%s is not allowed to be empty." msgstr "%s nemůže být prázdná." -#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301 +#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317 msgid "%s is not allowed to contain hyphens." msgstr "%s nemůže obsahovat pomlčky." -#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316 +#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332 msgid "%s is not available for the '%s' architecture." msgstr "%s není dostupný pro architekturu '%s'." -#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317 +#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333 msgid "Note that many packages may need a line added to their %s" msgstr "Poznámka: mnoho balíčků možná potřebuje přidat řádek do svého %s," -#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318 +#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334 msgid "such as arch=('%s')." msgstr "může vypadat takto: arch=('%s')." -#: scripts/makepkg.sh.in:1323 +#: scripts/makepkg.sh.in:1339 msgid "Install scriptlet (%s) does not exist." msgstr "Instalační skript (%s) neexistuje." -#: scripts/makepkg.sh.in:1337 +#: scripts/makepkg.sh.in:1353 msgid "A package has already been built, installing existing package..." msgstr "Balíček je již sestaven, instaluji existující balíček..." -#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372 +#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388 msgid "A package has already been built. (use -f to overwrite)" msgstr "Balíček je již sestaven. (použijte -f pro přepsání)" -#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449 +#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465 msgid "Skipping build." msgstr "Přeskakuji sestavování." -#: scripts/makepkg.sh.in:1358 +#: scripts/makepkg.sh.in:1374 msgid "Leaving fakeroot environment." msgstr "Opouštím prostředí fakeroot." -#: scripts/makepkg.sh.in:1362 +#: scripts/makepkg.sh.in:1378 msgid "Making package: %s" msgstr "Vytvářím balíček: %s" -#: scripts/makepkg.sh.in:1365 +#: scripts/makepkg.sh.in:1381 msgid "Running makepkg as root..." msgstr "Spouštím makepkg jako root..." -#: scripts/makepkg.sh.in:1376 +#: scripts/makepkg.sh.in:1392 msgid "Source package created: %s" msgstr "Zdrojový balíček vytvořen: %s" -#: scripts/makepkg.sh.in:1383 +#: scripts/makepkg.sh.in:1399 msgid "Skipping dependency checks." msgstr "Přeskakuji kontrolu závislostí." -#: scripts/makepkg.sh.in:1390 +#: scripts/makepkg.sh.in:1406 msgid "Checking Runtime Dependencies..." msgstr "Kontroluji závislosti potřebné pro běh..." -#: scripts/makepkg.sh.in:1393 +#: scripts/makepkg.sh.in:1409 msgid "Checking Buildtime Dependencies..." msgstr "Kontroluji závislosti potřebné pro sestavení..." -#: scripts/makepkg.sh.in:1397 +#: scripts/makepkg.sh.in:1413 msgid "Could not resolve all dependencies." msgstr "Nemohu vyřešit všechny závislosti." -#: scripts/makepkg.sh.in:1401 +#: scripts/makepkg.sh.in:1417 msgid "pacman was not found in PATH; skipping dependency checks." msgstr "pacman nebyl nalezen v PATH, přeskakuji kontrolu závislostí." -#: scripts/makepkg.sh.in:1415 +#: scripts/makepkg.sh.in:1431 msgid "Skipping source retrieval -- using existing src/ tree" msgstr "Přeskakuji hledání zdrojů -- používám existující src/ strom" -#: scripts/makepkg.sh.in:1416 +#: scripts/makepkg.sh.in:1432 msgid "Skipping source integrity checks -- using existing src/ tree" msgstr "Přeskakuji kontrolu integrity -- používám existující src/ strom" -#: scripts/makepkg.sh.in:1417 +#: scripts/makepkg.sh.in:1433 msgid "Skipping source extraction -- using existing src/ tree" msgstr "Přeskakuji rozbalování zdrojů -- používám existující src/ strom" -#: scripts/makepkg.sh.in:1420 +#: scripts/makepkg.sh.in:1436 msgid "The source directory is empty, there is nothing to build!" msgstr "Zdrojový adresář je prázdný, není co sestavovat!" -#: scripts/makepkg.sh.in:1424 +#: scripts/makepkg.sh.in:1440 msgid "The package directory is empty, there is nothing to repackage!" msgstr "Adresář s balíčkem je prázdný, není nic k opětovnému zabalení!" -#: scripts/makepkg.sh.in:1435 +#: scripts/makepkg.sh.in:1451 msgid "Sources are ready." msgstr "Zdroje jsou připraveny." -#: scripts/makepkg.sh.in:1440 +#: scripts/makepkg.sh.in:1456 msgid "Removing existing pkg/ directory..." msgstr "Odstraňuji existující pkg/ adresář..." -#: scripts/makepkg.sh.in:1458 +#: scripts/makepkg.sh.in:1474 msgid "Entering fakeroot environment..." msgstr "Vstupuji do fakeroot prostředí..." -#: scripts/makepkg.sh.in:1470 +#: scripts/makepkg.sh.in:1486 msgid "Finished making: %s" msgstr "Dokončeno vytváření: %s" @@ -1819,8 +1837,8 @@ msgid "" "pacman-optimize is a little hack that should improve the performance\\nof " "pacman when reading/writing to its filesystem-based database.\\n\\n" msgstr "" -"pacman-optimize je malý hack, který pomáhá zlepšit výkon pacmana\\npři čtení a " -"zápisu do jeho databáze na bázi souborového systému.\\n\\n" +"pacman-optimize je malý hack, který pomáhá zlepšit výkon pacmana\\npři čtení " +"a zápisu do jeho databáze na bázi souborového systému.\\n\\n" #: scripts/pacman-optimize.sh.in:46 msgid "" @@ -1906,8 +1924,8 @@ msgid "" "repo-add will update a package database by reading a package file." "\\nMultiple packages to add can be specified on the command line.\\n\\n" msgstr "" -"repo-add aktualizuje databázi balíčků pomocí čtení souboru balíčku." -"\\nNa příkazové řádce může být uvedeno více balíčků pro přidání.\\n\\n" +"repo-add aktualizuje databázi balíčků pomocí čtení souboru balíčku.\\nNa " +"příkazové řádce může být uvedeno více balíčků pro přidání.\\n\\n" #: scripts/repo-add.sh.in:61 msgid "" @@ -1937,7 +1955,7 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Neplatný soubor balíčku '%s'." -#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89 +#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88 msgid "Removing existing package '%s'..." msgstr "Odstraňuji existující balíček '%s'..." @@ -1965,19 +1983,19 @@ msgstr "Přidávám rozdíl '%s'" msgid "Could not add delta '%s'" msgstr "Nemohu přidat rozdíl '%s'" -#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121 +#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120 msgid "%s not found. Cannot continue." msgstr "%s nenalezen. Nemohu pokračovat." -#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131 +#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130 msgid "Cannot create temp directory for database building." msgstr "Nemohu vytvořit dočasný adresář pro sestavení databáze." -#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140 +#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139 msgid "Repository file '%s' is not a proper pacman database." msgstr "Soubor repositáře '%s' není vhodná databáze pacmana." -#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143 +#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142 msgid "Extracting database to a temporary location..." msgstr "Rozbaluji databázi do dočasného umístění..." @@ -1997,23 +2015,23 @@ msgstr "Balíček '%s' nenalezen." msgid "Creating updated database file %s" msgstr "Vytvářím aktualizovaný soubor databáze %s" -#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168 +#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167 msgid "No compression set." msgstr "Žádná komprese." -#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176 +#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178 msgid "No packages modified, nothing to do." msgstr "Nebyl změněn žádný balíček, není co dělat." -#: scripts/repo-remove.sh.in:53 +#: scripts/repo-remove.sh.in:52 msgid "repo-remove %s\\n\\n" msgstr "repo-remove %s\\n\\n" -#: scripts/repo-remove.sh.in:54 +#: scripts/repo-remove.sh.in:53 msgid "usage: %s ...\\n\\n" msgstr "použití: %s ...\\n\\n" -#: scripts/repo-remove.sh.in:55 +#: scripts/repo-remove.sh.in:54 msgid "" "repo-remove will update a package database by removing the package name" "\\nspecified on the command line from the given repo database. Multiple" @@ -2023,27 +2041,31 @@ msgstr "" "\\nuvedeného na příkazové řádce z dané databáze. Na příkazové řádce může" "\\nbýt uvedeno více balíčků pro odebrání.\\n\\n" -#: scripts/repo-remove.sh.in:59 +#: scripts/repo-remove.sh.in:58 msgid "Example: repo-remove /path/to/repo.db.tar.gz kernel26" msgstr "Příklad: repo-remove /cesta/k/repo.db.tar.gz kernel26" -#: scripts/repo-remove.sh.in:147 +#: scripts/repo-remove.sh.in:146 msgid "Searching for package '%s'..." msgstr "Vyhledávám balíček '%s'..." -#: scripts/repo-remove.sh.in:152 +#: scripts/repo-remove.sh.in:151 msgid "Package matching '%s' not found." msgstr "Balíček odpovídající '%s' nenalezen." -#: scripts/repo-remove.sh.in:159 +#: scripts/repo-remove.sh.in:158 msgid "Creating updated database file '%s'..." msgstr "Vytvářím aktualizovaný soubor databáze '%s'..." +#: scripts/repo-remove.sh.in:172 +msgid "All packages have been removed from the database. Deleting '%s'." +msgstr "" + #: scripts/updatesync.sh.in:33 msgid "Usage: %s