From ab8c82536477c596b640faa8db0dc18114bb3814 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 28 Mar 2007 04:32:00 +0000 Subject: Fix --ignore behavior on sysupgrade * --ignore was being ignored (haha) on sysupgrade when a package was listed as being a force upgrade. This adds a prompt to the user in this case asking what to do. Signed-off-by: Dan McGee --- lib/libalpm/sync.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 1de78f75..8405bbfb 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -216,14 +216,22 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s alpm_pkg_get_name(local), alpm_pkg_get_version(local), alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); if(!_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) { - pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(local), - alpm_pkg_get_version(local)); - if(dummy == NULL) { + /* If package is in the ignorepkg list, ask before we add it to + * the transaction */ + if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(local))) { + int resp = 0; + QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp); + if(!resp) { + continue; + } + } + pmpkg_t *tmp = _alpm_pkg_dup(local); + if(tmp == NULL) { goto error; } - sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); + sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, tmp); if(sync == NULL) { - FREEPKG(dummy); + FREEPKG(tmp); goto error; } trans->packages = alpm_list_add(trans->packages, sync); -- cgit v1.2.3-70-g09d2 From 1e859c647f84f162aca282907953b5bf5948021f Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 30 Mar 2007 03:24:09 +0000 Subject: From: Andrew Fyfe Date: Thu, 29 Mar 2007 11:11:36 +0100 Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives. For some reason 'tar -xf' doesn't work with .tar.Z, you need to use 'tar -xzf' to extract the archive. Signed-off-by: Andrew Fyfe Signed-off-by: Aaron Griffin --- scripts/makepkg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/makepkg b/scripts/makepkg index 5afb285c..92d8ab26 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -809,6 +809,8 @@ else file_type=$(file -biz "$file") unset cmd case "$file_type" in + *application/x-tar*application/x-compress*) + cmd="tar -xzf $file" ;; *application/x-tar*) cmd="tar -xf $file" ;; *application/x-zip*) -- cgit v1.2.3-70-g09d2 From a0f8f03056e0611bcedb9505ea7753830171d499 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 30 Mar 2007 03:33:19 +0000 Subject: commit 970d2e942eb29bf78fe89895ace4d781970b6e94 Author: Aaron Griffin Date: Thu Mar 29 21:30:40 2007 -0500 repo-add leaves .PKGINFO in the current directory * Misuse of 'tar xf', which should be 'tar tf' Signed-off-by: Aaron Griffin --- scripts/repo-add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add b/scripts/repo-add index d6e2c5ae..dc280161 100755 --- a/scripts/repo-add +++ b/scripts/repo-add @@ -246,7 +246,7 @@ if [ $# -gt 1 ]; then fi else if [ -f "$arg" ]; then - if ! tar xf "$arg" .PKGINFO 2>&1 >/dev/null; then + if ! tar tf "$arg" .PKGINFO 2>&1 >/dev/null; then echo "error: '$arg' is not a package file, skipping" else echo ":: adding package '$arg'" -- cgit v1.2.3-70-g09d2 From 19cec12f731d842cad9696e7eef88039d6c0e8c8 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 30 Mar 2007 04:46:17 +0000 Subject: commit 1d35c4dcc6399023217e41eaa8ff4733b1ad2b0d Author: Aaron Griffin Date: Thu Mar 29 22:44:10 2007 -0500 Report an error on setmntent failure Signed-off-by: Aaron Griffin --- lib/libalpm/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index daaa8c76..decb5959 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -560,11 +560,13 @@ cleanup: static long long get_freespace() { struct mntent *mnt; - char *table = MOUNTED; + const char *table = MOUNTED; FILE *fp; long long ret=0; if((fp = setmntent(table, "r")) == NULL) { + _alpm_log(PM_LOG_ERROR, _("cannot read disk space information from %s: %s"), + table, strerror(errno)); return(-1); } -- cgit v1.2.3-70-g09d2 From 3382a1416f7f5c926b6272d8580ede5eeddb16c2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 30 Mar 2007 18:06:04 +0000 Subject: * Updated Russian translation Владимир Байраковский <4rayven@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pacman/po/ru_RU.po | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/pacman/po/ru_RU.po b/src/pacman/po/ru_RU.po index 42b60782..36cf2501 100644 --- a/src/pacman/po/ru_RU.po +++ b/src/pacman/po/ru_RU.po @@ -134,7 +134,7 @@ msgstr "предупреждение: " #: src/pacman/package.c:60 msgid "Explicitly installed" -msgstr "Неявно установлен" +msgstr "Явно установлен" #: src/pacman/package.c:63 msgid "Installed as a dependency for another package" @@ -173,7 +173,7 @@ msgstr "Группы :" #: src/pacman/package.c:78 src/pacman/package.c:130 msgid "Provides :" -msgstr "Обеспечивает :" +msgstr "Предоставляет :" #: src/pacman/package.c:79 src/pacman/package.c:131 msgid "Depends On :" @@ -311,32 +311,32 @@ msgstr " %s {-V --version}\n" #: src/pacman/pacman.c:92 #, c-format msgid " %s {-A --add} [options] \n" -msgstr " %s {-A --add} [опции] <файл>\n" +msgstr " %s {-A --add} [параметры] <файл>\n" #: src/pacman/pacman.c:93 #, c-format msgid " %s {-F --freshen} [options] \n" -msgstr " %s {-F --freshen} [опции] <файл>\n" +msgstr " %s {-F --freshen} [параметры] <файл>\n" #: src/pacman/pacman.c:94 #, c-format msgid " %s {-Q --query} [options] [package]\n" -msgstr " %s {-Q --query} [опции] [пакет]\n" +msgstr " %s {-Q --query} [параметры] [пакет]\n" #: src/pacman/pacman.c:95 #, c-format msgid " %s {-R --remove} [options] \n" -msgstr " %s {-R --remove} [опции] <пакет>\n" +msgstr " %s {-R --remove} [параметры] <пакет>\n" #: src/pacman/pacman.c:96 #, c-format msgid " %s {-S --sync} [options] [package]\n" -msgstr " %s {-S --sync} [опции] [пакет]\n" +msgstr " %s {-S --sync} [параметры] [пакет]\n" #: src/pacman/pacman.c:97 #, c-format msgid " %s {-U --upgrade} [options] \n" -msgstr " %s {-U --upgrade} [опции] <файл>\n" +msgstr " %s {-U --upgrade} [параметры] <файл>\n" #: src/pacman/pacman.c:98 #, c-format @@ -351,13 +351,13 @@ msgstr "" #: src/pacman/pacman.c:101 #, c-format msgid "usage: %s {-A --add} [options] \n" -msgstr "использование: %s {-A --add} [опции] <файл>\n" +msgstr "использование: %s {-A --add} [параметры] <файл>\n" #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138 #, c-format msgid "options:\n" -msgstr "опции:\n" +msgstr "параметры:\n" #: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 #: src/pacman/pacman.c:140 @@ -375,7 +375,7 @@ msgstr "" #: src/pacman/pacman.c:106 #, c-format msgid "usage: %s {-R --remove} [options] \n" -msgstr "использование: %s {-R --remove} [опции] <пакет>\n" +msgstr "использование: %s {-R --remove} [параметры] <пакет>\n" #: src/pacman/pacman.c:108 #, c-format @@ -407,17 +407,17 @@ msgstr "" #: src/pacman/pacman.c:115 #, c-format msgid "usage: %s {-F --freshen} [options] \n" -msgstr "использование: %s {-F --freshen} [опции] <файл>\n" +msgstr "использование: %s {-F --freshen} [параметры] <файл>\n" #: src/pacman/pacman.c:117 #, c-format msgid "usage: %s {-U --upgrade} [options] \n" -msgstr "использование: %s {-U --upgrade} [опции] <файл>\n" +msgstr "использование: %s {-U --upgrade} [параметры] <файл>\n" #: src/pacman/pacman.c:123 #, c-format msgid "usage: %s {-Q --query} [options] [package]\n" -msgstr "использование: %s {-Q --query} [опции] [пакет]\n" +msgstr "использование: %s {-Q --query} [параметры] [пакет]\n" #: src/pacman/pacman.c:125 #, c-format @@ -468,7 +468,7 @@ msgstr " -o, --owns <файл> найти пакет содержащий < #, c-format msgid " -p, --file query a package file instead of the database\n" msgstr "" -" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " +" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " "базы данных\n" #: src/pacman/pacman.c:134 @@ -477,7 +477,7 @@ msgid "" " -s, --search search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search искать указанную строку в локально установленных " +" -s, --search искать указанную строку в локально установленных " "пакетах\n" #: src/pacman/pacman.c:135 @@ -490,7 +490,7 @@ msgstr "" #: src/pacman/pacman.c:137 #, c-format msgid "usage: %s {-S --sync} [options] [package]\n" -msgstr "использование: %s {-S --sync} [опции] [пакет]\n" +msgstr "использование: %s {-S --sync} [параметры] [пакет]\n" #: src/pacman/pacman.c:139 #, c-format @@ -539,8 +539,7 @@ msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" msgstr "" -" -w, --downloadonly загрузить пакеты с сервера, но ничего не " -"устанавливать и не обновлять\n" +" -w, --downloadonly загрузить пакеты с сервера, но не устанавливать\n" #: src/pacman/pacman.c:150 #, c-format @@ -642,7 +641,7 @@ msgstr "'%s' неправильно указан путь к базе данны #: src/pacman/pacman.c:363 #, c-format msgid "'%s' is not a valid root path\n" -msgstr "'%s' не является верным корневым каталогом\n" +msgstr "некорректный корневой каталог: '%s'\n" #: src/pacman/pacman.c:390 msgid "only one operation may be used at a time\n" @@ -659,12 +658,13 @@ msgstr "не удалось инициализировать библиотек #: src/pacman/pacman.c:489 msgid "you cannot perform this operation unless you are root.\n" -msgstr "Вы не можете выполнить эту операцию если вы не root.\n" +msgstr "" +"Вы не можете выполнить эту операцию не являясь суперпользователем (root).\n" #: src/pacman/pacman.c:505 #, c-format msgid "failed to parse config (%s)\n" -msgstr "не удалось разобрать конфигурационный файл (%s)\n" +msgstr "не удалось обработать конфигурационный файл (%s)\n" #: src/pacman/pacman.c:516 msgid "Targets :" @@ -673,15 +673,15 @@ msgstr "Цели :" #: src/pacman/pacman.c:522 #, c-format msgid "could not register 'local' database (%s)\n" -msgstr "не могу зарегистрировать 'локальную' базу данных (%s)\n" +msgstr "не могу зарегистрировать локальную базу данных (%s)\n" #: src/pacman/pacman.c:529 msgid "no targets specified (use -h for help)\n" -msgstr "не задано целей (для помощи используйте -h)\n" +msgstr "не задано целей (для справки используйте -h)\n" #: src/pacman/pacman.c:542 msgid "no operation specified (use -h for help)\n" -msgstr "не указаны конкретные операции (для помощи используйте -h)\n" +msgstr "не задана операция (для справки используйте -h)\n" #: src/pacman/query.c:90 msgid "no file was specified for --owns\n" @@ -730,7 +730,7 @@ msgstr "группа \"%s\" не найдена\n" #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" -msgstr "не указан файл пакета для опции --file\n" +msgstr "не указан файл пакета для параметра --file\n" #: src/pacman/query.c:236 #, c-format @@ -852,7 +852,7 @@ msgstr ":: Синхронизирую базу данных пакетов...\n" #: src/pacman/sync.c:491 msgid "synchronizing package lists" -msgstr "синхронизирую список пакетов" +msgstr "синхронизирую списки пакетов" #: src/pacman/sync.c:493 msgid "failed to synchronize any databases" @@ -884,7 +884,7 @@ msgstr ":: после чего перезапустить операцию с и #: src/pacman/sync.c:522 msgid ":: Upgrade pacman first? [Y/n] " -msgstr ":: Сначала обновить pacman? [Y/n] " +msgstr ":: Обновить pacman в первую очередь? [Y/n] " #: src/pacman/sync.c:537 #, c-format @@ -908,7 +908,7 @@ msgstr ":: Установить %s из группы %s? [Y/n] " #: src/pacman/sync.c:603 #, c-format msgid "'%s': not found in sync db\n" -msgstr "'%s': не найдено в базе данных\n" +msgstr "'%s': не найдено в базе пакетов\n" #: src/pacman/sync.c:621 msgid "requires" -- cgit v1.2.3-70-g09d2 From 60a588261cc453f903f389cd17cc5659aea444e1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 30 Mar 2007 19:55:05 +0000 Subject: * Updated Hungarian translation Nagy Gabor --- src/pacman/po/hu.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po index 43ea80e9..629abbec 100644 --- a/src/pacman/po/hu.po +++ b/src/pacman/po/hu.po @@ -129,7 +129,7 @@ msgstr "hiba: " #: src/pacman/log.h:34 msgid "warning: " -msgstr "figyelmeztets" +msgstr "figyelmeztets: " #: src/pacman/package.c:60 msgid "Explicitly installed" @@ -270,7 +270,7 @@ msgstr "Backup f #: src/pacman/package.c:180 #, c-format msgid "error calculating checksums for %s\n" -msgstr "hiba a %s ellenrz sszegnek szmtsa kzben\n" +msgstr "hiba a(z) %s ellenrz sszegnek szmtsa kzben\n" #: src/pacman/package.c:193 #, c-format @@ -615,7 +615,7 @@ msgstr " foglaltak alapj #: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" -msgstr "a '%s' nem rvnyes hibakeressi szint" +msgstr "a(z) '%s' nem rvnyes hibakeressi szint" #: src/pacman/pacman.c:315 #, c-format @@ -687,7 +687,7 @@ msgstr "nem siker #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "nem llapthat meg a valdi tvonal a '%s' szmra: %s" +msgstr "nem llapthat meg a valdi tvonal a(z) '%s' szmra: %s" #: src/pacman/query.c:119 #, c-format @@ -714,7 +714,7 @@ msgstr "nem tal #: src/pacman/query.c:221 #, c-format msgid "group \"%s\" was not found\n" -msgstr "a \"%s\" csoport nem tallhat\n" +msgstr "a(z) \"%s\" csoport nem tallhat\n" #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" @@ -752,7 +752,7 @@ msgstr "nem siker #: src/pacman/remove.c:92 #, c-format msgid "failed to add target '%s' (%s)\n" -msgstr "nem sikerlt a '%s' clt hozzadni a tranzakcihoz (%s)\n" +msgstr "nem sikerlt a(z) '%s' clt hozzadni a tranzakcihoz (%s)\n" #: src/pacman/remove.c:106 #, c-format @@ -812,7 +812,7 @@ msgstr "nem siker #: src/pacman/sync.c:223 #, c-format msgid " %s is up to date\n" -msgstr " a %s napraksz\n" +msgstr " a(z) %s napraksz\n" #: src/pacman/sync.c:345 #, c-format -- cgit v1.2.3-70-g09d2 From d2c6bcdbbd06bb35d490b22bc9fa1426fdea00bf Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 1 Apr 2007 17:05:16 +0000 Subject: * Updated Italian translation Giovanni Scafora --- src/pacman/po/it.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po index 6be03ac5..1714bd40 100644 --- a/src/pacman/po/it.po +++ b/src/pacman/po/it.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" -"PO-Revision-Date: 2007-03-22 12:40+0100\n" +"POT-Creation-Date: 2007-03-31 03:37+0200\n" +"PO-Revision-Date: 2007-03-31 04:00+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" "MIME-Version: 1.0\n" @@ -434,7 +434,7 @@ msgstr "" #: src/pacman/pacman.c:127 #, c-format msgid " required by any package\n" -msgstr " più richiesti da nessun pacchetto\n" +msgstr " ma non più richiesti da alcun pacchetto\n" #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format @@ -887,11 +887,6 @@ msgstr ":: Aggiornare pacman adesso? [Y/n] " msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Installare l'intero contenuto? [Y/n] " @@ -1091,6 +1086,9 @@ msgstr "" msgid "Total Installed Size: %.2f MB\n" msgstr "Dimensione totale dei pacchetti installati: %.2f MB\n" +#~ msgid "'%s': %s\n" +#~ msgstr "'%s': %s\n" + #~ msgid "is required by" #~ msgstr "è richiesto da" -- cgit v1.2.3-70-g09d2 From ec689b5978cc28b40f63eaa6700afd31b020ee6c Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 4 Apr 2007 02:03:44 +0000 Subject: * Tom Killian Properly align checksums on makepkg -g --- scripts/makepkg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg b/scripts/makepkg index 92d8ab26..ffd34d48 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -746,7 +746,11 @@ else if [ $ct -eq 0 ]; then echo -n "${integrity_name}s=(" else - echo -ne "\t " + indent=0 + while [ $indent -lt $((${#integrity_name}+3)) ]; do + echo -n " " + indent=$(($indent+1)) + done fi echo -n "'$sum'" ct=$(($ct+1)) -- cgit v1.2.3-70-g09d2 From c87745646c12118e39e393b55c50edd4bbbaf54e Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 4 Apr 2007 02:19:37 +0000 Subject: Added new Russian mirror --- etc/pacman.d/mirrorlist.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index 2f6090ea..2cd2cf06 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -52,6 +52,8 @@ Server = ftp://cesium.di.uminho.pt/pub/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@ # - Romania Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@ +# - Russia +Server = http://archlinux.freeside.ru/ # - Sweden Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@ -- cgit v1.2.3-70-g09d2 From 8153e3851e34d8f654d6be03bc55dcf001014569 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 4 Apr 2007 03:00:24 +0000 Subject: Forgot the @@REPO@@ part of the russian mirror. --- etc/pacman.d/mirrorlist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index 2cd2cf06..7eb0ff26 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -53,7 +53,7 @@ Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@ # - Romania Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@ # - Russia -Server = http://archlinux.freeside.ru/ +Server = http://archlinux.freeside.ru/@@REPO@@/os/@CARCH@ # - Sweden Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@ -- cgit v1.2.3-70-g09d2 From 1cd7567ff8af4bcc2813eb0f104fdab8ef0f7c53 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 4 Apr 2007 03:59:36 +0000 Subject: This change does two things: * Prefer case-insensitive config settings. In the future case-insensitivity may be enforced. * Provides a fix for the tr_TR locale by checking the case-insensitive version first. This is more elegant than setting the 'C' locale for tr_TR. Also added a 'RootDir' config option to match CacheDir and DBPath --- lib/libalpm/alpm.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 48044bad..227cd5e9 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -884,6 +884,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const char *ptr = NULL; char *key = NULL; int linenum = 0; + char origkey[256]; char section[256] = ""; pmdb_t *db = NULL; @@ -938,21 +939,22 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); } _alpm_strtrim(key); + strncpy(origkey, key, min(255, strlen(key))); key = _alpm_strtoupper(key); if(!strlen(section) && strcmp(key, "INCLUDE")) { RET_ERR(PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, -1); } if(ptr == NULL) { - if(!strcmp(key, "NOPASSIVEFTP")) { + if(strcmp(origkey, "NoPassiveFTP") == 0 || strcmp(key, "NOPASSIVEFTP") == 0) { alpm_option_set_nopassiveftp(1); _alpm_log(PM_LOG_DEBUG, _("config: nopassiveftp")); - } else if(!strcmp(key, "USESYSLOG")) { + } else if(strcmp(origkey, "UseSyslog") == 0 || strcmp(key, "USESYSLOG") == 0) { alpm_option_set_usesyslog(1); _alpm_log(PM_LOG_DEBUG, _("config: usesyslog")); - } else if(!strcmp(key, "ILOVECANDY")) { + } else if(strcmp(origkey, "ILoveCandy") == 0 || strcmp(key, "ILOVECANDY") == 0) { alpm_option_set_chomp(1); _alpm_log(PM_LOG_DEBUG, _("config: chomp")); - } else if(!strcmp(key, "USECOLOR")) { + } else if(strcmp(origkey, "UseColor") == 0 || strcmp(key, "USECOLOR") == 0) { alpm_option_set_usecolor(1); _alpm_log(PM_LOG_DEBUG, _("config: usecolor")); } else { @@ -960,13 +962,13 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } } else { _alpm_strtrim(ptr); - if(!strcmp(key, "INCLUDE")) { + if(strcmp(origkey, "Include") == 0 || strcmp(key, "INCLUDE") == 0) { char conf[PATH_MAX]; strncpy(conf, ptr, PATH_MAX); _alpm_log(PM_LOG_DEBUG, _("config: including %s"), conf); alpm_parse_config(conf, callback, section); - } else if(!strcmp(section, "options")) { - if(!strcmp(key, "NOUPGRADE")) { + } else if(strcmp(section, "options") == 0) { + if(strcmp(origkey, "NoUpgrade") == 0 || strcmp(key, "NOUPGRADE") == 0) { char *p = ptr; char *q; @@ -979,7 +981,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } alpm_option_add_noupgrade(p); _alpm_log(PM_LOG_DEBUG, _("config: noupgrade: %s"), p); - } else if(!strcmp(key, "NOEXTRACT")) { + } else if(strcmp(origkey, "NoExtract") == 0 || strcmp(key, "NOEXTRACT") == 0) { char *p = ptr; char *q; @@ -992,7 +994,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } alpm_option_add_noextract(p); _alpm_log(PM_LOG_DEBUG, _("config: noextract: %s"), p); - } else if(!strcmp(key, "IGNOREPKG")) { + } else if(strcmp(origkey, "IgnorePkg") == 0 || strcmp(key, "IGNOREPKG") == 0) { char *p = ptr; char *q; @@ -1005,7 +1007,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } alpm_option_add_ignorepkg(p); _alpm_log(PM_LOG_DEBUG, _("config: ignorepkg: %s"), p); - } else if(!strcmp(key, "HOLDPKG")) { + } else if(strcmp(origkey, "HoldPkg") == 0 || strcmp(key, "HOLDPKG") == 0) { char *p = ptr; char *q; @@ -1018,27 +1020,34 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } alpm_option_add_holdpkg(p); _alpm_log(PM_LOG_DEBUG, _("config: holdpkg: %s"), p); - } else if(!strcmp(key, "DBPATH")) { + } else if(strcmp(origkey, "DBPath") == 0 || strcmp(key, "DBPATH") == 0) { /* shave off the leading slash, if there is one */ if(*ptr == '/') { ptr++; } alpm_option_set_dbpath(ptr); _alpm_log(PM_LOG_DEBUG, _("config: dbpath: %s"), ptr); - } else if(!strcmp(key, "CACHEDIR")) { + } else if(strcmp(origkey, "CacheDir") == 0 || strcmp(key, "CACHEDIR") == 0) { /* shave off the leading slash, if there is one */ if(*ptr == '/') { ptr++; } alpm_option_set_cachedir(ptr); _alpm_log(PM_LOG_DEBUG, _("config: cachedir: %s"), ptr); - } else if (!strcmp(key, "LOGFILE")) { + } else if(strcmp(origkey, "RootDir") == 0 || strcmp(key, "ROOTDIR") == 0) { + /* shave off the leading slash, if there is one */ + if(*ptr == '/') { + ptr++; + } + alpm_option_set_root(ptr); + _alpm_log(PM_LOG_DEBUG, _("config: rootdir: %s"), ptr); + } else if (strcmp(origkey, "LogFile") == 0 || strcmp(key, "LOGFILE") == 0) { alpm_option_set_logfile(ptr); _alpm_log(PM_LOG_DEBUG, _("config: logfile: %s"), ptr); - } else if (!strcmp(key, "XFERCOMMAND")) { + } else if (strcmp(origkey, "XferCommand") == 0 || strcmp(key, "XFERCOMMAND") == 0) { alpm_option_set_xfercommand(ptr); _alpm_log(PM_LOG_DEBUG, _("config: xfercommand: %s"), ptr); - } else if (!strcmp(key, "UPGRADEDELAY")) { + } else if (strcmp(origkey, "UpgradeDelay") == 0 || strcmp(key, "UPGRADEDELAY") == 0) { /* The config value is in days, we use seconds */ time_t ud = atol(ptr) * 60 * 60 *24; alpm_option_set_upgradedelay(ud); @@ -1047,7 +1056,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); } } else { - if(!strcmp(key, "SERVER")) { + if(strcmp(origkey, "Server") == 0 || strcmp(key, "SERVER") == 0) { /* add to the list */ if(alpm_db_setserver(db, ptr) != 0) { /* pm_errno is set by alpm_db_setserver */ -- cgit v1.2.3-70-g09d2 From 10ba6369871c4301f3a976eef52c025098a1391a Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 4 Apr 2007 04:43:24 +0000 Subject: * Fix FS#6798 - there is no reason to fail on a duplicate removal target Added a pactest case for this ("-R foo foo foo foo foo" should do what is expected) --- lib/libalpm/trans.c | 3 ++- pactest/tests/remove001.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pactest/tests/remove001.py diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 1198292f..009ec7f1 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -135,7 +135,8 @@ int _alpm_trans_addtarget(pmtrans_t *trans, char *target) ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); if(alpm_list_find_str(trans->targets, target)) { - RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); + return(0); + //RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } switch(trans->type) { diff --git a/pactest/tests/remove001.py b/pactest/tests/remove001.py new file mode 100644 index 00000000..809bfdb7 --- /dev/null +++ b/pactest/tests/remove001.py @@ -0,0 +1,10 @@ +# If someone else can come up with a better name, please do so +self.description = "Remove a package listed 5 times" + +p = pmpkg("foo") +self.addpkg2db("local", p) + +self.args = "-R " + "foo "*5 + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXISTS=foo") -- cgit v1.2.3-70-g09d2 From cfbec7464f344f18abac0f33bacb9ebe32d39984 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 4 Apr 2007 05:03:52 +0000 Subject: * Version number bump --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d0d6fd36..91d32a76 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ CFLAGS="" AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([Pacman package manager], 3.0.0, [pacman-dev@archlinux.org], [pacman]) +AC_INIT([Pacman package manager], 3.0.1, [pacman-dev@archlinux.org], [pacman]) AC_LANG([C]) AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST -- cgit v1.2.3-70-g09d2 From ef578e77c836c629a47d9efc63bc6580307b7126 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 4 Apr 2007 05:07:43 +0000 Subject: * Updated --- NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS b/NEWS index af038157..3398f6e9 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.0.1 - fix a locale issue with tr_TR upper/lower-case conversion + - allow removal when listing the same package multiple times + - fix a repo-add bug that left a .PKGINFO file in the current + directory + - proper error messages when we cannot read mtab for freespace 3.0.0 - first release based on libalpm backend - added internationalization (gettext) support: - de, fr, hu, it, pt_BR, en_GB, ru_RU translations -- cgit v1.2.3-70-g09d2 From d4f78116e0c3bc300098b13f7d8bd328edb13cd1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 5 Apr 2007 16:37:23 +0000 Subject: Fix running of pre_remove and Post_remove pkgname was undefined previously when this was called, fixed. Patch from Roman Kyrylych . --- lib/libalpm/remove.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 03b23d25..291eb7a0 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -284,10 +284,10 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) break; } - snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, - pkgname, alpm_pkg_get_version(info)); /* get the name now so we can use it after package is removed */ pkgname = alpm_pkg_get_name(info); + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, + pkgname, alpm_pkg_get_version(info)); if(trans->type != PM_TRANS_TYPE_UPGRADE) { EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL); -- cgit v1.2.3-70-g09d2 From 14d74623b05945b58f83f37b35f0c8fd229bcb1c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 9 Apr 2007 20:13:31 +0000 Subject: Added easynews mirror --- etc/pacman.d/mirrorlist.in | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index 7eb0ff26..c5c9aee4 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -7,6 +7,7 @@ Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@ Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@ +Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@ # Europe -- cgit v1.2.3-70-g09d2 From 562887ba5cda60cb288f2c46fcb4b84339f50cb2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 11 Apr 2007 16:41:29 +0000 Subject: Fix FS #6872- CFLAGS were not being exported --- scripts/makepkg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/makepkg b/scripts/makepkg index ffd34d48..9cfea69e 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -885,6 +885,10 @@ else unset LC_ALL LANG umask 0022 + # ensure CFLAGS and CXXFLAGS are used + export CFLAGS + export CXXFLAGS + #check for "exit on syntax error" shell option echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? -- cgit v1.2.3-70-g09d2 From ec83c93ea4a7d4742c5d92438b0da1c469704257 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 17 Apr 2007 01:49:06 +0000 Subject: Bugfixes in prep for a 3.0.2 release Fix #6905- makepkg dependency checking error Fix #6915- add SUU mirror to mirrorlist.in --- etc/pacman.d/mirrorlist.in | 1 + scripts/makepkg | 3 +-- src/pacman/deptest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index c5c9aee4..f1c53a8e 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -5,6 +5,7 @@ # United States Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@ Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@ +Server = ftp://locke.suu.edu/linux/dist/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@ Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@ diff --git a/scripts/makepkg b/scripts/makepkg index 9cfea69e..9e38a6dd 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -182,8 +182,7 @@ checkdeps() { pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? if [ $ret -eq 1 ]; then #unresolved deps - #strip out the pacman prefix from "requires: xyz" - echo $pmout | sed 's|requires:||g' + echo $pmout elif [ $ret -ne 0 ]; then error "pacman returned a fatal error ($ret): $pmout" exit 1 diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index dc968f25..1ae7ceb5 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -81,7 +81,7 @@ int pacman_deptest(alpm_list_t *targets) } if(!found) { - MSG(NL, _("requires: %s"), saved_target); + MSG(NL, "%s", saved_target); retval = 1; } free(saved_target); -- cgit v1.2.3-70-g09d2 From e0f5d4efbeadd9921ec7628888877d8f7e36f8b1 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 17 Apr 2007 02:31:04 +0000 Subject: * Nagy Gabor Make sure ldconfig runs on upgrade * Added 3 pactests to verify (by output only) that ldconfig is run --- lib/libalpm/add.c | 2 +- pactest/tests/ldconfig001.py | 12 ++++++++++++ pactest/tests/ldconfig002.py | 16 ++++++++++++++++ pactest/tests/ldconfig003.py | 14 ++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pactest/tests/ldconfig001.py create mode 100644 pactest/tests/ldconfig002.py create mode 100644 pactest/tests/ldconfig003.py diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5236b6ab..ddeca317 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -837,7 +837,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) } /* run ldconfig if it exists */ - if((trans->type != PM_TRANS_TYPE_UPGRADE) && (handle->trans->state != STATE_INTERRUPTED)) { + if(handle->trans->state != STATE_INTERRUPTED) { _alpm_log(PM_LOG_DEBUG, _("running \"ldconfig -r %s\""), handle->root); _alpm_ldconfig(handle->root); } diff --git a/pactest/tests/ldconfig001.py b/pactest/tests/ldconfig001.py new file mode 100644 index 00000000..aced413b --- /dev/null +++ b/pactest/tests/ldconfig001.py @@ -0,0 +1,12 @@ +# quick note here - chroot() is expected to fail. We're not checking the +# validity of the scripts, only that they fire (or try to) +self.description = "Make sure ldconfig runs on an add operation" + +p = pmpkg("dummy") +self.addpkg(p) + +# --debug is necessary to check PACMAN_OUTPUT +self.args = "--debug -A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=ldconfig") diff --git a/pactest/tests/ldconfig002.py b/pactest/tests/ldconfig002.py new file mode 100644 index 00000000..162f5831 --- /dev/null +++ b/pactest/tests/ldconfig002.py @@ -0,0 +1,16 @@ +# quick note here - chroot() is expected to fail. We're not checking the +# validity of the scripts, only that they fire (or try to) +self.description = "Make sure ldconfig runs on an upgrade operation" + +lp = pmpkg("dummy") +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.0-2") +self.addpkg(p) + +# --debug is necessary to check PACMAN_OUTPUT +self.args = "--debug -U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-2") +self.addrule("PACMAN_OUTPUT=ldconfig") diff --git a/pactest/tests/ldconfig003.py b/pactest/tests/ldconfig003.py new file mode 100644 index 00000000..1b48efad --- /dev/null +++ b/pactest/tests/ldconfig003.py @@ -0,0 +1,14 @@ +# quick note here - chroot() is expected to fail. We're not checking the +# validity of the scripts, only that they fire (or try to) +self.description = "Make sure ldconfig runs on a sync operation" + +sp = pmpkg("dummy") +self.addpkg2db("sync", sp) + +self.args = "-S %s" % sp.name + +# --debug is necessary to check PACMAN_OUTPUT +self.args = "--debug -S %s" % sp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=ldconfig") -- cgit v1.2.3-70-g09d2 From 38ff2153c69d2cf9ec07ff11a114fbaa550c0e77 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 17 Apr 2007 02:35:59 +0000 Subject: Adding Polish language translation, thanks! From: Mateusz Jędrasik MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/pl_PL.po | 1507 +++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/LINGUAS | 1 + src/pacman/po/pl_PL.po | 1077 +++++++++++++++++++++++++++++++++ 4 files changed, 2586 insertions(+) create mode 100644 lib/libalpm/po/pl_PL.po create mode 100644 src/pacman/po/pl_PL.po diff --git a/lib/libalpm/po/LINGUAS b/lib/libalpm/po/LINGUAS index 1e5c80c1..db14c2ff 100644 --- a/lib/libalpm/po/LINGUAS +++ b/lib/libalpm/po/LINGUAS @@ -6,3 +6,4 @@ it pt_BR en_GB ru_RU +pl_PL diff --git a/lib/libalpm/po/pl_PL.po b/lib/libalpm/po/pl_PL.po new file mode 100644 index 00000000..35e6a56c --- /dev/null +++ b/lib/libalpm/po/pl_PL.po @@ -0,0 +1,1507 @@ +# Polish translations for Pacman package manager package +# Polskie tłumaczenia dla pakietu Pacman package manager. +# Copyright (C) 2007 Judd Vinet +# This file is distributed under the same license as the Pacman package manager package. +# Mateusz Jędrasik , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: Pacman package manager 3.0.1\n" +"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" +"POT-Creation-Date: 2007-04-03 23:07-0500\n" +"PO-Revision-Date: 2007-04-12 04:23+0200\n" +"Last-Translator: Mateusz Jędrasik \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#: lib/libalpm/add.c:77 +#, c-format +msgid "loading target '%s'" +msgstr "ładowanie celu '%s'" + +#: lib/libalpm/add.c:122 +#, c-format +msgid "replacing older version %s-%s by %s in target list" +msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów" + +#: lib/libalpm/add.c:131 +#, c-format +msgid "newer version %s-%s is in the target list -- skipping" +msgstr "nowsza wersja %s-%s znajduje się w liście celów -- pomijam" + +#: lib/libalpm/add.c:138 +#, c-format +msgid "reading '%s' metadata" +msgstr "czytanie metadane '%s'" + +#: lib/libalpm/add.c:191 lib/libalpm/remove.c:111 +msgid "looking for unsatisfied dependencies" +msgstr "szukanie nieusatysfakcjonowanych zależności" + +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 +msgid "looking for conflicts" +msgstr "szukanie konfliktów" + +#: lib/libalpm/add.c:208 +msgid "replacing packages with -A and -U is not supported yet" +msgstr "zastępowanie pakietów z -A i -U nie jest jeszcze wspierane" + +#: lib/libalpm/add.c:209 +#, c-format +msgid "please remove '%s' first, using -Rd" +msgstr "proszę usunąć pierw '%s', korzystając z -Rd" + +#: lib/libalpm/add.c:250 lib/libalpm/remove.c:147 +msgid "sorting by dependencies" +msgstr "sortowanie według zależności" + +#: lib/libalpm/add.c:262 +msgid "cleaning up" +msgstr "czyszczenie" + +#: lib/libalpm/add.c:277 +msgid "looking for file conflicts" +msgstr "szukanie konfliktów plików" + +#: lib/libalpm/add.c:346 +#, c-format +msgid "upgrading package %s-%s" +msgstr "aktualizowanie pakietu %s-%s" + +#: lib/libalpm/add.c:370 +#, c-format +msgid "adding package %s-%s" +msgstr "dodawanie pakietu %s-%s" + +#: lib/libalpm/add.c:383 +#, c-format +msgid "removing old package first (%s-%s)" +msgstr "usuwanie wpierw starego pakietu (%s-%s)" + +#: lib/libalpm/add.c:411 +#, c-format +msgid "adding %s to the NoUpgrade array temporarily" +msgstr "dodawanie %s tymczasowo do tablicy NoUpgrade" + +#: lib/libalpm/add.c:429 +msgid "extracting files" +msgstr "rozpakowywanie plików" + +#: lib/libalpm/add.c:444 lib/libalpm/util.c:465 +msgid "could not get current working directory" +msgstr "nie można znaleźć obecnego katalogu" + +#: lib/libalpm/add.c:500 lib/libalpm/add.c:501 +#, c-format +msgid "%s is in NoExtract, skipping extraction" +msgstr "%s znajduje się w NoExtract, pomijanie rozpakowywania" + +#: lib/libalpm/add.c:508 +#, c-format +msgid "%s is in trans->skip_add, skipping extraction" +msgstr "%s znajduje się w trans->skip_add, pomijanie rozpakowywania" + +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#, c-format +msgid "could not extract %s (%s)" +msgstr "nie udało się rozpakować %s (%s)" + +#: lib/libalpm/add.c:598 +#, c-format +msgid "checking md5 hashes for %s" +msgstr "sprawdzanie sum md5 dla %s" + +#: lib/libalpm/add.c:600 +#, c-format +msgid "checking sha1 hashes for %s" +msgstr "sprawdzanie sum sha1 dla %s" + +#: lib/libalpm/add.c:602 +#, c-format +msgid "current: %s" +msgstr "bieżące: %s" + +#: lib/libalpm/add.c:603 +#, c-format +msgid "new: %s" +msgstr "nowe: %s" + +#: lib/libalpm/add.c:604 +#, c-format +msgid "original: %s" +msgstr "oryginalne: %s" + +#: lib/libalpm/add.c:616 +#, c-format +msgid "could not rename %s (%s)" +msgstr "nie udało się zmienić nazwy %s (%s)" + +#: lib/libalpm/add.c:617 +#, c-format +msgid "error: could not rename %s (%s)" +msgstr "błąd: nie udało się zmienić nazwy %s (%s)" + +#: lib/libalpm/add.c:623 lib/libalpm/add.c:642 +#, c-format +msgid "could not copy tempfile to %s (%s)" +msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)" + +#: lib/libalpm/add.c:624 +#, c-format +msgid "error: could not copy tempfile to %s (%s)" +msgstr "błąd: nie udało się skopiować pliku tymczasowego do %s (%s)" + +#: lib/libalpm/add.c:628 lib/libalpm/remove.c:247 +#, c-format +msgid "%s saved as %s" +msgstr "%s zachowane jako %s" + +#: lib/libalpm/add.c:629 +#, c-format +msgid "warning: %s saved as %s" +msgstr "uwaga: %s zachowane jako %s" + +#: lib/libalpm/add.c:639 +#, c-format +msgid "action: installing new file: %s" +msgstr "czynność: instalowanie nowego pliku: %s" + +#: lib/libalpm/add.c:649 lib/libalpm/add.c:655 lib/libalpm/add.c:660 +msgid "action: leaving existing file in place" +msgstr "czynność: zostawianie obecnych plików na miejscu" + +#: lib/libalpm/add.c:663 +msgid "action: keeping current file and installing new one with .pacnew ending" +msgstr "czynność: zachowywanie obecnego pliku i instalowanie nowego z końcówką .pacnew" + +#: lib/libalpm/add.c:666 +#, c-format +msgid "could not install %s as %s: %s" +msgstr "nie udało się zainstalować %s jako %s: %s" + +#: lib/libalpm/add.c:667 +#, c-format +msgid "error: could not install %s as %s: %s" +msgstr "błąd: nie udało się zainstalować %s jako %s: %s" + +#: lib/libalpm/add.c:669 +#, c-format +msgid "%s installed as %s" +msgstr "%s zainstalowano jako %s" + +#: lib/libalpm/add.c:670 +#, c-format +msgid "warning: %s installed as %s" +msgstr "uwaga: %s zainstalowano jako %s" + +#: lib/libalpm/add.c:684 +#, c-format +msgid "%s is in NoUpgrade -- skipping" +msgstr "%s znajduje się w NoUpgrade -- pomijanie" + +#: lib/libalpm/add.c:685 +#, c-format +msgid "extracting %s as %s.pacnew" +msgstr "rozpakowywanie %s jako %s.pacnew" + +#: lib/libalpm/add.c:686 +#, c-format +msgid "warning: extracting %s as %s.pacnew" +msgstr "uwaga: rozpakowywanie %s jako %s.pacnew" + +#: lib/libalpm/add.c:689 +#, c-format +msgid "extracting %s" +msgstr "rozpakowywanie %s" + +#: lib/libalpm/add.c:705 +#, c-format +msgid "error: could not extract %s (%s)" +msgstr "błąd: nie udało się rozpakować %s (%s)" + +#: lib/libalpm/add.c:717 +#, c-format +msgid "appending backup entry for %s" +msgstr "dodawanie pozycji kopii zapasowej dla %s" + +#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#, c-format +msgid "errors occurred while %s %s" +msgstr "wystąpiły błędy podczas %s %s" + +#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +msgid "upgrading" +msgstr "aktualizowanie" + +#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +msgid "installing" +msgstr "instalowanie" + +#: lib/libalpm/add.c:769 +#, c-format +msgid "provision '%s' has been removed from package %s (%s => %s)" +msgstr "zasób '%s' został usunięty z pakietu %s (%s => %s)" + +#: lib/libalpm/add.c:781 +#, c-format +msgid "updating '%s' due to provision change (%s)" +msgstr "aktualizowanie '%s' z powodu zmiany zasobu (%s)" + +#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#, c-format +msgid "could not update provision '%s' from '%s'" +msgstr "nie udało się zaktualizować zasobu '%s' z '%s'" + +#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +msgid "updating database" +msgstr "aktualizowanie bazy danych" + +#: lib/libalpm/add.c:800 +#, c-format +msgid "adding database entry '%s'" +msgstr "dodawanie pozycji bazy danych '%s'" + +#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#, c-format +msgid "could not update database entry %s-%s" +msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s" + +#: lib/libalpm/add.c:811 +#, c-format +msgid "could not add entry '%s' in cache" +msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym" + +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#, c-format +msgid "running \"ldconfig -r %s\"" +msgstr "uruchamianie \"ldconfig -r %s\"" + +#: lib/libalpm/alpm.c:116 +#, c-format +msgid "removing DB %s, %d remaining..." +msgstr "usuwanie BD %s, pozostało %d..." + +#: lib/libalpm/alpm.c:181 +#, c-format +msgid "unregistering database '%s'" +msgstr "odrejestrowywanie bazy danych '%s'" + +#: lib/libalpm/alpm.c:186 +#, c-format +msgid "closing database '%s'" +msgstr "zamykanie bazy danych '%s'" + +#: lib/libalpm/alpm.c:232 +#, c-format +msgid "" +"adding new server to database '%s': protocol '%s', server '%s', path '%s'" +msgstr "" +"dodawanie nowego serwera do bazy danych '%s': protokół '%s', serwer '%s', ścieżka '%s'" + +#: lib/libalpm/alpm.c:236 +#, c-format +msgid "serverlist flushed for '%s'" +msgstr "lista serwerów spuszczona(?) dla '%s'" + +#: lib/libalpm/alpm.c:279 +#, c-format +msgid "failed to get lastupdate time for %s (no big deal)" +msgstr "nie udało się otrzymać czasu ostatniej aktualizacji dla %s (nic wielkiego)" + +#: lib/libalpm/alpm.c:298 +#, c-format +msgid "failed to sync db: %s [%d]" +msgstr "nie udało się zsynchronizować bd: %s [%d]" + +#: lib/libalpm/alpm.c:302 +#, c-format +msgid "sync: new mtime for %s: %s" +msgstr "sync: nowy mtime dla %s: %s" + +#: lib/libalpm/alpm.c:308 +#, c-format +msgid "flushing database %s%s" +msgstr "spuszczanie(?) bazy danych %s%s" + +#: lib/libalpm/alpm.c:312 +#, c-format +msgid "could not remove database entry %s%s" +msgstr "nie udało się usunąć wpisu %s%s z bazy danych" + +#: lib/libalpm/alpm.c:481 +#, c-format +msgid "could not get sha1sum for package %s-%s" +msgstr "nie udało się otrzymać sumy sha1 dla pakietu %s-%s" + +#: lib/libalpm/alpm.c:487 +#, c-format +msgid "sha1sums for package %s-%s match" +msgstr "sumy kontrolne sha1 zgadzają się dla pakietu %s-%s" + +#: lib/libalpm/alpm.c:490 +#, c-format +msgid "sha1sums do not match for package %s-%s" +msgstr "sumy kontrolne sha1 dla pakietu %s-%s nie zgadzają się" + +#: lib/libalpm/alpm.c:525 +#, c-format +msgid "could not get md5sum for package %s-%s" +msgstr "nie udało się otrzymać sumy md5 dla pakietu %s-%s" + +#: lib/libalpm/alpm.c:531 +#, c-format +msgid "md5sums for package %s-%s match" +msgstr "sumy kontrolne md5 zgadzają się dla pakietu %s-%s" + +#: lib/libalpm/alpm.c:534 +#, c-format +msgid "md5sums do not match for package %s-%s" +msgstr "sumy kontrolne md5 dla pakietu %s-%s nie zgadzają się" + +#: lib/libalpm/alpm.c:783 +#, c-format +msgid "could not remove lock file %s" +msgstr "nie udało się usunąć pliku blokującego %s" + +#: lib/libalpm/alpm.c:784 +#, c-format +msgid "warning: could not remove lock file %s" +msgstr "uwaga: nie udało się usunąć pliku blokującego %s" + +#: lib/libalpm/alpm.c:920 +#, c-format +msgid "config: new section '%s'" +msgstr "konfiguracja: nowa sekcja '%s'" + +#: lib/libalpm/alpm.c:950 +msgid "config: nopassiveftp" +msgstr "konfiguracja: nopassiveftp" + +#: lib/libalpm/alpm.c:953 +msgid "config: usesyslog" +msgstr "konfiguracja: usesyslog" + +#: lib/libalpm/alpm.c:956 +msgid "config: chomp" +msgstr "konfiguracja: chomp" + +#: lib/libalpm/alpm.c:959 +msgid "config: usecolor" +msgstr "konfiguracja: usecolor" + +#: lib/libalpm/alpm.c:968 +#, c-format +msgid "config: including %s" +msgstr "konfiguracja: zawieranie %s" + +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#, c-format +msgid "config: noupgrade: %s" +msgstr "konfiguracja: noupgrade: %s" + +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#, c-format +msgid "config: noextract: %s" +msgstr "konfiguracja: noextract: %s" + +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#, c-format +msgid "config: ignorepkg: %s" +msgstr "konfiguracja: ignorepkg: %s" + +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#, c-format +msgid "config: holdpkg: %s" +msgstr "konfiguracja: holdpkg: %s" + +#: lib/libalpm/alpm.c:1029 +#, c-format +msgid "config: dbpath: %s" +msgstr "konfiguracja: dbpath: %s" + +#: lib/libalpm/alpm.c:1036 +#, c-format +msgid "config: cachedir: %s" +msgstr "konfiguracja: cachedir: %s" + +#: lib/libalpm/alpm.c:1043 +#, c-format +msgid "config: rootdir: %s" +msgstr "konfiguracja: rootdir: %s" + +#: lib/libalpm/alpm.c:1046 +#, c-format +msgid "config: logfile: %s" +msgstr "konfiguracja: logfile: %s" + +#: lib/libalpm/alpm.c:1049 +#, c-format +msgid "config: xfercommand: %s" +msgstr "konfiguracja: xfercommand: %s" + +#: lib/libalpm/alpm.c:1054 +#, c-format +msgid "config: upgradedelay: %d" +msgstr "konfiguracja: upgradedelay: %d" + +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +msgid "checking for package replacements" +msgstr "sprawdzanie potencjalnych pakietów zastępczych" + +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#, c-format +msgid "checking replacement '%s' for package '%s'" +msgstr "sprawdzanie zastępcy '%s' dla pakietu '%s'" + +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#, c-format +msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" +msgstr "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)" + +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#, c-format +msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" +msgstr "%s-%s wybrany do zaktualizowania (do zastąpienia przez %s-%s)" + +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#, c-format +msgid "'%s' not found in sync db -- skipping" +msgstr "'%s' nie odnaleziony w bd sync -- pomijanie" + +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#, c-format +msgid "'%s' is already elected for removal -- skipping" +msgstr "'%s' jest już wybrany do usunięcia -- pomijanie" + +#: lib/libalpm/alpm.c:1178 +#, c-format +msgid "%s elected for upgrade (%s => %s)" +msgstr "%s wybrany do zaktualizowania (%s => %s)" + +#: lib/libalpm/be_files.c:61 +#, c-format +msgid "unpacking database '%s'" +msgstr "rozpakowywanie bazy danych '%s'" + +#: lib/libalpm/be_files.c:78 +#, c-format +msgid "opening database from path '%s'" +msgstr "otwieranie bazy danych ze ścieżki '%s'" + +#: lib/libalpm/be_files.c:182 +#, c-format +msgid "db scan could not find package: %s" +msgstr "skan bd nie odnalazł pakietu: %s" + +#: lib/libalpm/be_files.c:186 +#, c-format +msgid "invalid name for database entry '%s'" +msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'" + +#: lib/libalpm/be_files.c:221 +msgid "invalid package entry provided to _alpm_db_read, skipping" +msgstr "dostarczono nieprawidłowy wpis pakietu do _alpm_db_read, pomijanie" + +#: lib/libalpm/be_files.c:226 +#, c-format +msgid "" +"request to read database info for a file-based package '%s', skipping..." +msgstr "" +"żądanie odczytania informacji bazy danych dla pakietu '%s' bazowanego na pliku, pomijanie..." + +#: lib/libalpm/be_files.c:239 +#, c-format +msgid "loading package data for %s : level=%d" +msgstr "ładowanie danych pakietu dla %s : poziom=%d" + +#: lib/libalpm/be_files.c:247 +#, c-format +msgid "cannot find '%s-%s' in db '%s'" +msgstr "nie udało się odnaleźć '%s-%s' w bd '%s'" + +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 +#: lib/libalpm/package.c:206 +#, c-format +msgid "could not open file %s: %s" +msgstr "nie udało się otworzyć pliku %s: %s" + +#: lib/libalpm/be_files.c:512 +#, c-format +msgid "writing %s-%s DESC information back to db" +msgstr "zapisywanie informacji DESC dla %s-%s spowrotem do bd" + +#: lib/libalpm/be_files.c:602 +#, c-format +msgid "writing %s-%s FILES information back to db" +msgstr "zapisywanie informacji FILES dla %s-%s spowrotem do bd" + +#: lib/libalpm/be_files.c:629 +#, c-format +msgid "writing %s-%s DEPENDS information back to db" +msgstr "zapisywanie informacji DEPENDS dla %s-%s spowrotem do bd" + +#: lib/libalpm/cache.c:59 +#, c-format +msgid "loading package cache for repository '%s'" +msgstr "ładowanie pamięci podręcznej pakietów dla repozytorium '%s'" + +#: lib/libalpm/cache.c:64 +#, c-format +msgid "adding '%s' to package cache for db '%s'" +msgstr "dodawanie '%s' do pamięci podręcznej pakietów dla bd '%s'" + +#: lib/libalpm/cache.c:85 +#, c-format +msgid "freeing package cache for repository '%s'" +msgstr "uwalnianie pamięci podręcznej pakietów dla repozytorium '%s'" + +#: lib/libalpm/cache.c:109 +#, c-format +msgid "error: pkgcache is NULL for db '%s'" +msgstr "błąd: pkgcache jest równy NULL dla bd '%s'" + +#: lib/libalpm/cache.c:129 +#, c-format +msgid "adding entry '%s' in '%s' cache" +msgstr "dodawanie wpisu '%s' pamięci podręcznej '%s'" + +#: lib/libalpm/cache.c:149 +#, c-format +msgid "removing entry '%s' from '%s' cache" +msgstr "usuwanie wpisu '%s' z pamięci podręcznej '%s'" + +#: lib/libalpm/cache.c:156 +#, c-format +msgid "cannot remove entry '%s' from '%s' cache: not found" +msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej '%s': nie znaleziono" + +#: lib/libalpm/cache.c:178 +#, c-format +msgid "error: failed to get '%s' from NULL pkgcache" +msgstr "błąd: nie udało się otrzymać '%s' z NULL pkgcache" + +#: lib/libalpm/cache.c:201 +#, c-format +msgid "loading group cache for repository '%s'" +msgstr "ładowanie pamięci podręcznej grup z repozytorium '%s'" + +#: lib/libalpm/conflict.c:69 +#, c-format +msgid " found conflict '%s' : package '%s'" +msgstr " znaleziono konflikt '%s' : pakiet '%s'" + +#: lib/libalpm/conflict.c:78 +#, c-format +msgid " found conflict '%s' : package '%s' provides '%s'" +msgstr " znaleziono konflikt '%s' : pakiet '%s' dostarcza '%s'" + +#: lib/libalpm/conflict.c:101 lib/libalpm/conflict.c:143 +#, c-format +msgid "package '%s' conflicts with itself - packaging error" +msgstr "pakiet '%s' konfliktuje ze sobą - błąd pakowania" + +#: lib/libalpm/conflict.c:107 +#, c-format +msgid "checkconflicts: target '%s' vs db" +msgstr "checkconflicts: cel '%s' vs bd" + +#: lib/libalpm/conflict.c:149 +#, c-format +msgid "checkconflicts: target '%s' vs all targets" +msgstr "checkconflicts: cel '%s' vs wszystkie cele" + +#: lib/libalpm/conflict.c:181 +#, c-format +msgid "checkconflicts: db vs target '%s'" +msgstr "checkconflicts: bd vs cel '%s'" + +#: lib/libalpm/conflict.c:201 +#, c-format +msgid "target '%s' is also in target list, using NEW conflicts" +msgstr "cel '%s' jest także w liście celów, używanie NOWYCH konfliktów" + +#: lib/libalpm/conflict.c:257 +#, c-format +msgid "\tCONFLICTS:: %s conflicts with %s" +msgstr "\tCONFLICTS:: %s konfliktuje z %s" + +#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 +#: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 +#: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 +#, c-format +msgid "malloc failure: could not allocate %d bytes" +msgstr "błąd malloc: nie udało się zaalokować %d bajtów" + +#: lib/libalpm/db.c:64 lib/libalpm/db.c:71 +#, c-format +msgid "malloc failed: could not allocate %d bytes" +msgstr "błąd malloc: nie udało się zaalokować %d bajtów" + +#: lib/libalpm/db.c:167 +msgid "attempt to re-register the 'local' DB" +msgstr "próba ponownej rejestracji 'lokalnej' BD" + +#: lib/libalpm/db.c:175 +#, c-format +msgid "attempt to re-register the '%s' database, using existing" +msgstr "próba ponownej rejestracji bazy danych '%s', używając obecnej" + +#: lib/libalpm/db.c:181 +#, c-format +msgid "registering database '%s'" +msgstr "rejestrowanie bazy danych '%s'" + +#: lib/libalpm/db.c:186 +#, c-format +msgid "database directory '%s' does not exist, creating it" +msgstr "katalog bazy danych '%s' nie istnieje, utwarzanie" + +#: lib/libalpm/db.c:197 +#, c-format +msgid "opening database '%s'" +msgstr "otwieranie bazy danych '%s'" + +#: lib/libalpm/deps.c:131 +msgid "started sorting dependencies" +msgstr "rozpoczynanie sortowania zależności" + +#: lib/libalpm/deps.c:136 +msgid "possible dependency cycle detected" +msgstr "odkryto potencjalny cykl zależności" + +#: lib/libalpm/deps.c:183 +msgid "sorting dependencies finished" +msgstr "sortowanie zależności ukończone" + +#: lib/libalpm/deps.c:225 lib/libalpm/deps.c:310 +msgid "null package found in package list" +msgstr "zerowy pakiet odnaleziony w liście pakietów" + +#: lib/libalpm/deps.c:230 +#, c-format +msgid "cannot find package installed '%s'" +msgstr "nie udało się odnaleźć pakietu który zainstalował '%s'" + +#: lib/libalpm/deps.c:261 +#, c-format +msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'" +msgstr "checkdeps: zależność '%s' została przesunięta z '%s' do '%s'" + +#: lib/libalpm/deps.c:280 +#, c-format +msgid "checkdeps: dependency '%s' satisfied by installed package '%s'" +msgstr "checkdeps: zależność '%s' satysfakcjonowana przez zainstalowany pakiet '%s'" + +#: lib/libalpm/deps.c:289 +#, c-format +msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" +msgstr "checkdeps: zaktualizowany '%s' nie satysfakcjonuje zależności '%s'" + +#: lib/libalpm/deps.c:359 +#, c-format +msgid "missing dependency '%s' for package '%s'" +msgstr "brakująca zależność '%s' dla pakietu '%s'" + +#: lib/libalpm/deps.c:409 +#, c-format +msgid "checkdeps: found %s as required by %s" +msgstr "checkdeps: znaleziono %s wymagane przez %s" + +#: lib/libalpm/deps.c:485 +#, c-format +msgid "excluding %s -- explicitly installed" +msgstr "wykluczanie %s -- zainstalowany eksplicytnie" + +#: lib/libalpm/deps.c:532 +#, c-format +msgid "cannot find package \"%s\" or anything that provides it!" +msgstr "nie udało się odnaleźć pakietu \"%s\" ani niczego co go dostarcza!" + +#: lib/libalpm/deps.c:540 lib/libalpm/deps.c:551 +#, c-format +msgid "adding '%s' to the targets" +msgstr "dodawanie '%s' do celów" + +#: lib/libalpm/deps.c:583 +msgid "started resolving dependencies" +msgstr "rozpoczynanie rozwiązywania zależności" + +#: lib/libalpm/deps.c:601 +#, c-format +msgid "%s provides dependency %s -- skipping" +msgstr "%s dostarcza zależność %s -- pomijanie" + +#: lib/libalpm/deps.c:630 +#, c-format +msgid "" +"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" +msgstr "" +"nie udało się rozwiązać zależności dla \"%s\" (\"%s\" nie znajduje się w zbiorze pakietów)" + +#: lib/libalpm/deps.c:647 +#, c-format +msgid "dependency %s is already in the target list -- skipping" +msgstr "zależność %s jest już w liście celów -- pomijanie" + +#: lib/libalpm/deps.c:667 +#, c-format +msgid "pulling dependency %s (needed by %s)" +msgstr "wciąganie zależności %s (wymagane przez %s)" + +#: lib/libalpm/deps.c:671 +#, c-format +msgid "cannot resolve dependencies for \"%s\"" +msgstr "nie udało się rozwiązać zależności dla \"%s\"" + +#: lib/libalpm/deps.c:687 +#, c-format +msgid "dependency cycle detected: %s" +msgstr "wykryto cykl zależności: %s" + +#: lib/libalpm/deps.c:691 +msgid "finished resolving dependencies" +msgstr "zakończono rozwiązywanie zależności" + +#: lib/libalpm/error.c:40 +msgid "out of memory!" +msgstr "brak pamięci!" + +#: lib/libalpm/error.c:42 +msgid "unexpected system error" +msgstr "niespodziewany błąd systemu" + +#: lib/libalpm/error.c:44 +msgid "insufficient privileges" +msgstr "niewystarczające przywileje" + +#: lib/libalpm/error.c:46 +msgid "could not find or read file" +msgstr "nie udało się znaleźć bądź odczytać pliku" + +#: lib/libalpm/error.c:48 +msgid "wrong or NULL argument passed" +msgstr "błędny bądź ZEROWY argument dany" + +#: lib/libalpm/error.c:51 +msgid "library not initialized" +msgstr "biblioteka nie została zainicjowana" + +#: lib/libalpm/error.c:53 +msgid "library already initialized" +msgstr "biblioteka już zainicjowana" + +#: lib/libalpm/error.c:55 +msgid "unable to lock database" +msgstr "nie udało się zablokować bazy danych" + +#: lib/libalpm/error.c:58 +msgid "could not open database" +msgstr "nie udało się otworzyć bazy danych" + +#: lib/libalpm/error.c:60 +msgid "could not create database" +msgstr "nie udało się stworzyć bazy danych" + +#: lib/libalpm/error.c:62 +msgid "database not initialized" +msgstr "baza danych nie została zainicjowana" + +#: lib/libalpm/error.c:64 +msgid "database already registered" +msgstr "baza danych już zarejestrowana" + +#: lib/libalpm/error.c:66 +msgid "could not find database" +msgstr "nie udało się odnaleźc bazy danych" + +#: lib/libalpm/error.c:68 +msgid "could not update database" +msgstr "nie udało się zaktualizować bazy danych" + +#: lib/libalpm/error.c:70 +msgid "could not remove database entry" +msgstr "nie udało się usunąć wpisu do bazy danych" + +#: lib/libalpm/error.c:73 +msgid "invalid url for server" +msgstr "nieprawidłowy url dla serwera" + +#: lib/libalpm/error.c:80 +msgid "could not set parameter" +msgstr "nie udało się ustawić parametru" + +#: lib/libalpm/error.c:83 +msgid "transaction already initialized" +msgstr "tranzakcja już zainicjowana" + +#: lib/libalpm/error.c:85 lib/libalpm/error.c:89 +msgid "transaction not initialized" +msgstr "tranzakcja nie została zainicjowana" + +#: lib/libalpm/error.c:87 +msgid "duplicate target" +msgstr "duplikat celu" + +#: lib/libalpm/error.c:91 +msgid "transaction not prepared" +msgstr "tranzakcja nie została przygotowana" + +#: lib/libalpm/error.c:93 +msgid "transaction aborted" +msgstr "tranzakcja zaniechana" + +#: lib/libalpm/error.c:95 +msgid "operation not compatible with the transaction type" +msgstr "operacja niekompatybilna z typem tranzakcji" + +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 +msgid "could not commit transaction" +msgstr "nie udało się wykonać tranzakcji" + +#: lib/libalpm/error.c:99 +msgid "could not download all files" +msgstr "nie udało się pobrać wszystkich plików" + +#: lib/libalpm/error.c:102 +msgid "could not find or read package" +msgstr "nie udało się znaleźć bądź odczytać pakietu" + +#: lib/libalpm/error.c:104 +msgid "invalid or corrupted package" +msgstr "nieprawidłowy bądź skorumpowany pakiet" + +#: lib/libalpm/error.c:106 +msgid "cannot open package file" +msgstr "nie udało się otworzyć pliku pakietu" + +#: lib/libalpm/error.c:108 +msgid "cannot load package data" +msgstr "nie udało się załadować danych pakietu" + +#: lib/libalpm/error.c:110 +msgid "package already installed" +msgstr "pakiet już zainstalowany" + +#: lib/libalpm/error.c:112 +msgid "package not installed or lesser version" +msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji" + +#: lib/libalpm/error.c:114 +msgid "cannot remove all files for package" +msgstr "nie udało się usunąć wszystkich plików pakietu" + +#: lib/libalpm/error.c:116 +msgid "package name is not valid" +msgstr "nieprawidłowa nazwa pakietu" + +#: lib/libalpm/error.c:118 +msgid "corrupted package" +msgstr "skorumpowany pakiet" + +#: lib/libalpm/error.c:120 +msgid "no such repository" +msgstr "nie ma takiego repozytorium" + +#: lib/libalpm/error.c:123 +msgid "group not found" +msgstr "grupa nie została odnaleziona" + +#: lib/libalpm/error.c:126 +msgid "could not satisfy dependencies" +msgstr "nie udało się usatysfakcjonować zależności" + +#: lib/libalpm/error.c:128 +msgid "conflicting dependencies" +msgstr "konfliktujące zależności" + +#: lib/libalpm/error.c:130 +msgid "conflicting files" +msgstr "konfliktujące pliki" + +#: lib/libalpm/error.c:133 +msgid "user aborted the operation" +msgstr "użytkownik zaniechał operacji" + +#: lib/libalpm/error.c:135 +msgid "internal error" +msgstr "błąd wewnętrzny" + +#: lib/libalpm/error.c:137 +msgid "libarchive error" +msgstr "błąd libarchive" + +#: lib/libalpm/error.c:139 +msgid "not enough space on disk" +msgstr "nie wystarczająca ilość wolnego miejsca na dysku" + +#: lib/libalpm/error.c:142 +msgid "not confirmed" +msgstr "nie potwierdzono" + +#: lib/libalpm/error.c:145 +msgid "bad configuration section name" +msgstr "zła nazwa sekcji konfiguracji" + +#: lib/libalpm/error.c:147 +msgid "'local' is reserved and cannot be used as a repository name" +msgstr "'local' jest nazwą zarezerwowaną i nie może zostać użyty jako nazwa repozytorium" + +#: lib/libalpm/error.c:149 +msgid "syntax error in config file" +msgstr "błąd składni w pliku konfiguracyjnym" + +#: lib/libalpm/error.c:151 +msgid "all directives must belong to a section" +msgstr "wszystkie dyrektywy muszą być własnością sekcji" + +#: lib/libalpm/error.c:153 +msgid "invalid regular expression" +msgstr "nieprawidłowe wyrażenie regularne" + +#: lib/libalpm/error.c:156 +msgid "connection to remote host failed" +msgstr "połączenie ze zdalnym hostem nieudane" + +#: lib/libalpm/error.c:159 +msgid "unexpected error" +msgstr "niespodziewany błąd" + +#: lib/libalpm/handle.c:163 +#, c-format +msgid "cannot canonicalize specified root path '%s'" +msgstr "nie udało się skanonizować podanej ścieżki docelowej '%s'" + +#: lib/libalpm/handle.c:175 +#, c-format +msgid "option 'root' = %s" +msgstr "opcja 'root' = %s" + +#: lib/libalpm/handle.c:195 +#, c-format +msgid "option 'dbpath' = %s" +msgstr "opcja 'dbpath' = %s" + +#: lib/libalpm/handle.c:211 +#, c-format +msgid "option 'cachedir' = %s" +msgstr "opcja 'cachedir' = %s" + +#: lib/libalpm/md5driver.c:56 +#, c-format +msgid "%s can't be opened\n" +msgstr "%s nie może być otwarte\n" + +#: lib/libalpm/md5driver.c:74 +#, c-format +msgid "md5(%s) = %s" +msgstr "md5(%s) = %s" + +#: lib/libalpm/package.c:150 +#, c-format +msgid "%s: forcing upgrade to version %s" +msgstr "%s: wymuszanie aktualizacji do wersji %s" + +#: lib/libalpm/package.c:155 +#, c-format +msgid "%s: local (%s) is newer than %s (%s)" +msgstr "%s: local (%s) jest nowsze niż %s (%s)" + +#: lib/libalpm/package.c:163 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: ignorowanie aktualizacji pakietu (%s)" + +#: lib/libalpm/package.c:169 +#, c-format +msgid "%s-%s: delaying upgrade of package (%s)" +msgstr "%s-%s: opóźnianie aktualizacji pakietu (%s)" + +#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#, c-format +msgid "%s: syntax error in description file line %d" +msgstr "%s: błąd składni w pliku opisu linia %d" + +#: lib/libalpm/package.c:353 +msgid "could not parse the package description file" +msgstr "nie udało się przeczytać pliku opisu" + +#: lib/libalpm/package.c:357 +#, c-format +msgid "missing package name in %s" +msgstr "brak nazwy pakietu w %s" + +#: lib/libalpm/package.c:361 +#, c-format +msgid "missing package version in %s" +msgstr "brak wersji pakietu w %s" + +#: lib/libalpm/package.c:396 +#, c-format +msgid "could not remove tempfile %s" +msgstr "nie udało się usunąć pliku tymczasowego %s" + +#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#, c-format +msgid "error while reading package: %s" +msgstr "błąd odczytywania pakietu: %s" + +#: lib/libalpm/package.c:422 +msgid "missing package metadata" +msgstr "brak metadanych pakietu" + +#: lib/libalpm/package.c:429 +#, c-format +msgid "missing package filelist in %s, generating one" +msgstr "brak listy plików pakietu w %s, generowanie" + +#: lib/libalpm/package.c:568 +#, c-format +msgid "adding '%s' in requiredby field for '%s'" +msgstr "dodawanie '%s' w polu requiredby dla '%s'" + +#: lib/libalpm/package.c:582 +#, c-format +msgid "adding '%s' in requiredby field for '%s' (provides: %s)" +msgstr "dodawanie '%s' w polu requiredby dla '%s' (dostarcza: %s)" + +#: lib/libalpm/remove.c:79 +#, c-format +msgid "could not find %s in database" +msgstr "nie udało się odnaleźć %s w bazie danych" + +#: lib/libalpm/remove.c:93 +#, c-format +msgid "adding %s in the targets list" +msgstr "dodawanie %s do listy celów" + +#: lib/libalpm/remove.c:121 +#, c-format +msgid "pulling %s in the targets list" +msgstr "wciąganie %s na listę celów" + +#: lib/libalpm/remove.c:124 +#, c-format +msgid "could not find %s in database -- skipping" +msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie" + +#: lib/libalpm/remove.c:142 +msgid "finding removable dependencies" +msgstr "odnajdywanie usuwalnych zależności" + +#: lib/libalpm/remove.c:175 +#, c-format +msgid "cannot remove file '%s': %s" +msgstr "nie udało się usunąć pliku '%s': %s" + +#: lib/libalpm/remove.c:213 +#, c-format +msgid "Skipping removal of '%s' due to NoUpgrade" +msgstr "Pomijanie usunięcia '%s' ze względu na NoUpgrade" + +#: lib/libalpm/remove.c:220 +#, c-format +msgid "file %s does not exist" +msgstr "plik %s nie istnieje" + +#: lib/libalpm/remove.c:227 +#, c-format +msgid "keeping directory %s" +msgstr "zachowywanie katalogu %s" + +#: lib/libalpm/remove.c:229 +#, c-format +msgid "removing directory %s" +msgstr "usuwanie katalogu %s" + +#: lib/libalpm/remove.c:236 +#, c-format +msgid "%s is in trans->skip_remove, skipping removal" +msgstr "%s jest w trans->skip_remove, pomijanie usunięcia" + +#: lib/libalpm/remove.c:250 +#, c-format +msgid "transaction is set to NOSAVE, not backing up '%s'" +msgstr "tranzakcja ustawiona jako NOSAVE, brak tworzenia kopii zapasowej dla '%s'" + +#: lib/libalpm/remove.c:254 +#, c-format +msgid "unlinking %s" +msgstr "odlinkowywanie %s" + +#: lib/libalpm/remove.c:261 +#, c-format +msgid "cannot remove file %s: %s" +msgstr "nie udało się usunąć pliku %s: %s" + +#: lib/libalpm/remove.c:294 +#, c-format +msgid "removing package %s-%s" +msgstr "usuwanie pakietu %s-%s" + +#: lib/libalpm/remove.c:309 +#, c-format +msgid "not removing package '%s', can't remove all files" +msgstr "pakiet '%s' nie zostanie usunięty, nie udało się usunąć wszystkich plików" + +#: lib/libalpm/remove.c:316 +#, c-format +msgid "removing %d files" +msgstr "usuwanie %d plików" + +#: lib/libalpm/remove.c:337 +#, c-format +msgid "removing database entry '%s'" +msgstr "usuwanie wpisu '%s' z bazy danych" + +#: lib/libalpm/remove.c:339 +#, c-format +msgid "could not remove database entry %s-%s" +msgstr "nie udało się usunąć wpisu %s-%s z bazy danych" + +#: lib/libalpm/remove.c:344 +#, c-format +msgid "could not remove entry '%s' from cache" +msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej" + +#: lib/libalpm/sha1.c:397 +#, c-format +msgid "sha1: %s can't be opened\n" +msgstr "sha1: %s nie może zostać otwarty\n" + +#: lib/libalpm/sha1.c:412 +#, c-format +msgid "sha1(%s) = %s" +msgstr "sha1(%s) = %s" + +#: lib/libalpm/sync.c:183 +msgid "checking for package upgrades" +msgstr "sprawdzanie potencjalnych uaktualnień pakietów" + +#: lib/libalpm/sync.c:215 +#, c-format +msgid "%s-%s elected for upgrade (%s => %s)" +msgstr "%s-%s wybrany do aktualizacji (%s => %s)" + +#: lib/libalpm/sync.c:270 +#, c-format +msgid "searching for target in repo '%s'" +msgstr "poszukiwanie celu w repo '%s'" + +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 +#, c-format +msgid "target '%s' not found -- looking for provisions" +msgstr "cel '%s' nie został odnaleziony -- szukanie zasobów dostarczających" + +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 +#, c-format +msgid "found '%s' as a provision for '%s'" +msgstr "znaleziono '%s' jako zasób dla '%s'" + +#: lib/libalpm/sync.c:290 +#, c-format +msgid "repository '%s' not found" +msgstr "repozytorium '%s' nie zostało znalezione" + +#: lib/libalpm/sync.c:331 +#, c-format +msgid "%s-%s is up to date -- skipping" +msgstr "%s-%s jest w najnowszej wersji -- pomijanie" + +#: lib/libalpm/sync.c:354 +#, c-format +msgid "adding target '%s' to the transaction set" +msgstr "dodawanie celu '%s' do zestawu tranzakcji" + +#: lib/libalpm/sync.c:402 +msgid "resolving target's dependencies" +msgstr "rozwiązywanie zależności celu" + +#: lib/libalpm/sync.c:422 +#, c-format +msgid "adding package %s-%s to the transaction targets" +msgstr "dodawanie pakietu %s-%s do celów tranzakcji" + +#: lib/libalpm/sync.c:463 +msgid "looking for unresolvable dependencies" +msgstr "szukanie nierozwiązywalnych zależności" + +#: lib/libalpm/sync.c:494 +#, c-format +msgid "package '%s' conflicts with '%s'" +msgstr "pakiet '%s' konfliktuje z '%s'" + +#: lib/libalpm/sync.c:516 +#, c-format +msgid "'%s' not found in transaction set -- skipping" +msgstr "'%s' nie znaleziony w zestawie tranzakcji -- pomijanie" + +#: lib/libalpm/sync.c:527 +#, c-format +msgid "package '%s' provides its own conflict" +msgstr "pakiet '%s' dostarcza swój własny konflikt" + +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 +#, c-format +msgid "'%s' is in the target list -- keeping it" +msgstr "'%s' jest w liście celów -- zachowywanie" + +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 +#, c-format +msgid "removing '%s' from target list" +msgstr "usuwanie '%s' z listy celów" + +#: lib/libalpm/sync.c:576 +#, c-format +msgid "resolving package '%s' conflict" +msgstr "rozwiązywanie konfliktu pakietu '%s'" + +#: lib/libalpm/sync.c:599 +#, c-format +msgid "electing '%s' for removal" +msgstr "wybieranie '%s' do usunięcia" + +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 +msgid "unresolvable package conflicts detected" +msgstr "odkryto nierozwiązywalne konflikty pakietów" + +#: lib/libalpm/sync.c:678 +msgid "checking dependencies of packages designated for removal" +msgstr "sprawdzanie zależności pakietów wyznaczonych do usunięcia" + +#: lib/libalpm/sync.c:692 +msgid "something has gone horribly wrong" +msgstr "coś się bardzo nie udało" + +#: lib/libalpm/sync.c:712 +#, c-format +msgid "found '%s' as a provision for '%s' -- conflict aborted" +msgstr "znaleziono '%s' jako zasób dla '%s' -- konflikt zaniechany" + +#: lib/libalpm/sync.c:808 +#, c-format +msgid "%s is already in the cache\n" +msgstr "%s jest już w pamięci podręcznej\n" + +#: lib/libalpm/sync.c:819 +#, c-format +msgid "no %s cache exists, creating...\n" +msgstr "brak pamięci podręcznej dla %s, tworzenie...\n" + +#: lib/libalpm/sync.c:820 +#, c-format +msgid "warning: no %s cache exists, creating..." +msgstr "uwaga: brak pamięci podręcznej dla %s, tworzenie..." + +#: lib/libalpm/sync.c:825 +msgid "couldn't create package cache, using /tmp instead\n" +msgstr "nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian\n" + +#: lib/libalpm/sync.c:826 +msgid "warning: couldn't create package cache, using /tmp instead" +msgstr "uwaga: nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian" + +#: lib/libalpm/sync.c:833 +#, c-format +msgid "failed to retrieve some files from %s\n" +msgstr "nie udało się pobrać niektórych plików z %s\n" + +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 +#, c-format +msgid "can't get md5 or sha1 checksum for package %s\n" +msgstr "nie udało się otrzymać sum kontrolnych md5 lub sha1 dla pakietu %s\n" + +#: lib/libalpm/sync.c:894 +#, c-format +msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" +msgstr "archiwum %s było skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n" + +#: lib/libalpm/sync.c:896 +#, c-format +msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" +msgstr "archiwum %s jest skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n" + +#: lib/libalpm/sync.c:917 +msgid "could not create removal transaction" +msgstr "nie udało się utworzyć tranzakcji usuwania" + +#: lib/libalpm/sync.c:923 +msgid "could not initialize the removal transaction" +msgstr "nie udało się zainicjować tranzakcji usuwania" + +#: lib/libalpm/sync.c:943 +msgid "removing conflicting and to-be-replaced packages" +msgstr "usuwanie pakietów konfliktujących i pakietów do zastąpienia" + +#: lib/libalpm/sync.c:945 +msgid "could not prepare removal transaction" +msgstr "nie udało się przygotować tranzakcji usuwania" + +#: lib/libalpm/sync.c:951 +msgid "could not commit removal transaction" +msgstr "nie udało się wykonać tranzakcji usuwania" + +#: lib/libalpm/sync.c:958 +msgid "installing packages" +msgstr "instalowanie pakietów" + +#: lib/libalpm/sync.c:961 +msgid "could not create transaction" +msgstr "nie udało się stworzyć tranzakcji" + +#: lib/libalpm/sync.c:966 +msgid "could not initialize transaction" +msgstr "nie udało się zainicjować tranzakcji" + +#: lib/libalpm/sync.c:989 +msgid "could not prepare transaction" +msgstr "nie udało się przygotować tranzakcji" + +#: lib/libalpm/sync.c:1001 +msgid "updating database for replaced packages' dependencies" +msgstr "aktualizowanie baz danych dla zależności zastąpionych pakietów" + +#: lib/libalpm/sync.c:1030 +#, c-format +msgid "could not update requiredby for database entry %s-%s" +msgstr "nie udało się zaktualizować requiredby dla wpisu %s-%s w bazie danych" + +#: lib/libalpm/sync.c:1039 +#, c-format +msgid "could not update new database entry %s-%s" +msgstr "nie udało się zaktualizować nowego wpisu %s-%s w bazie danych" + +#: lib/libalpm/sync.c:1079 +#, c-format +msgid "found package '%s-%s' in sync" +msgstr "znaleziono pakiet '%s-%s' w sync" + +#: lib/libalpm/sync.c:1085 +#, c-format +msgid "package '%s' not found in sync" +msgstr "pakiet '%s' nie został odnaleziony w sync" + +#: lib/libalpm/trans.c:271 +#, c-format +msgid "updating dependency packages 'requiredby' fields for %s-%s" +msgstr "aktualizowanie pól 'requiredby' pakietów zależności dla %s-%s" + +#: lib/libalpm/trans.c:274 +msgid "package has no dependencies, no other packages to update" +msgstr "pakiet nie ma żadnych zależności, brak innych pakietów do zaktualizowania" + +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 +#, c-format +msgid "updating 'requiredby' field for package '%s'" +msgstr "aktualizowanie pola 'requiredby' dla pakietu '%s'" + +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 +#, c-format +msgid "could not update 'requiredby' database entry %s-%s" +msgstr "nie udało się zaktualizować wpisu do bazy danych 'requiredby' dla %s-%s" + +#: lib/libalpm/trans.c:333 +#, c-format +msgid "could not find dependency '%s'" +msgstr "nie udało się odnaleźć zależności '%s'" + +#: lib/libalpm/util.c:142 +#, c-format +msgid "failed to make path '%s' : %s" +msgstr "nie udało się stworzyć ścieżki '%s' : %s" + +#: lib/libalpm/util.c:280 +#, c-format +msgid "could not open %s: %s\n" +msgstr "nie udało się otworzyć %s: %s\n" + +#: lib/libalpm/util.c:293 +#, c-format +msgid "could not extract %s: %s\n" +msgstr "nie udało się rozpakować %s: %s\n" + +#: lib/libalpm/util.c:350 +#, c-format +msgid "logaction called: %s" +msgstr "zawołane logaction: %s" + +#: lib/libalpm/util.c:445 +msgid "could not create temp directory" +msgstr "nie udało się stworzyć katalogu tymczasowego" + +#: lib/libalpm/util.c:472 +#, c-format +msgid "could not change directory to %s (%s)" +msgstr "nie udało się zmienić katalogu na %s (%s)" + +#: lib/libalpm/util.c:476 +#, c-format +msgid "executing %s script..." +msgstr "wykonywanie skryptu %s..." + +#: lib/libalpm/util.c:489 +#, c-format +msgid "could not fork a new process (%s)" +msgstr "nie udało się odwidlić nowego procesu (%s)" + +#: lib/libalpm/util.c:496 +#, c-format +msgid "chrooting in %s" +msgstr "chroot'owanie do %s" + +#: lib/libalpm/util.c:498 +#, c-format +msgid "could not change the root directory (%s)" +msgstr "nie udało się zmienić katalogu głównego (%s)" + +#: lib/libalpm/util.c:502 +#, c-format +msgid "could not change directory to / (%s)" +msgstr "nie udało się zmienić katalogu na / (%s)" + +#: lib/libalpm/util.c:506 +#, c-format +msgid "executing \"%s\"" +msgstr "wykonywanie \"%s\"" + +#: lib/libalpm/util.c:509 +#, c-format +msgid "call to popen failed (%s)" +msgstr "zawołanie do popen nieudane (%s)" + +#: lib/libalpm/util.c:541 +#, c-format +msgid "call to waitpid failed (%s)" +msgstr "zawołanie do waitpid nieudane (%s)" + +#: lib/libalpm/util.c:550 +#, c-format +msgid "could not remove tmpdir %s" +msgstr "nie udało się usunąć katalogu tymczasowego %s" + +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "nie udało się odczytać informacji o ilości danych na dysku z %s: %s" + +#: lib/libalpm/util.c:609 +#, c-format +msgid "check_freespace: total pkg size: %lld, disk space: %lld" +msgstr "check_freespace: pełen rozmiar pakietu: %lld, wolna przestrzeń: %lld" + +#: lib/libalpm/versioncmp.c:279 +#, c-format +msgid "depcmp: %s-%s %s %s-%s => %s" +msgstr "depcmp: %s-%s %s %s-%s => %s" + +#: lib/libalpm/versioncmp.c:284 +#, c-format +msgid "depcmp: %s-%s %s %s => %s" +msgstr "depcmp: %s-%s %s %s => %s" diff --git a/src/pacman/po/LINGUAS b/src/pacman/po/LINGUAS index 1e5c80c1..db14c2ff 100644 --- a/src/pacman/po/LINGUAS +++ b/src/pacman/po/LINGUAS @@ -6,3 +6,4 @@ it pt_BR en_GB ru_RU +pl_PL diff --git a/src/pacman/po/pl_PL.po b/src/pacman/po/pl_PL.po new file mode 100644 index 00000000..7ac16c53 --- /dev/null +++ b/src/pacman/po/pl_PL.po @@ -0,0 +1,1077 @@ +# Polish translations for Pacman package manager package +# Polskie tłumaczenia dla pakietu Pacman package manager. +# Copyright (C) 2007 Judd Vinet +# This file is distributed under the same license as the Pacman package manager package. +# Mateusz Jędrasik , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: Pacman package manager 3.0.1\n" +"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" +"POT-Creation-Date: 2007-04-03 23:07-0500\n" +"PO-Revision-Date: 2007-04-12 04:22+0200\n" +"Last-Translator: Mateusz Jędrasik \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 +#: src/pacman/sync.c:531 +#, c-format +msgid "" +" if you're sure a package manager is not already running,\n" +" you can remove %s%s\n" +msgstr "jeśli jesteś pewien że menedżer pakietów nie jest już uruchomiony,\n" +" możesz usunąć %s%s\n" + +#: src/pacman/add.c:79 +msgid "loading package data... " +msgstr "ładowanie informacji o pakietach... " + +#: src/pacman/add.c:83 +#, c-format +msgid "failed to add target '%s' (%s)" +msgstr "nie udało się dodać celu '%s' (%s)" + +#: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 +#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105 +#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142 +msgid "done.\n" +msgstr "gotowe.\n" + +#: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616 +#, c-format +msgid "failed to prepare transaction (%s)\n" +msgstr "nie udało się przygotować tranzakcji (%s)\n" + +#: src/pacman/add.c:104 +#, c-format +msgid ":: %s: requires %s" +msgstr ":: %s: wymaga %s" + +#: src/pacman/add.c:125 src/pacman/sync.c:643 +#, c-format +msgid ":: %s: conflicts with %s" +msgstr ":: %s: konfliktuje z %s" + +#: src/pacman/add.c:134 src/pacman/sync.c:707 +#, c-format +msgid "%s exists in both '%s' and '%s'\n" +msgstr "%s znajduje się w '%s' i w '%s'\n" + +#: src/pacman/add.c:140 src/pacman/sync.c:713 +#, c-format +msgid "%s: %s exists in filesystem\n" +msgstr "%s: %s znajduje się w systemie plików\n" + +#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725 +msgid "" +"\n" +"errors occurred, no packages were upgraded.\n" +msgstr "" +"\n" +"wystąpiły błędy, nie zaktualizowano żadnych pakietów.\n" + +#: src/pacman/add.c:156 src/pacman/sync.c:650 +#, c-format +msgid ":: %.1f MB required, have %.1f MB" +msgstr ":: %.1f MB wymagane, dostępnych %.1f MB" + +#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700 +#, c-format +msgid "failed to commit transaction (%s)\n" +msgstr "nie udało się dokonać tranzakcji (%s)\n" + +#: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524 +#: src/pacman/sync.c:741 +#, c-format +msgid "failed to release transaction (%s)\n" +msgstr "nie udało się wyswobodzić transaction (%s)\n" + +#: src/pacman/deptest.c:84 +#, c-format +msgid "requires: %s" +msgstr "wymaga: %s" + +#: src/pacman/log.c:63 +#, c-format +msgid "debug" +msgstr "debug" + +#: src/pacman/log.c:66 +#, c-format +msgid "error" +msgstr "błąd" + +#: src/pacman/log.c:69 +#, c-format +msgid "warning" +msgstr "ostrzeżenie" + +#: src/pacman/log.c:75 +#, c-format +msgid "function" +msgstr "funkcja" + +#: src/pacman/log.c:194 +msgid "Y" +msgstr "T" + +#: src/pacman/log.c:194 +msgid "YES" +msgstr "TAK" + +#: src/pacman/log.h:30 +msgid "error: " +msgstr "błąd: " + +#: src/pacman/log.h:34 +msgid "warning: " +msgstr "ostrzeżenie: " + +#: src/pacman/package.c:60 +msgid "Explicitly installed" +msgstr "Explicitly installed" + +#: src/pacman/package.c:63 +msgid "Installed as a dependency for another package" +msgstr "Zainstalowano jako wymóg innej paczki" + +#: src/pacman/package.c:66 src/pacman/package.c:90 +msgid "Unknown" +msgstr "Nieznane" + +#: src/pacman/package.c:70 src/pacman/package.c:121 +msgid "Description : " +msgstr "Opis : " + +#: src/pacman/package.c:73 src/pacman/package.c:127 +#, c-format +msgid "Name : %s\n" +msgstr "Nazwa : %s\n" + +#: src/pacman/package.c:74 src/pacman/package.c:128 +#, c-format +msgid "Version : %s\n" +msgstr "Wersja : %s\n" + +#: src/pacman/package.c:75 +#, c-format +msgid "URL : %s\n" +msgstr "URL : %s\n" + +#: src/pacman/package.c:76 +msgid "License :" +msgstr "Licencja :" + +#: src/pacman/package.c:77 src/pacman/package.c:129 +msgid "Groups :" +msgstr "Grupy :" + +#: src/pacman/package.c:78 src/pacman/package.c:130 +msgid "Provides :" +msgstr "Dostarcza :" + +#: src/pacman/package.c:79 src/pacman/package.c:131 +msgid "Depends On :" +msgstr "Zależy od :" + +#: src/pacman/package.c:80 src/pacman/package.c:132 +msgid "Removes :" +msgstr "Usuwa :" + +#: src/pacman/package.c:83 +msgid "Required By :" +msgstr "Wymagane przez :" + +#: src/pacman/package.c:85 src/pacman/package.c:133 +msgid "Conflicts With :" +msgstr "Konfliktuje z :" + +#: src/pacman/package.c:86 src/pacman/package.c:136 +#, c-format +msgid "Installed Size : %6.2f K\n" +msgstr "Rozmiar po instalacji : %6.2f K\n" + +#: src/pacman/package.c:87 +#, c-format +msgid "Packager : %s\n" +msgstr "Pakujący : %s\n" + +#: src/pacman/package.c:88 +#, c-format +msgid "Architecture : %s\n" +msgstr "Architektura : %s\n" + +#: src/pacman/package.c:89 +#, c-format +msgid "Build Date : %s %s\n" +msgstr "Data budowy : %s %s\n" + +#: src/pacman/package.c:90 +#, c-format +msgid "Build Type : %s\n" +msgstr "Typ budowy : %s\n" + +#: src/pacman/package.c:92 +#, c-format +msgid "Install Date : %s %s\n" +msgstr "Data instalacji : %s %s\n" + +#: src/pacman/package.c:93 +#, c-format +msgid "Install Reason : %s\n" +msgstr "Powód ku instalacji : %s\n" + +#: src/pacman/package.c:95 +#, c-format +msgid "Install Script : %s\n" +msgstr "Skrypt instalacyjny : %s\n" + +#: src/pacman/package.c:96 +msgid "Yes" +msgstr "Tak" + +#: src/pacman/package.c:96 +msgid "No" +msgstr "Nie" + +#: src/pacman/package.c:126 +#, c-format +msgid "Repository : %s\n" +msgstr "Repozytorium : %s\n" + +#: src/pacman/package.c:134 +msgid "Replaces :" +msgstr "Zastępuje :" + +#: src/pacman/package.c:135 +#, c-format +msgid "Download Size : %6.2f K\n" +msgstr "Ilość danych do pobrania : %6.2f K\n" + +#: src/pacman/package.c:144 +#, c-format +msgid "MD5 Sum : %s" +msgstr "Suma MD5 : %s" + +#: src/pacman/package.c:147 +#, c-format +msgid "SHA1 Sum : %s" +msgstr "Suma SHA1 : %s" + +#: src/pacman/package.c:158 +#, c-format +msgid "Backup Files:\n" +msgstr "Pliki kopii zapasowej:\n" + +#: src/pacman/package.c:180 +#, c-format +msgid "error calculating checksums for %s\n" +msgstr "błąd kalkulowania sum kontrolnych dla %s\n" + +#: src/pacman/package.c:193 +#, c-format +msgid "MODIFIED\t%s\n" +msgstr "ZMIENIONE\t%s\n" + +#: src/pacman/package.c:195 +#, c-format +msgid "Not Modified\t%s\n" +msgstr "Nie zmienione\t%s\n" + +#: src/pacman/package.c:200 +#, c-format +msgid "MISSING\t\t%s\n" +msgstr "BRAKUJĄCE\t\t%s\n" + +#: src/pacman/package.c:206 +#, c-format +msgid "(none)\n" +msgstr "(żadnych)\n" + +#: src/pacman/package.c:246 +#, c-format +msgid "No changelog available for '%s'.\n" +msgstr "Brak dostępnego changelog'a dla '%s'.\n" + +#: src/pacman/pacman.c:90 +#, c-format +msgid "usage: %s {-h --help}\n" +msgstr "składnia: %s {-h --help}\n" + +#: src/pacman/pacman.c:91 +#, c-format +msgid " %s {-V --version}\n" +msgstr " %s {-V --version}\n" + +#: src/pacman/pacman.c:92 +#, c-format +msgid " %s {-A --add} [options] \n" +msgstr " %s {-A --add} [opcje] \n" + +#: src/pacman/pacman.c:93 +#, c-format +msgid " %s {-F --freshen} [options] \n" +msgstr " %s {-F --freshen} [opcje] \n" + +#: src/pacman/pacman.c:94 +#, c-format +msgid " %s {-Q --query} [options] [package]\n" +msgstr " %s {-Q --query} [opcje] [pakiet]\n" + +#: src/pacman/pacman.c:95 +#, c-format +msgid " %s {-R --remove} [options] \n" +msgstr " %s {-R --remove} [opcje] \n" + +#: src/pacman/pacman.c:96 +#, c-format +msgid " %s {-S --sync} [options] [package]\n" +msgstr " %s {-S --sync} [opcje] [pakiet]\n" + +#: src/pacman/pacman.c:97 +#, c-format +msgid " %s {-U --upgrade} [options] \n" +msgstr " %s {-U --upgrade} [opcje] \n" + +#: src/pacman/pacman.c:98 +#, c-format +msgid "" +"\n" +"use '%s --help' with other options for more syntax\n" +msgstr "" +"\n" +"użyj '%s --help' z innymi opcjami dla dalszych składni\n" + +#: src/pacman/pacman.c:101 +#, c-format +msgid "usage: %s {-A --add} [options] \n" +msgstr "składnia: %s {-A --add} [options] \n" + +#: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 +#: src/pacman/pacman.c:124 src/pacman/pacman.c:138 +#, c-format +msgid "options:\n" +msgstr "opcje:\n" + +#: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 +#: src/pacman/pacman.c:140 +#, c-format +msgid " -d, --nodeps skip dependency checks\n" +msgstr " -d, --nodeps pomija sprawdzanie zależności\n" + +#: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 +#, c-format +msgid " -f, --force force install, overwrite conflicting files\n" +msgstr " -f, --force wymusza instalację, nadpisując konfliktujące pliki\n" + +#: src/pacman/pacman.c:106 +#, c-format +msgid "usage: %s {-R --remove} [options] \n" +msgstr "składnia: %s {-R --remove} [opcje] \n" + +#: src/pacman/pacman.c:108 +#, c-format +msgid "" +" -c, --cascade remove packages and all packages that depend on them\n" +msgstr "" +" -c, --cascade usuwa pakiet i wszystkie pakiety od niego zależne\n" + +#: src/pacman/pacman.c:110 +#, c-format +msgid "" +" -k, --dbonly only remove database entry, do not remove files\n" +msgstr "" +" -k, --dbonly usuwa jedynie wpis w bazie danych, bez zmian na plikach \n" + +#: src/pacman/pacman.c:111 +#, c-format +msgid " -n, --nosave remove configuration files as well\n" +msgstr " -n, --nosave usuwa także pliki konfiguracyjne\n" + +#: src/pacman/pacman.c:112 +#, c-format +msgid "" +" -s, --recursive remove dependencies also (that won't break packages)\n" +msgstr "" +" -s, --recursive usuwa także zależności (które nie złamią działania innych pakietów)\n" + +#: src/pacman/pacman.c:115 +#, c-format +msgid "usage: %s {-F --freshen} [options] \n" +msgstr "składnia: %s {-F --freshen} [opcje] \n" + +#: src/pacman/pacman.c:117 +#, c-format +msgid "usage: %s {-U --upgrade} [options] \n" +msgstr "składnia: %s {-U --upgrade} [opcje] \n" + +#: src/pacman/pacman.c:123 +#, c-format +msgid "usage: %s {-Q --query} [options] [package]\n" +msgstr "składnia: %s {-Q --query} [opcje] [pakiet]\n" + +#: src/pacman/pacman.c:125 +#, c-format +msgid " -c, --changelog view the changelog of a package\n" +msgstr " -c, --changelog wyświetla changelog dla pakietu\n" + +#: src/pacman/pacman.c:126 +#, c-format +msgid "" +" -e, --orphans list all packages installed as dependencies but no " +"longer\n" +msgstr "" +" -e, --orphans wylistowywuje wszystkie pakiety zainstalowane jako zależności " +"ale nie\n" + +#: src/pacman/pacman.c:127 +#, c-format +msgid " required by any package\n" +msgstr " wymagane już przez jakikolwiek pakiet\n" + +#: src/pacman/pacman.c:128 src/pacman/pacman.c:143 +#, c-format +msgid " -g, --groups view all members of a package group\n" +msgstr " -g, --groups wyświetla zawartość grupy pakietów\n" + +#: src/pacman/pacman.c:129 src/pacman/pacman.c:144 +#, c-format +msgid " -i, --info view package information\n" +msgstr " -i, --info wyświetla informację o pakiecie\n" + +#: src/pacman/pacman.c:130 +#, c-format +msgid " -l, --list list the contents of the queried package\n" +msgstr " -l, --list wylistowywuje zawartość pytanego pakietu\n" + +#: src/pacman/pacman.c:131 +#, c-format +msgid "" +" -m, --foreign list installed packages not found in sync db(s)\n" +msgstr "" +" -m, --foreign wylistowywuje zainstalowane paczki nie znalezione w bazach sync\n" + +#: src/pacman/pacman.c:132 +#, c-format +msgid " -o, --owns query the package that owns \n" +msgstr " -o, --owns pyta pakiet zawierającą \n" + +#: src/pacman/pacman.c:133 +#, c-format +msgid " -p, --file query a package file instead of the database\n" +msgstr " -p, --file pyta plik pakietu zamiast bazy danych\n" + +#: src/pacman/pacman.c:134 +#, c-format +msgid "" +" -s, --search search locally-installed packages for matching " +"strings\n" +msgstr "" +" -s, --search przeszukuje lokalnie zainstalowane pakiety według " +"pasujących ciągów\n" + +#: src/pacman/pacman.c:135 +#, c-format +msgid " -u, --upgrades list all packages that can be upgraded\n" +msgstr " -u, --upgrades wylistowywuje wszystkie pakiety które można uaktualnić\n" + +#: src/pacman/pacman.c:137 +#, c-format +msgid "usage: %s {-S --sync} [options] [package]\n" +msgstr "składnia: %s {-S --sync} [opcje] [paczka]\n" + +#: src/pacman/pacman.c:139 +#, c-format +msgid "" +" -c, --clean remove old packages from cache directory (-cc for " +"all)\n" +msgstr "" +" -c, --clean usuwa stare pakiety z katalogu pamięci podręcznej " +"(-cc dla wszystkich)\n" + +#: src/pacman/pacman.c:141 +#, c-format +msgid " -e, --dependsonly install dependencies only\n" +msgstr " -e, --dependsonly instaluje tylko zależności\n" + +#: src/pacman/pacman.c:145 +#, c-format +msgid " -l, --list view a list of packages in a repo\n" +msgstr " -l, --list przegląda listę pakietów w repozytorium \n" + +#: src/pacman/pacman.c:146 +#, c-format +msgid "" +" -p, --print-uris print out URIs for given packages and their " +"dependencies\n" +msgstr "" +" -p, --print-uris wykazuje URI dla danych pakietów oraz ich " +"zależności\n" + +#: src/pacman/pacman.c:147 +#, c-format +msgid "" +" -s, --search search remote repositories for matching strings\n" +msgstr "" +" -s, --search przeszukuje zdalne repozytoria wedle pasujących ciągów\n" + +#: src/pacman/pacman.c:148 +#, c-format +msgid " -u, --sysupgrade upgrade all packages that are out of date\n" +msgstr " -u, --sysupgrade uaktualnia wszystkie niektualne pakiety\n" + +#: src/pacman/pacman.c:149 +#, c-format +msgid "" +" -w, --downloadonly download packages but do not install/upgrade " +"anything\n" +msgstr "" +" -w, --downloadonly pobiera jedynie pakiety bez instalacji/uaktualniania" +"czegokolwiek\n" + +#: src/pacman/pacman.c:150 +#, c-format +msgid "" +" -y, --refresh download fresh package databases from the server\n" +msgstr "" +" -y, --refresh pobiera świeże bazy danych pakietów z serwera\n" + +#: src/pacman/pacman.c:151 +#, c-format +msgid "" +" --ignore ignore a package upgrade (can be used more than " +"once)\n" +msgstr "" +" --ignore ignoruje uaktualnienie pakietu (może zostać użyte " +"więcej niż raz)\n" + +#: src/pacman/pacman.c:153 +#, c-format +msgid " --config set an alternate configuration file\n" +msgstr " --config ustawia alternatywny plik konfiguracji\n" + +#: src/pacman/pacman.c:154 +#, c-format +msgid " --noconfirm do not ask for any confirmation\n" +msgstr " --noconfirm nie pyta o potwierdzenie ze strony użytkownika\n" + +#: src/pacman/pacman.c:155 +#, c-format +msgid "" +" --ask pre-specify answers for questions (see manpage)\n" +msgstr "" +" --ask zadaje pytania z góry (zobacz stronę podręcznika)\n" + +#: src/pacman/pacman.c:156 +#, c-format +msgid "" +" --noprogressbar do not show a progress bar when downloading files\n" +msgstr "" +" --noprogressbar wyłącza pasek postępu podczas pobierania plików\n" + +#: src/pacman/pacman.c:157 +#, c-format +msgid "" +" --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr "" +" --noscriptlet nie wykonuje skryptu instalacyjnego jeśli takowy istnieje\n" + +#: src/pacman/pacman.c:158 +#, c-format +msgid " -v, --verbose be verbose\n" +msgstr " -v, --verbose włącza tryb wypisywania szczegółów\n" + +#: src/pacman/pacman.c:159 +#, c-format +msgid " -r, --root set an alternate installation root\n" +msgstr " -r, --root ustawia alternatywny cel instalacji\n" + +#: src/pacman/pacman.c:160 +#, c-format +msgid " -b, --dbpath set an alternate database location\n" +msgstr " -b, --dbpath ustawia alternatywną lokalizację bazy danych\n" + +#: src/pacman/pacman.c:161 +#, c-format +msgid " --cachedir set an alternate package cache location\n" +msgstr " --cachedir ustawia alternatywną lokalizację pliku " +"podręcznego pakietów\n" + +#: src/pacman/pacman.c:174 +#, c-format +msgid " This program may be freely redistributed under\n" +msgstr " Ten program może być wolno rozpowszechniany na\n" + +#: src/pacman/pacman.c:175 +#, c-format +msgid " the terms of the GNU General Public License\n" +msgstr " zasadach Licencji Publicznej GNU (GPL)\n" + +#: src/pacman/pacman.c:300 +#, c-format +msgid "'%s' is not a valid debug level" +msgstr "'%s' nie jest ważnym poziomem debug'owania" + +#: src/pacman/pacman.c:315 +#, c-format +msgid "'%s' is not a valid cache directory\n" +msgstr "'%s' nie jest ważnym katalogiem pamięci podręcznej\n" + +#: src/pacman/pacman.c:333 +#, c-format +msgid "'%s' is not a valid db path\n" +msgstr "'%s' nie jest ważną ścieżką db (bazy danych)\n" + +#: src/pacman/pacman.c:363 +#, c-format +msgid "'%s' is not a valid root path\n" +msgstr "'%s' nie jest ważną ścieżką docelową\n" + +#: src/pacman/pacman.c:390 +msgid "only one operation may be used at a time\n" +msgstr "tylko jedna operacja może być użyta na raz\n" + +#: src/pacman/pacman.c:436 +msgid "warning: current locale is invalid; using default \"C\" locale" +msgstr "ostrzeżenie: ustawione locale jest niewłaściwe; używanie locale \"C\"" + +#: src/pacman/pacman.c:456 +#, c-format +msgid "failed to initialize alpm library (%s)\n" +msgstr "nie udało się zinicjalizować biblioteki alpm (%s)\n" + +#: src/pacman/pacman.c:489 +msgid "you cannot perform this operation unless you are root.\n" +msgstr "tą operację wykonać można jedynie jako root.\n" + +#: src/pacman/pacman.c:505 +#, c-format +msgid "failed to parse config (%s)\n" +msgstr "nie udało się przeczytać pliku konfiguracji (%s)\n" + +#: src/pacman/pacman.c:516 +msgid "Targets :" +msgstr "Cele :" + +#: src/pacman/pacman.c:522 +#, c-format +msgid "could not register 'local' database (%s)\n" +msgstr "nie udało się zarejestrować 'lokalnej' bazy danych (%s)\n" + +#: src/pacman/pacman.c:529 +msgid "no targets specified (use -h for help)\n" +msgstr "nie podano żadnych celów (użyj -h aby otrzymać pomoc)\n" + +#: src/pacman/pacman.c:542 +msgid "no operation specified (use -h for help)\n" +msgstr "nie podano żadnej operacji (użyj -h aby otrzymać pomoc)\n" + +#: src/pacman/query.c:90 +msgid "no file was specified for --owns\n" +msgstr "nie podano pliku dla --owns\n" + +#: src/pacman/query.c:95 +#, c-format +msgid "failed to read file '%s': %s" +msgstr "nie udało się odczytać pliku '%s': %s" + +#: src/pacman/query.c:100 +msgid "cannot determine ownership of a directory" +msgstr "nie można ustalić właściciela katalogu" + +#: src/pacman/query.c:105 +#, c-format +msgid "cannot determine real path for '%s': %s" +msgstr "nie można ustalić pełnej ścieżki dla '%s': %s" + +#: src/pacman/query.c:119 +#, c-format +msgid "%s is owned by %s %s\n" +msgstr "%s jest własnością %s %s\n" + +#: src/pacman/query.c:127 +#, c-format +msgid "No package owns %s\n" +msgstr "Żaden pakiet nie jest właścicielem %s\n" + +#: src/pacman/query.c:170 src/pacman/sync.c:453 +msgid "no usable package repositories configured.\n" +msgstr "nie skonfigurowano używalnych repozytoriów.\n" + +#: src/pacman/query.c:176 +msgid "Checking for package upgrades..." +msgstr "Sprawdzanie możliwych aktualizacji..." + +#: src/pacman/query.c:183 +msgid "no upgrades found" +msgstr "żadnych aktualizacji nie znaleziono" + +#: src/pacman/query.c:221 +#, c-format +msgid "group \"%s\" was not found\n" +msgstr "grupa \"%s\" nie została znaleziona\n" + +#: src/pacman/query.c:232 +msgid "no package file was specified for --file\n" +msgstr "nie podano pliku pakietu dla --file\n" + +#: src/pacman/query.c:236 +#, c-format +msgid "failed to load package '%s' (%s)\n" +msgstr "nie udało się załadować pakietu '%s' (%s)\n" + +#: src/pacman/query.c:273 src/pacman/query.c:305 +#, c-format +msgid "package \"%s\" not found\n" +msgstr "pakiet \"%s\" nie został odnaleziony\n" + +#: src/pacman/remove.c:61 src/pacman/sync.c:568 +#, c-format +msgid ":: group %s:\n" +msgstr ":: grupa %s:\n" + +#: src/pacman/remove.c:63 +msgid " Remove whole content? [Y/n] " +msgstr " Usunąć całą zawartość [T/n] " + +#: src/pacman/remove.c:67 +#, c-format +msgid ":: Remove %s from group %s? [Y/n] " +msgstr ":: Usunąć %s z grupy %s? [T/n] " + +#: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529 +#, c-format +msgid "failed to init transaction (%s)\n" +msgstr "nie udało się zainicjować tranzakcji (%s)\n" + +#: src/pacman/remove.c:92 +#, c-format +msgid "failed to add target '%s' (%s)\n" +msgstr "nie udało się dodać celu '%s' (%s)\n" + +#: src/pacman/remove.c:106 +#, c-format +msgid ":: %s is required by %s\n" +msgstr ":: %s jest wymagane przez %s\n" + +#: src/pacman/remove.c:128 src/pacman/util.c:324 +msgid "Targets:" +msgstr "Celuje:" + +#: src/pacman/remove.c:131 +msgid "" +"\n" +"Do you want to remove these packages? [Y/n] " +msgstr "" +"\n" +"Czy chcesz usunąć te pakiety? [T/n] " + +#: src/pacman/sync.c:115 +msgid "Do you want to remove old packages from cache? [Y/n] " +msgstr "Czy chcesz usunąć stare pakiety z pamięci podręcznej? [T/n] " + +#: src/pacman/sync.c:117 +msgid "removing old packages from cache... " +msgstr "usuwanie starych pakietów z pamięci podręcznej... " + +#: src/pacman/sync.c:120 +msgid "could not access cache directory\n" +msgstr "brak dostępu do katalogu pamięci podręcznej\n" + +#: src/pacman/sync.c:181 +msgid "Do you want to remove all packages from cache? [Y/n] " +msgstr "Czy chcesz usunąć wszystkie pakiety z pamięci podręcznej? [T/n] " + +#: src/pacman/sync.c:183 +msgid "removing all packages from cache... " +msgstr "usuwanie wszystkich pakietów z pamięci podręcznej... " + +#: src/pacman/sync.c:186 +msgid "could not remove cache directory\n" +msgstr "nie udało się usunąć katalogu pamięci podręcznej\n" + +#: src/pacman/sync.c:191 +msgid "could not create new cache directory\n" +msgstr "nie udało się utworzyć nowego katalogu pamięci podręcznej\n" + +#: src/pacman/sync.c:218 +#, c-format +msgid "failed to synchronize %s: %s\n" +msgstr "nie udało się zsynchronizować %s: %s\n" + +#: src/pacman/sync.c:220 +#, c-format +msgid "failed to update %s (%s)\n" +msgstr "nie udało się zaktualizować %s (%s)\n" + +#: src/pacman/sync.c:223 +#, c-format +msgid " %s is up to date\n" +msgstr " %s jest już w najnowszej wersji\n" + +#: src/pacman/sync.c:345 +#, c-format +msgid "repository '%s' does not exist\n" +msgstr "repozytorium '%s' nie istnieje\n" + +#: src/pacman/sync.c:361 +#, c-format +msgid "package '%s' was not found in repository '%s'\n" +msgstr "pakiet '%s' nie został odnaleziony w repozytorium '%s'\n" + +#: src/pacman/sync.c:381 +#, c-format +msgid "package '%s' was not found\n" +msgstr "pakiet '%s' nie został odnaleziony\n" + +#: src/pacman/sync.c:418 +#, c-format +msgid "repository \"%s\" was not found.\n" +msgstr "repozytorium \"%s\" nie zostało znalezione.\n" + +#: src/pacman/sync.c:490 +msgid ":: Synchronizing package databases...\n" +msgstr ":: Synchronizowanie baz danych z pakietami...\n" + +#: src/pacman/sync.c:491 +msgid "synchronizing package lists" +msgstr "synchronizowanie list pakietów" + +#: src/pacman/sync.c:493 +msgid "failed to synchronize any databases" +msgstr "nie udało się zsynchronizować żadnych baz danych" + +#: src/pacman/sync.c:499 +msgid ":: Starting full system upgrade...\n" +msgstr ":: Rozpoczynanie pełnej aktualizacji systemu...\n" + +#: src/pacman/sync.c:500 +msgid "starting full system upgrade" +msgstr "rozpoczynanie pełnej aktualizacji systemu" + +#: src/pacman/sync.c:518 +msgid "" +"\n" +":: pacman has detected a newer version of the \"pacman\" package.\n" +msgstr "" +"\n" +":: pacman wykrył nowszą wersję pakietu \"pacman\".\n" + +#: src/pacman/sync.c:519 +msgid ":: It is recommended that you allow pacman to upgrade itself\n" +msgstr ":: Rekomendowane jest ażeby pozwolić pacman'owi zaktualizować się\n" + +#: src/pacman/sync.c:520 +msgid ":: first, then you can re-run the operation with the newer version.\n" +msgstr ":: najpierw, po czym uruchomić ponownie operację z nowszą wersją.\n" + +#: src/pacman/sync.c:522 +msgid ":: Upgrade pacman first? [Y/n] " +msgstr ":: Zaktualizować pacman'a najpierw? [T/n] " + +#: src/pacman/sync.c:537 +#, c-format +msgid "pacman: %s\n" +msgstr "pacman: %s\n" + +#: src/pacman/sync.c:572 +msgid ":: Install whole content? [Y/n] " +msgstr ":: Zainstalować całą zawartość? [T/n] " + +#: src/pacman/sync.c:579 +#, c-format +msgid ":: Install %s from group %s? [Y/n] " +msgstr ":: Zainstalować %s z grupy %s? [T/n] " + +#: src/pacman/sync.c:603 +#, c-format +msgid "'%s': not found in sync db\n" +msgstr "'%s': nie znaleziono w bazie danych synchronizacji\n" + +#: src/pacman/sync.c:621 +msgid "requires" +msgstr "wymaga" + +#: src/pacman/sync.c:663 +msgid " local database is up to date\n" +msgstr " lokalna baza pakietów jest już w najnowszej wersji\n" + +#: src/pacman/sync.c:672 +msgid "" +"\n" +"Beginning download...\n" +msgstr "" +"\n" +"Rozpoczynanie pobierania...\n" + +#: src/pacman/sync.c:676 +msgid "Proceed with download? [Y/n] " +msgstr "Kontynuować pobieranie? [T/n] " + +#: src/pacman/sync.c:684 +msgid "" +"\n" +"Beginning upgrade process...\n" +msgstr "" +"\n" +"Rozpoczynanie procesu aktualizacji...\n" + +#: src/pacman/sync.c:688 +msgid "Proceed with installation? [Y/n] " +msgstr "Kontynuować instalację? [T/n] " + +#: src/pacman/trans.c:55 +msgid "checking dependencies... " +msgstr "sprawdzanie zależności... " + +#: src/pacman/trans.c:59 +msgid "checking for file conflicts... " +msgstr "sprawdzanie konfliktów w systemie plików... " + +#: src/pacman/trans.c:63 +msgid "cleaning up... " +msgstr "czyszczenie... " + +#: src/pacman/trans.c:66 +msgid "resolving dependencies... " +msgstr "rozwiązywanie zależności... " + +#: src/pacman/trans.c:69 +msgid "looking for inter-conflicts... " +msgstr "szukanie konfliktów międzypakietowych... " + +#: src/pacman/trans.c:86 +#, c-format +msgid "installing %s... " +msgstr "instalowanie %s... " + +#: src/pacman/trans.c:93 +#, c-format +msgid "installed %s (%s)" +msgstr "zainstalowano %s (%s)" + +#: src/pacman/trans.c:100 +#, c-format +msgid "removing %s... " +msgstr "usuwanie %s... " + +#: src/pacman/trans.c:107 +#, c-format +msgid "removed %s (%s)" +msgstr "usunięto %s (%s)" + +#: src/pacman/trans.c:114 +#, c-format +msgid "upgrading %s... " +msgstr "aktualizowanie %s... " + +#: src/pacman/trans.c:121 +#, c-format +msgid "upgraded %s (%s -> %s)" +msgstr "zaktualizowano %s (%s -> %s)" + +#: src/pacman/trans.c:128 +msgid "checking package integrity... " +msgstr "sprawdzanie spójności pakietów... " + +#: src/pacman/trans.c:144 +msgid "failed.\n" +msgstr "nieudane.\n" + +#: src/pacman/trans.c:151 +#, c-format +msgid ":: Retrieving packages from %s...\n" +msgstr ":: Pobieranie pakietów z %s...\n" + +#: src/pacman/trans.c:172 +#, c-format +msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " +msgstr ":: %1$s wymaga %2$s z IgnorePkg. Zainstalować %2$s? [T/n] " + +#: src/pacman/trans.c:177 +#, c-format +msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " +msgstr ":: %s jest w IgnorePkg. Zainstalować mimo to? [T/n] " + +#: src/pacman/trans.c:190 +#, c-format +msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " +msgstr ":: %s desygnowany jest jako HoldPkg. Usunąć mimo tego? [T/n] " + +#: src/pacman/trans.c:203 +#, c-format +msgid ":: Replace %s with %s/%s? [Y/n] " +msgstr ":: Zastąpić %s przez %s/%s? [T/n] " + +#: src/pacman/trans.c:218 +#, c-format +msgid ":: %s conflicts with %s. Remove %s? [Y/n] " +msgstr ":: %s konfliktuje z %s. Usunąć %s? [T/n] " + +#: src/pacman/trans.c:234 +#, c-format +msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " +msgstr ":: %s-%s: lokalna wersja jest nowsza. Aktualizować pomimo tego? [T/n] " + +#: src/pacman/trans.c:252 +#, c-format +msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " +msgstr ":: %s-%s: lokalny pakiet jest już w najnowszej wersji. Aktualizować mimo tego? [T/n] " + +#: src/pacman/trans.c:270 +#, c-format +msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " +msgstr ":: Archiwum %s jest skorumpowane. Czy chcesz je usunąć? [T/n] " + +#: src/pacman/trans.c:326 +msgid "installing" +msgstr "instalowanie" + +#: src/pacman/trans.c:329 +msgid "upgrading" +msgstr "aktualizowanie" + +#: src/pacman/trans.c:332 +msgid "removing" +msgstr "usuwanie" + +#: src/pacman/trans.c:335 +msgid "checking for file conflicts" +msgstr "sprawdzanie konfliktów plików" + +#: src/pacman/util.c:259 +#, c-format +msgid "None\n" +msgstr "Żadnych\n" + +#: src/pacman/util.c:311 +msgid "Remove:" +msgstr "Usunąć:" + +#: src/pacman/util.c:319 +#, c-format +msgid "" +"\n" +"Total Removed Size: %.2f MB\n" +msgstr "" +"\n" +"Całkowity rozmiar usunięć: %.2f MB\n" + +#: src/pacman/util.c:330 +#, c-format +msgid "" +"\n" +"Total Package Size: %.2f MB\n" +msgstr "" +"\n" +"Całkowity rozmiar pakietów: %.2f MB\n" + +#: src/pacman/util.c:337 +#, c-format +msgid "Total Installed Size: %.2f MB\n" +msgstr "Całkowity rozmiar po instalacji: %.2f MB\n" -- cgit v1.2.3-70-g09d2 From 756ec7e69f183b0aadd9bcfeedd7903d80d9f0d3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 17 Apr 2007 03:32:20 +0000 Subject: Updated German translation Matthias Gorissen --- lib/libalpm/po/de.po | 221 +++++++++++++++++++++++++-------------------------- src/pacman/po/de.po | 66 +++++++-------- 2 files changed, 143 insertions(+), 144 deletions(-) diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 528b34f5..45e120da 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-07 09:12+0100\n" -"Last-Translator: Pierre Schmitz \n" +"Last-Translator: Matthias Gorissen \n" "Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +33,7 @@ msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste" #: lib/libalpm/add.c:131 #, c-format msgid "newer version %s-%s is in the target list -- skipping" -msgstr "Neuere Version %s-%s ist in der Ziel-liste -- Überspringe" +msgstr "Neuere Version %s-%s ist in der Ziel-Liste -- Überspringe" #: lib/libalpm/add.c:138 #, c-format @@ -55,7 +55,7 @@ msgstr "Das Ersetzen von Paketen mit -A und -U wird noch nicht unterstützt" #: lib/libalpm/add.c:209 #, c-format msgid "please remove '%s' first, using -Rd" -msgstr "Entferne bitte zuerst '%s' mit -Rd" +msgstr "Entfernen Sie bitte zuerst '%s' mit -Rd" #: lib/libalpm/add.c:250 lib/libalpm/remove.c:147 msgid "sorting by dependencies" @@ -115,12 +115,12 @@ msgstr "Konnte %s nicht entpacken (%s)" #: lib/libalpm/add.c:598 #, c-format msgid "checking md5 hashes for %s" -msgstr "Prüfe MD5 Hashes für %s" +msgstr "Prüfe MD5-Hashes für %s" #: lib/libalpm/add.c:600 #, c-format msgid "checking sha1 hashes for %s" -msgstr "Prüfe SHA1 Hashes für %s" +msgstr "Prüfe SHA1-Hashes für %s" #: lib/libalpm/add.c:602 #, c-format @@ -165,7 +165,7 @@ msgstr "%s gespeichert als %s" #: lib/libalpm/add.c:629 #, c-format msgid "warning: %s saved as %s" -msgstr "Warnung: %s gesichert als %s" +msgstr "Warnung: %s gespeichert als %s" #: lib/libalpm/add.c:639 #, c-format @@ -174,12 +174,12 @@ msgstr "Aktion: Installiere neue Datei: %s" #: lib/libalpm/add.c:649 lib/libalpm/add.c:655 lib/libalpm/add.c:660 msgid "action: leaving existing file in place" -msgstr "Aktion: Lasse existierende Datei an ihrem Platz" +msgstr "Aktion: Belasse existierende Datei an ihrem Platz" #: lib/libalpm/add.c:663 msgid "action: keeping current file and installing new one with .pacnew ending" msgstr "" -"Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew" +"Aktion: Behalte aktuelle Datei und installiere die neue mit der Endung .pacnew" #: lib/libalpm/add.c:666 #, c-format @@ -238,11 +238,11 @@ msgstr "Fehler traten auf, während %s %s" #: lib/libalpm/add.c:750 lib/libalpm/add.c:752 msgid "upgrading" -msgstr "aktualisiere" +msgstr "Aktualisiere" #: lib/libalpm/add.c:750 lib/libalpm/add.c:752 msgid "installing" -msgstr "installiere" +msgstr "Installiere" #: lib/libalpm/add.c:769 #, c-format @@ -252,12 +252,12 @@ msgstr "'%s' wird nicht mehr von %s bereitgestellt (%s => %s)" #: lib/libalpm/add.c:781 #, c-format msgid "updating '%s' due to provision change (%s)" -msgstr "aktualisiere '%s' aufgrund einer Bereitstellungsänderung (%s)" +msgstr "Aktualisiere '%s' aufgrund einer Bereitstellungsänderung (%s)" #: lib/libalpm/add.c:785 lib/libalpm/add.c:786 #, c-format msgid "could not update provision '%s' from '%s'" -msgstr "konnte Bereitstellung '%s' von '%s' nicht aktualisieren" +msgstr "Konnte Bereitstellung '%s' von '%s' nicht aktualisieren" #: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 msgid "updating database" @@ -314,7 +314,7 @@ msgstr "Server-Liste geleert für '%s'" #: lib/libalpm/alpm.c:279 #, c-format msgid "failed to get lastupdate time for %s (no big deal)" -msgstr "Konnte letzte Updatezeit für %s nicht ermitteln (nicht schlimm)" +msgstr "Konnte letzte Update-Zeit für %s nicht ermitteln (nicht schlimm)" #: lib/libalpm/alpm.c:298 #, c-format @@ -339,7 +339,7 @@ msgstr "Konnte Datenbankeintrag %s%s nicht entfernen" #: lib/libalpm/alpm.c:481 #, c-format msgid "could not get sha1sum for package %s-%s" -msgstr "Konnte SHA1 Prüfsumme für Paket %s-%s nicht ermitteln" +msgstr "Konnte SHA1-Prüfsumme für Paket %s-%s nicht ermitteln" #: lib/libalpm/alpm.c:487 #, c-format @@ -349,12 +349,12 @@ msgstr "SHA1-Prüfsummen für Paket %s-%s stimmen überein" #: lib/libalpm/alpm.c:490 #, c-format msgid "sha1sums do not match for package %s-%s" -msgstr "SHA1 Summen für Paket %s-%s stimmen nicht überein" +msgstr "SHA1-Prüfsummen für Paket %s-%s stimmen nicht überein" #: lib/libalpm/alpm.c:525 #, c-format msgid "could not get md5sum for package %s-%s" -msgstr "Konnte MD5 Prüfsumme für Paket %s-%s nicht ermitteln" +msgstr "Konnte MD5-Prüfsumme für Paket %s-%s nicht ermitteln" #: lib/libalpm/alpm.c:531 #, c-format @@ -364,7 +364,7 @@ msgstr "MD5-Prüfsummen für Paket %s-%s stimmen überein" #: lib/libalpm/alpm.c:534 #, c-format msgid "md5sums do not match for package %s-%s" -msgstr "MD5 Summen für Paket %s-%s stimmen nicht überein" +msgstr "MD5-Prüfsummen für Paket %s-%s stimmen nicht überein" #: lib/libalpm/alpm.c:783 #, c-format @@ -464,12 +464,12 @@ msgstr "%s-%s: Ignoriere zu aktualisierendes Packet (zu ersetzen durch %s-%s)" #: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" -msgstr "%s-%s wurde zum aktualisieren gewählt (wird durch %s-%s ersetzt)" +msgstr "%s-%s wurde zur Aktualisierung ausgewählt (wird durch %s-%s ersetzt)" #: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" -msgstr "'%s' nicht in sync DB gefunden -- Überspringe" +msgstr "'%s' nicht in Sync-DB gefunden -- Überspringe" #: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 #, c-format @@ -479,7 +479,7 @@ msgstr "'%s' ist bereits zum Entfernen ausgewählt -- Überspringe" #: lib/libalpm/alpm.c:1169 #, c-format msgid "%s elected for upgrade (%s => %s)" -msgstr "%s ausgewählt für Aktualisierung (%s => %s)" +msgstr "%s wurde zur Aktualisierung ausgewählt (%s => %s)" #: lib/libalpm/be_files.c:61 #, c-format @@ -499,18 +499,18 @@ msgstr "Konnte Paket nicht in Datenbank finden: %s" #: lib/libalpm/be_files.c:186 #, c-format msgid "invalid name for database entry '%s'" -msgstr "Falscher Name für Datenbankeintrag '%s'" +msgstr "Falscher Name für Datenbank-Eintrag '%s'" #: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" -msgstr "Überspringe ungültigen an _alpm_db_read übergebenen Paket-Eintrag" +msgstr "Ungültiger Paket-Eintrag wurde an _alpm_db_read übergeben, überspringe" #: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" -"Überspringe das Lesen der Datenbank für ein Datei-basiertes Paket '%s'..." +"Überspringe das Lesen der Datenbank-Information für das Datei-basierte Paket '%s'..." #: lib/libalpm/be_files.c:239 #, c-format @@ -533,22 +533,22 @@ msgstr "Konnte Datei %s nicht öffnen: %s" #: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" -msgstr "schreibe %s-%s Beschreibungsinformationen zurück in die Datenbank" +msgstr "Schreibe %s-%s Informationen aus DESC-Datei zurück in die Datenbank" #: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" -msgstr "schreibe %s-%s Dateiinformationen zurück in die Datenbank" +msgstr "Schreibe %s-%s Informationen aus FILES-Datei zurück in die Datenbank" #: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" -msgstr "schreibe %s-%s Abhängigkeitsinformationen zurück in die Datenbank" +msgstr "Schreibe %s-%s Informationen aus DEPENDS-Datei zurück in die Datenbank" #: lib/libalpm/cache.c:59 #, c-format msgid "loading package cache for repository '%s'" -msgstr "lade Paketpuffer für Repositorium '%s'" +msgstr "Lade Paketpuffer für Repositorium '%s'" #: lib/libalpm/cache.c:64 #, c-format @@ -558,7 +558,7 @@ msgstr "Füge '%s' zum Paketpuffer der Datenbank '%s' hinzu" #: lib/libalpm/cache.c:85 #, c-format msgid "freeing package cache for repository '%s'" -msgstr "Lösche Paketpuffer für Repository '%s'" +msgstr "Lösche Paketpuffer für Repositorium '%s'" #: lib/libalpm/cache.c:109 #, c-format @@ -568,17 +568,17 @@ msgstr "Fehler: Paketpuffer ist NULL für Datenbank '%s'" #: lib/libalpm/cache.c:129 #, c-format msgid "adding entry '%s' in '%s' cache" -msgstr "Füge Eintrag '%s' zu '%s' Cache hinzu" +msgstr "Füge Eintrag '%s' zu '%s'-Puffer hinzu" #: lib/libalpm/cache.c:149 #, c-format msgid "removing entry '%s' from '%s' cache" -msgstr "Entferne Eintrag '%s' aus '%s' Cache" +msgstr "Entferne Eintrag '%s' aus '%s'-Puffer" #: lib/libalpm/cache.c:156 #, c-format msgid "cannot remove entry '%s' from '%s' cache: not found" -msgstr "konnte Eintrag '%s' aus '%s' Cache nicht entfernen: nicht gefunden" +msgstr "Konnte Eintrag '%s' aus '%s'-Puffer nicht entfernen: nicht gefunden" #: lib/libalpm/cache.c:178 #, c-format @@ -598,12 +598,12 @@ msgstr " Konflikt gefunden '%s' : Paket '%s'" #: lib/libalpm/conflict.c:78 #, c-format msgid " found conflict '%s' : package '%s' provides '%s'" -msgstr " Konflikt gefunden '%s' : Paket '%s' stellt '%s' bereit" +msgstr " Konflikt '%s' gefunden: Paket '%s' stellt '%s' bereit" #: lib/libalpm/conflict.c:101 lib/libalpm/conflict.c:143 #, c-format msgid "package '%s' conflicts with itself - packaging error" -msgstr "Paket '%s' steht im Konflikt mit sich selbst - Verpackungsfehler" +msgstr "Paket '%s' steht im Konflikt mit sich selbst - ist falsch gepackt" #: lib/libalpm/conflict.c:107 #, c-format @@ -613,7 +613,7 @@ msgstr "checkconflicts: Ziel '%s' gegen Datenbank" #: lib/libalpm/conflict.c:149 #, c-format msgid "checkconflicts: target '%s' vs all targets" -msgstr "checkconflicts: Ziel '%s' gegen gesamte Ziel-Liste" +msgstr "checkconflicts: Ziel '%s' gegen alle Ziele" #: lib/libalpm/conflict.c:181 #, c-format @@ -637,23 +637,22 @@ msgstr "\tCONFLICTS:: %s steht im Konflikt mit %s" #: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 #, c-format msgid "malloc failure: could not allocate %d bytes" -msgstr "malloc Fehler: Konnte %d Bytes nicht allozieren" +msgstr "malloc-Fehler: Konnte %d Bytes nicht zuweisen" #: lib/libalpm/db.c:64 lib/libalpm/db.c:71 #, c-format msgid "malloc failed: could not allocate %d bytes" -msgstr "malloc fehlgeschlagen: Konnte %d Bytes nicht allozieren" +msgstr "malloc fehlgeschlagen: Konnte %d Bytes nicht zuweisen" #: lib/libalpm/db.c:167 msgid "attempt to re-register the 'local' DB" -msgstr "Versuche die lokale Datenbank erneut zu registrieren" +msgstr "Versuche die lokale Datenbank neu zu registrieren" #: lib/libalpm/db.c:175 #, c-format msgid "attempt to re-register the '%s' database, using existing" msgstr "" -"Versuche die %s Datenbank, durch Nutzung der existierenden, erneut zu " -"registrieren" +"Versuche die %s Datenbank neu zu registrieren, verwende die bestehende" #: lib/libalpm/db.c:181 #, c-format @@ -664,7 +663,7 @@ msgstr "Registriere Datenbank '%s'" #, c-format msgid "database directory '%s' does not exist, creating it" msgstr "" -"Datenbankverzeichnis '%s' ist nicht vorhanden, versuche es zu erstellen" +"Datenbank-Verzeichnis '%s' ist nicht vorhanden, erstelle es" #: lib/libalpm/db.c:197 #, c-format @@ -677,7 +676,7 @@ msgstr "Sortieren von Abhängigkeiten gestartet" #: lib/libalpm/deps.c:136 msgid "possible dependency cycle detected" -msgstr "möglicher Abhängigkeitszyklus gefunden" +msgstr "Möglicher Abhängigkeitszyklus gefunden" #: lib/libalpm/deps.c:183 msgid "sorting dependencies finished" @@ -685,7 +684,7 @@ msgstr "Sortieren von Abhängigkeiten beendet" #: lib/libalpm/deps.c:225 lib/libalpm/deps.c:310 msgid "null package found in package list" -msgstr "ein leeres Paket wurde in der Paketliste gefunden" +msgstr "Ein leeres Paket wurde in der Paketliste gefunden" #: lib/libalpm/deps.c:230 #, c-format @@ -701,14 +700,14 @@ msgstr "checkdeps: Abhängigkeit'%s' wurde von '%s' nach '%s' verschoben" #, c-format msgid "checkdeps: dependency '%s' satisfied by installed package '%s'" msgstr "" -"checkdeps: Abhängigkeit '%s' von installiertem Paket '%s' bereitgestellt" +"checkdeps: Abhängigkeit '%s' von installiertem Paket '%s' erfüllt" #: lib/libalpm/deps.c:289 #, c-format msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" msgstr "" "checkdeps: aktualisiertes '%s' wird die Abhängigkeit von '%s' nicht " -"zufriedenstellen" +"erfüllen" #: lib/libalpm/deps.c:359 #, c-format @@ -756,7 +755,7 @@ msgstr "" #: lib/libalpm/deps.c:647 #, c-format msgid "dependency %s is already in the target list -- skipping" -msgstr "Abhängigkeit %s ist bereits in Ziel-Liste -- Überspringe" +msgstr "Abhängigkeit %s ist bereits in der Ziel-Liste -- Überspringe" #: lib/libalpm/deps.c:667 #, c-format @@ -771,7 +770,7 @@ msgstr "Kann Abhängigkeiten für \"%s\" nicht auflösen" #: lib/libalpm/deps.c:687 #, c-format msgid "dependency cycle detected: %s" -msgstr "Abhängigkeitszyklus entdeckt: %s" +msgstr "Abhängigkeits-Zyklus entdeckt: %s" #: lib/libalpm/deps.c:691 msgid "finished resolving dependencies" @@ -787,7 +786,7 @@ msgstr "Unerwarteter Systemfehler" #: lib/libalpm/error.c:44 msgid "insufficient privileges" -msgstr "Ungenügende Rechte" +msgstr "Unzureichende Rechte" #: lib/libalpm/error.c:46 msgid "could not find or read file" @@ -795,7 +794,7 @@ msgstr "Konnte Datei nicht finden oder lesen" #: lib/libalpm/error.c:48 msgid "wrong or NULL argument passed" -msgstr "Falsches oder NULL Argument übergeben" +msgstr "Falsches oder NULL-Argument übergeben" #: lib/libalpm/error.c:51 msgid "library not initialized" @@ -835,7 +834,7 @@ msgstr "Konnte Datenbank nicht aktualisieren" #: lib/libalpm/error.c:70 msgid "could not remove database entry" -msgstr "Konnte Datenbankeintrag nicht entfernen" +msgstr "Konnte Datenbank-Eintrag nicht entfernen" #: lib/libalpm/error.c:73 msgid "invalid url for server" @@ -847,11 +846,11 @@ msgstr "Konnte Parameter nicht setzen" #: lib/libalpm/error.c:83 msgid "transaction already initialized" -msgstr "Übertragung wurde schon gestartet" +msgstr "Vorgang wurde schon gestartet" #: lib/libalpm/error.c:85 lib/libalpm/error.c:89 msgid "transaction not initialized" -msgstr "Übertragung nicht gestartet" +msgstr "Vorgang nicht gestartet" #: lib/libalpm/error.c:87 msgid "duplicate target" @@ -859,19 +858,19 @@ msgstr "Doppelte Ziele" #: lib/libalpm/error.c:91 msgid "transaction not prepared" -msgstr "Übertragung nicht vorbereitet" +msgstr "Vorgang nicht vorbereitet" #: lib/libalpm/error.c:93 msgid "transaction aborted" -msgstr "Übertragung abgebrochen" +msgstr "Vorgang abgebrochen" #: lib/libalpm/error.c:95 msgid "operation not compatible with the transaction type" -msgstr "Operation nicht mit dem Transaktionstyp kompatibel" +msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel" #: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 msgid "could not commit transaction" -msgstr "Konnte die Transaktion nicht übergeben" +msgstr "Konnte den Vorgang nicht durchführen" #: lib/libalpm/error.c:99 msgid "could not download all files" @@ -899,7 +898,7 @@ msgstr "Paket ist bereits installiert" #: lib/libalpm/error.c:112 msgid "package not installed or lesser version" -msgstr "Paket ist nicht installiert oder kleinere Version" +msgstr "Paket ist nicht installiert oder ältere Version" #: lib/libalpm/error.c:114 msgid "cannot remove all files for package" @@ -915,7 +914,7 @@ msgstr "Beschädigtes Paket" #: lib/libalpm/error.c:120 msgid "no such repository" -msgstr "Kein solches Repository" +msgstr "Kein solches Repositorium" #: lib/libalpm/error.c:123 msgid "group not found" @@ -935,7 +934,7 @@ msgstr "In Konflikt stehende Dateien" #: lib/libalpm/error.c:133 msgid "user aborted the operation" -msgstr "Benutzerabbruch" +msgstr "Benutzer brach die Aktion ab" #: lib/libalpm/error.c:135 msgid "internal error" @@ -943,7 +942,7 @@ msgstr "Interner Fehler" #: lib/libalpm/error.c:137 msgid "libarchive error" -msgstr "libarchive Fehler" +msgstr "libarchive-Fehler" #: lib/libalpm/error.c:139 msgid "not enough space on disk" @@ -984,7 +983,7 @@ msgstr "Unerwarteter Fehler" #: lib/libalpm/handle.c:163 #, c-format msgid "cannot canonicalize specified root path '%s'" -msgstr "kann das spezifizierte Wurzelverzeichnis nicht anerkennen '%s'" +msgstr "Kann das spezifizierte Wurzelverzeichnis nicht anerkennen '%s'" #: lib/libalpm/handle.c:175 #, c-format @@ -1009,12 +1008,12 @@ msgstr "%s kann nicht geöffnet werden\n" #: lib/libalpm/md5driver.c:74 #, c-format msgid "md5(%s) = %s" -msgstr "md5(%s) = %s" +msgstr "MD5(%s) = %s" #: lib/libalpm/package.c:150 #, c-format msgid "%s: forcing upgrade to version %s" -msgstr "%s: Erzwungenes Update auf Version %s" +msgstr "%s: Erzwungene Aktualisierung auf Version %s" #: lib/libalpm/package.c:155 #, c-format @@ -1029,7 +1028,7 @@ msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)" #: lib/libalpm/package.c:169 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" -msgstr "%s-%s: Verzögere Paketaktualisierung (%s)" +msgstr "%s-%s: Verzögere die Aktualisierung von Paket (%s)" #: lib/libalpm/package.c:220 lib/libalpm/package.c:279 #, c-format @@ -1038,7 +1037,7 @@ msgstr "%s: Falscher Syntax in Beschreibungsdatei, Zeile %d" #: lib/libalpm/package.c:353 msgid "could not parse the package description file" -msgstr "Konnte Paketbeschreibungsdatei nicht analysieren" +msgstr "Konnte Paket-Beschreibungsdatei nicht analysieren" #: lib/libalpm/package.c:357 #, c-format @@ -1058,26 +1057,26 @@ msgstr "Konnte tempfile %s nicht entfernen" #: lib/libalpm/package.c:409 lib/libalpm/package.c:416 #, c-format msgid "error while reading package: %s" -msgstr "Fehler beim Paketlesen: %s" +msgstr "Fehler beim Lesen des Paketes: %s" #: lib/libalpm/package.c:422 msgid "missing package metadata" -msgstr "Fehlende Paketdaten" +msgstr "Fehlende Paket-Metadaten" #: lib/libalpm/package.c:429 #, c-format msgid "missing package filelist in %s, generating one" -msgstr "Fehlende Paketdateiliste in %s, erstelle eine" +msgstr "Fehlende Paket-Dateiliste in %s, erstelle eine" #: lib/libalpm/package.c:568 #, c-format msgid "adding '%s' in requiredby field for '%s'" -msgstr "Füge '%s' zum requiredby Feld für '%s' hinzu" +msgstr "Füge '%s' zum requiredby-Feld für '%s' hinzu" #: lib/libalpm/package.c:582 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" -msgstr "Füge '%s' zum requiredby Feld für '%s' hinzu (stellt bereit: %s)" +msgstr "Füge '%s' zum requiredby-Feld für '%s' hinzu (stellt bereit: %s)" #: lib/libalpm/remove.c:79 #, c-format @@ -1087,12 +1086,12 @@ msgstr "Konnte %s nicht in der Datenbank finden" #: lib/libalpm/remove.c:93 #, c-format msgid "adding %s in the targets list" -msgstr "füge %s zur Liste hinzu" +msgstr "Füge %s zur Ziel-Liste hinzu" #: lib/libalpm/remove.c:121 #, c-format msgid "pulling %s in the targets list" -msgstr "Füge %s der Ziel-Liste hinzu" +msgstr "Ziehe %s in die Ziel-Liste" #: lib/libalpm/remove.c:124 #, c-format @@ -1136,7 +1135,7 @@ msgstr "%s ist in trans->skip_remove, überspringe das Entfernen" #: lib/libalpm/remove.c:250 #, c-format msgid "transaction is set to NOSAVE, not backing up '%s'" -msgstr "Transaktion wurde auf NOSAVE gesetzt, '%s' wird nicht gesichert" +msgstr "Vorgang wurde auf NOSAVE gesetzt, '%s' wird nicht gesichert" #: lib/libalpm/remove.c:254 #, c-format @@ -1166,17 +1165,17 @@ msgstr "Entferne %d Dateien" #: lib/libalpm/remove.c:337 #, c-format msgid "removing database entry '%s'" -msgstr "Entferne Datenbankeintrag '%s'" +msgstr "Entferne Datenbank-Eintrag '%s'" #: lib/libalpm/remove.c:339 #, c-format msgid "could not remove database entry %s-%s" -msgstr "Konnte Datenbankeintrag %s-%s nicht entfernen" +msgstr "Konnte Datenbank-Eintrag %s-%s nicht entfernen" #: lib/libalpm/remove.c:344 #, c-format msgid "could not remove entry '%s' from cache" -msgstr "Konnte Eintrag '%s' nicht aus dem Cache entfernen" +msgstr "Konnte Eintrag '%s' nicht aus dem Puffer entfernen" #: lib/libalpm/sha1.c:397 #, c-format @@ -1190,7 +1189,7 @@ msgstr "sha1(%s) = %s" #: lib/libalpm/sync.c:183 msgid "checking for package upgrades" -msgstr "Prüfe auf Paketaktualisierungen" +msgstr "Suche nach Paketaktualisierungen" #: lib/libalpm/sync.c:215 #, c-format @@ -1205,7 +1204,7 @@ msgstr "Suche nach Ziel in Repositorium '%s'" #: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 #, c-format msgid "target '%s' not found -- looking for provisions" -msgstr "Ziel '%s' wurde nicht gefunden -- suche nach Vorherigen" +msgstr "Ziel '%s' wurde nicht gefunden -- suche nach Ähnlichem" #: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 #, c-format @@ -1225,7 +1224,7 @@ msgstr "%s-%s ist aktuell -- Überspringe" #: lib/libalpm/sync.c:346 #, c-format msgid "adding target '%s' to the transaction set" -msgstr "Füge das Ziel '%s' zur Transaktion hinzu" +msgstr "Füge das Ziel '%s' zur Vorgangsliste hinzu" #: lib/libalpm/sync.c:394 msgid "resolving target's dependencies" @@ -1234,11 +1233,11 @@ msgstr "Auflösen von Ziel-Abhängigkeiten" #: lib/libalpm/sync.c:414 #, c-format msgid "adding package %s-%s to the transaction targets" -msgstr "Füge Ziel %s-%s zur Transaktion hinzu" +msgstr "Füge Paket %s-%s zur Vorgangszielen hinzu" #: lib/libalpm/sync.c:455 msgid "looking for unresolvable dependencies" -msgstr "Suche nach ungelösten Abhängigkeiten" +msgstr "Suche nach unlösbaren Abhängigkeiten" #: lib/libalpm/sync.c:486 #, c-format @@ -1248,17 +1247,17 @@ msgstr "Paket '%s' steht im Konflikt mit '%s'" #: lib/libalpm/sync.c:508 #, c-format msgid "'%s' not found in transaction set -- skipping" -msgstr "'%s' wurde nicht in der Übertragung gefunden -- überspringe" +msgstr "'%s' wurde nicht in der Vorgangsliste gefunden -- überspringe" #: lib/libalpm/sync.c:519 #, c-format msgid "package '%s' provides its own conflict" -msgstr "Paket '%s' liefert seinen eigenen Konflikt" +msgstr "Paket '%s' steht im Konflikt mit sich selbst" #: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 #, c-format msgid "'%s' is in the target list -- keeping it" -msgstr "'%s' ist in der Ziel-Liste -- behalte es" +msgstr "'%s' ist in der Ziel-Liste -- ich behalte es" #: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 #, c-format @@ -1285,7 +1284,7 @@ msgstr "Überprüfe die Abhängigkeiten der zu entfernenden Pakete" #: lib/libalpm/sync.c:684 msgid "something has gone horribly wrong" -msgstr "etwas ist schief gegangen" +msgstr "etwas ist fürchterlich schief gegangen" #: lib/libalpm/sync.c:704 #, c-format @@ -1309,11 +1308,11 @@ msgstr "Warnung: Es existiert kein %s Puffer. Erstelle..." #: lib/libalpm/sync.c:817 msgid "couldn't create package cache, using /tmp instead\n" -msgstr "Konnte Paketpuffer nicht erstellen, benutze /tmp stattdessen\n" +msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n" #: lib/libalpm/sync.c:818 msgid "warning: couldn't create package cache, using /tmp instead" -msgstr "Warnung: Konnte Paketpuffer nicht erstellen; benutze /tmp stattdessen" +msgstr "Warnung: Konnte Paketpuffer nicht erstellen; benutze stattdessen /tmp" #: lib/libalpm/sync.c:825 #, c-format @@ -1323,25 +1322,25 @@ msgstr "Konnte manche Dateien von %s nicht übertragen\n" #: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" -msgstr "Kann MD5 oder SHA1 Prüfsumme für Paket %s nicht ermitteln\n" +msgstr "Kann MD5- oder SHA1-Prüfsumme für Paket %s nicht ermitteln\n" #: lib/libalpm/sync.c:886 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" -msgstr "Archiv %s war beschädigt (falsche MD5 oder SHA1 Prüfsumme)\n" +msgstr "Archiv %s war beschädigt (falsche MD5- oder SHA1-Prüfsumme)\n" #: lib/libalpm/sync.c:888 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" -msgstr "Archiv %s ist beschädigt (falsche MD5 oder SHA1 Prüfsumme)\n" +msgstr "Archiv %s ist beschädigt (falsche MD5- oder SHA1-Prüfsumme)\n" #: lib/libalpm/sync.c:909 msgid "could not create removal transaction" -msgstr "Konnte die Lösch-Transaktion nicht erstellen" +msgstr "Konnte den Lösch-Vorgang nicht erstellen" #: lib/libalpm/sync.c:915 msgid "could not initialize the removal transaction" -msgstr "Konnte die Lösch-Transaktion nicht initialisieren" +msgstr "Konnte den Lösch-Vorgang nicht beginnen" #: lib/libalpm/sync.c:935 msgid "removing conflicting and to-be-replaced packages" @@ -1349,11 +1348,11 @@ msgstr "Entferne im Konflikt stehende und zu ersetzende Pakete" #: lib/libalpm/sync.c:937 msgid "could not prepare removal transaction" -msgstr "Konnte Lösch-Transaktion nicht vorbereiten" +msgstr "Konnte Lösch-Vorgang nicht vorbereiten" #: lib/libalpm/sync.c:943 msgid "could not commit removal transaction" -msgstr "Konnte Lösche-Transaktion nicht übergeben" +msgstr "Konnte Lösch-Vorgang nicht durchführen" #: lib/libalpm/sync.c:950 msgid "installing packages" @@ -1361,29 +1360,29 @@ msgstr "Installiere Pakete" #: lib/libalpm/sync.c:953 msgid "could not create transaction" -msgstr "Konnte die Transaktion nicht erstellen" +msgstr "Konnte den Vorgang nicht erstellen" #: lib/libalpm/sync.c:958 msgid "could not initialize transaction" -msgstr "Konnte die Transaktion nicht initialisieren" +msgstr "Konnte den Vorgang nicht beginnen" #: lib/libalpm/sync.c:981 msgid "could not prepare transaction" -msgstr "Konnte die Transaktion nicht vorbereiten" +msgstr "Konnte den Vorgang nicht vorbereiten" #: lib/libalpm/sync.c:993 msgid "updating database for replaced packages' dependencies" -msgstr "Aktualisiere Datenbank für ersetzte Paketabhängigkeiten" +msgstr "Aktualisiere Datenbank für die Abhängigkeiten der ersetzten Pakete" #: lib/libalpm/sync.c:1022 #, c-format msgid "could not update requiredby for database entry %s-%s" -msgstr "Konnte requiredby für Datenbankeintrag %s-%s nicht aktualisieren" +msgstr "Konnte requiredby für Datenbank-Eintrag %s-%s nicht aktualisieren" #: lib/libalpm/sync.c:1031 #, c-format msgid "could not update new database entry %s-%s" -msgstr "Konnte neuen Datenbankeintrag %s-%s nicht aktualisieren" +msgstr "Konnte neuen Datenbank-Eintrag %s-%s nicht aktualisieren" #: lib/libalpm/sync.c:1071 #, c-format @@ -1393,12 +1392,12 @@ msgstr "Paket '%s-%s' gefunden" #: lib/libalpm/sync.c:1077 #, c-format msgid "package '%s' not found in sync" -msgstr "Paket '%s' nicht gefunden" +msgstr "Paket '%s' nicht in Datenbank gefunden" #: lib/libalpm/trans.c:270 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" -msgstr "Aktualisiere 'requiredby' Felder abhängiger Pakete für %s-%s" +msgstr "Aktualisiere requiredby-Felder abhängiger Pakete für %s-%s" #: lib/libalpm/trans.c:273 msgid "package has no dependencies, no other packages to update" @@ -1409,12 +1408,12 @@ msgstr "" #: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 #, c-format msgid "updating 'requiredby' field for package '%s'" -msgstr "Aktualisiere 'requiredby' Feld für Paket '%s'" +msgstr "Aktualisiere requiredby-Feld für Paket '%s'" #: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 #, c-format msgid "could not update 'requiredby' database entry %s-%s" -msgstr "Konnte 'requiredby' Eintrag %s-%s nicht aktualisieren" +msgstr "Konnte requiredby-Eintrag %s-%s nicht aktualisieren" #: lib/libalpm/trans.c:332 #, c-format @@ -1424,7 +1423,7 @@ msgstr "Konnte Abhängigkeit '%s' nicht finden" #: lib/libalpm/util.c:142 #, c-format msgid "failed to make path '%s' : %s" -msgstr "konnte Pfad nicht erstellen '%s' : %s" +msgstr "Konnte Pfad nicht erstellen '%s' : %s" #: lib/libalpm/util.c:280 #, c-format @@ -1443,7 +1442,7 @@ msgstr "Log-Aktion aufgerufen: %s" #: lib/libalpm/util.c:445 msgid "could not create temp directory" -msgstr "Konnte temp Verzeichnis nicht erstellen" +msgstr "Konnte temp-Verzeichnis nicht erstellen" #: lib/libalpm/util.c:472 #, c-format @@ -1453,7 +1452,7 @@ msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)" #: lib/libalpm/util.c:476 #, c-format msgid "executing %s script..." -msgstr "Führe %s Skript aus ..." +msgstr "Führe %s-Skript aus ..." #: lib/libalpm/util.c:489 #, c-format @@ -1463,12 +1462,12 @@ msgstr "Konnte keinen neuen Prozess starten (%s)" #: lib/libalpm/util.c:496 #, c-format msgid "chrooting in %s" -msgstr "Wechsel root zu %s" +msgstr "chroot in %s" #: lib/libalpm/util.c:498 #, c-format msgid "could not change the root directory (%s)" -msgstr "Konnte root Verzeichnis nicht wechseln (%s)" +msgstr "Konnte root-Verzeichnis nicht wechseln (%s)" #: lib/libalpm/util.c:502 #, c-format @@ -1483,12 +1482,12 @@ msgstr "Führe \"%s\" aus" #: lib/libalpm/util.c:509 #, c-format msgid "call to popen failed (%s)" -msgstr "Aufruf von popen fehlgeschlagen (%s)" +msgstr "Aufruf von 'popen' fehlgeschlagen (%s)" #: lib/libalpm/util.c:541 #, c-format msgid "call to waitpid failed (%s)" -msgstr "Aufruf von waitpid fehlgeschlagen (%s)" +msgstr "Aufruf von 'waitpid' fehlgeschlagen (%s)" #: lib/libalpm/util.c:550 #, c-format @@ -1498,7 +1497,7 @@ msgstr "Konnte tmpdir %s nicht entfernen" #: lib/libalpm/util.c:607 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" -msgstr "Prüfe freien Speicher: Gesamte pkg Größe: %lld, Speicherplatz: %lld" +msgstr "Prüfe freien Speicher: Gesamte pkg-Größe: %lld, Speicherplatz: %lld" #: lib/libalpm/versioncmp.c:279 #, c-format diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index f84ae482..4bb71302 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-23 18:08+0100\n" -"Last-Translator: Pierre Schmitz \n" +"Last-Translator: Matthias Gorissen \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,12 +42,12 @@ msgstr "Konnte Paket '%s' nicht hinzufügen (%s)" #: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105 #: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142 msgid "done.\n" -msgstr "fertig.\n" +msgstr "Fertig.\n" #: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616 #, c-format msgid "failed to prepare transaction (%s)\n" -msgstr "Konnte Aktion nicht vorbereiten (%s)\n" +msgstr "Konnte Vorgang nicht vorbereiten (%s)\n" #: src/pacman/add.c:104 #, c-format @@ -293,7 +293,7 @@ msgstr "FEHLEND\t\t%s\n" #: src/pacman/package.c:206 #, c-format msgid "(none)\n" -msgstr "(nichts)\n" +msgstr "(Nichts)\n" #: src/pacman/package.c:246 #, c-format @@ -352,7 +352,7 @@ msgstr "" #: src/pacman/pacman.c:101 #, c-format msgid "usage: %s {-A --add} [options] \n" -msgstr "Benutzung: %s {-A -add} [Optionen] \n" +msgstr "Verwendung: %s {-A -add} [Optionen] \n" #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138 @@ -375,7 +375,7 @@ msgstr "" #: src/pacman/pacman.c:106 #, c-format msgid "usage: %s {-R --remove} [options] \n" -msgstr "Benutzung: %s {-R --remove} [Optionen] \n" +msgstr "Verwendung: %s {-R --remove} [Optionen] \n" #: src/pacman/pacman.c:108 #, c-format @@ -406,17 +406,17 @@ msgstr "" #: src/pacman/pacman.c:115 #, c-format msgid "usage: %s {-F --freshen} [options] \n" -msgstr "Benutzung: %s {-F --freshen} [Optionen] \n" +msgstr "Verwendung: %s {-F --freshen} [Optionen] \n" #: src/pacman/pacman.c:117 #, c-format msgid "usage: %s {-U --upgrade} [options] \n" -msgstr "Benutzung: %s {-U --upgrade} [Optionen] \n" +msgstr "Verwendung: %s {-U --upgrade} [Optionen] \n" #: src/pacman/pacman.c:123 #, c-format msgid "usage: %s {-Q --query} [options] [package]\n" -msgstr "Benutzung: %s {-Q --query} [Optionen] [Pakete]\n" +msgstr "Verwendung: %s {-Q --query} [Optionen] [Pakete]\n" #: src/pacman/pacman.c:125 #, c-format @@ -440,12 +440,12 @@ msgstr " wurden, aber nicht mehr benötigt werden\n" #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format msgid " -g, --groups view all members of a package group\n" -msgstr " -g, --groups Zeige alle Mitglieder einer Paket-Gruppe an\n" +msgstr " -g, --groups Zeigt alle Mitglieder einer Paket-Gruppe an\n" #: src/pacman/pacman.c:129 src/pacman/pacman.c:144 #, c-format msgid " -i, --info view package information\n" -msgstr " -i, --info Zeige Paketinformationen an\n" +msgstr " -i, --info Zeigt Paketinformationen an\n" #: src/pacman/pacman.c:130 #, c-format @@ -457,7 +457,7 @@ msgstr " -l, --list Zeigt den Inhalt des abgefragten Paketes an\n" msgid "" " -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" -" -m, --foreign Zeigt alle Pakete an, die nicht in den Sync db(s)\n" +" -m, --foreign Zeigt alle Pakete an, die nicht in den Sync-db(s)\n" " gefunden wurden\n" #: src/pacman/pacman.c:132 @@ -507,7 +507,7 @@ msgstr " -e, --dependsonly Nur Abhängigkeiten installieren\n" #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list view a list of packages in a repo\n" -msgstr " -l, --list Liste aller Pakete eines Repositoriums\n" +msgstr " -l, --list Zeigt eine Liste aller Pakete eines Repositoriums an\n" #: src/pacman/pacman.c:146 #, c-format @@ -551,7 +551,7 @@ msgid "" " --ignore ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore Ignoriere ein neues Paket (kann mehrfach genutzt\n" +" --ignore Ignoriert ein neues Paket (kann mehrfach genutzt\n" " werden)\n" #: src/pacman/pacman.c:153 @@ -595,7 +595,7 @@ msgstr " -v, --verbose Sei gesprächig\n" #, c-format msgid " -r, --root set an alternate installation root\n" msgstr "" -" -r, --root Benutze ein alternatives Wurzelverzeichnis zur\n" +" -r, --root Setzt ein alternatives Wurzelverzeichnis zur\n" " Installation\n" #: src/pacman/pacman.c:160 @@ -616,7 +616,7 @@ msgstr " Dieses Programm ist frei verfügbar unter\n" #: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr " der GNU General Public License\n" +msgstr " den Bedingungen der GNU General Public License\n" #: src/pacman/pacman.c:300 #, c-format @@ -631,7 +631,7 @@ msgstr "'%s' ist kein gültiges Paketpuffer-Verzeichnis\n" #: src/pacman/pacman.c:333 #, c-format msgid "'%s' is not a valid db path\n" -msgstr "'%s' ist kein gültiger Db-Pfad\n" +msgstr "'%s' ist kein gültiger db-Pfad\n" #: src/pacman/pacman.c:363 #, c-format @@ -660,7 +660,7 @@ msgstr "Sie benötigen root-Rechte, um diese Operation ausführen zu können\n" #: src/pacman/pacman.c:505 #, c-format msgid "failed to parse config (%s)\n" -msgstr "Konnte Konfiguration nicht lesen (%s)\n" +msgstr "Konnte Konfiguration (%s) nicht lesen\n" #: src/pacman/pacman.c:516 msgid "Targets :" @@ -669,7 +669,7 @@ msgstr "Pakete :" #: src/pacman/pacman.c:522 #, c-format msgid "could not register 'local' database (%s)\n" -msgstr "Kein auf die lokale Datenbank (%s)\n" +msgstr "Kein Zugriff auf die lokale Datenbank (%s)\n" #: src/pacman/pacman.c:529 msgid "no targets specified (use -h for help)\n" @@ -690,12 +690,12 @@ msgstr "Fehler beim Lesen der Datei '%s': %s" #: src/pacman/query.c:100 msgid "cannot determine ownership of a directory" -msgstr "konnte den Besitzer eines Verzeichnisses nicht ermitteln" +msgstr "Konnte den Besitzer eines Verzeichnisses nicht ermitteln" #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "konnte den wahren Pfad für '%s' nicht ermitteln: %s" +msgstr "Konnte den wahren Pfad für '%s' nicht ermitteln: %s" #: src/pacman/query.c:119 #, c-format @@ -745,7 +745,7 @@ msgstr ":: Gruppe %s:\n" #: src/pacman/remove.c:63 msgid " Remove whole content? [Y/n] " -msgstr " Den gesamten Inhalt entfernen? [J/n] " +msgstr " Gesamten Inhalt entfernen? [J/n] " #: src/pacman/remove.c:67 #, c-format @@ -781,31 +781,31 @@ msgstr "" #: src/pacman/sync.c:115 msgid "Do you want to remove old packages from cache? [Y/n] " -msgstr "Möchten Sie alte Pakete aus dem Cache entfernen? [J/n] " +msgstr "Möchten Sie alte Pakete aus dem Puffer entfernen? [J/n] " #: src/pacman/sync.c:117 msgid "removing old packages from cache... " -msgstr "Entferne alte Pakete aus dem Cache... " +msgstr "Entferne alte Pakete aus dem Puffer... " #: src/pacman/sync.c:120 msgid "could not access cache directory\n" -msgstr "Konnte nicht auf Cache-Verzeichnis zugreifen\n" +msgstr "Konnte nicht auf Puffer-Verzeichnis zugreifen\n" #: src/pacman/sync.c:181 msgid "Do you want to remove all packages from cache? [Y/n] " -msgstr "Wollen Sie alle Pakete aus dem Cache entfernen? [J/n] " +msgstr "Wollen Sie alle Pakete aus dem Puffer entfernen? [J/n] " #: src/pacman/sync.c:183 msgid "removing all packages from cache... " -msgstr "Entferne alle Pakete aus dem Cache... " +msgstr "Entferne alle Pakete aus dem Puffer... " #: src/pacman/sync.c:186 msgid "could not remove cache directory\n" -msgstr "Konnte Cache-Verzeichnis nicht entfernen\n" +msgstr "Konnte Puffer-Verzeichnis nicht entfernen\n" #: src/pacman/sync.c:191 msgid "could not create new cache directory\n" -msgstr "Konnte neues Cache-Verzeichnis nicht erstellen\n" +msgstr "Konnte neues Puffer-Verzeichnis nicht erstellen\n" #: src/pacman/sync.c:218 #, c-format @@ -908,11 +908,11 @@ msgstr "'%s': nicht in Synchronisations-Datenbank gefunden\n" #: src/pacman/sync.c:621 msgid "requires" -msgstr "benötigt" +msgstr "Benötigt" #: src/pacman/sync.c:663 msgid " local database is up to date\n" -msgstr " lokale Datenbank ist aktuell\n" +msgstr " Lokale Datenbank ist aktuell\n" #: src/pacman/sync.c:672 msgid "" @@ -1019,7 +1019,7 @@ msgstr ":: %s ist als ein HoldPkg gekennzeichnet. Trotzdem entfernen? [J/n] " #: src/pacman/trans.c:203 #, c-format msgid ":: Replace %s with %s/%s? [Y/n] " -msgstr ":: %s mit %s/%s ersetzen? [J/n] " +msgstr ":: %s durch %s/%s ersetzen? [J/n] " #: src/pacman/trans.c:218 #, c-format @@ -1051,7 +1051,7 @@ msgstr "Aktualisiere" #: src/pacman/trans.c:332 msgid "removing" -msgstr "entferne" +msgstr "Entferne" #: src/pacman/trans.c:335 msgid "checking for file conflicts" -- cgit v1.2.3-70-g09d2 From eb448f222a5fd32158f5840ccf11c01338701104 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 17 Apr 2007 03:56:52 +0000 Subject: makepkg: unset one more language variable --- scripts/makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg b/scripts/makepkg index 9e38a6dd..618dbdf3 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -881,7 +881,7 @@ else msg "Starting build()..." # some applications (eg, blackbox) will not build with some languages - unset LC_ALL LANG + unset LC_ALL LC_MESSAGES LANG umask 0022 # ensure CFLAGS and CXXFLAGS are used -- cgit v1.2.3-70-g09d2 From 1a42b23187941fa4b283e6f56a063455427c1e8e Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 18 Apr 2007 05:50:00 +0000 Subject: * Alexander Baldeck Bugfix for FS#6944 --- scripts/makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg b/scripts/makepkg index 618dbdf3..ebd6b543 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -822,7 +822,7 @@ else *application/x-cpio*) cmd="bsdtar -x -f $file" ;; *application/x-gzip*) - cmd="gunzip -f $file" ;; + cmd="gunzip -d -f $file" ;; *application/x-bzip*) cmd="bunzip2 -f $file" ;; esac -- cgit v1.2.3-70-g09d2 From 8af5c8d421c6c833a467fb16400aa4c22d2e7ab8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 23 Apr 2007 02:56:11 +0000 Subject: Added Spanish Translation. Juan Pablo González T. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/libalpm/po/LINGUAS | 5 +- lib/libalpm/po/es.po | 1547 ++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/LINGUAS | 5 +- src/pacman/po/es.po | 1080 +++++++++++++++++++++++++++++++++ 4 files changed, 2633 insertions(+), 4 deletions(-) create mode 100644 lib/libalpm/po/es.po create mode 100644 src/pacman/po/es.po diff --git a/lib/libalpm/po/LINGUAS b/lib/libalpm/po/LINGUAS index db14c2ff..8c249f79 100644 --- a/lib/libalpm/po/LINGUAS +++ b/lib/libalpm/po/LINGUAS @@ -1,9 +1,10 @@ # Set of available languages. de +en_GB +es fr hu it +pl_PL pt_BR -en_GB ru_RU -pl_PL diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po new file mode 100644 index 00000000..6ae01122 --- /dev/null +++ b/lib/libalpm/po/es.po @@ -0,0 +1,1547 @@ +msgid "" +msgstr "" +"Project-Id-Version: libalpm\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2007-04-20 21:19-0300\n" +"Last-Translator: Juan Pablo González Tognarelli \n" +"Language-Team: juan pablo gonzález tognarelli \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: CHILE\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: lib/libalpm/add.c:77 +#, c-format +msgid "loading target '%s'" +msgstr "cargando el archivo '%s'" + +#: lib/libalpm/add.c:122 +#, c-format +msgid "replacing older version %s-%s by %s in target list" +msgstr "reemplazando la versión antigua %s-%s por %s en la lista de objetivos" + +#: lib/libalpm/add.c:131 +#, c-format +msgid "newer version %s-%s is in the target list -- skipping" +msgstr "una nueva versión %s-%s esta en la lista de objetivos list -- saltándola" + +#: lib/libalpm/add.c:138 +#, c-format +msgid "reading '%s' metadata" +msgstr "leyendo los metadatos '%s'" + +#: lib/libalpm/add.c:191 +#: lib/libalpm/remove.c:111 +msgid "looking for unsatisfied dependencies" +msgstr "buscando por dependencias no satisfechas" + +#: lib/libalpm/add.c:203 +#: lib/libalpm/sync.c:475 +msgid "looking for conflicts" +msgstr "buscando por conflictos" + +#: lib/libalpm/add.c:208 +msgid "replacing packages with -A and -U is not supported yet" +msgstr "el reemplazo de paqutes con -A y -U aún no esta soportado" + +#: lib/libalpm/add.c:209 +#, c-format +msgid "please remove '%s' first, using -Rd" +msgstr "por favor quitar '%s' primero, usando -Rd" + +#: lib/libalpm/add.c:250 +#: lib/libalpm/remove.c:147 +msgid "sorting by dependencies" +msgstr "ordenando por dependencias" + +#: lib/libalpm/add.c:262 +msgid "cleaning up" +msgstr "limpiando" + +#: lib/libalpm/add.c:277 +msgid "looking for file conflicts" +msgstr "buscando por conflictos de archivos" + +#: lib/libalpm/add.c:346 +#, c-format +msgid "upgrading package %s-%s" +msgstr "actualizando el paquete %s-%s" + +#: lib/libalpm/add.c:370 +#, c-format +msgid "adding package %s-%s" +msgstr "agregando el paquete %s-%s" + +#: lib/libalpm/add.c:383 +#, c-format +msgid "removing old package first (%s-%s)" +msgstr "quitando el paquete antiguo primero (%s-%s)" + +#: lib/libalpm/add.c:411 +#, c-format +msgid "adding %s to the NoUpgrade array temporarily" +msgstr "agregando %s al arreglo NoUpgrade temporalmente" + +#: lib/libalpm/add.c:429 +msgid "extracting files" +msgstr "descomprimiendo archivos" + +#: lib/libalpm/add.c:444 +#: lib/libalpm/util.c:465 +msgid "could not get current working directory" +msgstr "no se pudo obtener el directorio de trabajo actual" + +#: lib/libalpm/add.c:500 +#: lib/libalpm/add.c:501 +#, c-format +msgid "%s is in NoExtract, skipping extraction" +msgstr "%s está en NoExtract. Saltando la extracción" + +#: lib/libalpm/add.c:508 +#, c-format +msgid "%s is in trans->skip_add, skipping extraction" +msgstr "%s esta en la extracción trans->skip_add, skipping" + +#: lib/libalpm/add.c:554 +#: lib/libalpm/add.c:555 +#: lib/libalpm/add.c:704 +#, c-format +msgid "could not extract %s (%s)" +msgstr "no se pudo extraer %s (%s)" + +#: lib/libalpm/add.c:598 +#, c-format +msgid "checking md5 hashes for %s" +msgstr "verificando los hash md5 para %s" + +#: lib/libalpm/add.c:600 +#, c-format +msgid "checking sha1 hashes for %s" +msgstr "verificando los hash SHA1 para %s" + +#: lib/libalpm/add.c:602 +#, c-format +msgid "current: %s" +msgstr "actual: %s" + +#: lib/libalpm/add.c:603 +#, c-format +msgid "new: %s" +msgstr "nuevo: %s" + +#: lib/libalpm/add.c:604 +#, c-format +msgid "original: %s" +msgstr "original: %s" + +#: lib/libalpm/add.c:616 +#, c-format +msgid "could not rename %s (%s)" +msgstr "no se pudo renombrar %s (%s)" + +#: lib/libalpm/add.c:617 +#, c-format +msgid "error: could not rename %s (%s)" +msgstr "error: no se pudo renombrar %s (%s)" + +#: lib/libalpm/add.c:623 +#: lib/libalpm/add.c:642 +#, c-format +msgid "could not copy tempfile to %s (%s)" +msgstr "no se pudo copiar el archivo temporal a %s (%s)" + +#: lib/libalpm/add.c:624 +#, c-format +msgid "error: could not copy tempfile to %s (%s)" +msgstr "error: no se pudo copiar el archivo temporal a %s (%s)" + +#: lib/libalpm/add.c:628 +#: lib/libalpm/remove.c:247 +#, c-format +msgid "%s saved as %s" +msgstr "%s guardado como %s" + +#: lib/libalpm/add.c:629 +#, c-format +msgid "warning: %s saved as %s" +msgstr "advertencia: %s guardado como %s" + +#: lib/libalpm/add.c:639 +#, c-format +msgid "action: installing new file: %s" +msgstr "acción: instalando nuevo archivo: %s" + +#: lib/libalpm/add.c:649 +#: lib/libalpm/add.c:655 +#: lib/libalpm/add.c:660 +msgid "action: leaving existing file in place" +msgstr "acción: dejando el archivo existente en su lugar" + +#: lib/libalpm/add.c:663 +msgid "action: keeping current file and installing new one with .pacnew ending" +msgstr "action:manteniendo el archivo actual e instalando un no nuevo con postfijo .pacnew" + +#: lib/libalpm/add.c:666 +#, c-format +msgid "could not install %s as %s: %s" +msgstr "no se pudo instalar %s como %s: %s" + +#: lib/libalpm/add.c:667 +#, c-format +msgid "error: could not install %s as %s: %s" +msgstr "error: no se pudo instalar %s como %s: %s" + +#: lib/libalpm/add.c:669 +#, c-format +msgid "%s installed as %s" +msgstr "%s instalado como %s" + +#: lib/libalpm/add.c:670 +#, c-format +msgid "warning: %s installed as %s" +msgstr "advertencia: %s instalado como %s" + +#: lib/libalpm/add.c:684 +#, c-format +msgid "%s is in NoUpgrade -- skipping" +msgstr "%s esta en en los no actualizables -- saltando" + +#: lib/libalpm/add.c:685 +#, c-format +msgid "extracting %s as %s.pacnew" +msgstr "descomprimiendo %s como %s.pacnew" + +#: lib/libalpm/add.c:686 +#, c-format +msgid "warning: extracting %s as %s.pacnew" +msgstr "advertencia: descomprimiendo %s como %s.pacnew" + +#: lib/libalpm/add.c:689 +#, c-format +msgid "extracting %s" +msgstr "descomprimiendo %s" + +#: lib/libalpm/add.c:705 +#, c-format +msgid "error: could not extract %s (%s)" +msgstr "error: no se pudo descomprimir %s (%s)" + +#: lib/libalpm/add.c:717 +#, c-format +msgid "appending backup entry for %s" +msgstr "agregando la entrada de respaldo para %s" + +#: lib/libalpm/add.c:749 +#: lib/libalpm/add.c:751 +#, c-format +msgid "errors occurred while %s %s" +msgstr "ocurrieron errores mientras %s %s" + +#: lib/libalpm/add.c:750 +#: lib/libalpm/add.c:752 +msgid "upgrading" +msgstr "actualizando" + +#: lib/libalpm/add.c:750 +#: lib/libalpm/add.c:752 +msgid "installing" +msgstr "instalando" + +#: lib/libalpm/add.c:769 +#, c-format +msgid "provision '%s' has been removed from package %s (%s => %s)" +msgstr "el provisional '%s' ha sido eliminado desde el paquete %s (%s => %s)" + +#: lib/libalpm/add.c:781 +#, c-format +msgid "updating '%s' due to provision change (%s)" +msgstr "actualizando '%s' debido a un cambio de provisiones (%s)" + +#: lib/libalpm/add.c:785 +#: lib/libalpm/add.c:786 +#, c-format +msgid "could not update provision '%s' from '%s'" +msgstr "no se pudo actualizar la provisión '%s' desde '%s'" + +#: lib/libalpm/add.c:799 +#: lib/libalpm/remove.c:336 +msgid "updating database" +msgstr "actualizando la base de datos" + +#: lib/libalpm/add.c:800 +#, c-format +msgid "adding database entry '%s'" +msgstr "agregando a la base de datos '%s'" + +#: lib/libalpm/add.c:803 +#: lib/libalpm/add.c:805 +#, c-format +msgid "could not update database entry %s-%s" +msgstr "no se pudo actualizar en la base de datos la entrada %s-%s" + +#: lib/libalpm/add.c:811 +#, c-format +msgid "could not add entry '%s' in cache" +msgstr "no se pudo agregar '%s' en la cache" + +#: lib/libalpm/add.c:841 +#: lib/libalpm/remove.c:363 +#: lib/libalpm/sync.c:1047 +#, c-format +msgid "running \"ldconfig -r %s\"" +msgstr "ejecutando \"ldconfig -r %s\"" + +#: lib/libalpm/alpm.c:116 +#, c-format +msgid "removing DB %s, %d remaining..." +msgstr "quitando la base de datos %s, %d quedando..." + +#: lib/libalpm/alpm.c:181 +#, c-format +msgid "unregistering database '%s'" +msgstr "desmarcando la base de datos '%s'" + +#: lib/libalpm/alpm.c:186 +#, c-format +msgid "closing database '%s'" +msgstr "cerrando la base de datos '%s'" + +#: lib/libalpm/alpm.c:232 +#, c-format +msgid "adding new server to database '%s': protocol '%s', server '%s', path '%s'" +msgstr "agregando un nuevo servidor a la base de datos '%s': protocolo '%s', servidor '%s', ruta '%s'" + +#: lib/libalpm/alpm.c:236 +#, c-format +msgid "serverlist flushed for '%s'" +msgstr "lista de servidores se ha barrido para '%s'" + +#: lib/libalpm/alpm.c:279 +#, c-format +msgid "failed to get lastupdate time for %s (no big deal)" +msgstr "fallo al obtener la última fecha de actualización para %s (no es un gran problema)" + +#: lib/libalpm/alpm.c:298 +#, c-format +msgid "failed to sync db: %s [%d]" +msgstr "fallo al sincronizar la base de datos: %s [%d]" + +#: lib/libalpm/alpm.c:302 +#, c-format +msgid "sync: new mtime for %s: %s" +msgstr "sync: nuevo mtime para %s: %s" + +#: lib/libalpm/alpm.c:308 +#, c-format +msgid "flushing database %s%s" +msgstr "barriendo la base de datos %s%s" + +#: lib/libalpm/alpm.c:312 +#, c-format +msgid "could not remove database entry %s%s" +msgstr "no se pudo quitar la entrada en la base de datos %s%s" + +#: lib/libalpm/alpm.c:481 +#, c-format +msgid "could not get sha1sum for package %s-%s" +msgstr "no se pudo obtener la verificación sha1 para %s-%s" + +#: lib/libalpm/alpm.c:487 +#, c-format +msgid "sha1sums for package %s-%s match" +msgstr "verificando sha1 para el paquete %s-%s coincide" + +#: lib/libalpm/alpm.c:490 +#, c-format +msgid "sha1sums do not match for package %s-%s" +msgstr "la verificación sha1 no coincide para %s-%s" + +#: lib/libalpm/alpm.c:525 +#, c-format +msgid "could not get md5sum for package %s-%s" +msgstr "no se pudo obtener la verificación md5 para %s-%s" + +#: lib/libalpm/alpm.c:531 +#, c-format +msgid "md5sums for package %s-%s match" +msgstr "la verificación md5 para el paquete %s-%s concuerda" + +#: lib/libalpm/alpm.c:534 +#, c-format +msgid "md5sums do not match for package %s-%s" +msgstr "la verificación md5 para el paquete %s-%s no concuerda" + +#: lib/libalpm/alpm.c:783 +#, c-format +msgid "could not remove lock file %s" +msgstr "no se pudo quitar el archivo de bloqueo %s" + +#: lib/libalpm/alpm.c:784 +#, c-format +msgid "warning: could not remove lock file %s" +msgstr "advertencia: no se pudo eliminar el archivo de bloqueo %s" + +#: lib/libalpm/alpm.c:919 +#, c-format +msgid "config: new section '%s'" +msgstr "config: nueva sección '%s'" + +#: lib/libalpm/alpm.c:948 +msgid "config: nopassiveftp" +msgstr "config: nopassiveftp" + +#: lib/libalpm/alpm.c:951 +msgid "config: usesyslog" +msgstr "config: usesyslog" + +#: lib/libalpm/alpm.c:954 +msgid "config: chomp" +msgstr "config: chomp" + +#: lib/libalpm/alpm.c:957 +msgid "config: usecolor" +msgstr "config: usecolor" + +#: lib/libalpm/alpm.c:966 +#, c-format +msgid "config: including %s" +msgstr "config: incluyendo %s" + +#: lib/libalpm/alpm.c:976 +#: lib/libalpm/alpm.c:981 +#, c-format +msgid "config: noupgrade: %s" +msgstr "config: noupgrade: %s" + +#: lib/libalpm/alpm.c:989 +#: lib/libalpm/alpm.c:994 +#, c-format +msgid "config: noextract: %s" +msgstr "config: noextract: %s" + +#: lib/libalpm/alpm.c:1002 +#: lib/libalpm/alpm.c:1007 +#, c-format +msgid "config: ignorepkg: %s" +msgstr "config: ignorepkg: %s" + +#: lib/libalpm/alpm.c:1015 +#: lib/libalpm/alpm.c:1020 +#, c-format +msgid "config: holdpkg: %s" +msgstr "config: holdpkg: %s" + +#: lib/libalpm/alpm.c:1027 +#, c-format +msgid "config: dbpath: %s" +msgstr "config: dbpath: %s" + +#: lib/libalpm/alpm.c:1034 +#, c-format +msgid "config: cachedir: %s" +msgstr "config: cachedir: %s" + +#: lib/libalpm/alpm.c:1037 +#, c-format +msgid "config: logfile: %s" +msgstr "config: logfile: %s" + +#: lib/libalpm/alpm.c:1040 +#, c-format +msgid "config: xfercommand: %s" +msgstr "config: xfercommand: %s" + +#: lib/libalpm/alpm.c:1045 +#, c-format +msgid "config: upgradedelay: %d" +msgstr "config: upgradedelay: %d" + +#: lib/libalpm/alpm.c:1083 +#: lib/libalpm/sync.c:107 +msgid "checking for package replacements" +msgstr "verificando si hay reemplazo de paquetes" + +#: lib/libalpm/alpm.c:1094 +#: lib/libalpm/sync.c:123 +#, c-format +msgid "checking replacement '%s' for package '%s'" +msgstr "verificando el reemplazo '%s' para el paquete '%s'" + +#: lib/libalpm/alpm.c:1097 +#: lib/libalpm/sync.c:125 +#, c-format +msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" +msgstr "%s-%s: ignorando la actualización del paquete(para ser reemplazado por %s-%s)" + +#: lib/libalpm/alpm.c:1127 +#: lib/libalpm/sync.c:160 +#, c-format +msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" +msgstr "%s-%s escogido para actualizar (para ser reemplazado por %s-%s)" + +#: lib/libalpm/alpm.c:1149 +#: lib/libalpm/sync.c:194 +#, c-format +msgid "'%s' not found in sync db -- skipping" +msgstr "'%s' not encontrado en la base -- saltando" + +#: lib/libalpm/alpm.c:1163 +#: lib/libalpm/sync.c:208 +#: lib/libalpm/sync.c:501 +#, c-format +msgid "'%s' is already elected for removal -- skipping" +msgstr "'%s' está ya seleccionado para quitar -- saltando" + +#: lib/libalpm/alpm.c:1169 +#, c-format +msgid "%s elected for upgrade (%s => %s)" +msgstr "%s seleccionado para actualizar (%s => %s)" + +#: lib/libalpm/be_files.c:61 +#, c-format +msgid "unpacking database '%s'" +msgstr "desempaquetando la base de datos '%s'" + +#: lib/libalpm/be_files.c:78 +#, c-format +msgid "opening database from path '%s'" +msgstr "abriendo la base de datos desde la ruta '%s'" + +#: lib/libalpm/be_files.c:182 +#, c-format +msgid "db scan could not find package: %s" +msgstr "db scan no pudo encontrar el paquete: %s" + +#: lib/libalpm/be_files.c:186 +#, c-format +msgid "invalid name for database entry '%s'" +msgstr "nombre invalido para la entrada de la base de datos '%s'" + +#: lib/libalpm/be_files.c:221 +msgid "invalid package entry provided to _alpm_db_read, skipping" +msgstr "entrada de paquete invalida a _alpm_db_read, saltando" + +#: lib/libalpm/be_files.c:226 +#, c-format +msgid "request to read database info for a file-based package '%s', skipping..." +msgstr "petición para leer la información de la base para el paquete basado en archivo '%s', saltando..." + +#: lib/libalpm/be_files.c:239 +#, c-format +msgid "loading package data for %s : level=%d" +msgstr "cargando la información del paquete para %s : nivel=%d" + +#: lib/libalpm/be_files.c:247 +#, c-format +msgid "cannot find '%s-%s' in db '%s'" +msgstr "no se pudo encontrar '%s-%s' en la base '%s'" + +#: lib/libalpm/be_files.c:255 +#: lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 +#: lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 +#: lib/libalpm/be_files.c:632 +#: lib/libalpm/package.c:206 +#, c-format +msgid "could not open file %s: %s" +msgstr "no se pudo abrir el archivo %s: %s" + +#: lib/libalpm/be_files.c:512 +#, c-format +msgid "writing %s-%s DESC information back to db" +msgstr "escribiendo %s-%s, información DESC en la base" + +#: lib/libalpm/be_files.c:602 +#, c-format +msgid "writing %s-%s FILES information back to db" +msgstr "escribiendo %s-%s, información FILES en la base" + +#: lib/libalpm/be_files.c:629 +#, c-format +msgid "writing %s-%s DEPENDS information back to db" +msgstr "escribiendo %s-%s, información DEPENDS en la base" + +#: lib/libalpm/cache.c:59 +#, c-format +msgid "loading package cache for repository '%s'" +msgstr "cargando la cache de paquetes para el repositorio '%s'" + +#: lib/libalpm/cache.c:64 +#, c-format +msgid "adding '%s' to package cache for db '%s'" +msgstr "agregando '%s' a la cache de paquetes para la base '%s'" + +#: lib/libalpm/cache.c:85 +#, c-format +msgid "freeing package cache for repository '%s'" +msgstr "liberando la cache de paquetes para el repositorio '%s'" + +#: lib/libalpm/cache.c:109 +#, c-format +msgid "error: pkgcache is NULL for db '%s'" +msgstr "error: la cache de paquetes es nula para la base de datos '%s'" + +#: lib/libalpm/cache.c:129 +#, c-format +msgid "adding entry '%s' in '%s' cache" +msgstr "agregando '%s' en la cache '%s'" + +#: lib/libalpm/cache.c:149 +#, c-format +msgid "removing entry '%s' from '%s' cache" +msgstr "quitando '%s' de la cache '%s'" + +#: lib/libalpm/cache.c:156 +#, c-format +msgid "cannot remove entry '%s' from '%s' cache: not found" +msgstr "no se pudo quitar '%s' de la cache '%s': no encontrado" + +#: lib/libalpm/cache.c:178 +#, c-format +msgid "error: failed to get '%s' from NULL pkgcache" +msgstr "error: se produjo un fallo al obtener '%s' desde la cache de paquetes \"NULL\"" + +#: lib/libalpm/cache.c:201 +#, c-format +msgid "loading group cache for repository '%s'" +msgstr "cargando la cache de grupo para el repositorio '%s'" + +#: lib/libalpm/conflict.c:69 +#, c-format +msgid " found conflict '%s' : package '%s'" +msgstr " se ha encontrado un conflicto '%s' : paquete '%s'" + +#: lib/libalpm/conflict.c:78 +#, c-format +msgid " found conflict '%s' : package '%s' provides '%s'" +msgstr " se ha encontrado un conflicto '%s' : paquete '%s' provee '%s'" + +#: lib/libalpm/conflict.c:101 +#: lib/libalpm/conflict.c:143 +#, c-format +msgid "package '%s' conflicts with itself - packaging error" +msgstr "el paquete '%s' posee conflictos con si mismo- error del paquete" + +#: lib/libalpm/conflict.c:107 +#, c-format +msgid "checkconflicts: target '%s' vs db" +msgstr "checkconflicts: el objetivo '%s' vs la base de datos" + +#: lib/libalpm/conflict.c:149 +#, c-format +msgid "checkconflicts: target '%s' vs all targets" +msgstr "checkconflicts: el objetivo '%s' vs todos los objetivos" + +#: lib/libalpm/conflict.c:181 +#, c-format +msgid "checkconflicts: db vs target '%s'" +msgstr "checkconflicts: la base de datos vs el objetivo '%s'" + +#: lib/libalpm/conflict.c:201 +#, c-format +msgid "target '%s' is also in target list, using NEW conflicts" +msgstr "'%s' esta también en la lista de objetivos, usando NEW provoca conflictos" + +#: lib/libalpm/conflict.c:257 +#, c-format +msgid "\tCONFLICTS:: %s conflicts with %s" +msgstr "\tCONFLICTS:: %s posee conflictos con %s" + +#: lib/libalpm/conflict.c:349 +#: lib/libalpm/deps.c:60 +#: lib/libalpm/deps.c:438 +#: lib/libalpm/deps.c:634 +#: lib/libalpm/deps.c:674 +#: lib/libalpm/group.c:45 +#: lib/libalpm/handle.c:51 +#: lib/libalpm/package.c:82 +#: lib/libalpm/sync.c:67 +#: lib/libalpm/sync.c:606 +#: lib/libalpm/sync.c:622 +#: lib/libalpm/sync.c:719 +#: lib/libalpm/trans.c:55 +#: lib/libalpm/util.c:612 +#: lib/libalpm/util.c:619 +#, c-format +msgid "malloc failure: could not allocate %d bytes" +msgstr "falla en malloc: no se pudo alocar %d bytes" + +#: lib/libalpm/db.c:64 +#: lib/libalpm/db.c:71 +#, c-format +msgid "malloc failed: could not allocate %d bytes" +msgstr "malloc falló: no se pudo alocar %d bytes" + +#: lib/libalpm/db.c:167 +msgid "attempt to re-register the 'local' DB" +msgstr "intento para re-registrar la base de datos 'local'" + +#: lib/libalpm/db.c:175 +#, c-format +msgid "attempt to re-register the '%s' database, using existing" +msgstr "intento para re-registrar la base de datos '%s', usando la existente" + +#: lib/libalpm/db.c:181 +#, c-format +msgid "registering database '%s'" +msgstr "registrando la base de datos '%s'" + +#: lib/libalpm/db.c:186 +#, c-format +msgid "database directory '%s' does not exist, creating it" +msgstr "el directorio de base de datos '%s' no existe, creando" + +#: lib/libalpm/db.c:197 +#, c-format +msgid "opening database '%s'" +msgstr "abriendo la base de datos '%s'" + +#: lib/libalpm/deps.c:131 +msgid "started sorting dependencies" +msgstr "empezando a ordenar dependencias" + +#: lib/libalpm/deps.c:136 +msgid "possible dependency cycle detected" +msgstr "posible ciclo de dependencias detectado" + +#: lib/libalpm/deps.c:183 +msgid "sorting dependencies finished" +msgstr "ordenamiento de dependencias finalizado" + +#: lib/libalpm/deps.c:225 +#: lib/libalpm/deps.c:310 +msgid "null package found in package list" +msgstr "se ha encontrado un paquete nulo en la lista de paquetes" + +#: lib/libalpm/deps.c:230 +#, c-format +msgid "cannot find package installed '%s'" +msgstr "no se pudo encontrar el paquete instalado '%s'" + +#: lib/libalpm/deps.c:261 +#, c-format +msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'" +msgstr "checkdeps: la dependencia '%s' ha sido movida desde '%s' a '%s'" + +#: lib/libalpm/deps.c:280 +#, c-format +msgid "checkdeps: dependency '%s' satisfied by installed package '%s'" +msgstr "checkdeps: la dependencia '%s' es satisfecha por el paquete instalado '%s'" + +#: lib/libalpm/deps.c:289 +#, c-format +msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" +msgstr "checkdeps: El paquete actualizado '%s' no satisfará una dependencia de'%s'" + +#: lib/libalpm/deps.c:359 +#, c-format +msgid "missing dependency '%s' for package '%s'" +msgstr "dependencia faltante '%s' para el paquete '%s'" + +#: lib/libalpm/deps.c:409 +#, c-format +msgid "checkdeps: found %s as required by %s" +msgstr "checkdeps: encontrado %s como lo requería %s" + +#: lib/libalpm/deps.c:485 +#, c-format +msgid "excluding %s -- explicitly installed" +msgstr "excluyendo %s -- instalado explícitamente" + +#: lib/libalpm/deps.c:532 +#, c-format +msgid "cannot find package \"%s\" or anything that provides it!" +msgstr "no se pudo encontrar el paquete \"%s\" o algo que lo provea!" + +#: lib/libalpm/deps.c:540 +#: lib/libalpm/deps.c:551 +#, c-format +msgid "adding '%s' to the targets" +msgstr "agregando '%s' a los objetivos" + +#: lib/libalpm/deps.c:583 +msgid "started resolving dependencies" +msgstr "empezando a resolver dependencias" + +#: lib/libalpm/deps.c:601 +#, c-format +msgid "%s provides dependency %s -- skipping" +msgstr "%s provee la dependencia %s -- saltando" + +#: lib/libalpm/deps.c:630 +#, c-format +msgid "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" +msgstr "no se pudo resolver dependecias para \"%s\" (\"%s\" no está en las listas de paquetes)" + +#: lib/libalpm/deps.c:647 +#, c-format +msgid "dependency %s is already in the target list -- skipping" +msgstr "la dependencia %s ya está en la lista de objetivos -- saltando" + +#: lib/libalpm/deps.c:667 +#, c-format +msgid "pulling dependency %s (needed by %s)" +msgstr "trayendo la dependencia %s (necesitada por %s)" + +#: lib/libalpm/deps.c:671 +#, c-format +msgid "cannot resolve dependencies for \"%s\"" +msgstr "no se pudo resolver las dependencias para \"%s\"" + +#: lib/libalpm/deps.c:687 +#, c-format +msgid "dependency cycle detected: %s" +msgstr "ciclo de dependencias detectado: %s" + +#: lib/libalpm/deps.c:691 +msgid "finished resolving dependencies" +msgstr "se ha finalizado la resolución de dependencias" + +#: lib/libalpm/error.c:40 +msgid "out of memory!" +msgstr "no hay memoria!" + +#: lib/libalpm/error.c:42 +msgid "unexpected system error" +msgstr "error de sistema inesperado" + +#: lib/libalpm/error.c:44 +msgid "insufficient privileges" +msgstr "privilegios insuficientes" + +#: lib/libalpm/error.c:46 +msgid "could not find or read file" +msgstr "no se pudo encontrar o leer el archivo" + +#: lib/libalpm/error.c:48 +msgid "wrong or NULL argument passed" +msgstr "argumento erroneo o núlo" + +#: lib/libalpm/error.c:51 +msgid "library not initialized" +msgstr "librería no inicializada" + +#: lib/libalpm/error.c:53 +msgid "library already initialized" +msgstr "la librería ya fue inicializada" + +#: lib/libalpm/error.c:55 +msgid "unable to lock database" +msgstr "no se pudo bloquear la base de datos" + +#: lib/libalpm/error.c:58 +msgid "could not open database" +msgstr "no se pudo abrir la base de datos" + +#: lib/libalpm/error.c:60 +msgid "could not create database" +msgstr "no se pudo crear la base de datos" + +#: lib/libalpm/error.c:62 +msgid "database not initialized" +msgstr "base de datos no inicializada" + +#: lib/libalpm/error.c:64 +msgid "database already registered" +msgstr "base de datos ya registrada" + +#: lib/libalpm/error.c:66 +msgid "could not find database" +msgstr "no se pudo encontrar la base de datos" + +#: lib/libalpm/error.c:68 +msgid "could not update database" +msgstr "no se pudo actualizar la base de datos" + +#: lib/libalpm/error.c:70 +msgid "could not remove database entry" +msgstr "no se pudo quitar la entrada de la base de datos" + +#: lib/libalpm/error.c:73 +msgid "invalid url for server" +msgstr "dirección inválida para el servidor" + +#: lib/libalpm/error.c:80 +msgid "could not set parameter" +msgstr "no se pudo fijar el parámetro" + +#: lib/libalpm/error.c:83 +msgid "transaction already initialized" +msgstr "la operación ya se inicializó" + +#: lib/libalpm/error.c:85 +#: lib/libalpm/error.c:89 +msgid "transaction not initialized" +msgstr "operación no inicializada" + +#: lib/libalpm/error.c:87 +msgid "duplicate target" +msgstr "objetivo duplicado" + +#: lib/libalpm/error.c:91 +msgid "transaction not prepared" +msgstr "operación no lista" + +#: lib/libalpm/error.c:93 +msgid "transaction aborted" +msgstr "operación abortada" + +#: lib/libalpm/error.c:95 +msgid "operation not compatible with the transaction type" +msgstr "la operación no es compatible con el tipo de transacción" + +#: lib/libalpm/error.c:97 +#: lib/libalpm/sync.c:986 +msgid "could not commit transaction" +msgstr "no se pudo hacer la transacción" + +#: lib/libalpm/error.c:99 +msgid "could not download all files" +msgstr "no se pudo descargar todos los archivos" + +#: lib/libalpm/error.c:102 +msgid "could not find or read package" +msgstr "no se pudo encontrar o leer el paquete" + +#: lib/libalpm/error.c:104 +msgid "invalid or corrupted package" +msgstr "paquete invalido o corrupto" + +#: lib/libalpm/error.c:106 +msgid "cannot open package file" +msgstr "no se pudo abrir el archivo de paquetes" + +#: lib/libalpm/error.c:108 +msgid "cannot load package data" +msgstr "no se pudo cargar la información del paquete" + +#: lib/libalpm/error.c:110 +msgid "package already installed" +msgstr "el paquete ya está instalado" + +#: lib/libalpm/error.c:112 +msgid "package not installed or lesser version" +msgstr "el paquete no está instalado o es una versión menor" + +#: lib/libalpm/error.c:114 +msgid "cannot remove all files for package" +msgstr "no se pudo quitar todos los archivos del paquete" + +#: lib/libalpm/error.c:116 +msgid "package name is not valid" +msgstr "el nombre del paquete no es válido" + +#: lib/libalpm/error.c:118 +msgid "corrupted package" +msgstr "paquete corrupto" + +#: lib/libalpm/error.c:120 +msgid "no such repository" +msgstr "no existe el repositorio" + +#: lib/libalpm/error.c:123 +msgid "group not found" +msgstr "grupo no encontrado" + +#: lib/libalpm/error.c:126 +msgid "could not satisfy dependencies" +msgstr "no se pudieron satisfacer las dependencias" + +#: lib/libalpm/error.c:128 +msgid "conflicting dependencies" +msgstr "dependencias en conflicto" + +#: lib/libalpm/error.c:130 +msgid "conflicting files" +msgstr "archivos en conflicto" + +#: lib/libalpm/error.c:133 +msgid "user aborted the operation" +msgstr "el usuario abortó la operación" + +#: lib/libalpm/error.c:135 +msgid "internal error" +msgstr "error interno" + +#: lib/libalpm/error.c:137 +msgid "libarchive error" +msgstr "error de libarchive" + +#: lib/libalpm/error.c:139 +msgid "not enough space on disk" +msgstr "no hay suficiente espacio en el disco" + +#: lib/libalpm/error.c:142 +msgid "not confirmed" +msgstr "no confirmado" + +#: lib/libalpm/error.c:145 +msgid "bad configuration section name" +msgstr "nombre de sección de configuración erróneo" + +#: lib/libalpm/error.c:147 +msgid "'local' is reserved and cannot be used as a repository name" +msgstr "'local' esta reservado y no puede ser utilizado como nombre de repositorio" + +#: lib/libalpm/error.c:149 +msgid "syntax error in config file" +msgstr "error de sintaxis en el archivo de configuración" + +#: lib/libalpm/error.c:151 +msgid "all directives must belong to a section" +msgstr "todas las directivas deben pertener a una sección" + +#: lib/libalpm/error.c:153 +msgid "invalid regular expression" +msgstr "expresión regular inválida" + +#: lib/libalpm/error.c:156 +msgid "connection to remote host failed" +msgstr "falló la conexión con el host remoto" + +#: lib/libalpm/error.c:159 +msgid "unexpected error" +msgstr "error inesperado" + +# canonicalize.. no supe traducirla bien +#: lib/libalpm/handle.c:163 +#, c-format +msgid "cannot canonicalize specified root path '%s'" +msgstr "no se pudo obtener el la ruta canonica de la raiz especificada '%s'" + +#: lib/libalpm/handle.c:175 +#, c-format +msgid "option 'root' = %s" +msgstr "opción 'root' = %s" + +#: lib/libalpm/handle.c:195 +#, c-format +msgid "option 'dbpath' = %s" +msgstr "opción 'dbpath' = %s" + +#: lib/libalpm/handle.c:211 +#, c-format +msgid "option 'cachedir' = %s" +msgstr "opción 'cachedir' = %s" + +#: lib/libalpm/md5driver.c:56 +#, c-format +msgid "%s can't be opened\n" +msgstr "%s no puede ser abierto\n" + +#: lib/libalpm/md5driver.c:74 +#, c-format +msgid "md5(%s) = %s" +msgstr "md5(%s) = %s" + +#: lib/libalpm/package.c:150 +#, c-format +msgid "%s: forcing upgrade to version %s" +msgstr "%s: forzando la actualización a la versión %s" + +#: lib/libalpm/package.c:155 +#, c-format +msgid "%s: local (%s) is newer than %s (%s)" +msgstr "%s: local (%s) es más nuevo que %s (%s)" + +#: lib/libalpm/package.c:163 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: ignorando la actualización del paquete (%s)" + +#: lib/libalpm/package.c:169 +#, c-format +msgid "%s-%s: delaying upgrade of package (%s)" +msgstr "%s-%s: aplazando la actualización del paquete (%s)" + +#: lib/libalpm/package.c:220 +#: lib/libalpm/package.c:279 +#, c-format +msgid "%s: syntax error in description file line %d" +msgstr "%s: error de sintaxis en la linea de descripción de archivos %d" + +#: lib/libalpm/package.c:353 +msgid "could not parse the package description file" +msgstr "no se pudo interpretar el archivo de descripción" + +#: lib/libalpm/package.c:357 +#, c-format +msgid "missing package name in %s" +msgstr "nombre de paquete perdido en %s" + +#: lib/libalpm/package.c:361 +#, c-format +msgid "missing package version in %s" +msgstr "versión de paquete perdida en %s" + +#: lib/libalpm/package.c:396 +#, c-format +msgid "could not remove tempfile %s" +msgstr "no se pudo quitar el archivo temporal %s" + +#: lib/libalpm/package.c:409 +#: lib/libalpm/package.c:416 +#, c-format +msgid "error while reading package: %s" +msgstr "error mientras se leía el paquete : %s" + +#: lib/libalpm/package.c:422 +msgid "missing package metadata" +msgstr "falta la metadata del paquete " + +#: lib/libalpm/package.c:429 +#, c-format +msgid "missing package filelist in %s, generating one" +msgstr "falta la lita de paquetes en %s. generando una" + +#: lib/libalpm/package.c:568 +#, c-format +msgid "adding '%s' in requiredby field for '%s'" +msgstr "agregando '%s' en el campo requiredby para '%s'" + +#: lib/libalpm/package.c:582 +#, c-format +msgid "adding '%s' in requiredby field for '%s' (provides: %s)" +msgstr "agregando '%s' en el campo requiredby para '%s' (provee %s)" + +#: lib/libalpm/remove.c:79 +#, c-format +msgid "could not find %s in database" +msgstr "no se pudo encontrar %s en la base de datos" + +#: lib/libalpm/remove.c:93 +#, c-format +msgid "adding %s in the targets list" +msgstr "agregando %s en la lista de objetivos" + +#: lib/libalpm/remove.c:121 +#, c-format +msgid "pulling %s in the targets list" +msgstr "poniendo %s en la lista de objetivos" + +#: lib/libalpm/remove.c:124 +#, c-format +msgid "could not find %s in database -- skipping" +msgstr "no se pudo encontrar %s en la base de datos -- saltando" + +#: lib/libalpm/remove.c:142 +msgid "finding removable dependencies" +msgstr "buscando dependencias a eliminar" + +#: lib/libalpm/remove.c:175 +#, c-format +msgid "cannot remove file '%s': %s" +msgstr "no se pudo quitar el archivo '%s': %s" + +#: lib/libalpm/remove.c:213 +#, c-format +msgid "Skipping removal of '%s' due to NoUpgrade" +msgstr "saltando la eliminación de '%s' debido a la condición de no actualización" + +#: lib/libalpm/remove.c:220 +#, c-format +msgid "file %s does not exist" +msgstr "el archivo %s no existe" + +#: lib/libalpm/remove.c:227 +#, c-format +msgid "keeping directory %s" +msgstr "manteniendo el directorio %s" + +#: lib/libalpm/remove.c:229 +#, c-format +msgid "removing directory %s" +msgstr "quitando el directorio %s" + +#: lib/libalpm/remove.c:236 +#, c-format +msgid "%s is in trans->skip_remove, skipping removal" +msgstr "%s esta en trans->skip_remove, saltando la eliminación" + +#: lib/libalpm/remove.c:250 +#, c-format +msgid "transaction is set to NOSAVE, not backing up '%s'" +msgstr "la transacción esta definida como NOSAVE, no se respaldará '%s'" + +#: lib/libalpm/remove.c:254 +#, c-format +msgid "unlinking %s" +msgstr "desvinculando %s" + +#: lib/libalpm/remove.c:261 +#, c-format +msgid "cannot remove file %s: %s" +msgstr "no se pudo quitar el archivo %s: %s" + +#: lib/libalpm/remove.c:294 +#, c-format +msgid "removing package %s-%s" +msgstr "quitando el paquete %s-%s" + +#: lib/libalpm/remove.c:309 +#, c-format +msgid "not removing package '%s', can't remove all files" +msgstr "no se quitará el paquete '%s', no se puede quitar todos los archivos" + +#: lib/libalpm/remove.c:316 +#, c-format +msgid "removing %d files" +msgstr "quitando %d archivos" + +#: lib/libalpm/remove.c:337 +#, c-format +msgid "removing database entry '%s'" +msgstr "quitando de la base de datos '%s'" + +#: lib/libalpm/remove.c:339 +#, c-format +msgid "could not remove database entry %s-%s" +msgstr "no se pudo quitar de la base de datos %s-%s" + +#: lib/libalpm/remove.c:344 +#, c-format +msgid "could not remove entry '%s' from cache" +msgstr "no se pudo quitar la entrada '%s' de la cache" + +#: lib/libalpm/sha1.c:397 +#, c-format +msgid "sha1: %s can't be opened\n" +msgstr "sha1: %s no puede ser abierto\n" + +#: lib/libalpm/sha1.c:412 +#, c-format +msgid "sha1(%s) = %s" +msgstr "sha1(%s) = %s" + +#: lib/libalpm/sync.c:183 +msgid "checking for package upgrades" +msgstr "verificando actualizaciones de paquetes" + +#: lib/libalpm/sync.c:215 +#, c-format +msgid "%s-%s elected for upgrade (%s => %s)" +msgstr "%s-%s seleccionada para actualización (%s => %s)" + +#: lib/libalpm/sync.c:262 +#, c-format +msgid "searching for target in repo '%s'" +msgstr "buscando el objetivo en el repositorio '%s'" + +#: lib/libalpm/sync.c:270 +#: lib/libalpm/sync.c:293 +#, c-format +msgid "target '%s' not found -- looking for provisions" +msgstr "'%s' no se encontró -- buscando provisionales" + +#: lib/libalpm/sync.c:275 +#: lib/libalpm/sync.c:298 +#, c-format +msgid "found '%s' as a provision for '%s'" +msgstr "encontrado '%s' como provisional para '%s'" + +#: lib/libalpm/sync.c:282 +#, c-format +msgid "repository '%s' not found" +msgstr "repositorio '%s' no encontrado" + +#: lib/libalpm/sync.c:323 +#, c-format +msgid "%s-%s is up to date -- skipping" +msgstr "%s-%s esta al día -- saltando" + +#: lib/libalpm/sync.c:346 +#, c-format +msgid "adding target '%s' to the transaction set" +msgstr "agregando el objetivo '%s' a la lista de transacciones" + +#: lib/libalpm/sync.c:394 +msgid "resolving target's dependencies" +msgstr "resolviendo las dependencias" + +#: lib/libalpm/sync.c:414 +#, c-format +msgid "adding package %s-%s to the transaction targets" +msgstr "agregando el paquete %s-%s como blanco para la transacción" + +#: lib/libalpm/sync.c:455 +msgid "looking for unresolvable dependencies" +msgstr "buscando dependencias no resueltas" + +#: lib/libalpm/sync.c:486 +#, c-format +msgid "package '%s' conflicts with '%s'" +msgstr "el paquete '%s' posee conflictos con '%s'" + +#: lib/libalpm/sync.c:508 +#, c-format +msgid "'%s' not found in transaction set -- skipping" +msgstr "'%s' no se encontró en las transacciones -- saltando" + +#: lib/libalpm/sync.c:519 +#, c-format +msgid "package '%s' provides its own conflict" +msgstr "el paquete '%s' provee su propio conflicto" + +#: lib/libalpm/sync.c:542 +#: lib/libalpm/sync.c:547 +#, c-format +msgid "'%s' is in the target list -- keeping it" +msgstr "'%s' esta en la lista de objetivos -- manteniendolo" + +#: lib/libalpm/sync.c:559 +#: lib/libalpm/sync.c:596 +#, c-format +msgid "removing '%s' from target list" +msgstr "quitando '%s' de la lista de objetivos" + +#: lib/libalpm/sync.c:568 +#, c-format +msgid "resolving package '%s' conflict" +msgstr "resolviendo el conflicto del paquete '%s'" + +#: lib/libalpm/sync.c:591 +#, c-format +msgid "electing '%s' for removal" +msgstr "escogiendo '%s' para quitarlo" + +#: lib/libalpm/sync.c:602 +#: lib/libalpm/sync.c:618 +msgid "unresolvable package conflicts detected" +msgstr "se han detectado paquetes con conflictos no resueltos" + +#: lib/libalpm/sync.c:670 +msgid "checking dependencies of packages designated for removal" +msgstr "verificando dependencias de paquetes indicados para quitar" + +#: lib/libalpm/sync.c:684 +msgid "something has gone horribly wrong" +msgstr "algo ha ido horriblemente mal" + +#: lib/libalpm/sync.c:704 +#, c-format +msgid "found '%s' as a provision for '%s' -- conflict aborted" +msgstr "encontrado '%s' como provisional para '%s' -- conflicto abortado" + +#: lib/libalpm/sync.c:800 +#, c-format +msgid "%s is already in the cache\n" +msgstr "%s ya esta en la cache\n" + +#: lib/libalpm/sync.c:811 +#, c-format +msgid "no %s cache exists, creating...\n" +msgstr "no existe la cache %s, creando...\n" + +#: lib/libalpm/sync.c:812 +#, c-format +msgid "warning: no %s cache exists, creating..." +msgstr "advertencia: no existe la cache %s. creándola..." + +#: lib/libalpm/sync.c:817 +msgid "couldn't create package cache, using /tmp instead\n" +msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n" + +#: lib/libalpm/sync.c:818 +msgid "warning: couldn't create package cache, using /tmp instead" +msgstr "advertencia: no se pudo crear la cache para paquetes. usando /tmp en su lugar" + +#: lib/libalpm/sync.c:825 +#, c-format +msgid "failed to retrieve some files from %s\n" +msgstr "fallo al descargar algunos archivos desde %s\n" + +#: lib/libalpm/sync.c:855 +#: lib/libalpm/sync.c:867 +#, c-format +msgid "can't get md5 or sha1 checksum for package %s\n" +msgstr "no se pudo verificar md5 o sha1 para el paquete %s\n" + +#: lib/libalpm/sync.c:886 +#, c-format +msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" +msgstr "el archivo %s estaba corrupto (no coincidió la verificación MD5 o SHA1)\n" + +#: lib/libalpm/sync.c:888 +#, c-format +msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" +msgstr "el archivo %s esta corrupto (verificación MD5 o SHA1 errónea)\n" + +#: lib/libalpm/sync.c:909 +msgid "could not create removal transaction" +msgstr "no se pudo crear la operación de eliminación" + +#: lib/libalpm/sync.c:915 +msgid "could not initialize the removal transaction" +msgstr "no se pudo iniciar la operación de eliminación" + +#: lib/libalpm/sync.c:935 +msgid "removing conflicting and to-be-replaced packages" +msgstr "quitando paquetes conflictivos y los que serán reemplazados" + +#: lib/libalpm/sync.c:937 +msgid "could not prepare removal transaction" +msgstr "no se pudo preparar la operación de eliminación" + +#: lib/libalpm/sync.c:943 +msgid "could not commit removal transaction" +msgstr "no se pudo asignar la operación de quitado" + +#: lib/libalpm/sync.c:950 +msgid "installing packages" +msgstr "instalando paquetes" + +#: lib/libalpm/sync.c:953 +msgid "could not create transaction" +msgstr "no se pudo crear la operación" + +#: lib/libalpm/sync.c:958 +msgid "could not initialize transaction" +msgstr "no se pudo iniciar la operación" + +#: lib/libalpm/sync.c:981 +msgid "could not prepare transaction" +msgstr "no se pudo preparar la transacción" + +#: lib/libalpm/sync.c:993 +msgid "updating database for replaced packages' dependencies" +msgstr "actuando la base de datos para las dependencias de los paquetes reemplazados" + +#: lib/libalpm/sync.c:1022 +#, c-format +msgid "could not update requiredby for database entry %s-%s" +msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s" + +#: lib/libalpm/sync.c:1031 +#, c-format +msgid "could not update new database entry %s-%s" +msgstr "no se pudo actualizar la nueva entrada a la base de datos %s-%s" + +#: lib/libalpm/sync.c:1071 +#, c-format +msgid "found package '%s-%s' in sync" +msgstr "paquete encontrado '%s-%s' en la base de sincronización" + +#: lib/libalpm/sync.c:1077 +#, c-format +msgid "package '%s' not found in sync" +msgstr "el paquete '%s' no fue encontrado en la base de sincronización" + +# No me agrada mucho esta traducción. Habrá una mejor manera de indicarlo? +#: lib/libalpm/trans.c:270 +#, c-format +msgid "updating dependency packages 'requiredby' fields for %s-%s" +msgstr "actualizando los campos 'requeridospor' de los paquetes de dependencias para %s-%s" + +#: lib/libalpm/trans.c:273 +msgid "package has no dependencies, no other packages to update" +msgstr "el paquete no posee dependencias, no hay más paquetes para actualizar" + +#: lib/libalpm/trans.c:310 +#: lib/libalpm/trans.c:340 +#, c-format +msgid "updating 'requiredby' field for package '%s'" +msgstr "actualizando el campo 'requiredby' para '%s'" + +#: lib/libalpm/trans.c:325 +#: lib/libalpm/trans.c:355 +#, c-format +msgid "could not update 'requiredby' database entry %s-%s" +msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s" + +#: lib/libalpm/trans.c:332 +#, c-format +msgid "could not find dependency '%s'" +msgstr "no se pudo encontrar la dependencia '%s'" + +#: lib/libalpm/util.c:142 +#, c-format +msgid "failed to make path '%s' : %s" +msgstr "fallo al crear la ruta '%s' : %s" + +#: lib/libalpm/util.c:280 +#, c-format +msgid "could not open %s: %s\n" +msgstr "no se pudo abrir %s: %s\n" + +#: lib/libalpm/util.c:293 +#, c-format +msgid "could not extract %s: %s\n" +msgstr "no se pudo extraer %s: %s\n" + +#: lib/libalpm/util.c:350 +#, c-format +msgid "logaction called: %s" +msgstr "acción de registro llamada: %s" + +#: lib/libalpm/util.c:445 +msgid "could not create temp directory" +msgstr "no se puede crear el directorio temporal " + +#: lib/libalpm/util.c:472 +#, c-format +msgid "could not change directory to %s (%s)" +msgstr "no se pudo cambiar el directorio a %s (%s)" + +#: lib/libalpm/util.c:476 +#, c-format +msgid "executing %s script..." +msgstr "ejecutando el script %s..." + +#: lib/libalpm/util.c:489 +#, c-format +msgid "could not fork a new process (%s)" +msgstr "no se pudo crear un nuevo proceso (%s)" + +#: lib/libalpm/util.c:496 +#, c-format +msgid "chrooting in %s" +msgstr "haciendo cambio de raiz en %s" + +#: lib/libalpm/util.c:498 +#, c-format +msgid "could not change the root directory (%s)" +msgstr "no se pudo cambiar el directorio raíz (%s)" + +#: lib/libalpm/util.c:502 +#, c-format +msgid "could not change directory to / (%s)" +msgstr "no se pudo cambiar el directorio a / (%s)" + +#: lib/libalpm/util.c:506 +#, c-format +msgid "executing \"%s\"" +msgstr "ejecutando \"%s\"" + +#: lib/libalpm/util.c:509 +#, c-format +msgid "call to popen failed (%s)" +msgstr "llamada a popen fallida (%s)" + +#: lib/libalpm/util.c:541 +#, c-format +msgid "call to waitpid failed (%s)" +msgstr "llamada a waitpid fallida (%s)" + +#: lib/libalpm/util.c:550 +#, c-format +msgid "could not remove tmpdir %s" +msgstr "no se pudo quitar el directorio temporal %s" + +#: lib/libalpm/util.c:607 +#, c-format +msgid "check_freespace: total pkg size: %lld, disk space: %lld" +msgstr "verificando espacio libre: tamaño total: %lld, espacio en disco: %lld" + +#: lib/libalpm/versioncmp.c:279 +#, c-format +msgid "depcmp: %s-%s %s %s-%s => %s" +msgstr "depcmp: %s-%s %s %s-%s => %s" + +#: lib/libalpm/versioncmp.c:284 +#, c-format +msgid "depcmp: %s-%s %s %s => %s" +msgstr "depcmp: %s-%s %s %s => %s" + diff --git a/src/pacman/po/LINGUAS b/src/pacman/po/LINGUAS index db14c2ff..8c249f79 100644 --- a/src/pacman/po/LINGUAS +++ b/src/pacman/po/LINGUAS @@ -1,9 +1,10 @@ # Set of available languages. de +en_GB +es fr hu it +pl_PL pt_BR -en_GB ru_RU -pl_PL diff --git a/src/pacman/po/es.po b/src/pacman/po/es.po new file mode 100644 index 00000000..22a14bce --- /dev/null +++ b/src/pacman/po/es.po @@ -0,0 +1,1080 @@ +msgid "" +msgstr "" +"Project-Id-Version: pacman 3.0\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2007-04-03 12:12-0300\n" +"Last-Translator: Gustavo Chaín \n" +"Language-Team: Juan Pablo GOnzález Tognarelli\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: CHILE\n" + +#"Content-Type: text/plain; charset=utf-8\n" +#: src/pacman/add.c:72 +#: src/pacman/remove.c:82 +#: src/pacman/sync.c:482 +#: src/pacman/sync.c:531 +#, c-format +msgid "" +" if you're sure a package manager is not already running,\n" +" you can remove %s%s\n" +msgstr "" +" Si está seguro que no se está ejecutando pacman,\n" +" puede eliminar %s%s\n" + +#: src/pacman/add.c:79 +msgid "loading package data... " +msgstr "Cargando información del paquete..." + +#: src/pacman/add.c:83 +#, c-format +msgid "failed to add target '%s' (%s)" +msgstr "fallo al agregar objetivo '%s' (%s)" + +#: src/pacman/add.c:88 +#: src/pacman/sync.c:196 +#: src/pacman/trans.c:73 +#: src/pacman/trans.c:80 +#: src/pacman/trans.c:91 +#: src/pacman/trans.c:105 +#: src/pacman/trans.c:119 +#: src/pacman/trans.c:131 +#: src/pacman/trans.c:142 +msgid "done.\n" +msgstr "Hecho.\n" + +#: src/pacman/add.c:95 +#: src/pacman/remove.c:101 +#: src/pacman/sync.c:616 +#, c-format +msgid "failed to prepare transaction (%s)\n" +msgstr "fallo al preparar operación (%s)\n" + +#: src/pacman/add.c:104 +#, c-format +msgid ":: %s: requires %s" +msgstr ":: %s: necesita %s" + +#: src/pacman/add.c:125 +#: src/pacman/sync.c:643 +#, c-format +msgid ":: %s: conflicts with %s" +msgstr ":: %s: tiene conflictos con %s" + +#: src/pacman/add.c:134 +#: src/pacman/sync.c:707 +#, c-format +msgid "%s exists in both '%s' and '%s'\n" +msgstr "%s existe en '%s' y '%s'\n" + +#: src/pacman/add.c:140 +#: src/pacman/sync.c:713 +#, c-format +msgid "%s: %s exists in filesystem\n" +msgstr "%s: %s existe en el sistema de archivos\n" + +#: src/pacman/add.c:146 +#: src/pacman/sync.c:719 +#: src/pacman/sync.c:725 +msgid "" +"\n" +"errors occurred, no packages were upgraded.\n" +msgstr "" +"\n" +"ocurrieron errores, ningún paquete fue actualizado.\n" + +#: src/pacman/add.c:156 +#: src/pacman/sync.c:650 +#, c-format +msgid ":: %.1f MB required, have %.1f MB" +msgstr ":: %.1f MB son necesarios, se dispone de %.1f MB" + +#: src/pacman/add.c:169 +#: src/pacman/remove.c:141 +#: src/pacman/sync.c:700 +#, c-format +msgid "failed to commit transaction (%s)\n" +msgstr "fallo al realizar la transacción (%s)\n" + +#: src/pacman/add.c:179 +#: src/pacman/remove.c:151 +#: src/pacman/sync.c:524 +#: src/pacman/sync.c:741 +#, c-format +msgid "failed to release transaction (%s)\n" +msgstr "fallo al liberar la transacción (%s)\n" + +#: src/pacman/deptest.c:84 +#, c-format +msgid "requires: %s" +msgstr "necesita: %s" + +#: src/pacman/log.c:63 +#, c-format +msgid "debug" +msgstr "depuración" + +#: src/pacman/log.c:66 +#, c-format +msgid "error" +msgstr "error" + +#: src/pacman/log.c:69 +#, c-format +msgid "warning" +msgstr "advertencia" + +#: src/pacman/log.c:75 +#, c-format +msgid "function" +msgstr "función" + +#: src/pacman/log.c:194 +msgid "Y" +msgstr "S" + +#: src/pacman/log.c:194 +msgid "YES" +msgstr "SI" + +#: src/pacman/log.h:30 +msgid "error: " +msgstr "error: " + +#: src/pacman/log.h:34 +msgid "warning: " +msgstr "advertencia: " + +#: src/pacman/package.c:60 +msgid "Explicitly installed" +msgstr "Explícitamente instalado" + +#: src/pacman/package.c:63 +msgid "Installed as a dependency for another package" +msgstr "instalado como una dependencia para otro paquete" + +#: src/pacman/package.c:66 +#: src/pacman/package.c:90 +msgid "Unknown" +msgstr "Desconocido" + +#: src/pacman/package.c:70 +#: src/pacman/package.c:121 +msgid "Description : " +msgstr "Descripción : " + +#: src/pacman/package.c:73 +#: src/pacman/package.c:127 +#, c-format +msgid "Name : %s\n" +msgstr "Nombre : %s\n" + +#: src/pacman/package.c:74 +#: src/pacman/package.c:128 +#, c-format +msgid "Version : %s\n" +msgstr "Versión : %s\n" + +#: src/pacman/package.c:75 +#, c-format +msgid "URL : %s\n" +msgstr "URL : %s\n" + +#: src/pacman/package.c:76 +msgid "License :" +msgstr "Licencia :" + +#: src/pacman/package.c:77 +#: src/pacman/package.c:129 +msgid "Groups :" +msgstr "Grupos :" + +#: src/pacman/package.c:78 +#: src/pacman/package.c:130 +msgid "Provides :" +msgstr "Provee :" + +#: src/pacman/package.c:79 +#: src/pacman/package.c:131 +msgid "Depends On :" +msgstr "Depende De :" + +#: src/pacman/package.c:80 +#: src/pacman/package.c:132 +msgid "Removes :" +msgstr "Elimina :" + +#: src/pacman/package.c:83 +msgid "Required By :" +msgstr "Requerido por :" + +#: src/pacman/package.c:85 +#: src/pacman/package.c:133 +msgid "Conflicts With :" +msgstr "Conflictos con :" + +#: src/pacman/package.c:86 +#: src/pacman/package.c:136 +#, c-format +msgid "Installed Size : %6.2f K\n" +msgstr "Tamaño instalado : %6.2f K\n" + +#: src/pacman/package.c:87 +#, c-format +msgid "Packager : %s\n" +msgstr "Empaquetador : %s\n" + +#: src/pacman/package.c:88 +#, c-format +msgid "Architecture : %s\n" +msgstr "Arquitectura : %s\n" + +#: src/pacman/package.c:89 +#, c-format +msgid "Build Date : %s %s\n" +msgstr "Fecha de compilación : %s %s\n" + +#: src/pacman/package.c:90 +#, c-format +msgid "Build Type : %s\n" +msgstr "Tipo de compilación : %s\n" + +#: src/pacman/package.c:92 +#, c-format +msgid "Install Date : %s %s\n" +msgstr "Fecha de instalación : %s %s\n" + +#: src/pacman/package.c:93 +#, c-format +msgid "Install Reason : %s\n" +msgstr "Tipo de instalación : %s\n" + +#: src/pacman/package.c:95 +#, c-format +msgid "Install Script : %s\n" +msgstr "Script de instalación: %s\n" + +#: src/pacman/package.c:96 +msgid "Yes" +msgstr "Si" + +#: src/pacman/package.c:96 +msgid "No" +msgstr "No" + +#: src/pacman/package.c:126 +#, c-format +msgid "Repository : %s\n" +msgstr "Repositorio : %s\n" + +#: src/pacman/package.c:134 +msgid "Replaces :" +msgstr "Reemplaza :" + +#: src/pacman/package.c:135 +#, c-format +msgid "Download Size : %6.2f K\n" +msgstr "Tamaño de la descarga : %6.2f K\n" + +#: src/pacman/package.c:144 +#, c-format +msgid "MD5 Sum : %s" +msgstr "Hash MD5 Sum : %s" + +#: src/pacman/package.c:147 +#, c-format +msgid "SHA1 Sum : %s" +msgstr "Hash SHA1 : %s" + +#: src/pacman/package.c:158 +#, c-format +msgid "Backup Files:\n" +msgstr "Archivos de respaldo:\n" + +#: src/pacman/package.c:180 +#, c-format +msgid "error calculating checksums for %s\n" +msgstr "error calculando la verificación para %s\n" + +#: src/pacman/package.c:193 +#, c-format +msgid "MODIFIED\t%s\n" +msgstr "MODIFICADOt%s\n" + +#: src/pacman/package.c:195 +#, c-format +msgid "Not Modified\t%s\n" +msgstr "No Modificado\t%s\n" + +#: src/pacman/package.c:200 +#, c-format +msgid "MISSING\t\t%s\n" +msgstr "FALTANTE\t\t%s\n" + +#: src/pacman/package.c:206 +#, c-format +msgid "(none)\n" +msgstr "(nada)\n" + +#: src/pacman/package.c:246 +#, c-format +msgid "No changelog available for '%s'.\n" +msgstr "No hay registro de cambios para '%s'.\n" + +#: src/pacman/pacman.c:90 +#, c-format +msgid "usage: %s {-h --help}\n" +msgstr "uso: %s {-h --help}\n" + +#: src/pacman/pacman.c:91 +#, c-format +msgid " %s {-V --version}\n" +msgstr " %s {-V --version}\n" + +#: src/pacman/pacman.c:92 +#, c-format +msgid " %s {-A --add} [options] \n" +msgstr " %s {-A --add} [opciones] \n" + +#: src/pacman/pacman.c:93 +#, c-format +msgid " %s {-F --freshen} [options] \n" +msgstr " %s {-F --freshen} [opciones] \n" + +#: src/pacman/pacman.c:94 +#, c-format +msgid " %s {-Q --query} [options] [package]\n" +msgstr " %s {-Q --query} [opciones] [archivo]\n" + +#: src/pacman/pacman.c:95 +#, c-format +msgid " %s {-R --remove} [options] \n" +msgstr " %s {-R --remove} [opciones] \n" + +#: src/pacman/pacman.c:96 +#, c-format +msgid " %s {-S --sync} [options] [package]\n" +msgstr " %s {-S --sync} [opciones] [paquete]\n" + +#: src/pacman/pacman.c:97 +#, c-format +msgid " %s {-U --upgrade} [options] \n" +msgstr " %s {-U --upgrade} [opciones] \n" + +#: src/pacman/pacman.c:98 +#, c-format +msgid "" +"\n" +"use '%s --help' with other options for more syntax\n" +msgstr "" +"\n" +"digite '%s --help' con otra opción para ayuda más específica\n" + +#: src/pacman/pacman.c:101 +#, c-format +msgid "usage: %s {-A --add} [options] \n" +msgstr "uso: %s {-A --add} [opciones] \n" + +#: src/pacman/pacman.c:102 +#: src/pacman/pacman.c:107 +#: src/pacman/pacman.c:119 +#: src/pacman/pacman.c:124 +#: src/pacman/pacman.c:138 +#, c-format +msgid "options:\n" +msgstr "opciones:\n" + +#: src/pacman/pacman.c:103 +#: src/pacman/pacman.c:109 +#: src/pacman/pacman.c:120 +#: src/pacman/pacman.c:140 +#, c-format +msgid " -d, --nodeps skip dependency checks\n" +msgstr " -d, --nodeps se salta la verificación de dependencias \n" + +#: src/pacman/pacman.c:104 +#: src/pacman/pacman.c:121 +#: src/pacman/pacman.c:142 +#, c-format +msgid " -f, --force force install, overwrite conflicting files\n" +msgstr " -f, --force fuerza la instalación, sobreescribiendo los archivos en conflicto\n" + +#: src/pacman/pacman.c:106 +#, c-format +msgid "usage: %s {-R --remove} [options] \n" +msgstr "uso: %s {-R --remove} [opciones] \n" + +#: src/pacman/pacman.c:108 +#, c-format +msgid " -c, --cascade remove packages and all packages that depend on them\n" +msgstr " -c, --cascade quita paquetes, junto a todos los paquetes que dependan de ellos\n" + +#: src/pacman/pacman.c:110 +#, c-format +msgid " -k, --dbonly only remove database entry, do not remove files\n" +msgstr " -k, --dbonly sólo quita la referencia en la base de datos. No quita los archivos\n" + +#: src/pacman/pacman.c:111 +#, c-format +msgid " -n, --nosave remove configuration files as well\n" +msgstr " -n, --nosave quita también los archivos de configuración\n" + +#: src/pacman/pacman.c:112 +#, c-format +msgid " -s, --recursive remove dependencies also (that won't break packages)\n" +msgstr " -s, --recursive quita también las dependencias (que no rompen dependencias de otros paquetes)\n" + +#: src/pacman/pacman.c:115 +#, c-format +msgid "usage: %s {-F --freshen} [options] \n" +msgstr "uso: %s {-F --freshen} [opciones] \n" + +#: src/pacman/pacman.c:117 +#, c-format +msgid "usage: %s {-U --upgrade} [options] \n" +msgstr "uso: %s {-U --upgrade} [opciones] \n" + +#: src/pacman/pacman.c:123 +#, c-format +msgid "usage: %s {-Q --query} [options] [package]\n" +msgstr "uso: %s {-Q --query} [opciones] [paquete]\n" + +#: src/pacman/pacman.c:125 +#, c-format +msgid " -c, --changelog view the changelog of a package\n" +msgstr " -c, --changelog muestra el registro de cambios de un paquete\n" + +#: src/pacman/pacman.c:126 +#, c-format +msgid " -e, --orphans list all packages installed as dependencies but no longer\n" +msgstr " -e, --orphans lista todos los paquetes instalados como dependencias pero que ya no lo son mas\n" + +#: src/pacman/pacman.c:127 +#, c-format +msgid " required by any package\n" +msgstr " requerido por cualquier paquete\n" + +#: src/pacman/pacman.c:128 +#: src/pacman/pacman.c:143 +#, c-format +msgid " -g, --groups view all members of a package group\n" +msgstr " -g, --groups muestra todos los elementos del grupo de paquetes \n" + +#: src/pacman/pacman.c:129 +#: src/pacman/pacman.c:144 +#, c-format +msgid " -i, --info view package information\n" +msgstr " -i, --info ver la información del paquete\n" + +#: src/pacman/pacman.c:130 +#, c-format +msgid " -l, --list list the contents of the queried package\n" +msgstr " -l, --list lista los archivos contenidos en los paquetes consultados\n" + +#: src/pacman/pacman.c:131 +#, c-format +msgid " -m, --foreign list installed packages not found in sync db(s)\n" +msgstr " -m, --foreign lista paquetes no encontrados en las bases de datos de sincronización\n" + +#: src/pacman/pacman.c:132 +#, c-format +msgid " -o, --owns query the package that owns \n" +msgstr " -o, --owns consulta el paquete que contiene el archivo indicado\n" + +#: src/pacman/pacman.c:133 +#, c-format +msgid " -p, --file query a package file instead of the database\n" +msgstr " -p, --file consulta un archivo de paquetes en lugar de la base de datos\n" + +#: src/pacman/pacman.c:134 +#, c-format +msgid " -s, --search search locally-installed packages for matching strings\n" +msgstr " -s, --search busca paquetes instalados localmente que coincidan con la cadena\n" + +#: src/pacman/pacman.c:135 +#, c-format +msgid " -u, --upgrades list all packages that can be upgraded\n" +msgstr " -u, --upgrades muestra todos los paquetes que pueden ser actualizados\n" + +#: src/pacman/pacman.c:137 +#, c-format +msgid "usage: %s {-S --sync} [options] [package]\n" +msgstr "uso: %s {-S --sync} [opciones] [paquete]\n" + +#: src/pacman/pacman.c:139 +#, c-format +msgid " -c, --clean remove old packages from cache directory (-cc for all)\n" +msgstr " -c, --clean elimina paquetes antiguos del directorio de la cache (-cc para todos los paquetes)\n" + +#: src/pacman/pacman.c:141 +#, c-format +msgid " -e, --dependsonly install dependencies only\n" +msgstr " -e, --dependsonly instala sólo dependencias\n" + +#: src/pacman/pacman.c:145 +#, c-format +msgid " -l, --list view a list of packages in a repo\n" +msgstr " -l, --list ve una lista de paquetes en un repositorio\n" + +#: src/pacman/pacman.c:146 +#, c-format +msgid " -p, --print-uris print out URIs for given packages and their dependencies\n" +msgstr " -p, --print-uris muestra las URIs (nombres de paquetes) para los archivos indicados y sus dependencias\n" + +#: src/pacman/pacman.c:147 +#, c-format +msgid " -s, --search search remote repositories for matching strings\n" +msgstr " -s, --search busca en los repositorios remotos por coincidencias de la cadena especificada.\n" + +#: src/pacman/pacman.c:148 +#, c-format +msgid " -u, --sysupgrade upgrade all packages that are out of date\n" +msgstr " -u, --sysupgrade actualiza todos los paquetes que no están al día\n" + +#: src/pacman/pacman.c:149 +#, c-format +msgid " -w, --downloadonly download packages but do not install/upgrade anything\n" +msgstr " -w, --downloadonly sólo descarga los paquetes, sin instalar/actualizar nada\n" + +#: src/pacman/pacman.c:150 +#, c-format +msgid " -y, --refresh download fresh package databases from the server\n" +msgstr " -y, --refresh descarga bases de datos actualizadas desde el servidor\n" + +#: src/pacman/pacman.c:151 +#, c-format +msgid " --ignore ignore a package upgrade (can be used more than once)\n" +msgstr " --ignore ignora una actualización de paquete (puede ser usado más de una vez)\n" + +#: src/pacman/pacman.c:153 +#, c-format +msgid " --config set an alternate configuration file\n" +msgstr " --config define un archivo de configuración alterno\n" + +#: src/pacman/pacman.c:154 +#, c-format +msgid " --noconfirm do not ask for any confirmation\n" +msgstr " --noconfirm no solicita confirmación alguna\n" + +#: src/pacman/pacman.c:155 +#, c-format +msgid " --ask pre-specify answers for questions (see manpage)\n" +msgstr " --ask pre-define respuestas para preguntas (ver el manual)\n" + +#: src/pacman/pacman.c:156 +#, c-format +msgid " --noprogressbar do not show a progress bar when downloading files\n" +msgstr " --noprogressbar no muestra la barra de progreso cuando descarga archivos\n" + +#: src/pacman/pacman.c:157 +#, c-format +msgid " --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr " --noscriptlet no ejecuta el script de instalación. si es que existe\n" + +#: src/pacman/pacman.c:158 +#, c-format +msgid " -v, --verbose be verbose\n" +msgstr " -v, --verbose mostrar todo\n" + +#: src/pacman/pacman.c:159 +#, c-format +msgid " -r, --root set an alternate installation root\n" +msgstr " -r, --root define una raiz alterna para la instalación\n" + +#: src/pacman/pacman.c:160 +#, c-format +msgid " -b, --dbpath set an alternate database location\n" +msgstr " -b, --dbpath define una localización alternativa de la base de datos\n" + +#: src/pacman/pacman.c:161 +#, c-format +msgid " --cachedir set an alternate package cache location\n" +msgstr " --cachedir define una ruta alternativa para la localización de los archivos\n" + +#: src/pacman/pacman.c:174 +#, c-format +msgid " This program may be freely redistributed under\n" +msgstr " Este programa puede ser libremente distribuido bajo\n" + +#: src/pacman/pacman.c:175 +#, c-format +msgid " the terms of the GNU General Public License\n" +msgstr " los términos de la licencia GNU. General Public License\n" + +#: src/pacman/pacman.c:300 +#, c-format +msgid "'%s' is not a valid debug level" +msgstr "'%s' no es un nivel de depuración válido" + +#: src/pacman/pacman.c:315 +#, c-format +msgid "'%s' is not a valid cache directory\n" +msgstr "'%s' no es un directorio de cache válido\n" + +#: src/pacman/pacman.c:333 +#, c-format +msgid "'%s' is not a valid db path\n" +msgstr "%s' no es una ruta de base de datos válida\n" + +#: src/pacman/pacman.c:363 +#, c-format +msgid "'%s' is not a valid root path\n" +msgstr "'%s' no es una ruta de raíz válida\n" + +#: src/pacman/pacman.c:390 +msgid "only one operation may be used at a time\n" +msgstr "sólo una operación puede utilizarse a la vez\n" + +#: src/pacman/pacman.c:436 +msgid "warning: current locale is invalid; using default \"C\" locale" +msgstr "advertencia: la configuración \"locale\" es inválida: usando el locale por defecto \"C\"" + +#: src/pacman/pacman.c:456 +#, c-format +msgid "failed to initialize alpm library (%s)\n" +msgstr "falló al iniciar la libreria alpm (%s)\n" + +#: src/pacman/pacman.c:489 +msgid "you cannot perform this operation unless you are root.\n" +msgstr "no puede realizar esta operación, a menos que sea root.\n" + +#: src/pacman/pacman.c:505 +#, c-format +msgid "failed to parse config (%s)\n" +msgstr "falló al analizar la configuración (%s)\n" + +#: src/pacman/pacman.c:516 +msgid "Targets :" +msgstr "Objetivos :" + +#: src/pacman/pacman.c:522 +#, c-format +msgid "could not register 'local' database (%s)\n" +msgstr "no se pudo registrar la base de datos 'local' (%s)\n" + +#: src/pacman/pacman.c:529 +msgid "no targets specified (use -h for help)\n" +msgstr "no se especificaron objetivos (use -h para ayuda)\n" + +#: src/pacman/pacman.c:542 +msgid "no operation specified (use -h for help)\n" +msgstr "no se especificó una operación (utilice -h para ayuda)\n" + +#: src/pacman/query.c:90 +msgid "no file was specified for --owns\n" +msgstr "no se indico un archivo para --owns\n" + +#: src/pacman/query.c:95 +#, c-format +msgid "failed to read file '%s': %s" +msgstr "no se pudo leer el archivo '%s': %s" + +#: src/pacman/query.c:100 +msgid "cannot determine ownership of a directory" +msgstr "no se pudo determinar el propietario de un directorio" + +#: src/pacman/query.c:105 +#, c-format +msgid "cannot determine real path for '%s': %s" +msgstr "no se pudo determinar la ruta verdadera para '%s': %s" + +#: src/pacman/query.c:119 +#, c-format +msgid "%s is owned by %s %s\n" +msgstr "%s es propiedad de %s %s\n" + +#: src/pacman/query.c:127 +#, c-format +msgid "No package owns %s\n" +msgstr "Ningún paquete posee %s\n" + +#: src/pacman/query.c:170 +#: src/pacman/sync.c:453 +msgid "no usable package repositories configured.\n" +msgstr "no se encontraron repositorios útiles configurados.\n" + +#: src/pacman/query.c:176 +msgid "Checking for package upgrades..." +msgstr "Verificando actualizaciones de paquetes..." + +#: src/pacman/query.c:183 +msgid "no upgrades found" +msgstr "no se encontraron actualizaciones" + +#: src/pacman/query.c:221 +#, c-format +msgid "group \"%s\" was not found\n" +msgstr "el grupo \"%s\" no fue encontrado\n" + +#: src/pacman/query.c:232 +msgid "no package file was specified for --file\n" +msgstr "no se especificó un archivo de paquetes para --file\n" + +#: src/pacman/query.c:236 +#, c-format +msgid "failed to load package '%s' (%s)\n" +msgstr "error al cargar el paquete '%s' (%s)\n" + +#: src/pacman/query.c:273 +#: src/pacman/query.c:305 +#, c-format +msgid "package \"%s\" not found\n" +msgstr "el paquete \"%s\" no fue encontrado\n" + +#: src/pacman/remove.c:61 +#: src/pacman/sync.c:568 +#, c-format +msgid ":: group %s:\n" +msgstr ":: grupo %s:\n" + +#: src/pacman/remove.c:63 +msgid " Remove whole content? [Y/n] " +msgstr " ¿Quitar todo el contenido? [S/n] " + +#: src/pacman/remove.c:67 +#, c-format +msgid ":: Remove %s from group %s? [Y/n] " +msgstr ":: ¿Quitar %s del grupo %s? [S/n] " + +#: src/pacman/remove.c:80 +#: src/pacman/sync.c:480 +#: src/pacman/sync.c:529 +#, c-format +msgid "failed to init transaction (%s)\n" +msgstr "no se pudo iniciar la operación (%s)\n" + +#: src/pacman/remove.c:92 +#, c-format +msgid "failed to add target '%s' (%s)\n" +msgstr "error al agregar el paquete '%s' (%s)\n" + +#: src/pacman/remove.c:106 +#, c-format +msgid ":: %s is required by %s\n" +msgstr ":: %s es requerido por %s\n" + +#: src/pacman/remove.c:128 +#: src/pacman/util.c:324 +msgid "Targets:" +msgstr "A instalar:" + +#: src/pacman/remove.c:131 +msgid "" +"\n" +"Do you want to remove these packages? [Y/n] " +msgstr "" +"\n" +"¿Quiere eliminar estos paquetes? [S/n] " + +#: src/pacman/sync.c:115 +msgid "Do you want to remove old packages from cache? [Y/n] " +msgstr "Desea quitar los paquetes antiguos de la cache? [S/n] " + +#: src/pacman/sync.c:117 +msgid "removing old packages from cache... " +msgstr "quitando paquetes antiguos de la cache..." + +#: src/pacman/sync.c:120 +msgid "could not access cache directory\n" +msgstr "no se pudo acceder al directorio de la cache de paquetes\n" + +#: src/pacman/sync.c:181 +msgid "Do you want to remove all packages from cache? [Y/n] " +msgstr "Desea borrar todos los paquetes de la cache? [S/n] " + +#: src/pacman/sync.c:183 +msgid "removing all packages from cache... " +msgstr "quitando todos los paquetes de la cache... " + +#: src/pacman/sync.c:186 +msgid "could not remove cache directory\n" +msgstr "no se pudo eliminar el directorio de la cache\n" + +#: src/pacman/sync.c:191 +msgid "could not create new cache directory\n" +msgstr "no se pudo crear el nuevo directorio de la cache\n" + +#: src/pacman/sync.c:218 +#, c-format +msgid "failed to synchronize %s: %s\n" +msgstr "falló al sincronizar %s: %s\n" + +#: src/pacman/sync.c:220 +#, c-format +msgid "failed to update %s (%s)\n" +msgstr "falló al actualizar %s (%s)\n" + +#: src/pacman/sync.c:223 +#, c-format +msgid " %s is up to date\n" +msgstr " %s esta actualizado\n" + +#: src/pacman/sync.c:345 +#, c-format +msgid "repository '%s' does not exist\n" +msgstr "el repositorio '%s' no existe\n" + +#: src/pacman/sync.c:361 +#, c-format +msgid "package '%s' was not found in repository '%s'\n" +msgstr "el paquete '%s' no fue encontrado en el repositorio '%s'\n" + +#: src/pacman/sync.c:381 +#, c-format +msgid "package '%s' was not found\n" +msgstr "El paquete '%s' no fue encontrado\n" + +#: src/pacman/sync.c:418 +#, c-format +msgid "repository \"%s\" was not found.\n" +msgstr "el repositorio \"%s\" no fue encontrado.\n" + +#: src/pacman/sync.c:490 +msgid ":: Synchronizing package databases...\n" +msgstr ":: Sincronizando las bases de datos de paquetes...\n" + +#: src/pacman/sync.c:491 +msgid "synchronizing package lists" +msgstr "sincronizando la lista de paquetes" + +#: src/pacman/sync.c:493 +msgid "failed to synchronize any databases" +msgstr "falló al sincronizar cualquier base de datos." + +#: src/pacman/sync.c:499 +msgid ":: Starting full system upgrade...\n" +msgstr ":: iniciando actualización completa del sistema...\n" + +#: src/pacman/sync.c:500 +msgid "starting full system upgrade" +msgstr "iniciando la actualización completa del sistema" + +#: src/pacman/sync.c:518 +msgid "" +"\n" +":: pacman has detected a newer version of the \"pacman\" package.\n" +msgstr "" +"\n" +":: pacman ha detectado una nueva versión del paquete \"pacman\".\n" + +#: src/pacman/sync.c:519 +msgid ":: It is recommended that you allow pacman to upgrade itself\n" +msgstr ":: es recomendado que permita a pacman actualizarse a si mismo\n" + +#: src/pacman/sync.c:520 +msgid ":: first, then you can re-run the operation with the newer version.\n" +msgstr ":: primero, después puedes volver a ejecutar la operación con la nueva versión.\n" + +#: src/pacman/sync.c:522 +msgid ":: Upgrade pacman first? [Y/n] " +msgstr ":: ¿Actualizar pacman primero? [S/n] " + +#: src/pacman/sync.c:537 +#, c-format +msgid "pacman: %s\n" +msgstr "pacman: %s\n" + +#: src/pacman/sync.c:557 +#, c-format +msgid "'%s': %s\n" +msgstr "%s': %s\n" + +#: src/pacman/sync.c:572 +msgid ":: Install whole content? [Y/n] " +msgstr ":: ¿Instalar el todo el contenido? [S/n] " + +#: src/pacman/sync.c:579 +#, c-format +msgid ":: Install %s from group %s? [Y/n] " +msgstr ":: ¿Instalar %s del grupo %s? [S/n] " + +#: src/pacman/sync.c:603 +#, c-format +msgid "'%s': not found in sync db\n" +msgstr "'%s': no encontrado en la base de datos de sincronización\n" + +#: src/pacman/sync.c:621 +msgid "requires" +msgstr "necesita" + +#: src/pacman/sync.c:663 +msgid " local database is up to date\n" +msgstr " la base de datos local esta actualizada\n" + +#: src/pacman/sync.c:672 +msgid "" +"\n" +"Beginning download...\n" +msgstr "" +"\n" +"Empezando la descarga...\n" + +#: src/pacman/sync.c:676 +msgid "Proceed with download? [Y/n] " +msgstr "¿Continuar con la descarga? [S/n] " + +#: src/pacman/sync.c:684 +msgid "" +"\n" +"Beginning upgrade process...\n" +msgstr "" +"\n" +"Empezando proceso de actualización...\n" + +#: src/pacman/sync.c:688 +msgid "Proceed with installation? [Y/n] " +msgstr "¿Continuar con la instalación? [S/n] " + +#: src/pacman/trans.c:55 +msgid "checking dependencies... " +msgstr "comprobando dependencias... " + +#: src/pacman/trans.c:59 +msgid "checking for file conflicts... " +msgstr "verificando si existen conflictos entre archivos... " + +#: src/pacman/trans.c:63 +msgid "cleaning up... " +msgstr "limpiando..." + +#: src/pacman/trans.c:66 +msgid "resolving dependencies... " +msgstr "resolviendo dependencias... " + +#: src/pacman/trans.c:69 +msgid "looking for inter-conflicts... " +msgstr "verificando conflictos... " + +#: src/pacman/trans.c:86 +#, c-format +msgid "installing %s... " +msgstr "instalando %s..." + +#: src/pacman/trans.c:93 +#, c-format +msgid "installed %s (%s)" +msgstr "instalado %s (%s)" + +#: src/pacman/trans.c:100 +#, c-format +msgid "removing %s... " +msgstr "quitando %s..." + +#: src/pacman/trans.c:107 +#, c-format +msgid "removed %s (%s)" +msgstr "eliminado %s (%s)" + +#: src/pacman/trans.c:114 +#, c-format +msgid "upgrading %s... " +msgstr "actualizando %s... " + +#: src/pacman/trans.c:121 +#, c-format +msgid "upgraded %s (%s -> %s)" +msgstr "actualizado %s (%s -> %s)" + +#: src/pacman/trans.c:128 +msgid "checking package integrity... " +msgstr "Verificando la integridad de los paquetes... " + +#: src/pacman/trans.c:144 +msgid "failed.\n" +msgstr "falló.\n" + +#: src/pacman/trans.c:151 +#, c-format +msgid ":: Retrieving packages from %s...\n" +msgstr ":: Descargando paquetes desde %s...\n" + +#: src/pacman/trans.c:172 +#, c-format +msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " +msgstr ":: %1$s requiere %2$s que está en los paquetes ignorados . ¿Instalar %2$s? [S/n] " + +#: src/pacman/trans.c:177 +#, c-format +msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " +msgstr ":: %s esta en la lista a ignorar. ¿Instalar de todas formas? [S/n] " + +#: src/pacman/trans.c:190 +#, c-format +msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " +msgstr ":: %s esta indicado como paquete a mantener. ¿Quitar de todas formas? [S/n] " + +#: src/pacman/trans.c:203 +#, c-format +msgid ":: Replace %s with %s/%s? [Y/n] " +msgstr ":: ¿Reemplazar %s con %s/%s? [S/n] " + +#: src/pacman/trans.c:218 +#, c-format +msgid ":: %s conflicts with %s. Remove %s? [Y/n] " +msgstr ":: %s provoca conflictos con %s. ¿Quitar %s? [S/n]" + +#: src/pacman/trans.c:234 +#, c-format +msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " +msgstr ":: %s-%s: la versión local es mas reciente. ¿Actualizar de todas formas? [S/n] " + +#: src/pacman/trans.c:252 +#, c-format +msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " +msgstr ":: %s-%s: la versión local esta actualizada. ¿Actualizar de todas formas? [S/n] " + +#: src/pacman/trans.c:270 +#, c-format +msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " +msgstr ":: El Archivo %s esta corrupto. Desea borrarlo? [S/n] " + +#: src/pacman/trans.c:326 +msgid "installing" +msgstr "instalando" + +#: src/pacman/trans.c:329 +msgid "upgrading" +msgstr "actualizando" + +#: src/pacman/trans.c:332 +msgid "removing" +msgstr "quitando" + +#: src/pacman/trans.c:335 +msgid "checking for file conflicts" +msgstr "verificando conflictos entre archivos" + +#: src/pacman/util.c:259 +#, c-format +msgid "None\n" +msgstr "Nada\n" + +#: src/pacman/util.c:311 +msgid "Remove:" +msgstr "Se quitará:" + +#: src/pacman/util.c:319 +#, c-format +msgid "" +"\n" +"Total Removed Size: %.2f MB\n" +msgstr "" +"\n" +"Tamaño total eliminado: %.2f MB\n" + +#: src/pacman/util.c:330 +#, c-format +msgid "" +"\n" +"Total Package Size: %.2f MB\n" +msgstr "" +"\n" +"Tamaño total de paquetes: %.2f MB\n" + +#: src/pacman/util.c:337 +#, c-format +msgid "Total Installed Size: %.2f MB\n" +msgstr "Tamaño total instalado: %.2f MB\n" + -- cgit v1.2.3-70-g09d2 From 38e3b7c4fabe4f44533308a6e4ca01c3b13b74e1 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 23 Apr 2007 03:46:54 +0000 Subject: * Chantry Xavier Let IgnorePkg take precedence over the FORCE package flag --- lib/libalpm/package.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d1bbcda3..74adf5cd 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -142,6 +142,14 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } + if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) { + /* package should be ignored (IgnorePkg) */ + _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), + alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg), + alpm_pkg_get_version(pkg)); + return(0); + } + /* compare versions and see if we need to upgrade */ cmp = _alpm_versioncmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg)); @@ -158,13 +166,7 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) cmp = 0; } else if(cmp > 0) { /* we have an upgrade, make sure we should actually do it */ - if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) { - /* package should be ignored (IgnorePkg) */ - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), - alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg), - alpm_pkg_get_version(pkg)); - cmp = 0; - } else if(_alpm_pkg_istoonew(pkg)) { + if(_alpm_pkg_istoonew(pkg)) { /* package too new (UpgradeDelay) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: delaying upgrade of package (%s)"), alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg), -- cgit v1.2.3-70-g09d2 From c6a335501c73bf2cffa6e31b615da118b43d0229 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 23 Apr 2007 03:53:19 +0000 Subject: New archlinuxppc.org mirror added to mirrorlist --- etc/pacman.d/mirrorlist.in | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index f1c53a8e..53fefa67 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -30,6 +30,7 @@ Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@C # - Germany Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@ +Server = ftp://ftp.archlinuxppc.org/i686/@@REPO@@/os/@CARCH@ # - Great Britain Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@ # - Greece -- cgit v1.2.3-70-g09d2 From 5299115020d377fb6a6e4e1094e3a09c2abf88c1 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 23 Apr 2007 04:01:37 +0000 Subject: * Nagy Gabor Using the wrong variable in sortbydeps --- lib/libalpm/deps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 137be645..9295fabe 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -163,7 +163,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode) for(l = alpm_pkg_get_provides(q); l; l = l->next) { const char *provname = l->data; if(!strcmp(depend->name, provname)) { - if(!_alpm_pkg_find(provname, tmptargs)) { + if(!_alpm_pkg_find(qname, tmptargs)) { change = 1; tmptargs = alpm_list_add(tmptargs, q); } -- cgit v1.2.3-70-g09d2 From 4f2ecfdee3c19a9a5990513bc3940755d951f91b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 23 Apr 2007 04:09:00 +0000 Subject: rankmirrors: download first 50KB of DB to get more reliable numbers Scott Horowitz --- scripts/rankmirrors | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/rankmirrors b/scripts/rankmirrors index b2cfd18c..3eb10b5a 100644 --- a/scripts/rankmirrors +++ b/scripts/rankmirrors @@ -55,7 +55,8 @@ def timeCmd(cmd): def talkToServer(serverUrl): opener = urllib2.build_opener() - tmp = opener.open(serverUrl).read() + # retrieve first 50,000 bytes only + tmp = opener.open(serverUrl).read(50000) def getFuncToTime(serverUrl): return lambda : talkToServer(serverUrl) @@ -139,8 +140,23 @@ if __name__ == "__main__": elif options.times: print ' * ', sys.stdout.flush() + + # add *.db.tar.gz to server name. the repo name is parsed + # from the mirror url; it is the third (or fourth) dir + # from the end, where the url is http://foo/bar/REPO/os/arch + try: + splitted2 = serverUrl.split('/') + if serverUrl[-1] != '/': + repoName = splitted2[-3] + dbFileName = '/' + repoName + '.db.tar.gz' + else: + repoName = splitted2[-4] + dbFileName = repoName + '.db.tar.gz' + except: + dbFileName = '' + try: - serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) + serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl + dbFileName)) if options.verbose: try: print "%.2f" % serverToTime[serverUrl] -- cgit v1.2.3-70-g09d2 From 318d2b511bb6c93f43a3276bf44757019bb70303 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 23 Apr 2007 06:15:06 +0000 Subject: * Updated Italian translation Giovanni Scafora --- lib/libalpm/po/it.po | 166 +++++++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 78 deletions(-) diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index fb6cb77c..46eeb77f 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" -"PO-Revision-Date: 2007-03-22 12:30+0100\n" +"POT-Creation-Date: 2007-04-17 21:34+0200\n" +"PO-Revision-Date: 2007-04-17 22:00+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "lettura dei metadata di '%s' in corso" msgid "looking for unsatisfied dependencies" msgstr "ricerca delle dipendenze non soddisfatte" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "ricerca dei conflitti in corso" @@ -276,7 +276,7 @@ msgstr "impossibile aggiornare la voce %s-%s nel database" msgid "could not add entry '%s' in cache" msgstr "impossible includere la voce '%s' nella cache" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "esecuzione in corso di \"ldconfig -r %s\"" @@ -376,109 +376,114 @@ msgstr "impossibile rimuovere il file di lock %s" msgid "warning: could not remove lock file %s" msgstr "attenzione: impossibile rimuovere il file di lock %s" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "config: nuova sezione '%s'" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "config: nopassiveftp" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "config: usesyslog" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "config: chomp" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "config: usecolor" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "config: including %s" -#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "config: noupgrade: %s" -#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "config: noextract:·%s" -#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "config: ignorepkg: %s" -#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "config: holdpkg: %s" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "config: dbpath: %s" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, c-format +msgid "config: rootdir: %s" +msgstr "config: rootdir: %s" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "config: logfile: %s" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "config: xfercommand: %s" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "controllo della sostituzione dei pacchetti in corso" -#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "controllo in corso della sostituzione di '%s' con il pacchetto '%s'" -#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "" "%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%s)" -#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "" "%s-%s selezionato per l'aggiornamento (per essere sostituito con %s-%s)" -#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "impossibile trovare '%s' nel database, sarà ignorato" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' è già selezionato per la rimozione, sarà ignorato" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s selezionato per l'aggiornamento (%s => %s)" @@ -638,8 +643,8 @@ msgstr "\tCONFLITTI:: %s va in conflitto con %s" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "malloc failure: impossibile allocare %d byte" @@ -872,7 +877,7 @@ msgstr "operazione annullata" msgid "operation not compatible with the transaction type" msgstr "operazione incompatibile con il tipo di transazione" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" msgstr "impossibile eseguire l'operazione" @@ -1200,231 +1205,231 @@ msgstr "ricerca dei pacchetti da aggiornare in corso" msgid "%s-%s elected for upgrade (%s => %s)" msgstr "%s-%s selezionato per l'aggiornamento (%s => %s)" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" msgstr "ricerca in corso del pacchetto nel repository '%s'" -#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "pacchetto '%s' non trovato, ricerca delle alternative in corso" -#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "trovato '%s' come alternativa a '%s'" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" msgstr "impossibile trovare il repository '%s'" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "%s-%s è aggiornato, sarà ignorato" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" msgstr "aggiunta in corso del pacchetto '%s'" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" msgstr "risoluzione in corso delle dipendenze dei pacchetti" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "aggiunta in corso del pacchetto %s-%s" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" msgstr "ricerca in corso delle dipendenze irrisolvibili" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "il pacchetto '%s' va in conflitto con '%s'" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "impossibile trovare '%s', sarà ignorato" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" msgstr "il pacchetto '%s' fornisce il suo stesso conflitto" -#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "'%s' è nella lista dei pacchetti e sarà conservato" -#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" msgstr "rimozione in corso di '%s' dalla lista dei pacchetti" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" msgstr "risoluzione in corso del conflitto del pacchetto '%s'" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" msgstr "selezionato '%s' per la rimozione" -#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" msgstr "sono stati rilevati dei conflitti irrisolvibili" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" msgstr "" "controllo in corso delle dipendenze dei pacchetti designati per la rimozione" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" msgstr "qualcosa è andato orribilmente storto" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "trovato '%s' come alternativa a '%s', conflitto annullato" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" msgstr "%s è già presente nella cache\n" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" msgstr "la cache di %s non esiste, creazione in corso...\n" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "attenzione: la cache di %s non esiste, creazione in corso..." -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" msgstr "" "impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "" "attenzione: impossibile creare la cache del pacchetto, al suo posto sarà " "usata /tmp" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "impossibile recuperare alcuni file da %s\n" -#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "impossibile recuperare il checksum md5 o sha1 del pacchetto %s\n" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "archivio %s era corrotto (MD5 o SHA1 checksum errato)\n" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "archivio %s è corrotto (MD5 o SHA1 checksum errato)\n" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" msgstr "impossibile avviare l'operazione di rimozione" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" msgstr "impossibile inizializzare l'operazione di rimozione" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" msgstr "rimozione in corso dei pacchetti in conflitto e da sostituire" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" msgstr "impossibile preparare l'operazione di rimozione" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" msgstr "impossibile eseguire l'operazione di rimozione" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" msgstr "installazione dei pacchetti in corso" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" msgstr "impossibile avviare l'operazione" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" msgstr "impossibile inizializzare l'operazione" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" msgstr "impossibile preparare l'operazione" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" msgstr "" "aggiornamento in corso del database per le dipendenze dei pacchetti " "sostituiti" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "" "impossibile aggiornare il campo 'richiesto da' per la voce del database %s-%s" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" msgstr "impossibile aggiornare la nuova voce del database %s-%s" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, c-format msgid "found package '%s-%s' in sync" msgstr "trovato il pacchetto '%s-%s' nel database" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" msgstr "impossibile trovare il pacchetto '%s'" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" msgstr "aggiornamento delle dipendenze nei campi 'richiesto da' di %s-%s" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" msgstr "il pacchetto non ha dipendenze, nessun altro pacchetto da aggiornare" -#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "aggiornamento in corso del campo 'richiesto da' del pacchetto '%s'" -#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "impossibile aggiornare la voce 'richiesto da' del database %s-%s" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" msgstr "impossibile trovare la dipendenza '%s'" @@ -1503,7 +1508,12 @@ msgstr "chiamata a waitpid non riuscita (%s)" msgid "could not remove tmpdir %s" msgstr "impossibile rimuovere la directory temporanea %s" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "impossibile leggere le informazioni dello spazio del disco da %s: %s" + +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "" -- cgit v1.2.3-70-g09d2 From 3e42d00c991cde566cfcf8ed1933e446f545b928 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 23 Apr 2007 06:41:00 +0000 Subject: Add two pactests --- pactest/tests/sync136.py | 15 +++++++++++++++ pactest/tests/sync137.py | 14 ++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pactest/tests/sync136.py create mode 100644 pactest/tests/sync137.py diff --git a/pactest/tests/sync136.py b/pactest/tests/sync136.py new file mode 100644 index 00000000..58d08eb0 --- /dev/null +++ b/pactest/tests/sync136.py @@ -0,0 +1,15 @@ +self.description = "Sysupgrade with a sync package forcing a downgrade" + +sp = pmpkg("dummy", "1.0-1") +sp.force = 1 + +self.addpkg2db("sync", sp) + +lp = pmpkg("dummy", "1.0-2") + +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-1") diff --git a/pactest/tests/sync137.py b/pactest/tests/sync137.py new file mode 100644 index 00000000..94caca70 --- /dev/null +++ b/pactest/tests/sync137.py @@ -0,0 +1,14 @@ +self.description = "Sysupgrade with a force and ignore on same package" + +lp = pmpkg("dummy", "1.0-1") + +self.addpkg2db("local", lp) + +sp = pmpkg("dummy", "1.0-2") +sp.force = 1 +self.addpkg2db("sync", sp) + +self.args = "-Su --ignore %s" % lp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-1") -- cgit v1.2.3-70-g09d2 From 75b20014c1451aa18cc221b1af917304e9ad2092 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 23 Apr 2007 07:03:13 +0000 Subject: Updates in prep for 3.0.2 release --- NEWS | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3398f6e9..57a9da74 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.0.2 - fix a bug where pre/post_remove scriptlets were not ran + - ensure ldconfig is ran in all operations + - added a few new translations, updated existing ones + - updated mirror lists + - makepkg: ensure CFLAGS are exported to build function 3.0.1 - fix a locale issue with tr_TR upper/lower-case conversion - allow removal when listing the same package multiple times - fix a repo-add bug that left a .PKGINFO file in the current diff --git a/configure.ac b/configure.ac index 91d32a76..6396b54d 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ CFLAGS="" AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([Pacman package manager], 3.0.1, [pacman-dev@archlinux.org], [pacman]) +AC_INIT([Pacman package manager], 3.0.2, [pacman-dev@archlinux.org], [pacman]) AC_LANG([C]) AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST -- cgit v1.2.3-70-g09d2 From c60c1b5ccc5aee4797e4407b77b45336a97e235b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 23 Apr 2007 08:14:33 +0000 Subject: * Updated German translation Pierre Schmitz --- lib/libalpm/po/de.po | 204 ++++++++++++++++++++++++++------------------------- src/pacman/po/de.po | 42 +++++------ 2 files changed, 125 insertions(+), 121 deletions(-) diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 45e120da..ea0675d4 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -1,4 +1,4 @@ -# translation of de.po to Deutsch +# translation of de.po to German # German translations for Pacman package manager package. # Copyright (C) 2002-2007 Judd Vinet # This file is distributed under the same license as the Pacman package manager package. @@ -10,10 +10,10 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" -"PO-Revision-Date: 2007-03-07 09:12+0100\n" -"Last-Translator: Matthias Gorissen \n" -"Language-Team: Deutsch \n" +"POT-Creation-Date: 2007-04-17 20:23+0200\n" +"PO-Revision-Date: 2007-04-17 20:26+0200\n" +"Last-Translator: Pierre Schmitz \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -44,7 +44,7 @@ msgstr "Lese Metadaten von '%s'" msgid "looking for unsatisfied dependencies" msgstr "Suche nach ungelösten Abhängigkeiten" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "Suche nach Konflikten" @@ -179,7 +179,8 @@ msgstr "Aktion: Belasse existierende Datei an ihrem Platz" #: lib/libalpm/add.c:663 msgid "action: keeping current file and installing new one with .pacnew ending" msgstr "" -"Aktion: Behalte aktuelle Datei und installiere die neue mit der Endung .pacnew" +"Aktion: Behalte aktuelle Datei und installiere die neue mit der Endung ." +"pacnew" #: lib/libalpm/add.c:666 #, c-format @@ -278,7 +279,7 @@ msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren" msgid "could not add entry '%s' in cache" msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "Führe \"ldconfig -r %s\" aus" @@ -300,8 +301,7 @@ msgstr "Schließe Datenbank '%s'" #: lib/libalpm/alpm.c:232 #, c-format -msgid "" -"adding new server to database '%s': protocol '%s', server '%s', path '%s'" +msgid "adding new server to database '%s': protocol '%s', server '%s', path '%s'" msgstr "" "Füge neuen Server zur Datenbank '%s' hinzu: Protokoll '%s', Server '%s', " "Pfad '%s'" @@ -376,107 +376,112 @@ msgstr "Konnte Sperrdatei %s nicht entfernen" msgid "warning: could not remove lock file %s" msgstr "Warnung: Konnte Sperrdatei %s nicht entfernen" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "Konfiguration: Neuer Abschnitt '%s'" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "Konfiguration: nopassiveftp" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "Konfiguration: usesyslog" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "Konfiguration: chomp" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "Konfiguration: usecolor" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "Konfiguration: including %s" -#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "Konfiguration: noupgrade: %s" -#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "Konfiguration: noextract: %s" -#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "Konfiguration: ignorepkg: %s" -#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "Konfiguration: holdpkg: %s" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "Konfiguration: dbpath: %s" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "Konfiguration: cachedir: %s" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, c-format +msgid "config: rootdir: %s" +msgstr "Konfiguration: rootdir: %s" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "Konfiguration: logfile: %s" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "Konfiguration: xfercommand: %s" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "Konfiguration: upgradedelay: %d" -#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "Prüfe auf Paketersetzungen" -#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "Prüfe Ersetzung '%s' für Paket '%s'" -#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: Ignoriere zu aktualisierendes Packet (zu ersetzen durch %s-%s)" -#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s wurde zur Aktualisierung ausgewählt (wird durch %s-%s ersetzt)" -#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' nicht in Sync-DB gefunden -- Überspringe" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' ist bereits zum Entfernen ausgewählt -- Überspringe" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s wurde zur Aktualisierung ausgewählt (%s => %s)" @@ -507,10 +512,10 @@ msgstr "Ungültiger Paket-Eintrag wurde an _alpm_db_read übergeben, überspring #: lib/libalpm/be_files.c:226 #, c-format -msgid "" -"request to read database info for a file-based package '%s', skipping..." +msgid "request to read database info for a file-based package '%s', skipping..." msgstr "" -"Überspringe das Lesen der Datenbank-Information für das Datei-basierte Paket '%s'..." +"Überspringe das Lesen der Datenbank-Information für das Datei-basierte Paket " +"'%s'..." #: lib/libalpm/be_files.c:239 #, c-format @@ -633,8 +638,8 @@ msgstr "\tCONFLICTS:: %s steht im Konflikt mit %s" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "malloc-Fehler: Konnte %d Bytes nicht zuweisen" @@ -651,8 +656,7 @@ msgstr "Versuche die lokale Datenbank neu zu registrieren" #: lib/libalpm/db.c:175 #, c-format msgid "attempt to re-register the '%s' database, using existing" -msgstr "" -"Versuche die %s Datenbank neu zu registrieren, verwende die bestehende" +msgstr "Versuche die %s Datenbank neu zu registrieren, verwende die bestehende" #: lib/libalpm/db.c:181 #, c-format @@ -662,8 +666,7 @@ msgstr "Registriere Datenbank '%s'" #: lib/libalpm/db.c:186 #, c-format msgid "database directory '%s' does not exist, creating it" -msgstr "" -"Datenbank-Verzeichnis '%s' ist nicht vorhanden, erstelle es" +msgstr "Datenbank-Verzeichnis '%s' ist nicht vorhanden, erstelle es" #: lib/libalpm/db.c:197 #, c-format @@ -699,15 +702,12 @@ msgstr "checkdeps: Abhängigkeit'%s' wurde von '%s' nach '%s' verschoben" #: lib/libalpm/deps.c:280 #, c-format msgid "checkdeps: dependency '%s' satisfied by installed package '%s'" -msgstr "" -"checkdeps: Abhängigkeit '%s' von installiertem Paket '%s' erfüllt" +msgstr "checkdeps: Abhängigkeit '%s' von installiertem Paket '%s' erfüllt" #: lib/libalpm/deps.c:289 #, c-format msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" -msgstr "" -"checkdeps: aktualisiertes '%s' wird die Abhängigkeit von '%s' nicht " -"erfüllen" +msgstr "checkdeps: aktualisiertes '%s' wird die Abhängigkeit von '%s' nicht erfüllen" #: lib/libalpm/deps.c:359 #, c-format @@ -727,8 +727,7 @@ msgstr "Schließe %s aus -- Ausdrücklich installiert" #: lib/libalpm/deps.c:532 #, c-format msgid "cannot find package \"%s\" or anything that provides it!" -msgstr "" -"Kann Paket \"%s\" oder irgendwas, das es zur Verfügung stellt, nicht finden!" +msgstr "Kann Paket \"%s\" oder irgendwas, das es zur Verfügung stellt, nicht finden!" #: lib/libalpm/deps.c:540 lib/libalpm/deps.c:551 #, c-format @@ -746,8 +745,7 @@ msgstr "%s stellt Abhängigkeit %s zur Verfügung -- Überspringe" #: lib/libalpm/deps.c:630 #, c-format -msgid "" -"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" +msgid "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" msgstr "" "Kann Abhängigkeiten für \"%s\" nicht auflösen (\"%s\" ist nicht in " "Paketliste enthalten)" @@ -868,7 +866,7 @@ msgstr "Vorgang abgebrochen" msgid "operation not compatible with the transaction type" msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" msgstr "Konnte den Vorgang nicht durchführen" @@ -1196,226 +1194,226 @@ msgstr "Suche nach Paketaktualisierungen" msgid "%s-%s elected for upgrade (%s => %s)" msgstr "%s-%s ausgewählt für Aktualisierung (%s => %s)" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" msgstr "Suche nach Ziel in Repositorium '%s'" -#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "Ziel '%s' wurde nicht gefunden -- suche nach Ähnlichem" -#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "'%s' stellt '%s' bereit" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" msgstr "Repositorium '%s' nicht gefunden" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "%s-%s ist aktuell -- Überspringe" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" msgstr "Füge das Ziel '%s' zur Vorgangsliste hinzu" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" msgstr "Auflösen von Ziel-Abhängigkeiten" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "Füge Paket %s-%s zur Vorgangszielen hinzu" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" msgstr "Suche nach unlösbaren Abhängigkeiten" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "Paket '%s' steht im Konflikt mit '%s'" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "'%s' wurde nicht in der Vorgangsliste gefunden -- überspringe" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" msgstr "Paket '%s' steht im Konflikt mit sich selbst" -#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "'%s' ist in der Ziel-Liste -- ich behalte es" -#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" msgstr "Entferne '%s' von Ziel-Liste" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" msgstr "Löse Paket-Konflikt '%s'" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" msgstr "Wähle '%s' zum Entfernen aus" -#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" msgstr "Nicht lösbare Paketkonflikte gefunden" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" msgstr "Überprüfe die Abhängigkeiten der zu entfernenden Pakete" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" msgstr "etwas ist fürchterlich schief gegangen" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "'%s' stellt '%s' bereit -- Konflikt abgewandt" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" msgstr "%s ist bereits im Puffer\n" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" msgstr "Es existiert kein %s-Puffer. Erstelle... \n" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "Warnung: Es existiert kein %s Puffer. Erstelle..." -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "Warnung: Konnte Paketpuffer nicht erstellen; benutze stattdessen /tmp" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "Konnte manche Dateien von %s nicht übertragen\n" -#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "Kann MD5- oder SHA1-Prüfsumme für Paket %s nicht ermitteln\n" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "Archiv %s war beschädigt (falsche MD5- oder SHA1-Prüfsumme)\n" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "Archiv %s ist beschädigt (falsche MD5- oder SHA1-Prüfsumme)\n" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" msgstr "Konnte den Lösch-Vorgang nicht erstellen" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" msgstr "Konnte den Lösch-Vorgang nicht beginnen" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" msgstr "Entferne im Konflikt stehende und zu ersetzende Pakete" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" msgstr "Konnte Lösch-Vorgang nicht vorbereiten" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" msgstr "Konnte Lösch-Vorgang nicht durchführen" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" msgstr "Installiere Pakete" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" msgstr "Konnte den Vorgang nicht erstellen" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" msgstr "Konnte den Vorgang nicht beginnen" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" msgstr "Konnte den Vorgang nicht vorbereiten" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" msgstr "Aktualisiere Datenbank für die Abhängigkeiten der ersetzten Pakete" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "Konnte requiredby für Datenbank-Eintrag %s-%s nicht aktualisieren" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" msgstr "Konnte neuen Datenbank-Eintrag %s-%s nicht aktualisieren" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, c-format msgid "found package '%s-%s' in sync" msgstr "Paket '%s-%s' gefunden" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" msgstr "Paket '%s' nicht in Datenbank gefunden" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" msgstr "Aktualisiere requiredby-Felder abhängiger Pakete für %s-%s" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" msgstr "" "Paket besitzt keine Abhängigkeiten, kein anderes Paket muß aktualisiert " "werden" -#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "Aktualisiere requiredby-Feld für Paket '%s'" -#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "Konnte requiredby-Eintrag %s-%s nicht aktualisieren" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" msgstr "Konnte Abhängigkeit '%s' nicht finden" @@ -1494,7 +1492,12 @@ msgstr "Aufruf von 'waitpid' fehlgeschlagen (%s)" msgid "could not remove tmpdir %s" msgstr "Konnte tmpdir %s nicht entfernen" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "Konnte freien Speicher von %s nicht ermitteln: %s" + +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "Prüfe freien Speicher: Gesamte pkg-Größe: %lld, Speicherplatz: %lld" @@ -1508,3 +1511,4 @@ msgstr "depcmp: %s-%s %s %s-%s => %s" #, c-format msgid "depcmp: %s-%s %s %s => %s" msgstr "depcmp: %s-%s %s %s => %s" + diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index 4bb71302..4d502dcc 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" -"PO-Revision-Date: 2007-03-23 18:08+0100\n" -"Last-Translator: Matthias Gorissen \n" +"POT-Creation-Date: 2007-04-17 20:23+0200\n" +"PO-Revision-Date: 2007-04-17 20:18+0200\n" +"Last-Translator: Pierre Schmitz \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,11 +93,6 @@ msgstr "Konnte den Vorgang (%s) nicht durchführen\n" msgid "failed to release transaction (%s)\n" msgstr "Konnte den Vorgang (%s) nicht freigeben\n" -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "Erfordert: %s" - #: src/pacman/log.c:63 #, c-format msgid "debug" @@ -388,7 +383,9 @@ msgstr "" #, c-format msgid "" " -k, --dbonly only remove database entry, do not remove files\n" -msgstr " -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien\n" +msgstr "" +" -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien " +"entfernen\n" #: src/pacman/pacman.c:111 #, c-format @@ -478,12 +475,12 @@ msgid "" " -s, --search search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n" +" -s, --search Durchsucht lokal installierte Pakete nach einem Wort\n" #: src/pacman/pacman.c:135 #, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr " -u, --upgrades Zeige alle aktualisierbaren Pakete an\n" +msgstr " -u, --upgrades Zeigt alle aktualisierbaren Pakete an\n" #: src/pacman/pacman.c:137 #, c-format @@ -507,7 +504,8 @@ msgstr " -e, --dependsonly Nur Abhängigkeiten installieren\n" #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list view a list of packages in a repo\n" -msgstr " -l, --list Zeigt eine Liste aller Pakete eines Repositoriums an\n" +msgstr "" +" -l, --list Zeigt eine Liste aller Pakete eines Repositoriums an\n" #: src/pacman/pacman.c:146 #, c-format @@ -523,12 +521,12 @@ msgstr "" msgid "" " -s, --search search remote repositories for matching strings\n" msgstr "" -" -s, --search Durchsuche entfernte Repositorien nach einem Wort\n" +" -s, --search Durchsucht entfernte Repositorien nach einem Wort\n" #: src/pacman/pacman.c:148 #, c-format msgid " -u, --sysupgrade upgrade all packages that are out of date\n" -msgstr " -u, --sysupgrade Alle veralteten Pakete aktualisieren\n" +msgstr " -u, --sysupgrade Aktualisiert alle veralteten Pakete\n" #: src/pacman/pacman.c:149 #, c-format @@ -536,14 +534,15 @@ msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" msgstr "" -" -w, --downloadonly Lade Pakete herunter, aber nichts installieren oder\n" +" -w, --downloadonly Lädt Pakete herunter, ohne etwas zu installieren " +"oder\n" " aktualisieren\n" #: src/pacman/pacman.c:150 #, c-format msgid "" " -y, --refresh download fresh package databases from the server\n" -msgstr " -y, --refresh Lade frische Paketdatenbank vom Server\n" +msgstr " -y, --refresh Lädt frische Paketdatenbank vom Server\n" #: src/pacman/pacman.c:151 #, c-format @@ -887,11 +886,6 @@ msgstr ":: Zuerst pacman aktualisieren? [J/n] " msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s':%s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Gesamten Inhalt installieren? [J/n] " @@ -1088,3 +1082,9 @@ msgstr "" #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Gesamtgröße der installierten Pakete : %.2f MB\n" + +#~ msgid "requires: %s" +#~ msgstr "Erfordert: %s" + +#~ msgid "'%s': %s\n" +#~ msgstr "'%s':%s\n" -- cgit v1.2.3-70-g09d2 From a7e80fba9e9b53721261750e9e67a8c6356fc078 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 25 Apr 2007 04:38:54 +0000 Subject: Updated French translation from Nam <37i11@altern.org>. --- lib/libalpm/po/fr.po | 802 ++++++++++++++++++++++++++------------------------- src/pacman/po/fr.po | 600 ++++++++++++++++++++------------------ 2 files changed, 731 insertions(+), 671 deletions(-) diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index d9f1f6e4..ffa291a7 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -1,48 +1,47 @@ # French translations for Pacman package manager package. # Copyright (C) 2002-2007 Judd Vinet # This file is distributed under the same license as the Pacman package manager package. -# FIRST AUTHOR , YEAR. -# msgid "" msgstr "" -"Project-Id-Version: Pacman package manager 3.0.0\n" +"Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" -"PO-Revision-Date: 2007-03-22 12:20+0100\n" -"Last-Translator: solsTiCe d'hiver \n" +"POT-Creation-Date: 2007-04-25 00:34-0400\n" +"PO-Revision-Date: 2007-04-17 12:45+0100\n" +"Last-Translator: nam <37ii11@altern.org>\n" "Language-Team: solsTiCe d'Hiver \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -"X-Poedit-SourceCharset: iso-8859-15\n" #: lib/libalpm/add.c:77 #, c-format msgid "loading target '%s'" -msgstr "charge la cible '%s'" +msgstr "chargement de la cible '%s'" #: lib/libalpm/add.c:122 #, c-format msgid "replacing older version %s-%s by %s in target list" -msgstr "remplace l'ancienne version %s-%s par %s dans la liste de destination" +msgstr "" +"remplacement de l'ancienne version %s-%s par %s dans la liste des cibles" #: lib/libalpm/add.c:131 #, c-format msgid "newer version %s-%s is in the target list -- skipping" -msgstr "une version plus rcente %s-%s est dj prsente -- ignorer" +msgstr "" +"une version plus récente %s-%s est dans la liste des cibles -- paquet ignoré" #: lib/libalpm/add.c:138 #, c-format msgid "reading '%s' metadata" -msgstr "lecture des mta-donnes '%s'" +msgstr "lecture des méta-données '%s'" #: lib/libalpm/add.c:191 lib/libalpm/remove.c:111 msgid "looking for unsatisfied dependencies" -msgstr "recherche des dpendances non satisfaites" +msgstr "recherche des dépendances non satisfaites" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "recherche des conflits" @@ -53,11 +52,11 @@ msgstr "remplacer un paquet avec -A ou -U n'est pas encore possible" #: lib/libalpm/add.c:209 #, c-format msgid "please remove '%s' first, using -Rd" -msgstr "svp supprimer '%s' d'abord, en utilisant -Rd" +msgstr "veuillez supprimer '%s' d'abord, en utilisant -Rd" #: lib/libalpm/add.c:250 lib/libalpm/remove.c:147 msgid "sorting by dependencies" -msgstr "tri par dpendances" +msgstr "tri par dépendances" #: lib/libalpm/add.c:262 msgid "cleaning up" @@ -70,7 +69,7 @@ msgstr "recherche de conflits entre fichiers" #: lib/libalpm/add.c:346 #, c-format msgid "upgrading package %s-%s" -msgstr "mise jour du paquet %s-%s" +msgstr "mise à jour du paquet %s-%s" #: lib/libalpm/add.c:370 #, c-format @@ -80,45 +79,46 @@ msgstr "ajout du paquet %s-%s" #: lib/libalpm/add.c:383 #, c-format msgid "removing old package first (%s-%s)" -msgstr "retirer l'ancien paquet pralablement (%s-%s)" +msgstr "suppression préalable de l'ancien paquet (%s-%s)" #: lib/libalpm/add.c:411 #, c-format msgid "adding %s to the NoUpgrade array temporarily" -msgstr "ajout de %s NoUpgrade temporairement" +msgstr "ajout provisoire de %s parmi les paquets à ne pas mettre à jour" #: lib/libalpm/add.c:429 msgid "extracting files" msgstr "extraction des fichiers" +# j'ai traduit chaque fois "could not" par "a échoué" #: lib/libalpm/add.c:444 lib/libalpm/util.c:465 msgid "could not get current working directory" -msgstr "impossible de dterminer le rpertoire courant" +msgstr "déterminer le répertoire courant a échoué" #: lib/libalpm/add.c:500 lib/libalpm/add.c:501 #, c-format msgid "%s is in NoExtract, skipping extraction" -msgstr "%s est dans la liste NoExtract -- ignore l'extraction" +msgstr "%s est dans la liste des paquets NoExtract -- extraction non effectuée" #: lib/libalpm/add.c:508 #, c-format msgid "%s is in trans->skip_add, skipping extraction" -msgstr "%s est dans trans->skip_add, extration ignore" +msgstr "%s est dans trans->skip_add, extraction ignorée" #: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 #, c-format msgid "could not extract %s (%s)" -msgstr "n'a pas pu extraire %s (%s)" +msgstr "l'extraction de %s (%s) a échoué" #: lib/libalpm/add.c:598 #, c-format msgid "checking md5 hashes for %s" -msgstr "vrification de la 'signature' md5 pour %s" +msgstr "vérification de la 'signature' md5 pour %s" #: lib/libalpm/add.c:600 #, c-format msgid "checking sha1 hashes for %s" -msgstr "vrification de la 'signature' sha1 pour %s" +msgstr "vérification de la 'signature' sha1 pour %s" #: lib/libalpm/add.c:602 #, c-format @@ -138,32 +138,32 @@ msgstr "original: %s" #: lib/libalpm/add.c:616 #, c-format msgid "could not rename %s (%s)" -msgstr "n'a pas pu renommer %s (%s)" +msgstr "renommer %s (%s) a échoué" #: lib/libalpm/add.c:617 #, c-format msgid "error: could not rename %s (%s)" -msgstr "erreur: n'a pas pu renommer %s (%s)" +msgstr "erreur: renommer %s (%s) a échoué" #: lib/libalpm/add.c:623 lib/libalpm/add.c:642 #, c-format msgid "could not copy tempfile to %s (%s)" -msgstr "n'a pas pu copier tempfile vers %s (%s)" +msgstr "la copie du fichier temporaire vers %s (%s) a échoué" #: lib/libalpm/add.c:624 #, c-format msgid "error: could not copy tempfile to %s (%s)" -msgstr "erreur: n'a pas pu copier tempfile vers %s (%s)" +msgstr "erreur: la copie du fichier temporaire vers %s (%s) a échoué" #: lib/libalpm/add.c:628 lib/libalpm/remove.c:247 #, c-format msgid "%s saved as %s" -msgstr "%s sauve en tant que %s" +msgstr "%s enregistré en tant que %s" #: lib/libalpm/add.c:629 #, c-format msgid "warning: %s saved as %s" -msgstr "avertissement: %s sauv en tant que %s" +msgstr "avertissement: %s enregistré en tant que %s" #: lib/libalpm/add.c:639 #, c-format @@ -172,72 +172,72 @@ msgstr "action: installation du nouveau fichier: %s" #: lib/libalpm/add.c:649 lib/libalpm/add.c:655 lib/libalpm/add.c:660 msgid "action: leaving existing file in place" -msgstr "action: quitte en prservant les fichiers existant" +msgstr "action: quitte en préservant les fichiers existants" #: lib/libalpm/add.c:663 msgid "action: keeping current file and installing new one with .pacnew ending" msgstr "" -"action: conserve le fichier actuel et installer le nouveau avec l'extension ." +"action: conserve le fichier actuel et installe le nouveau avec l'extension ." "pacnew" #: lib/libalpm/add.c:666 #, c-format msgid "could not install %s as %s: %s" -msgstr "n'a pas pu installer %s en tant que %s: %s" +msgstr "l'installation de %s en tant que %s: %s a échoué" #: lib/libalpm/add.c:667 #, c-format msgid "error: could not install %s as %s: %s" -msgstr "erreur: n'a pas pu installer %s en tant que %s: %s" +msgstr "erreur: l'installation de %s en tant que %s: %s a échoué" #: lib/libalpm/add.c:669 #, c-format msgid "%s installed as %s" -msgstr "%s install en tant que %s" +msgstr "%s installé en tant que %s" #: lib/libalpm/add.c:670 #, c-format msgid "warning: %s installed as %s" -msgstr "avertissement: %s install en tant que %s" +msgstr "avertissement: %s installé en tant que %s" #: lib/libalpm/add.c:684 #, c-format msgid "%s is in NoUpgrade -- skipping" -msgstr "%s est marqu NoUpgrade -- ignore" +msgstr "%s est parmi les paquets à ne pas mettre à jour -- ignoré" #: lib/libalpm/add.c:685 #, c-format msgid "extracting %s as %s.pacnew" -msgstr "extrait %s en tant que %s.pacnew" +msgstr "extraction de %s comme %s.pacnew" #: lib/libalpm/add.c:686 #, c-format msgid "warning: extracting %s as %s.pacnew" -msgstr "avertissement: extrait %s en tant que %s.pacnew" +msgstr "avertissement: extraction de %s comme %s.pacnew" #: lib/libalpm/add.c:689 #, c-format msgid "extracting %s" -msgstr "extrait %s" +msgstr "extraction de %s" #: lib/libalpm/add.c:705 #, c-format msgid "error: could not extract %s (%s)" -msgstr "erreur: n'a pas pu extraire %s (%s)" +msgstr "erreur: l'extraction de %s (%s) a échoué" #: lib/libalpm/add.c:717 #, c-format msgid "appending backup entry for %s" -msgstr "ajoute une entre de sauvegarde pour %s" +msgstr "ajoute une entrée de sauvegarde pour %s" #: lib/libalpm/add.c:749 lib/libalpm/add.c:751 #, c-format msgid "errors occurred while %s %s" -msgstr "des erreurs sont survenue pendant %s %s" +msgstr "des erreurs sont survenues pendant %s %s" #: lib/libalpm/add.c:750 lib/libalpm/add.c:752 msgid "upgrading" -msgstr "mise jour" +msgstr "mise à jour" #: lib/libalpm/add.c:750 lib/libalpm/add.c:752 msgid "installing" @@ -246,41 +246,41 @@ msgstr "installation" #: lib/libalpm/add.c:769 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" -msgstr "supposant que '%s' a t supprim du paquet %s (%s => %s)" +msgstr "la condition '%s' a été supprimée du paquet %s (%s => %s)" #: lib/libalpm/add.c:781 #, c-format msgid "updating '%s' due to provision change (%s)" -msgstr "met jour '%s' comme disposition pour (%s)" +msgstr "mise à jour de '%s' suite à un changement de contenu (%s)" #: lib/libalpm/add.c:785 lib/libalpm/add.c:786 #, c-format msgid "could not update provision '%s' from '%s'" -msgstr "ne peut mettre jour '%s' depuis '%s'" +msgstr "la mise à jour du contenu '%s' dans '%s' a échoué" #: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 msgid "updating database" -msgstr "met jour la base de donnes" +msgstr "mise à jour de la base de données" #: lib/libalpm/add.c:800 #, c-format msgid "adding database entry '%s'" -msgstr "ajoute l'entre de base de donnes '%s'" +msgstr "ajout de l'entrée de base de données '%s'" #: lib/libalpm/add.c:803 lib/libalpm/add.c:805 #, c-format msgid "could not update database entry %s-%s" -msgstr "n'a pas pu mettre jour l'entre de base de donnes %s-%s" +msgstr "la mise à jour l'entrée de base de données %s-%s a échoué" #: lib/libalpm/add.c:811 #, c-format msgid "could not add entry '%s' in cache" -msgstr "n'a pas pu ajouter l'entre '%s' dans le cache" +msgstr "l'ajout au cache de l'entrée '%s' a échoué" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" -msgstr "excute \"ldconfig -r %s\"" +msgstr "exécution de \"ldconfig -r %s\"" #: lib/libalpm/alpm.c:116 #, c-format @@ -290,37 +290,37 @@ msgstr "suppression de la DB %s, %d restant..." #: lib/libalpm/alpm.c:181 #, c-format msgid "unregistering database '%s'" -msgstr "dsenregistre la base de donnes '%s'" +msgstr "désenregistrement de la base de données '%s'" #: lib/libalpm/alpm.c:186 #, c-format msgid "closing database '%s'" -msgstr "ferme la base de donnes '%s'" +msgstr "fermeture de la base de données '%s'" #: lib/libalpm/alpm.c:232 #, c-format msgid "" "adding new server to database '%s': protocol '%s', server '%s', path '%s'" msgstr "" -"ajout d'un nouveau serveur la base '%s': protocole '%s', serveur '%s', " +"ajout d'un nouveau serveur à la base '%s': protocole '%s', serveur '%s', " "chemin '%s'" #: lib/libalpm/alpm.c:236 #, c-format msgid "serverlist flushed for '%s'" -msgstr "liste de serveur rcupr depuis '%s'" +msgstr "liste des serveurs mise à jour pour '%s'" #: lib/libalpm/alpm.c:279 #, c-format msgid "failed to get lastupdate time for %s (no big deal)" msgstr "" -"chec de la rcupration de la date de dernire mise jour pour %s (pas un " -"problme)" +"échec de récupération de la date de dernière mise à jour pour %s (problème " +"mineur)" #: lib/libalpm/alpm.c:298 #, c-format msgid "failed to sync db: %s [%d]" -msgstr "chec de synchronisation de la base: %s [%d]" +msgstr "échec de synchronisation de la base de données: %s [%d]" #: lib/libalpm/alpm.c:302 #, c-format @@ -330,17 +330,17 @@ msgstr "sync: nouveau mtime pour %s: %s" #: lib/libalpm/alpm.c:308 #, c-format msgid "flushing database %s%s" -msgstr "recharge la base de donnes %s%s" +msgstr "mise à jour de la base de données %s%s" #: lib/libalpm/alpm.c:312 #, c-format msgid "could not remove database entry %s%s" -msgstr "n'a pas pu retirer l'entre de base de donnes %s%s" +msgstr "la suppression de l'entrée de base de données %s%s a échoué" #: lib/libalpm/alpm.c:481 #, c-format msgid "could not get sha1sum for package %s-%s" -msgstr "n'a pas pu obtenir la 'signature' sha1 pour le paquet %s-%s" +msgstr "l'obtention de la 'signature' sha1 pour le paquet %s-%s a échoué" #: lib/libalpm/alpm.c:487 #, c-format @@ -355,7 +355,7 @@ msgstr "les 'signatures' sha1 ne correspondent pas pour le paquet %s-%s" #: lib/libalpm/alpm.c:525 #, c-format msgid "could not get md5sum for package %s-%s" -msgstr "n'a pas pu obtenir la 'signature' md5 pour le paquet %s-%s" +msgstr "l'obtention de la 'signature' md5 pour le paquet %s-%s a échoué" #: lib/libalpm/alpm.c:531 #, c-format @@ -370,263 +370,271 @@ msgstr "les 'signatures' md5 ne correspondent pas pour le paquet %s-%s" #: lib/libalpm/alpm.c:783 #, c-format msgid "could not remove lock file %s" -msgstr "n'a pas pu effacer le fichier de verrou %s" +msgstr "la suppression du fichier de verrouillage %s a échoué" #: lib/libalpm/alpm.c:784 #, c-format msgid "warning: could not remove lock file %s" -msgstr "avertissement: n'a pas pu effacer le fichier de verrou %s" +msgstr "avertissement: la suppression du fichier de verrouillage %s a échoué" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "config: nouvelle section '%s'" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "config: nopassiveftp" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "config: usesyslog" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "config: chomp" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "config: usecolor" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "config: inclusion de %s" -#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "config: noupgrade: %s" -#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "config: noextract: %s" -#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "config: ignorepkg: %s" -#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "config: holdpkg: %s" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "config: dbpath: %s" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, c-format +msgid "config: rootdir: %s" +msgstr "config: rootdir: %s" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "config: logfile: %s" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "config: xfercommand: %s" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" -msgstr "vrification des remplacements pour le paquet" +msgstr "analyse de remplacements possibles pour le paquet" -#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "analyse du remplacement '%s' pour le paquet '%s'" -#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" -msgstr "%s-%s: ignore la mise jour du paquet ( remplacer par %s-%s)" +msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)" -#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" -msgstr "%s-%s slectionn pour mise jour ( remplacer par %s-%s)" +msgstr "%s-%s sélectionné pour mise à jour (à remplacer par %s-%s)" -#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" -msgstr "'%s' non trouv dans la liste de synchronisation -- ignor" +msgstr "'%s' non trouvé dans la liste de synchronisation -- ignoré" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" -msgstr "'%s' est dj slectionn pour retrait -- ignor" +msgstr "'%s' est déjà sélectionné pour suppression -- ignoré" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" -msgstr "%s slectionn pour mise jour (%s => %s)" +msgstr "%s sélectionné pour mise à jour (%s => %s)" #: lib/libalpm/be_files.c:61 #, c-format msgid "unpacking database '%s'" -msgstr "dballe la base de donnes '%s'" +msgstr "décompression de la base de données '%s'" #: lib/libalpm/be_files.c:78 #, c-format msgid "opening database from path '%s'" -msgstr "ouvre la base de donnes '%s'" +msgstr "ouverture de la base de données à partir du chemin '%s'" #: lib/libalpm/be_files.c:182 #, c-format msgid "db scan could not find package: %s" -msgstr "la db ne peut trouver le paquet: %s" +msgstr "l'analyse de la base de données n'a pas pu trouver le paquet: %s" #: lib/libalpm/be_files.c:186 #, c-format msgid "invalid name for database entry '%s'" -msgstr "nom invalide pour l'entre de base de donnes '%s'" +msgstr "nom invalide pour l'entrée de base de données '%s'" #: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" -msgstr "paquet invalide fournit _alpm_db_read, et ignor" +msgstr "paquet invalide fournit à _alpm_db_read, et ignoré" #: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" -"requte pour lire information de la db pour un paquet bas\" sur un fichier '%" -"s', ignor..." +"demande de lecture de la base de données pour un paquet type fichier '%s', " +"ignoré..." #: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" -msgstr "chargement des donnes du paquet %s: niveau=%d" +msgstr "chargement des données du paquet %s : niveau=%d" +# j'ai traduit chaque fois "cannot" par "impossible de" #: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" -msgstr "ne peut trouver %s-%s dans la base de donnes '%s'" +msgstr "impossible de trouver %s-%s dans la base de données '%s'" #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" -msgstr "ne peut ouvrir le fichier %s: %s" +msgstr "l'ouverture du fichier %s: %s a échoué" #: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" -msgstr "criture des informations DESC pour %s-%s dans la db" +msgstr "écriture des informations DESC pour %s-%s dans la base de données" #: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" -msgstr "criture des informations FILES pour %s-%s dans la db" +msgstr "écriture des informations FILES pour %s-%s dans la base de données" #: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" -msgstr "criture des informations DEPENDS pour %s-%s dans la db" +msgstr "écriture des informations DEPENDS pour %s-%s dans la base de données" #: lib/libalpm/cache.c:59 #, c-format msgid "loading package cache for repository '%s'" -msgstr "chargement du cache de paquet pour le dpt '%s'" +msgstr "chargement du cache de paquets pour le dépôt '%s'" #: lib/libalpm/cache.c:64 #, c-format msgid "adding '%s' to package cache for db '%s'" -msgstr "ajout de '%s' au cache de paquet pour la db '%s'" +msgstr "ajout de '%s' au cache de paquets pour la base de données '%s'" #: lib/libalpm/cache.c:85 #, c-format msgid "freeing package cache for repository '%s'" -msgstr "nettoyage du cache de paquet pour le dpot '%s'" +msgstr "nettoyage du cache de paquets pour le dépot '%s'" #: lib/libalpm/cache.c:109 #, c-format msgid "error: pkgcache is NULL for db '%s'" -msgstr "erreur: pkgcache est NULL pour la db '%s'" +msgstr "erreur: pkgcache est NULL pour la base de données '%s'" #: lib/libalpm/cache.c:129 #, c-format msgid "adding entry '%s' in '%s' cache" -msgstr "ajout de l'entre '%s' dans '%s' cache" +msgstr "ajout de l'entrée '%s' dans '%s' cache" #: lib/libalpm/cache.c:149 #, c-format msgid "removing entry '%s' from '%s' cache" -msgstr "retrait de l'entre '%s' depuis '%s' cache" +msgstr "suppression de l'entrée '%s' du '%s' cache" #: lib/libalpm/cache.c:156 #, c-format msgid "cannot remove entry '%s' from '%s' cache: not found" -msgstr "ne peut supprimer l'entre '%s' depuis le cache '%s': non trouv" +msgstr "impossible de supprimer le cache '%s' de l'entrée '%s': non trouvé" #: lib/libalpm/cache.c:178 #, c-format msgid "error: failed to get '%s' from NULL pkgcache" -msgstr "erreur: chec avoir '%s' depuis pkgcache NULL" +msgstr "erreur: échec d'obtention de '%s' de NULL pkgcache" #: lib/libalpm/cache.c:201 #, c-format msgid "loading group cache for repository '%s'" -msgstr "chargement du group depuis le cache pour le dpot '%s'" +msgstr "chargement du cache de groupe pour le dépôt '%s'" #: lib/libalpm/conflict.c:69 #, c-format msgid " found conflict '%s' : package '%s'" -msgstr " conflit trouv '%s' : paquet '%s'" +msgstr " conflit détecté '%s' : paquet '%s'" #: lib/libalpm/conflict.c:78 #, c-format msgid " found conflict '%s' : package '%s' provides '%s'" -msgstr " conflit trouv '%s': paquet '%s' fournit '%s'" +msgstr " conflit détecté '%s': paquet '%s' fournit '%s'" #: lib/libalpm/conflict.c:101 lib/libalpm/conflict.c:143 #, c-format msgid "package '%s' conflicts with itself - packaging error" msgstr "" -"le paquet '%s' est en conflit avec lui-mme - erreur de cration de paquet" +"le paquet '%s' est en conflit avec lui-même - erreur de création de paquet" #: lib/libalpm/conflict.c:107 #, c-format msgid "checkconflicts: target '%s' vs db" -msgstr "analyse des conflits: cible '%s' compare la base" +msgstr "analyse des conflits: cible '%s' comparée à la base" #: lib/libalpm/conflict.c:149 #, c-format msgid "checkconflicts: target '%s' vs all targets" -msgstr "analyse des conflits: cible '%s' compare aux cibles" +msgstr "analyse des conflits: cible '%s' comparée aux cibles" #: lib/libalpm/conflict.c:181 #, c-format msgid "checkconflicts: db vs target '%s'" -msgstr "analyse des conflits: base de donnes compare a la cible '%s'" +msgstr "analyse des conflits: base de données comparée à la cible '%s'" #: lib/libalpm/conflict.c:201 #, c-format msgid "target '%s' is also in target list, using NEW conflicts" -msgstr "'%s' est dans la la liste de cibles -- using NEW conflicts" +msgstr "" +"'%s' est aussi dans la liste de cibles, analyse des nouveaux conflits " +"possibles" #: lib/libalpm/conflict.c:257 #, c-format @@ -636,151 +644,153 @@ msgstr "\tCONFLITS:: %s est en conflit avec %s" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:617 lib/libalpm/util.c:624 #, c-format msgid "malloc failure: could not allocate %d bytes" -msgstr "problme malloc: n'a pas pu allouer %d bytes" +msgstr "erreur malloc: n'a pas pu allouer %d bytes" #: lib/libalpm/db.c:64 lib/libalpm/db.c:71 #, c-format msgid "malloc failed: could not allocate %d bytes" -msgstr "malloc echou: n'a pas pu allouer %d bytes" +msgstr "malloc a echoué: n'a pas pu allouer %d bytes" #: lib/libalpm/db.c:167 msgid "attempt to re-register the 'local' DB" -msgstr "tentative de r-enregistrer la db 'local'" +msgstr "tentative de ré-enregistrer la base de données locale" #: lib/libalpm/db.c:175 #, c-format msgid "attempt to re-register the '%s' database, using existing" -msgstr "tentative de r-enregistrer la db '%s', en utilisant l'existant" +msgstr "" +"essai de ré-enregistrement de la base de données '%s', utilisant celle qui " +"existe" #: lib/libalpm/db.c:181 #, c-format msgid "registering database '%s'" -msgstr "enregistre la base de donnes '%s'" +msgstr "enregistrement de la base de données '%s'" #: lib/libalpm/db.c:186 #, c-format msgid "database directory '%s' does not exist, creating it" -msgstr "" -"le rpertoire de base de donnes '%s' n'existe pas -- tentative de cration" +msgstr "le répertoire de base de données '%s' n'existe pas, création" #: lib/libalpm/db.c:197 #, c-format msgid "opening database '%s'" -msgstr "ouvre la base de donnes '%s'" +msgstr "ouverture de la base de données '%s'" #: lib/libalpm/deps.c:131 msgid "started sorting dependencies" -msgstr "dbut du tri des dpendances" +msgstr "début du tri des dépendances" #: lib/libalpm/deps.c:136 msgid "possible dependency cycle detected" -msgstr "possible cycle de dpendances dtecte" +msgstr "possible cycle de dépendances détecté" #: lib/libalpm/deps.c:183 msgid "sorting dependencies finished" -msgstr "fin du tri des dpendances" +msgstr "fin du tri des dépendances" #: lib/libalpm/deps.c:225 lib/libalpm/deps.c:310 msgid "null package found in package list" -msgstr "paquet nul trouv dans la liste des paquets" +msgstr "aucun paquet trouvé dans la liste des paquets" #: lib/libalpm/deps.c:230 #, c-format msgid "cannot find package installed '%s'" -msgstr "ne peut trouver le paquet install '%s'" +msgstr "impossible de trouver le paquet installé '%s'" #: lib/libalpm/deps.c:261 #, c-format msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'" -msgstr "checkdeps: dpendance '%s' a chang de '%s' '%s'" +msgstr "checkdeps: dépendance '%s' a changé de '%s' à '%s'" #: lib/libalpm/deps.c:280 #, c-format msgid "checkdeps: dependency '%s' satisfied by installed package '%s'" -msgstr "checkdeps: dpendance '%s' satisfaite pour le paquet install '%s'" +msgstr "checkdeps: dépendance '%s' satisfaite par le paquet installé '%s'" #: lib/libalpm/deps.c:289 #, c-format msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" -msgstr "checkdeps: '%s' mis jour ne satisfera pas la dpendance de '%s'" +msgstr "checkdeps: '%s' mis à jour ne satisfera pas une dépendance de '%s'" #: lib/libalpm/deps.c:359 #, c-format msgid "missing dependency '%s' for package '%s'" -msgstr "dpendance manquante '%s' pour le paquet '%s'" +msgstr "dépendance manquante '%s' pour le paquet '%s'" #: lib/libalpm/deps.c:409 #, c-format msgid "checkdeps: found %s as required by %s" -msgstr "analyse des dpendances: trouve %s comme besoin pour %s" +msgstr "checkdeps: trouvé %s, comme requis par %s" #: lib/libalpm/deps.c:485 #, c-format msgid "excluding %s -- explicitly installed" -msgstr "exclue %s -- explicitement installe" +msgstr "exclusion de %s -- explicitement installé" #: lib/libalpm/deps.c:532 #, c-format msgid "cannot find package \"%s\" or anything that provides it!" -msgstr "ne peut trouver le paquet \"%s\" ou quoique ce soit qui le fournisse!" +msgstr "" +"impossible de trouver le paquet \"%s\" ou quoique ce soit qui le fournisse!" #: lib/libalpm/deps.c:540 lib/libalpm/deps.c:551 #, c-format msgid "adding '%s' to the targets" -msgstr "ajoute '%s' aux cibles" +msgstr "ajout de '%s' aux cibles" #: lib/libalpm/deps.c:583 msgid "started resolving dependencies" -msgstr "dbut du tri des dpendances" +msgstr "début du tri des dépendances" #: lib/libalpm/deps.c:601 #, c-format msgid "%s provides dependency %s -- skipping" -msgstr "%s fourni la dpendance %s -- ignore" +msgstr "%s fournit la dépendance %s -- ignoré" #: lib/libalpm/deps.c:630 #, c-format msgid "" "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" msgstr "" -"ne peut rsoudre les dpendances pour \"%s\" (\"%s\" n'est pas dans le jeu " -"de paquet)" +"résolution des dépendances impossible pour \"%s\" (\"%s\" n'est pas parmi " +"les paquets)" #: lib/libalpm/deps.c:647 #, c-format msgid "dependency %s is already in the target list -- skipping" -msgstr "la dpendance %s est dj dans la liste de cible -- ignore" +msgstr "la dépendance %s est déjà dans la liste de cibles -- ignorée" #: lib/libalpm/deps.c:667 #, c-format msgid "pulling dependency %s (needed by %s)" -msgstr "rcupre la dpendance %s (requise par %s)" +msgstr "récupération de la dépendance %s (requise par %s)" #: lib/libalpm/deps.c:671 #, c-format msgid "cannot resolve dependencies for \"%s\"" -msgstr "ne peut rsoudre les dpendances pour \"%s\"" +msgstr "résolution des dépendances impossible pour \"%s\"" #: lib/libalpm/deps.c:687 #, c-format msgid "dependency cycle detected: %s" -msgstr "cycle de dpendances dtecte: %s" +msgstr "cycle de dépendances détecté: %s" #: lib/libalpm/deps.c:691 msgid "finished resolving dependencies" -msgstr "fin du tri des dpendances" +msgstr "fin du tri des dépendances" #: lib/libalpm/error.c:40 msgid "out of memory!" -msgstr "dpassement de mmoire!" +msgstr "dépassement de mémoire!" #: lib/libalpm/error.c:42 msgid "unexpected system error" -msgstr "erreur systme non prvue" +msgstr "erreur système non prévue" #: lib/libalpm/error.c:44 msgid "insufficient privileges" @@ -788,51 +798,51 @@ msgstr "autorisation insuffisante" #: lib/libalpm/error.c:46 msgid "could not find or read file" -msgstr "ne peut trouver ou lire le fichier" +msgstr "trouver ou lire le fichier a échoué" #: lib/libalpm/error.c:48 msgid "wrong or NULL argument passed" -msgstr "mauvais argument ou NULL pass" +msgstr "un argument erroné ou nul a été fourni" #: lib/libalpm/error.c:51 msgid "library not initialized" -msgstr "librairie non initialise" +msgstr "librairie non initialisée" #: lib/libalpm/error.c:53 msgid "library already initialized" -msgstr "librairie dj initialise" +msgstr "librairie déjà initialisée" #: lib/libalpm/error.c:55 msgid "unable to lock database" -msgstr "incapable de verrouiller la base de donnes" +msgstr "verrouillage de la base de données impossible" #: lib/libalpm/error.c:58 msgid "could not open database" -msgstr "n'a pas pu ouvrir la base de donnes" +msgstr "l'ouverture de la base de données a échoué" #: lib/libalpm/error.c:60 msgid "could not create database" -msgstr "n'a pas pu crer la base de donnes" +msgstr "la création de la base de données a échoué" #: lib/libalpm/error.c:62 msgid "database not initialized" -msgstr "base de donnes non initialise" +msgstr "base de données non initialisée" #: lib/libalpm/error.c:64 msgid "database already registered" -msgstr "base de donnes dj enregistres" +msgstr "base de données déjà enregistrée" #: lib/libalpm/error.c:66 msgid "could not find database" -msgstr "n'a pas pu trouver la base de donnes" +msgstr "trouver la base de données a échoué" #: lib/libalpm/error.c:68 msgid "could not update database" -msgstr "n'a pas pu mettre a jour la base de donnes" +msgstr "la mise à jour de la base de données a échoué" #: lib/libalpm/error.c:70 msgid "could not remove database entry" -msgstr "n'a pas pu retirer l'entre de base de donnes" +msgstr "la suppression de l'entrée de base de données a échoué" #: lib/libalpm/error.c:73 msgid "invalid url for server" @@ -840,43 +850,43 @@ msgstr "URL invalide pour le serveur" #: lib/libalpm/error.c:80 msgid "could not set parameter" -msgstr "n'a pas pu dfinir le paramtre" +msgstr "définir le paramètre a échoué" #: lib/libalpm/error.c:83 msgid "transaction already initialized" -msgstr "transaction dj initialise" +msgstr "transaction déjà initialisée" #: lib/libalpm/error.c:85 lib/libalpm/error.c:89 msgid "transaction not initialized" -msgstr "transaction non initialise" +msgstr "transaction non initialisée" #: lib/libalpm/error.c:87 msgid "duplicate target" -msgstr "cible rpte" +msgstr "cible répétée" #: lib/libalpm/error.c:91 msgid "transaction not prepared" -msgstr "transaction non prpare" +msgstr "transaction non préparée" #: lib/libalpm/error.c:93 msgid "transaction aborted" -msgstr "transaction annule" +msgstr "transaction annulée" #: lib/libalpm/error.c:95 msgid "operation not compatible with the transaction type" -msgstr "opration incompatible avec le type de transaction" +msgstr "opération incompatible avec le type de transaction" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" -msgstr "n'a pas pu appliquer la transaction" +msgstr "appliquer la transaction a échoué" #: lib/libalpm/error.c:99 msgid "could not download all files" -msgstr "n'a pu tlcharger tous les fichiers" +msgstr "tous les fichiers n'ont pas pu être téléchargés" #: lib/libalpm/error.c:102 msgid "could not find or read package" -msgstr "ne peut trouver ou lire le paquet" +msgstr "trouver ou de lire le paquet a échoué" #: lib/libalpm/error.c:104 msgid "invalid or corrupted package" @@ -884,23 +894,23 @@ msgstr "paquet invalide ou corrompu" #: lib/libalpm/error.c:106 msgid "cannot open package file" -msgstr "ne peut ouvrir le fichier de paquet" +msgstr "ouverture du fichier paquet impossible" #: lib/libalpm/error.c:108 msgid "cannot load package data" -msgstr "ne peut charger les donnes du paquet" +msgstr "chargement des données du paquet impossible" #: lib/libalpm/error.c:110 msgid "package already installed" -msgstr "paquet dj install" +msgstr "paquet déjà installé" #: lib/libalpm/error.c:112 msgid "package not installed or lesser version" -msgstr "paquet non install ou version plus ancienne" +msgstr "paquet non installé ou version plus ancienne" #: lib/libalpm/error.c:114 msgid "cannot remove all files for package" -msgstr "ne peut effacer tous les fichiers du paquet" +msgstr "suppression de certains fichiers du paquet impossible" #: lib/libalpm/error.c:116 msgid "package name is not valid" @@ -912,27 +922,27 @@ msgstr "paquet corrompu" #: lib/libalpm/error.c:120 msgid "no such repository" -msgstr "pas de tel dpt" +msgstr "ce dépôt n'existe pas" #: lib/libalpm/error.c:123 msgid "group not found" -msgstr "groupe non trouv" +msgstr "groupe non trouvé" #: lib/libalpm/error.c:126 msgid "could not satisfy dependencies" -msgstr "n'a pas pu satisfaire les dpendances" +msgstr "la satisfaction des dépendances a échoué" #: lib/libalpm/error.c:128 msgid "conflicting dependencies" -msgstr "conflit de dpendances" +msgstr "conflit de dépendances" #: lib/libalpm/error.c:130 msgid "conflicting files" -msgstr "conflit de fichier" +msgstr "conflit de fichiers" #: lib/libalpm/error.c:133 msgid "user aborted the operation" -msgstr "annulation utilisateur" +msgstr "opération annulée par l'utilisateur" #: lib/libalpm/error.c:135 msgid "internal error" @@ -944,44 +954,44 @@ msgstr "erreur de libarchive" #: lib/libalpm/error.c:139 msgid "not enough space on disk" -msgstr "pas assez d'espace disque" +msgstr "espace disque insuffisant" #: lib/libalpm/error.c:142 msgid "not confirmed" -msgstr "non confirm" +msgstr "non confirmé" #: lib/libalpm/error.c:145 msgid "bad configuration section name" -msgstr "mauvaise configuration du nom de la section" +msgstr "nom de la section de configuration erroné" #: lib/libalpm/error.c:147 msgid "'local' is reserved and cannot be used as a repository name" -msgstr "'local' est rserv et ne peut tre utilis comme nom de dpt" +msgstr "'local' est réservé et ne peut être utilisé comme nom de dépôt" #: lib/libalpm/error.c:149 msgid "syntax error in config file" -msgstr "erreur de syntaxe dans le fichier de description" +msgstr "erreur de syntaxe dans le fichier de configuration" #: lib/libalpm/error.c:151 msgid "all directives must belong to a section" -msgstr "toutes les directives doivent appartenir une section" +msgstr "toutes les directives doivent appartenir à une section" #: lib/libalpm/error.c:153 msgid "invalid regular expression" -msgstr "expression rgulire incorrecte" +msgstr "expression régulière incorrecte" #: lib/libalpm/error.c:156 msgid "connection to remote host failed" -msgstr "chec de connexion l'hte distant " +msgstr "échec de connexion à l'hôte distant " #: lib/libalpm/error.c:159 msgid "unexpected error" -msgstr "erreur non prvue" +msgstr "erreur non prévue" #: lib/libalpm/handle.c:163 #, c-format msgid "cannot canonicalize specified root path '%s'" -msgstr "ne peut cannoniser le chemin root '%s'" +msgstr "normalisation du chemin root '%s' impossible" #: lib/libalpm/handle.c:175 #, c-format @@ -1001,115 +1011,114 @@ msgstr "option 'cachedir' = %s" #: lib/libalpm/md5driver.c:56 #, c-format msgid "%s can't be opened\n" -msgstr "%s ne peut etre ouvert\n" +msgstr "l'ouverture de %s a échoué\n" #: lib/libalpm/md5driver.c:74 #, c-format msgid "md5(%s) = %s" msgstr "md5(%s) = %s" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 #, c-format -msgid "%s: forcing upgrade to version %s" -msgstr "%s: force la mise jour en version %s" +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: ignore la mise à jour du paquet (%s)" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:158 #, c-format -msgid "%s: local (%s) is newer than %s (%s)" -msgstr "%s: la version locale (%s) est plus rcente que %s (%s)" +msgid "%s: forcing upgrade to version %s" +msgstr "%s: force la mise à jour à la version %s" #: lib/libalpm/package.c:163 #, c-format -msgid "%s-%s: ignoring package upgrade (%s)" -msgstr "%s-%s: ignore la mise jour du paquet (%s)" +msgid "%s: local (%s) is newer than %s (%s)" +msgstr "%s: la version locale (%s) est plus récente que %s (%s)" -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" -msgstr "%s-%s: repousse la mise jour du paquet (%s)" +msgstr "%s-%s: retarde la mise à jour du paquet (%s)" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" -msgstr "%s: erreur de syntaxe dans le fichier de description la ligne %d" +msgstr "%s: erreur de syntaxe dans le fichier de description à la ligne %d" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" -msgstr "n'a pas pu analyser le fichier de description" +msgstr "l'analyse du fichier de description a échoué" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "nom de paquet manquant dans %s" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" -msgstr "version de paquet manquant dans %s" +msgstr "version de paquet manquante dans %s" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" -msgstr "ne peut effacer le fichier temporaire %s" +msgstr "la suppression du fichier temporaire %s a échoué" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "erreur lors de la lecture du paquet: %s" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" -msgstr "mta-donnes du paquet manquante" +msgstr "méta-données du paquet manquantes" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" -msgstr "" -"liste de fichiers du paquet absente dans %s -- cration d'une telle liste" +msgstr "liste de fichiers absente du paquet %s, création" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" -msgstr "ajoute '%s' dans le champ 'requit par' pour '%s'" +msgstr "ajoute '%s' dans le champ 'requis par' pour '%s'" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" -msgstr "ajoute '%s' dans le champ 'requit par' pour '%s' (fournit: %s)" +msgstr "ajoute '%s' dans le champ 'requis par' pour '%s' (fournit: %s)" #: lib/libalpm/remove.c:79 #, c-format msgid "could not find %s in database" -msgstr "ne peut trouver %s dans la base de donnes" +msgstr "trouver %s dans la base de données a échoué" #: lib/libalpm/remove.c:93 #, c-format msgid "adding %s in the targets list" -msgstr "ajoute %s dans la liste de cibles" +msgstr "ajoute %s dans la liste des cibles" #: lib/libalpm/remove.c:121 #, c-format msgid "pulling %s in the targets list" -msgstr "envoie %s dans la liste de destination" +msgstr "ajoute %s à la liste des cibles" #: lib/libalpm/remove.c:124 #, c-format msgid "could not find %s in database -- skipping" -msgstr "ne peut trouver %s dans la base de donnes -- ignor" +msgstr "trouver %s dans la base de données a échoué -- ignoré" #: lib/libalpm/remove.c:142 msgid "finding removable dependencies" -msgstr "trouve les dpendances dispensables" +msgstr "trouve les dépendances susceptibles d'être supprimées" #: lib/libalpm/remove.c:175 #, c-format msgid "cannot remove file '%s': %s" -msgstr "ne peut effacer le fichier '%s': %s" +msgstr "suppression du fichier '%s': %s impossible" #: lib/libalpm/remove.c:213 #, c-format msgid "Skipping removal of '%s' due to NoUpgrade" -msgstr "Ignore l'effacement de %s pour cause de NoUpgrade" +msgstr "Ignore la suppression de %s pour cause de NoUpgrade" #: lib/libalpm/remove.c:220 #, c-format @@ -1119,67 +1128,67 @@ msgstr "le fichier %s n'existe pas" #: lib/libalpm/remove.c:227 #, c-format msgid "keeping directory %s" -msgstr "conserve le rpertoire %s" +msgstr "préservation du répertoire %s" #: lib/libalpm/remove.c:229 #, c-format msgid "removing directory %s" -msgstr "efface le rpertoire %s" +msgstr "suppression du répertoire %s" #: lib/libalpm/remove.c:236 #, c-format msgid "%s is in trans->skip_remove, skipping removal" -msgstr "%s est dans trans->skip_remove, suppression ignore" +msgstr "%s est dans trans->skip_remove, suppression ignorée" #: lib/libalpm/remove.c:250 #, c-format msgid "transaction is set to NOSAVE, not backing up '%s'" -msgstr "la transaction est NOSAVE, pas de sauvegarde de '%s'" +msgstr "la transaction se fait avec option NOSAVE, pas de sauvegarde de '%s'" #: lib/libalpm/remove.c:254 #, c-format msgid "unlinking %s" -msgstr "suppression %s" +msgstr "suppression du lien %s" #: lib/libalpm/remove.c:261 #, c-format msgid "cannot remove file %s: %s" -msgstr "ne peut effacer le fichier %s: %s" +msgstr "suppression du fichier %s: %s impossible" #: lib/libalpm/remove.c:294 #, c-format msgid "removing package %s-%s" -msgstr "retrait du paquet %s-%s" +msgstr "suppression du paquet %s-%s" #: lib/libalpm/remove.c:309 #, c-format msgid "not removing package '%s', can't remove all files" -msgstr "non suppression du paquet '%s', on ne peut supprimer tous ses fichiers" +msgstr "paquet '%s' non supprimé, certains fichiers ne peuvent être supprimés" #: lib/libalpm/remove.c:316 #, c-format msgid "removing %d files" -msgstr "efface %d fichiers" +msgstr "suppression de %d fichiers" #: lib/libalpm/remove.c:337 #, c-format msgid "removing database entry '%s'" -msgstr "ne peut effacer l'entre de base de de donnes %s" +msgstr "suppression de l'entrée de base de données %s" #: lib/libalpm/remove.c:339 #, c-format msgid "could not remove database entry %s-%s" -msgstr "ne peut retirer l'entre de base de donne %s-%s" +msgstr "la suppression de l'entrée de base de données %s-%s a échoué" #: lib/libalpm/remove.c:344 #, c-format msgid "could not remove entry '%s' from cache" -msgstr "ne peut retirer l'entre '%s' du cache" +msgstr "la suppression du cache de l'entrée '%s' a échoué" #: lib/libalpm/sha1.c:397 #, c-format msgid "sha1: %s can't be opened\n" -msgstr "sha1: %s ne peut tre ouvert\n" +msgstr "sha1: %s ne peut être ouvert\n" #: lib/libalpm/sha1.c:412 #, c-format @@ -1188,256 +1197,256 @@ msgstr "sha1(%s) = %s" #: lib/libalpm/sync.c:183 msgid "checking for package upgrades" -msgstr "vrification des mises jour de paquets" +msgstr "vérification des mises à jour disponibles" #: lib/libalpm/sync.c:215 #, c-format msgid "%s-%s elected for upgrade (%s => %s)" -msgstr "%s-%s slectionn pour mise jour (%s => %s)" +msgstr "%s-%s sélectionné pour mise à jour (%s => %s)" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" -msgstr "cherche la cible dans le dpt '%s'" +msgstr "cherche la cible dans le dépôt '%s'" -#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" -msgstr "cible '%s' non trouve -- recherche des dispositions" +msgstr "cible '%s' non trouvée -- recherche des " -#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" -msgstr "trouv '%s' comme disposition pour '%s'" +msgstr "trouvé '%s' comme condition pour '%s'" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" -msgstr "dpt '%s' non trouv" +msgstr "dépôt '%s' non trouvé" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" -msgstr "%s-%s est jour -- ignor" +msgstr "%s-%s est à jour -- ignoré" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" -msgstr "ajout de la cible '%s' au jeu de transaction" +msgstr "ajout de la cible '%s' au jeu de transactions" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" -msgstr "rsolution des dpendances pour les cibles" +msgstr "résolution des dépendances pour la cible" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" -msgstr "ajout du paquet %s-%s la liste de transactions" +msgstr "ajout du paquet %s-%s aux cibles de la transaction" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" -msgstr "recherche de dpendancea non soluble" +msgstr "recherche de dépendances impossibles à résoudre" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "le paquet '%s' est en conflit avec '%s'" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" -msgstr "'%s' non trouve dans le jeu de transaction -- ignor" +msgstr "'%s' non trouvé dans le jeu de transactions -- ignoré" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" -msgstr "le paquet '%s' gnre son propre conflit" +msgstr "le paquet '%s' génère son propre conflit" -#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "'%s' est dans la la liste de cibles -- conservation" -#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" -msgstr "retire '%s' de la liste de cibles" +msgstr "suppression de '%s' de la liste des cibles" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" -msgstr "rsolution du conflit de paquet '%s'" +msgstr "résolution des conflits pour le paquet '%s'" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" -msgstr "slection de '%s' pour retrait" +msgstr "sélection de '%s' pour suppression" -#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" -msgstr "conflit de paquets non soluble dtect" +msgstr "un conflit de paquets impossible à résoudre a été détecté" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" -msgstr "analyse des dpendances pour les paquets marques retirer" +msgstr "analyse des dépendances des paquets sélectionnés pour suppression" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" -msgstr "quelque chose s'est horriblement mal pass" +msgstr "quelque chose s'est horriblement mal passé" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" -msgstr "trouv '%s' comme disposition pour '%s' -- conflit annul" +msgstr "trouvé '%s' comme pour '%s' -- conflit annulé" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" -msgstr "%s est dj dans le cache\n" +msgstr "%s est déjà dans le cache\n" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" -msgstr "le cache %s n'existe pas, cration...\n" +msgstr "le cache %s n'existe pas, création...\n" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." -msgstr "avertissement: le cache %s n'existe pas, cration..." +msgstr "avertissement: le cache %s n'existe pas, création..." -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" -msgstr "ne peut crer le cache de paquet, /tmp sera utilis la place\n" +msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "" -"avertissement: ne peut crer le cache de paquet, /tmp sera utilis la place" +"avertissement: ne peut créer le cache de paquets, /tmp sera utilisé à la " +"place" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" -msgstr "chec de rcupration de certains fichiers depuis %s\n" +msgstr "échec de récupération de certains fichiers depuis %s\n" -#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "ne peut obtenir la 'signature' md5 ou sha1 pour le paquet %s\n" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" -msgstr "l'archive %s tait corrompue (mauvaise somme MD5 ou SHA1)\n" +msgstr "l'archive %s était corrompue (mauvaise somme MD5 ou SHA1)\n" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "l'archive %s est corrompue (mauvaise somme MD5 ou SHA1)\n" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" -msgstr "n'a pas pu crer la transaction de retrait" +msgstr "la création de la transaction de suppression a échoué" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" -msgstr "n'a pas pu initialiser la transaction de retrait" +msgstr "l'initialisation de la transaction de suppression a échoué" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" -msgstr "efface les paquets en conflit et ceux remplacer" +msgstr "suppression des paquets en conflit et de ceux à remplacer" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" -msgstr "n'a pas pu prparer la transaction de retrait" +msgstr "la préparation de la transaction de suppression a échoué" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" -msgstr "n'a pas pu appliquer la transaction de retrait" +msgstr "appliquer la transaction de suppression a échoué" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" -msgstr "installe les paquets" +msgstr "installation des paquets" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" -msgstr "n'a pas pu crer la transaction" +msgstr "la création de la transaction a échoué" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" -msgstr "n'a pas pu initialiser la transaction" +msgstr "l'initialisation de la transaction a échoué" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" -msgstr "n'a pas pu prparer la transaction" +msgstr "la préparation de la transaction a échoué" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" msgstr "" -"mise a jour de la base de donnes concernant les dpendances de paquets " -"remplaces" +"mise à jour de la base de données avec les dépendances des paquets remplacés" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "" -"n'a pas pu mettre a jour les pr-requis pour l'entre de base de donnes %s-%" -"s" +"la mise à jour du champ requiredby pour l'entrée de base de données %s-%s a " +"échoué" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" -msgstr "n'a pu mettre a jour la nouvelle entre de base de donnes %s-%s" +msgstr "la mise à jour de la nouvelle entrée de base de données %s-%s a échoué" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, c-format msgid "found package '%s-%s' in sync" -msgstr "paquet '%s-%s' trouv dans sync" +msgstr "paquet '%s-%s' trouvé dans sync" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" -msgstr "'%s' non trouv dans la liste de synchronisation" +msgstr "paquet '%s' non trouvé dans la liste de synchronisation" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" -msgstr "mise jour des champs 'requit par' pour %s-%s" +msgstr "mise à jour des dépendances dans les champs 'requiredby' pour %s-%s" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" -msgstr "le paquet n'a aucune dpendance, pas d'autres paquets mettre jour" +msgstr "le paquet n'a aucune dépendance, pas d'autres paquets à mettre à jour" -#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" -msgstr "mise jour du champ 'requit par' pour le paquet '%s'" +msgstr "mise à jour du champ 'requiredby' pour le paquet '%s'" -#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "" -"n'a pas pu mettre jour le champ 'requit par' de l'entre de base de " -"donnes %s-%s" +"la mise à jour du champ 'requiredby' de l'entrée de base de données %s-%s a " +"échoué" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" -msgstr "n'a pas pu trouver la dpendance '%s'" +msgstr "trouver la dépendance '%s' a échoué" #: lib/libalpm/util.c:142 #, c-format msgid "failed to make path '%s' : %s" -msgstr "chec de la cration du chemin '%s' : %s" +msgstr "échec de la création du chemin '%s' : %s" #: lib/libalpm/util.c:280 #, c-format msgid "could not open %s: %s\n" -msgstr "ne peut ouvrir %s: %s\n" +msgstr "l'ouverture de %s: %s a échoué\n" #: lib/libalpm/util.c:293 #, c-format msgid "could not extract %s: %s\n" -msgstr "n'a pas pu extraire %s: %s\n" +msgstr "l'extraction de %s: %s a échoué\n" #: lib/libalpm/util.c:350 #, c-format @@ -1446,22 +1455,22 @@ msgstr "logaction called: %s" #: lib/libalpm/util.c:445 msgid "could not create temp directory" -msgstr "n'a pas pu crer le rpertoire temporaire" +msgstr "la création du répertoire temporaire a échoué" #: lib/libalpm/util.c:472 #, c-format msgid "could not change directory to %s (%s)" -msgstr "n'a pas pu changer de rpertoire pour %s (%s)" +msgstr "changer de répertoire vers %s (%s) a échoué" #: lib/libalpm/util.c:476 #, c-format msgid "executing %s script..." -msgstr "excute le script %s ..." +msgstr "exécution du script %s ..." #: lib/libalpm/util.c:489 #, c-format msgid "could not fork a new process (%s)" -msgstr "n'a pas pu gnrer un nouveau processus (%s)" +msgstr "la génération d'un nouveau processus (%s) a échoué" #: lib/libalpm/util.c:496 #, c-format @@ -1471,37 +1480,42 @@ msgstr "chroot dans %s" #: lib/libalpm/util.c:498 #, c-format msgid "could not change the root directory (%s)" -msgstr "n'a pas pu changer le rpertoire racine (%s)" +msgstr "changer le répertoire racine (%s) a échoué" #: lib/libalpm/util.c:502 #, c-format msgid "could not change directory to / (%s)" -msgstr "n'a pas pu changer de rpertoire vers / (%s)" +msgstr "changer de répertoire vers / (%s) a échoué" #: lib/libalpm/util.c:506 #, c-format msgid "executing \"%s\"" -msgstr "excute \"%s\"" +msgstr "exécution de \"%s\"" #: lib/libalpm/util.c:509 #, c-format msgid "call to popen failed (%s)" -msgstr "l'appel popen chouer (%s)" +msgstr "l'appel à popen a échoué (%s)" #: lib/libalpm/util.c:541 #, c-format msgid "call to waitpid failed (%s)" -msgstr "la demande de mise en attente du pid a choue (%s)" +msgstr "call to waitpid failed (%s)" #: lib/libalpm/util.c:550 #, c-format msgid "could not remove tmpdir %s" -msgstr "n'a pas pu effacer tmpdir %s" +msgstr "la suppression du répertoire temporaire %s a échoué" + +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "impossible de lire l'information concernant l'espace disque de %s: %s" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:612 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" -msgstr "check_freespace: taille totale du paquet: %lld, espace disque: %lld" +msgstr "check_freespace: taille totale: %lld, espace disque: %lld" #: lib/libalpm/versioncmp.c:279 #, c-format @@ -1517,42 +1531,42 @@ msgstr "depcmp: %s-%s %s %s => %s" #~ msgstr "%s sauve en tant que %s.pacorig" #~ msgid "could not parse token %s" -#~ msgstr "ne peut analyser l'lment %s" +#~ msgstr "ne peut analyser l'élément %s" #~ msgid "notice: %s is in NoExtract -- skipping extraction" #~ msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction" #~ msgid "loading package cache (infolevel=%#x) for repository '%s'" -#~ msgstr "chargement du cache de paquet (infolevel=%#x) pour le dpot '%s'" +#~ msgstr "chargement du cache de paquet (infolevel=%#x) pour le dépot '%s'" #, fuzzy #~ msgid "package cache reloaded (infolevel=%#x) for repository '%s'" -#~ msgstr "chargement du cache de paquet (infolevel=%#x) pour le dpot '%s'" +#~ msgstr "chargement du cache de paquet (infolevel=%#x) pour le dépot '%s'" #~ msgid "targs vs db: found %s as a conflict for %s" #~ msgstr "" -#~ "comparaison cibles / base de donnes : trouve %s comme conflit pour %s" +#~ "comparaison cibles / base de données : trouve %s comme conflit pour %s" #~ msgid "targs vs targs: found %s as a conflict for %s" #~ msgstr "" #~ "comparaison cible / liste de cibles : trouve %s comme conflit pour %s" #~ msgid "db vs targs: found %s as a conflict for %s" -#~ msgstr "comparaison base de donne / cibles: trouve %s en conflit avec %s" +#~ msgstr "comparaison base de donnée / cibles: trouve %s en conflit avec %s" #, fuzzy #~ msgid "no dependencies for target '%s'" -#~ msgstr "ne peut rsoudre les dpendances pour \"%s\"" +#~ msgstr "ne peut résoudre les dépendances pour \"%s\"" #, fuzzy #~ msgid "%s-%s: ignoring package upgrade (%s => %s)" -#~ msgstr "%s-%s: ignore la mise jour du paquet (%s)" +#~ msgstr "%s-%s: ignore la mise à jour du paquet (%s)" #~ msgid "adding new package %s-%s" #~ msgstr "ajout du nouveau paquet %s-%s" #~ msgid "error updating database for %s-%s!" -#~ msgstr "erreur lors de la mise a jour de la base de donnes pour %s-%s!" +#~ msgstr "erreur lors de la mise a jour de la base de données pour %s-%s!" #~ msgid "dep is NULL!" #~ msgstr "dep est NULL!" @@ -1562,7 +1576,7 @@ msgstr "depcmp: %s-%s %s %s => %s" #, fuzzy #~ msgid "could not find dependency '%s' for removal" -#~ msgstr "n'a pas pu trouver la dpendance '%s'" +#~ msgstr "n'a pas pu trouver la dépendance '%s'" #~ msgid "loading FILES info for '%s'" #~ msgstr "chargement des informations de fichiers pour '%s'" @@ -1575,7 +1589,7 @@ msgstr "depcmp: %s-%s %s %s => %s" #~ msgstr "erreur interne" #~ msgid "unpacking %s" -#~ msgstr "dcompacte %s" +#~ msgstr "décompacte %s" #~ msgid "loading SCRIPLET info for '%s'" #~ msgstr "charge les infos de SCRIPLET pour '%s'" @@ -1594,71 +1608,71 @@ msgstr "depcmp: %s-%s %s %s => %s" #~ msgstr "db_write: n' pas pu ouvrir le fichier %s/depends" #~ msgid "PM_OPT_DBPATH set to '%s'" -#~ msgstr "PM_OPT_DBPATH dfini '%s'" +#~ msgstr "PM_OPT_DBPATH défini à '%s'" #~ msgid "PM_OPT_CACHEDIR set to '%s'" -#~ msgstr "PM_OPT_CACHEDIR dfini '%s'" +#~ msgstr "PM_OPT_CACHEDIR défini à '%s'" #~ msgid "can't open log file %s" #~ msgstr "ne peut ouvrir le fichier de log %s" #~ msgid "PM_OPT_LOGFILE set to '%s'" -#~ msgstr "PM_OPT_LOGFILE dfini '%s'" +#~ msgstr "PM_OPT_LOGFILE défini à '%s'" #~ msgid "'%s' added to PM_OPT_NOUPGRADE" -#~ msgstr "'%s' ajout PM_OPT_NOUPGRADE" +#~ msgstr "'%s' ajouté à PM_OPT_NOUPGRADE" #~ msgid "PM_OPT_NOUPGRADE flushed" -#~ msgstr "PM_OPT_NOUPGRADE recharg" +#~ msgstr "PM_OPT_NOUPGRADE rechargé" #~ msgid "'%s' added to PM_OPT_NOEXTRACT" -#~ msgstr "'%s' ajout PM_OPT_NOEXTRACT" +#~ msgstr "'%s' ajouté à PM_OPT_NOEXTRACT" #~ msgid "PM_OPT_NOEXTRACT flushed" -#~ msgstr "PM_OPT_NOEXTRACT recharg" +#~ msgstr "PM_OPT_NOEXTRACT rechargé" #~ msgid "'%s' added to PM_OPT_IGNOREPKG" -#~ msgstr "'%s' ajout PM_OPT_IGNOREPKG" +#~ msgstr "'%s' ajouté à PM_OPT_IGNOREPKG" #~ msgid "PM_OPT_IGNOREPKG flushed" -#~ msgstr "PM_OPT_IGNOREPKG recharg" +#~ msgstr "PM_OPT_IGNOREPKG rechargé" #, fuzzy #~ msgid "'%s' added to PM_OPT_HOLDPKG" -#~ msgstr "'%s' ajout PM_OPT_IGNOREPKG" +#~ msgstr "'%s' ajouté à PM_OPT_IGNOREPKG" #, fuzzy #~ msgid "PM_OPT_HOLDPKG flushed" -#~ msgstr "PM_OPT_IGNOREPKG recharg" +#~ msgstr "PM_OPT_IGNOREPKG rechargé" #~ msgid "PM_OPT_USESYSLOG set to '%d'" -#~ msgstr "PM_OPT_USESYSLOG dfini '%d'" +#~ msgstr "PM_OPT_USESYSLOG défini à '%d'" #~ msgid "PM_OPT_LOGMASK set to '%02x'" -#~ msgstr "PM_OPT_LOGMASK dfini '%02x'" +#~ msgstr "PM_OPT_LOGMASK défini à '%02x'" #, fuzzy #~ msgid "PM_OPT_PROXYHOST set to '%s'" -#~ msgstr "PM_OPT_DBPATH dfini '%s'" +#~ msgstr "PM_OPT_DBPATH défini à '%s'" #, fuzzy #~ msgid "PM_OPT_PROXYPORT set to '%d'" -#~ msgstr "PM_OPT_DBPATH dfini '%s'" +#~ msgstr "PM_OPT_DBPATH défini à '%s'" #, fuzzy #~ msgid "PM_OPT_XFERCOMMAND set to '%s'" -#~ msgstr "PM_OPT_CACHEDIR dfini '%s'" +#~ msgstr "PM_OPT_CACHEDIR défini à '%s'" #, fuzzy #~ msgid "PM_OPT_NOPASSIVEFTP set to '%d'" -#~ msgstr "PM_OPT_DBPATH dfini '%s'" +#~ msgstr "PM_OPT_DBPATH défini à '%s'" #, fuzzy #~ msgid "PM_OPT_CHOMP set to '%d'" -#~ msgstr "PM_OPT_CACHEDIR dfini '%s'" +#~ msgstr "PM_OPT_CACHEDIR défini à '%s'" #~ msgid "bad package file in %s" #~ msgstr "mauvais fichier de paquet dans %s" #~ msgid "%s-%s: local version is newer -- skipping" -#~ msgstr "%s-%s: la version locale est plus rcente -- ignor" +#~ msgstr "%s-%s: la version locale est plus récente -- ignoré" diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po index a215ad38..146e9d6e 100644 --- a/src/pacman/po/fr.po +++ b/src/pacman/po/fr.po @@ -3,16 +3,18 @@ # This file is distributed under the same license as the Pacman package manager package. # Enda , 2006 # +# This is a revision of pacman's French translation by nam <37ii11@altern.org> +# on the basis of the work of solsTiCe d'hiver msgid "" msgstr "" "Project-Id-Version: pacman\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" -"PO-Revision-Date: 2007-03-22 12:50+0100\n" -"Last-Translator: solsTiCe d'hiver \n" -"Language-Team: \n" +"POT-Creation-Date: 2007-04-25 00:37-0400\n" +"PO-Revision-Date: 2007-04-20 15:02+0100\n" +"Last-Translator: nam <37ii11@altern.org>\n" +"Language-Team: solsTiCe d'Hiver \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" @@ -24,29 +26,29 @@ msgid "" " if you're sure a package manager is not already running,\n" " you can remove %s%s\n" msgstr "" -" Si vous tes sr que le gestionnaire de paquet ne fonctionne pas " -"dj,\n" -" vous pouvez retirer %s%s\n" +" Si vous êtes sûr que le gestionnaire de paquet n'est pas déjà\n" +" en cours de fonctionnement, vous pouvez supprimer %s%s\n" #: src/pacman/add.c:79 msgid "loading package data... " -msgstr "chargement des donnes du paquet... " +msgstr "Chargement des données du paquet... " #: src/pacman/add.c:83 #, c-format msgid "failed to add target '%s' (%s)" -msgstr "chec d'ajout de la cible '%s' (%s)" +msgstr "l'ajout de la cible '%s' (%s) a échoué" +# "fait" est incompréhensible #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 #: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105 #: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142 msgid "done.\n" -msgstr "fait.\n" +msgstr "terminé.\n" #: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616 #, c-format msgid "failed to prepare transaction (%s)\n" -msgstr "chec de prparation de la transaction (%s)\n" +msgstr "la préparation de la transaction a échoué (%s)\n" #: src/pacman/add.c:104 #, c-format @@ -61,12 +63,13 @@ msgstr ":: %s: est en conflit avec %s" #: src/pacman/add.c:134 src/pacman/sync.c:707 #, c-format msgid "%s exists in both '%s' and '%s'\n" -msgstr "%s existe la fois dans '%s' et '%s'\n" +msgstr "%s est présent à la fois dans '%s' et '%s'\n" +# id. #: src/pacman/add.c:140 src/pacman/sync.c:713 #, c-format msgid "%s: %s exists in filesystem\n" -msgstr "%s: %s existe dans le systme de fichiers\n" +msgstr "%s: %s est déjà présent dans le système de fichiers\n" #: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725 msgid "" @@ -74,48 +77,44 @@ msgid "" "errors occurred, no packages were upgraded.\n" msgstr "" "\n" -"des erreurs se sont produites, aucun paquet n'a t mis jour.\n" +"Des erreurs se sont produites, aucun paquet n'a été mis à jour.\n" +# improbable (mais pas impossible) que seul 1 Mo soit disponible; par défaut, le pluriel est meilleur. A disposition remplace disponible pour éviter le problème. #: src/pacman/add.c:156 src/pacman/sync.c:650 #, c-format msgid ":: %.1f MB required, have %.1f MB" -msgstr ":: %.1f Mo ncessaire, %.1f Mo disponible" +msgstr ":: %.1f Mo nécessaires, %.1f Mo à disposition" #: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700 #, c-format msgid "failed to commit transaction (%s)\n" -msgstr "chec de validation de la transaction (%s)\n" +msgstr "la validation de la transaction a échoué (%s)\n" #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524 #: src/pacman/sync.c:741 #, c-format msgid "failed to release transaction (%s)\n" -msgstr "chec de libration de la transaction (%s)\n" - -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "requiert: %s" +msgstr "la libération de la transaction a échoué (%s)\n" #: src/pacman/log.c:63 #, c-format msgid "debug" -msgstr "dbogage" +msgstr "Débogage" #: src/pacman/log.c:66 #, c-format msgid "error" -msgstr "erreur" +msgstr "Erreur" #: src/pacman/log.c:69 #, c-format msgid "warning" -msgstr "avertissement" +msgstr "Avertissement" #: src/pacman/log.c:75 #, c-format msgid "function" -msgstr "fonction" +msgstr "Fonction" #: src/pacman/log.c:194 msgid "Y" @@ -127,19 +126,19 @@ msgstr "OUI" #: src/pacman/log.h:30 msgid "error: " -msgstr "erreur: " +msgstr "Erreur: " #: src/pacman/log.h:34 msgid "warning: " -msgstr "avertissement: " +msgstr "Avertissement: " #: src/pacman/package.c:60 msgid "Explicitly installed" -msgstr "Explicitement install" +msgstr "Explicitement installé" #: src/pacman/package.c:63 msgid "Installed as a dependency for another package" -msgstr "Install comme dpendance d'un autre paquet" +msgstr "Installé comme dépendance d'un autre paquet" #: src/pacman/package.c:66 src/pacman/package.c:90 msgid "Unknown" @@ -147,85 +146,89 @@ msgstr "Inconnu" #: src/pacman/package.c:70 src/pacman/package.c:121 msgid "Description : " -msgstr "Description : " +msgstr "Description : " #: src/pacman/package.c:73 src/pacman/package.c:127 #, c-format msgid "Name : %s\n" -msgstr "Nom : %s\n" +msgstr "Nom : %s\n" #: src/pacman/package.c:74 src/pacman/package.c:128 #, c-format msgid "Version : %s\n" -msgstr "Version : %s\n" +msgstr "Version : %s\n" #: src/pacman/package.c:75 #, c-format msgid "URL : %s\n" -msgstr "URL : %s\n" +msgstr "URL : %s\n" #: src/pacman/package.c:76 msgid "License :" -msgstr "Licence :" +msgstr "Licence :" #: src/pacman/package.c:77 src/pacman/package.c:129 msgid "Groups :" -msgstr "Groupes :" +msgstr "Groupes :" #: src/pacman/package.c:78 src/pacman/package.c:130 msgid "Provides :" -msgstr "Fournit :" +msgstr "Fournit :" #: src/pacman/package.c:79 src/pacman/package.c:131 msgid "Depends On :" -msgstr "Dpend De :" +msgstr "Dépend de :" #: src/pacman/package.c:80 src/pacman/package.c:132 msgid "Removes :" -msgstr "Supprime :" +msgstr "Supprime :" #: src/pacman/package.c:83 msgid "Required By :" -msgstr "Requit par :" +msgstr "Requis par :" +# Plus compréhensible... #: src/pacman/package.c:85 src/pacman/package.c:133 msgid "Conflicts With :" -msgstr "Conflit avec :" +msgstr "Incompatible avec :" #: src/pacman/package.c:86 src/pacman/package.c:136 #, c-format msgid "Installed Size : %6.2f K\n" -msgstr "Taille d'installation : %6.2f K\n" +msgstr "Taille (installé) : %6.2f K\n" +# qu'en dites-vous? #: src/pacman/package.c:87 #, c-format msgid "Packager : %s\n" -msgstr "Packageur : %s\n" +msgstr "Paqueteur : %s\n" #: src/pacman/package.c:88 #, c-format msgid "Architecture : %s\n" -msgstr "Architecture : %s\n" +msgstr "Architecture : %s\n" +# En français, "construire" un programme n'a pas beaucoup de sens, on le compile #: src/pacman/package.c:89 #, c-format msgid "Build Date : %s %s\n" -msgstr "Date de construction : %s %s\n" +msgstr "Compilé le : %s %s\n" +# En français, "construire" un programme n'a pas beaucoup de sens, on le compile #: src/pacman/package.c:90 #, c-format msgid "Build Type : %s\n" -msgstr "Type de construction : %s\n" +msgstr "Type de compilation : %s\n" #: src/pacman/package.c:92 #, c-format msgid "Install Date : %s %s\n" -msgstr "Date d'installation : %s %s\n" +msgstr "Installé le : %s %s\n" #: src/pacman/package.c:93 #, c-format msgid "Install Reason : %s\n" -msgstr "Raison d'installation : %s\n" +msgstr "Motif d'installation : %s\n" #: src/pacman/package.c:95 #, c-format @@ -243,51 +246,51 @@ msgstr "Non" #: src/pacman/package.c:126 #, c-format msgid "Repository : %s\n" -msgstr "Dpt : %s\n" +msgstr "Dépôt : %s\n" #: src/pacman/package.c:134 msgid "Replaces :" -msgstr "Remplace :" +msgstr "Remplace :" #: src/pacman/package.c:135 #, c-format msgid "Download Size : %6.2f K\n" -msgstr "Taille de tlchargement : %6.2f K\n" +msgstr "A télécharger : %6.2f K\n" #: src/pacman/package.c:144 #, c-format msgid "MD5 Sum : %s" -msgstr "somme MD5 : %s" +msgstr "somme MD5 : %s" #: src/pacman/package.c:147 #, c-format msgid "SHA1 Sum : %s" -msgstr "somme SHA1 : %s" +msgstr "somme SHA1 : %s" #: src/pacman/package.c:158 #, c-format msgid "Backup Files:\n" -msgstr "Fichier de sauvegarde:\n" +msgstr "Fichiers de sauvegarde:\n" #: src/pacman/package.c:180 #, c-format msgid "error calculating checksums for %s\n" -msgstr "erreur lors du calcul des sommes de contrles pour %s\n" +msgstr "erreur lors du calcul des sommes de contrôle pour %s\n" #: src/pacman/package.c:193 #, c-format msgid "MODIFIED\t%s\n" -msgstr "MODIFIE\t%s\n" +msgstr "MODIFIÉ\t%s\n" #: src/pacman/package.c:195 #, c-format msgid "Not Modified\t%s\n" -msgstr "Non Modifi\t%s\n" +msgstr "Non modifié\t%s\n" #: src/pacman/package.c:200 #, c-format msgid "MISSING\t\t%s\n" -msgstr "MANQUANT\t\t%s\n" +msgstr "MANQUANT:\t\t%s\n" #: src/pacman/package.c:206 #, c-format @@ -297,12 +300,13 @@ msgstr "(Aucun)\n" #: src/pacman/package.c:246 #, c-format msgid "No changelog available for '%s'.\n" -msgstr "Aucun changelog disponible pour '%s'.\n" +msgstr "Changelog: non disponible pour '%s'.\n" +# "Utilisation" pour "usage", suggéré par nano, excellement traduit #: src/pacman/pacman.c:90 #, c-format msgid "usage: %s {-h --help}\n" -msgstr "usage: %s {-h --help}\n" +msgstr "Utilisation: %s {-h --help}\n" #: src/pacman/pacman.c:91 #, c-format @@ -346,136 +350,147 @@ msgid "" "use '%s --help' with other options for more syntax\n" msgstr "" "\n" -"utiliser '%s --help' avec d'autres options pour une syntaxe plus dtaille\n" +"Utilisez '%s --help' avec d'autres options pour une syntaxe plus détaillée.\n" #: src/pacman/pacman.c:101 #, c-format msgid "usage: %s {-A --add} [options] \n" -msgstr "usage: %s {-A --add} [options] \n" +msgstr "Utilisation: %s {-A --add} [options] \n" #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138 #, c-format msgid "options:\n" -msgstr "options:\n" +msgstr "Options:\n" #: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 #: src/pacman/pacman.c:140 #, c-format msgid " -d, --nodeps skip dependency checks\n" -msgstr " -d, --nodeps ignore le contrle des dpendances\n" +msgstr " -d, --nodeps ne vérifie pas les dépendances\n" #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" msgstr "" -" -f, --force force l'installation, en crasant les fichiers en " +" -f, --force force l'installation, en écrasant les fichiers en " "conflit\n" #: src/pacman/pacman.c:106 #, c-format msgid "usage: %s {-R --remove} [options] \n" -msgstr "usage: %s {-R --remove} [options] \n" +msgstr "Utilisation: %s {-R --remove} [options] \n" +# . #: src/pacman/pacman.c:108 #, c-format msgid "" " -c, --cascade remove packages and all packages that depend on them\n" msgstr "" -" -c, --cascade supprime les paquets et tout ceux qui en dpendent\n" +" -c, --cascade supprime les paquets ainsi que tous ceux qui en " +"dépendent\n" #: src/pacman/pacman.c:110 #, c-format msgid "" " -k, --dbonly only remove database entry, do not remove files\n" msgstr "" -" -k, --dbonly supprime uniquement les entres dans la base de " -"donnes, pas les fichiers\n" +" -k, --dbonly supprime uniquement les entrées dans la base de " +"données, et non les fichiers\n" #: src/pacman/pacman.c:111 #, c-format msgid " -n, --nosave remove configuration files as well\n" -msgstr " -n, --nosave efface galement les fichiers de configuration\n" +msgstr "" +" -n, --nosave supprime également les fichiers de configuration\n" +# Formule modifiée, sens préservé! #: src/pacman/pacman.c:112 #, c-format msgid "" " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" -" -s, --recursive supprime les dpendances galement (cela ne cassera " -"pas les dpendances d'autres paquets)\n" +" -s, --recursive supprime également les paquets qui ne dépendent " +"que de celui-ci\n" #: src/pacman/pacman.c:115 #, c-format msgid "usage: %s {-F --freshen} [options] \n" -msgstr "usage: %s {-F --freshen} [options] \n" +msgstr "Utilisation: %s {-F --freshen} [options] \n" #: src/pacman/pacman.c:117 #, c-format msgid "usage: %s {-U --upgrade} [options] \n" -msgstr "usage: %s {-U --upgrade} [options] \n" +msgstr "Utilisation: %s {-U --upgrade} [options] \n" #: src/pacman/pacman.c:123 #, c-format msgid "usage: %s {-Q --query} [options] [package]\n" -msgstr "usage: %s {-Q --query} [options] [package]\n" +msgstr "Utilisation: %s {-Q --query} [options] [package]\n" +# pour être cohérent #: src/pacman/pacman.c:125 #, c-format msgid " -c, --changelog view the changelog of a package\n" -msgstr " -c, --changelog afficher le changelog du paquet\n" +msgstr " -c, --changelog affiche le Changelog du paquet\n" +# id. #: src/pacman/pacman.c:126 #, c-format msgid "" " -e, --orphans list all packages installed as dependencies but no " "longer\n" msgstr "" -" -e, --orphans lister tous les paquets qui ont t installs comme " -"des dpendances\n" +" -e, --orphans liste tous les paquets qui ont été installés " +"comme des dépendances\n" #: src/pacman/pacman.c:127 #, c-format msgid " required by any package\n" -msgstr " requis par aucun autre paquet\n" +msgstr "" +" et qui ne sont plus requis par aucun paquet\n" +# id. #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format msgid " -g, --groups view all members of a package group\n" msgstr "" -" -g, --groups afficher tous les lments d'un groupe de paquet\n" +" -g, --groups affiche tous les éléments d'un groupe de paquet\n" #: src/pacman/pacman.c:129 src/pacman/pacman.c:144 #, c-format msgid " -i, --info view package information\n" -msgstr " -i, --info afficher les informations du paquet\n" +msgstr "" +" -i, --info affiche les informations concernant un paquet\n" #: src/pacman/pacman.c:130 #, c-format msgid " -l, --list list the contents of the queried package\n" -msgstr " -l, --list lister le contenu du paquet interrog\n" +msgstr " -l, --list liste le contenu du paquet interrogé\n" #: src/pacman/pacman.c:131 #, c-format msgid "" " -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" -" -m, --foreign liste les paquets non trouvs dans la/les base(s) de " -"donnes de synchronisation\n" +" -m, --foreign liste les paquets non trouvés dans la ou les " +"bases de données de synchronisation\n" +# il ne peut y en avoir qu'un seul... #: src/pacman/pacman.c:132 #, c-format msgid " -o, --owns query the package that owns \n" msgstr "" -" -o, --owns recherche les paquets contenant le fichier " +" -o, --owns recherche le paquet contenant le fichier " "\n" +# pour être cohérent... #: src/pacman/pacman.c:133 #, c-format msgid " -p, --file query a package file instead of the database\n" msgstr "" -" -p, --file utilise le fichier [paquet] au lieu de la base de " -"donnes\n" +" -p, --file interroge le fichier au lieu de la base " +"de données\n" #: src/pacman/pacman.c:134 #, c-format @@ -483,18 +498,19 @@ msgid "" " -s, --search search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search recherche dans les paquets installs localement ceux " -"qui contiennent la chaine\n" +" -s, --search recherche la chaîne correspondante dans les " +"paquets installés localement\n" #: src/pacman/pacman.c:135 #, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr " -u, --sysupgrade liste tous les paquets pouvant tre mis jour\n" +msgstr "" +" -u, --sysupgrade liste tous les paquets pouvant être mis à jour\n" #: src/pacman/pacman.c:137 #, c-format msgid "usage: %s {-S --sync} [options] [package]\n" -msgstr "usage: %s {-S --sync} [options] [paquet]\n" +msgstr "Utilisation: %s {-S --sync} [options] [paquet]\n" #: src/pacman/pacman.c:139 #, c-format @@ -502,38 +518,42 @@ msgid "" " -c, --clean remove old packages from cache directory (-cc for " "all)\n" msgstr "" -" -c, --clean supprime les paquets obsoltes du rpertoire de cache " -"(-cc pour tous)\n" +" -c, --clean supprime les paquets obsolètes du répertoire de " +"cache (-cc pour tous)\n" #: src/pacman/pacman.c:141 #, c-format msgid " -e, --dependsonly install dependencies only\n" -msgstr " -e, --dependsonly installe les dpendances uniquement\n" +msgstr " -e, --dependsonly n'installe que les dépendances\n" #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list view a list of packages in a repo\n" msgstr "" +" -l, --list donne une liste de tous les paquets d'un dépôt\n" +# plus clair #: src/pacman/pacman.c:146 #, c-format msgid "" " -p, --print-uris print out URIs for given packages and their " "dependencies\n" msgstr "" -" -p, --print-uris affiche les URIs pour des paquets donns et leurs " -"dpendances\n" +" -p, --print-uris affiche les URIs pour les paquets donnés et pour " +"leurs dépendances\n" #: src/pacman/pacman.c:147 #, c-format msgid "" " -s, --search search remote repositories for matching strings\n" -msgstr " -s, --search recherche la chane dans les dpts distants\n" +msgstr "" +" -s, --search recherche la chaîne correspondante dans les " +"dépôts distants\n" #: src/pacman/pacman.c:148 #, c-format msgid " -u, --sysupgrade upgrade all packages that are out of date\n" -msgstr " -u, --sysupgrade met jour tous les paquets obsoltes\n" +msgstr " -u, --sysupgrade met à jour tous les paquets obsolètes\n" #: src/pacman/pacman.c:149 #, c-format @@ -541,107 +561,113 @@ msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" msgstr "" -" -w, --downloadonly tlcharge les paquets mais n'installe rien et ne met " -"rien jour\n" +" -w, --downloadonly ne fait que télécharger les paquets, sans rien " +"installer ni mettre à jour\n" #: src/pacman/pacman.c:150 #, c-format msgid "" " -y, --refresh download fresh package databases from the server\n" msgstr "" -" -y, --refresh tlcharge les dernires bases de donnes depuis les " -"serveurs\n" +" -y, --refresh télécharge les dernières bases de données depuis " +"le serveur\n" +# moins fidèle, mais plus précis (je changerais l'anglais aussi ici) #: src/pacman/pacman.c:151 #, c-format msgid "" " --ignore ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore ignore la mise jour d'un paquet (peut tre utilis " -"plus d'une fois)\n" +" --ignore ignore un paquet lors de la mise à jour (peut " +"être utilisé plus d'une fois)\n" #: src/pacman/pacman.c:153 #, c-format msgid " --config set an alternate configuration file\n" -msgstr " --config dfini un fichier de configuration alternatif\n" +msgstr "" +" --config impose un fichier de configuration alternatif\n" #: src/pacman/pacman.c:154 #, c-format msgid " --noconfirm do not ask for any confirmation\n" -msgstr " --noconfirm ne demande aucune confirmation\n" +msgstr " --noconfirm ne demande aucune confirmation\n" #: src/pacman/pacman.c:155 #, c-format msgid "" " --ask pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask pr-spcifie des rponses aux questions (voir le " -"manpage\n" +" --ask spécifie à l'avance la réponses à certaines " +"questions (voir la page de manuel)\n" #: src/pacman/pacman.c:156 #, c-format msgid "" " --noprogressbar do not show a progress bar when downloading files\n" msgstr "" -" --noprogressbar n'affiche pas la barre de progression pendant le " -"tlchargement\n" +" --noprogressbar n'affiche pas la barre de progression pendant le " +"téléchargement\n" #: src/pacman/pacman.c:157 #, c-format msgid "" " --noscriptlet do not execute the install scriptlet if there is any\n" msgstr "" -" --noscriptlet n'excute pas les scripts d'installation s'il y'en a\n" +" --noscriptlet n'exécute pas le script d'installation, si le " +"paquet en contient\n" #: src/pacman/pacman.c:158 #, c-format msgid " -v, --verbose be verbose\n" -msgstr " -v, --verbose mode verbeux (affichage prolixe)\n" +msgstr " -v, --verbose affiche plus de détails\n" #: src/pacman/pacman.c:159 #, c-format msgid " -r, --root set an alternate installation root\n" msgstr "" -" -r, --root dfini un rpertoire d'installation alternatif\n" +" -r, --root impose un répertoire d'installation alternatif\n" #: src/pacman/pacman.c:160 #, c-format msgid " -b, --dbpath set an alternate database location\n" msgstr "" -" -b, --dbpath dfini un emplacement alternatif pour les bases de " -"donnes\n" +" -b, --dbpath impose un emplacement alternatif pour les bases " +"de données\n" #: src/pacman/pacman.c:161 #, c-format msgid " --cachedir set an alternate package cache location\n" -msgstr " --cachedir dfinit un rpertoire cache alternatif\n" +msgstr " --cachedir impose un répertoire cache alternatif\n" +# traduction officielle de la GPL #: src/pacman/pacman.c:174 #, c-format msgid " This program may be freely redistributed under\n" -msgstr "" -" Ce programme peut tre librement redistribu sous\n" +msgstr " Ce programme peut être librement diffusé sous\n" +# id. #: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr " les termes de la GNU General Public License\n" +msgstr "" +" les termes de la Licence publique générale GNU (GNU " +"GPL)\n" #: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" -msgstr "'%s' n'est pas un niveau valide de dbogage" +msgstr "'%s' n'est pas un niveau de débogage valide" #: src/pacman/pacman.c:315 #, c-format msgid "'%s' is not a valid cache directory\n" -msgstr "'%s' n'est pas un repertoire de cache valide\n" +msgstr "'%s' n'est pas un répertoire de cache valide\n" #: src/pacman/pacman.c:333 #, c-format msgid "'%s' is not a valid db path\n" -msgstr "'%s' n'est pas un chemin valide vers la base de donnes\n" +msgstr "'%s' n'est pas un chemin valide vers la base de données\n" #: src/pacman/pacman.c:363 #, c-format @@ -650,26 +676,28 @@ msgstr "'%s' n'est pas un chemin racine valide\n" #: src/pacman/pacman.c:390 msgid "only one operation may be used at a time\n" -msgstr "une seule opration peut tre effectue la fois\n" +msgstr "une seule opération peut être effectuée à la fois\n" +# localisation est la traduction officielle #: src/pacman/pacman.c:436 msgid "warning: current locale is invalid; using default \"C\" locale" msgstr "" -"Avertissement: la locale courante est invalide; la locale \"C\" sera utilise" +"Avertissement: la localisation courante n'est pas valide; la localisation " +"par défaut \"C\" sera utilisée." #: src/pacman/pacman.c:456 #, c-format msgid "failed to initialize alpm library (%s)\n" -msgstr "chec d'initialisation de la librairie alpm (%s)\n" +msgstr "l'initialisation de la librairie alpm a échoué (%s)\n" #: src/pacman/pacman.c:489 msgid "you cannot perform this operation unless you are root.\n" -msgstr "vous ne pouvez effectuer cette opration moins d'tre root.\n" +msgstr "vous ne pouvez effectuer cette opération à moins d'être root.\n" #: src/pacman/pacman.c:505 #, c-format msgid "failed to parse config (%s)\n" -msgstr "chec de lecture de la configuration (%s)\n" +msgstr "la lecture de la configuration a échoué (%s)\n" #: src/pacman/pacman.c:516 msgid "Targets :" @@ -678,38 +706,38 @@ msgstr "Cibles :" #: src/pacman/pacman.c:522 #, c-format msgid "could not register 'local' database (%s)\n" -msgstr "n'a pas pu enregistrer la base de donnes 'local' (%s)\n" +msgstr "l'enregistrement de la base de données 'local' a échoué (%s)\n" #: src/pacman/pacman.c:529 msgid "no targets specified (use -h for help)\n" -msgstr "aucune cible spcifie (utiliser -h pour de l'aide)\n" +msgstr "aucune cible spécifiée (utiliser -h pour obtenir de l'aide)\n" #: src/pacman/pacman.c:542 msgid "no operation specified (use -h for help)\n" -msgstr "aucune opration spcifie (utiliser -h pour de l'aide)\n" +msgstr "aucune opération spécifiée (utiliser -h pour obtenir de l'aide)\n" #: src/pacman/query.c:90 msgid "no file was specified for --owns\n" -msgstr "aucun fichier spcifi pour --owns\n" +msgstr "aucun fichier spécifié pour --owns\n" #: src/pacman/query.c:95 #, c-format msgid "failed to read file '%s': %s" -msgstr "chec d'ajout de la cible '%s': %s" +msgstr "échec de lecture du fichier '%s': %s" #: src/pacman/query.c:100 msgid "cannot determine ownership of a directory" -msgstr "" +msgstr "ne peut déterminer le propriétaire d'un répertoire" #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "" +msgstr "ne peut déterminer le vrai chemin pour '%s': %s" #: src/pacman/query.c:119 #, c-format msgid "%s is owned by %s %s\n" -msgstr "%s appartient %s %s\n" +msgstr "%s appartient à %s %s\n" #: src/pacman/query.c:127 #, c-format @@ -718,43 +746,45 @@ msgstr "Aucun paquet ne contient %s\n" #: src/pacman/query.c:170 src/pacman/sync.c:453 msgid "no usable package repositories configured.\n" -msgstr "aucun dpt de paquet utilisable n'est dfinie.\n" +msgstr "aucun dépôt de paquets utilisable n'a été défini.\n" +# le sens est plus clair #: src/pacman/query.c:176 msgid "Checking for package upgrades..." -msgstr "Vrification des mises jour de paquets..." +msgstr "Vérification des mises à jour disponibles... " #: src/pacman/query.c:183 msgid "no upgrades found" -msgstr "pas de mises jour trouves" +msgstr "pas de mises à jour trouvées" #: src/pacman/query.c:221 #, c-format msgid "group \"%s\" was not found\n" -msgstr "le groupe \"%s\" n'a pas t trouv\n" +msgstr "Le groupe \"%s\" n'a pas été trouvé\n" #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" -msgstr "aucun fichier du paquet spcifi pour --file\n" +msgstr "aucun fichier du paquet spécifié pour --file\n" #: src/pacman/query.c:236 #, c-format msgid "failed to load package '%s' (%s)\n" -msgstr "chec de chargement du paquet '%s' (%s)\n" +msgstr "le chargement du paquet '%s' (%s) a échoué\n" #: src/pacman/query.c:273 src/pacman/query.c:305 #, c-format msgid "package \"%s\" not found\n" -msgstr "paquet \"%s\" non trouv\n" +msgstr "paquet \"%s\" introuvable\n" #: src/pacman/remove.c:61 src/pacman/sync.c:568 #, c-format msgid ":: group %s:\n" -msgstr ":: groupe %s:\n" +msgstr ":: Groupe %s:\n" +# pour être cohérent #: src/pacman/remove.c:63 msgid " Remove whole content? [Y/n] " -msgstr " Effacer tout le contenu? [O/n] " +msgstr " Supprimer tout le contenu? [O/n] " #: src/pacman/remove.c:67 #, c-format @@ -764,17 +794,17 @@ msgstr ":: Supprimer %s du groupe %s? [O/n] " #: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format msgid "failed to init transaction (%s)\n" -msgstr "chec d'initialisation de la transaction (%s)\n" +msgstr "l'initialisation de la transaction a échoué (%s)\n" #: src/pacman/remove.c:92 #, c-format msgid "failed to add target '%s' (%s)\n" -msgstr "chec d'ajout de la cible '%s' (%s)\n" +msgstr "l'ajout de la cible '%s' (%s) a échoué\n" #: src/pacman/remove.c:106 #, c-format msgid ":: %s is required by %s\n" -msgstr ":: %s est requit par %s\n" +msgstr ":: %s est requis par %s\n" #: src/pacman/remove.c:128 src/pacman/util.c:324 msgid "Targets:" @@ -786,90 +816,94 @@ msgid "" "Do you want to remove these packages? [Y/n] " msgstr "" "\n" -"Voulez vous dsinstaller ces paquets? [O/n] " +"Voulez-vous désinstaller ces paquets? [O/n] " +# pour être cohérent #: src/pacman/sync.c:115 msgid "Do you want to remove old packages from cache? [Y/n] " -msgstr "Voulez vous effacer les anciens paquets du cache? [O/n] " +msgstr "Voulez vous supprimer du cache les paquets obsolètes? [O/n] " #: src/pacman/sync.c:117 msgid "removing old packages from cache... " -msgstr "effacement des anciens paquets du cache..." +msgstr "Suppression du cache des paquets obsolètes... " #: src/pacman/sync.c:120 msgid "could not access cache directory\n" -msgstr "n'a pas pu accder au rpertoire de cache\n" +msgstr "l'accès au répertoire du cache a échoué\n" +# id. #: src/pacman/sync.c:181 msgid "Do you want to remove all packages from cache? [Y/n] " -msgstr "Voulez vous effacer tous les paquets du cache? [O/n] " +msgstr "Voulez-vous supprimer du cache tous les paquets? [O/n] " #: src/pacman/sync.c:183 msgid "removing all packages from cache... " -msgstr "effacement de tous les paquets du cache..." +msgstr "Suppression du cache de tous les paquets... " #: src/pacman/sync.c:186 msgid "could not remove cache directory\n" -msgstr "n'a pas pu supprimer le rpertoire de cache\n" +msgstr "la suppression du répertoire de cache a échoué\n" #: src/pacman/sync.c:191 msgid "could not create new cache directory\n" -msgstr "n'a pas pu crer le nouveau rpertoire de cache\n" +msgstr "la création du nouveau répertoire de cache a échoué\n" #: src/pacman/sync.c:218 #, c-format msgid "failed to synchronize %s: %s\n" -msgstr "chec lors de la synchronisation %s: %s\n" +msgstr "la synchronisation %s: %s a échoué\n" #: src/pacman/sync.c:220 #, c-format msgid "failed to update %s (%s)\n" -msgstr "chec de la mise jour %s (%s)\n" +msgstr "la mise à jour de %s (%s) a échoué\n" #: src/pacman/sync.c:223 #, c-format msgid " %s is up to date\n" -msgstr " %s est jour\n" +msgstr " %s est à jour;\n" #: src/pacman/sync.c:345 #, c-format msgid "repository '%s' does not exist\n" -msgstr "le dpt '%s' n'a pas t trouv\n" +msgstr "le dépôt '%s' n'a pas été trouvé\n" #: src/pacman/sync.c:361 #, c-format msgid "package '%s' was not found in repository '%s'\n" -msgstr "paquet '%s' non trouv dans le dpt '%s'\n" +msgstr "le paquet '%s' n'a pas été trouvé dans le dépôt '%s'\n" +# pour être cohérent #: src/pacman/sync.c:381 #, c-format msgid "package '%s' was not found\n" -msgstr "paquet \"%s\" non trouv\n" +msgstr "le paquet \"%s\" n'a pas été trouvé.\n" #: src/pacman/sync.c:418 #, c-format msgid "repository \"%s\" was not found.\n" -msgstr "le dpt \"%s\" n'a pas t trouv.\n" +msgstr "le dépôt \"%s\" n'a pas été trouvé.\n" #: src/pacman/sync.c:490 msgid ":: Synchronizing package databases...\n" -msgstr ":: Synchronisation des bases de donnes de paquets...\n" +msgstr ":: Synchronisation des bases de données de paquets...\n" #: src/pacman/sync.c:491 msgid "synchronizing package lists" -msgstr "synchronisation de la liste des paquets" +msgstr "Synchronisation des listes de paquets" #: src/pacman/sync.c:493 msgid "failed to synchronize any databases" -msgstr "chec lors de la synchronisation" +msgstr "la synchronisation a échoué" +# un processus ne démarre pas (les véhiculent démarrent), il débute #: src/pacman/sync.c:499 msgid ":: Starting full system upgrade...\n" -msgstr ":: Dmarrage de la mise jour complte du systme...\n" +msgstr ":: Début de la mise à jour complète du système...\n" #: src/pacman/sync.c:500 msgid "starting full system upgrade" -msgstr "dmarrage de la mise jour complte du systme" +msgstr "Début de la mise à jour complète du système" #: src/pacman/sync.c:518 msgid "" @@ -877,31 +911,26 @@ msgid "" ":: pacman has detected a newer version of the \"pacman\" package.\n" msgstr "" "\n" -":: pacman a dtect une version plus rcente du paquet \"pacman\".\n" +":: pacman a détecté une version plus récente du paquet \"pacman\".\n" +# moins littéral, mais plus explicite #: src/pacman/sync.c:519 msgid ":: It is recommended that you allow pacman to upgrade itself\n" -msgstr ":: Il est recommand de laisser pacman se mettre jour\n" +msgstr ":: Il est recommandé de mettre d'abord pacman à jour\n" #: src/pacman/sync.c:520 msgid ":: first, then you can re-run the operation with the newer version.\n" -msgstr "" -":: d'abord, vous devriez relancer l'opration avec la nouvelle version.\n" +msgstr ":: puis de relancer l'opération avec la nouvelle version.\n" #: src/pacman/sync.c:522 msgid ":: Upgrade pacman first? [Y/n] " -msgstr ":: Mettre jour pacman pralablement? [O/n] " +msgstr ":: Mettre à jour pacman d'abord? [O/n] " #: src/pacman/sync.c:537 #, c-format msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Installer tout le contenu? [O/n] " @@ -911,10 +940,11 @@ msgstr ":: Installer tout le contenu? [O/n] " msgid ":: Install %s from group %s? [Y/n] " msgstr ":: Installer %s du groupe %s? [O/n] " +# pour être cohérent #: src/pacman/sync.c:603 #, c-format msgid "'%s': not found in sync db\n" -msgstr "%s': non trouv dans la db de synchronisation\n" +msgstr "'%s': non trouvé dans la base de données de synchronisation\n" #: src/pacman/sync.c:621 msgid "requires" @@ -922,7 +952,7 @@ msgstr "requiert" #: src/pacman/sync.c:663 msgid " local database is up to date\n" -msgstr " base de donnes 'local' est jour\n" +msgstr "La base de données locale est à jour.\n" #: src/pacman/sync.c:672 msgid "" @@ -930,11 +960,11 @@ msgid "" "Beginning download...\n" msgstr "" "\n" -"Dbut du tlchargement...\n" +"Début du téléchargement...\n" #: src/pacman/sync.c:676 msgid "Proceed with download? [Y/n] " -msgstr "Procder au tlchargement? [O/n] " +msgstr "Procéder au téléchargement? [O/n] " #: src/pacman/sync.c:684 msgid "" @@ -942,113 +972,122 @@ msgid "" "Beginning upgrade process...\n" msgstr "" "\n" -"Dbut du processus de mise jour...\n" +"Début du processus de mise à jour...\n" #: src/pacman/sync.c:688 msgid "Proceed with installation? [Y/n] " -msgstr "Procder l'installation [O/n] " +msgstr "Procéder à l'installation? [O/n] " #: src/pacman/trans.c:55 msgid "checking dependencies... " -msgstr "vrification des dpendances..." +msgstr "Vérification des dépendances... " #: src/pacman/trans.c:59 msgid "checking for file conflicts... " -msgstr "vrification des conflits de fichiers..." +msgstr "Recherche des conflits de fichiers... " #: src/pacman/trans.c:63 msgid "cleaning up... " -msgstr "nettoyage... " +msgstr "Nettoyage... " #: src/pacman/trans.c:66 msgid "resolving dependencies... " -msgstr "rsolution des dpendances... " +msgstr "Résolution des dépendances... " +# la formulation anglaise non plus n'est pas claire... #: src/pacman/trans.c:69 msgid "looking for inter-conflicts... " -msgstr "recherche inter-conflits... " +msgstr "Recherche des conflits possibles entre paquets... " #: src/pacman/trans.c:86 #, c-format msgid "installing %s... " -msgstr "installation de %s... " +msgstr "Installation de %s... " #: src/pacman/trans.c:93 #, c-format msgid "installed %s (%s)" -msgstr "%s install (%s)" +msgstr "%s installé (%s)" #: src/pacman/trans.c:100 #, c-format msgid "removing %s... " -msgstr "dsinstallation de %s... " +msgstr "Désinstallation de %s... " #: src/pacman/trans.c:107 #, c-format msgid "removed %s (%s)" -msgstr "%s dsinstall (%s)" +msgstr "%s désinstallé (%s)" #: src/pacman/trans.c:114 #, c-format msgid "upgrading %s... " -msgstr "mise jour de %s... " +msgstr "Mise à jour de %s... " #: src/pacman/trans.c:121 #, c-format msgid "upgraded %s (%s -> %s)" -msgstr "%s mis jour (%s -> %s)" +msgstr "%s mis à jour (%s -> %s)" #: src/pacman/trans.c:128 msgid "checking package integrity... " -msgstr "vrification de l'intgrit des paquets..." +msgstr "Analyse de l'intégrité des paquets... " #: src/pacman/trans.c:144 msgid "failed.\n" -msgstr "chec.\n" +msgstr "Échec.\n" +# pas du tout littéral, mais plus compréhensible #: src/pacman/trans.c:151 #, c-format msgid ":: Retrieving packages from %s...\n" -msgstr ":: Rcupration des paquets depuis %s...\n" +msgstr ":: Récupération des paquets du dépôt %s...\n" +# plus clair #: src/pacman/trans.c:172 #, c-format msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " msgstr "" -":: %1$s ncessite %2$s depuis IgnorePkg. Installer %2$s tout de mme? [O/n] " +":: %1$s requiert %2$s, défini comme paquet à ignorer (IgnorePkg). Installer %" +"2$s tout de même? [O/n] " #: src/pacman/trans.c:177 #, c-format msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " -msgstr ":: %s est dfini en IgnorePkg. Installer tout de mme? [O/n] " +msgstr "" +":: %s est défini comme paquet à ignorer (IgnorePkg). L'installer tout de " +"même? [O/n] " #: src/pacman/trans.c:190 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr ":: %s est indiqu comme 'HoldPkg'. Supprimer tout de mme? [O/n] " +msgstr "" +":: %s est indiqué comme paquet à conserver (HoldPkg). Le supprimer tout de " +"même? [O/n] " #: src/pacman/trans.c:203 #, c-format msgid ":: Replace %s with %s/%s? [Y/n] " msgstr ":: Remplacer %s avec %s/%s? [O/n] " +# pour être cohérent #: src/pacman/trans.c:218 #, c-format msgid ":: %s conflicts with %s. Remove %s? [Y/n] " -msgstr ":: %s est en conflit avec %s. Retirer %s? [O/n] " +msgstr ":: %s est en conflit avec %s. Supprimer %s? [O/n] " #: src/pacman/trans.c:234 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " msgstr "" -":: %s-%s: la version locale est plus rcente. Mettre jour tout de mme? [O/" +":: %s-%s: la version locale est plus récente. Mettre à jour tout de même? [O/" "n] " #: src/pacman/trans.c:252 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " msgstr "" -":: %s-%s: la version locale est jour. Mettre jour tout de mme? [O/n] " +":: %s-%s: la version locale est à jour. Mettre à jour tout de même? [O/n] " #: src/pacman/trans.c:270 #, c-format @@ -1061,24 +1100,25 @@ msgstr "Installation" #: src/pacman/trans.c:329 msgid "upgrading" -msgstr "Mise jour" +msgstr "Mise à jour" #: src/pacman/trans.c:332 msgid "removing" -msgstr "dsinstallation" +msgstr "Désinstallation" #: src/pacman/trans.c:335 msgid "checking for file conflicts" -msgstr "vrification des conflits de fichiers" +msgstr "Analyse des conflits entre fichiers" +# bon, on peut discuter là dessus; mais pacman -Qi avec tous ses "aucun" est vraiment trop laid... je le préfère comme ça #: src/pacman/util.c:259 #, c-format msgid "None\n" -msgstr "Aucun\n" +msgstr "--\n" #: src/pacman/util.c:311 msgid "Remove:" -msgstr "Supression:" +msgstr "Suppression:" #: src/pacman/util.c:319 #, c-format @@ -1087,7 +1127,7 @@ msgid "" "Total Removed Size: %.2f MB\n" msgstr "" "\n" -"Taille totale du paquet: %.2f Mo\n" +"Taille totale des paquets supprimés: %.2f Mo\n" #: src/pacman/util.c:330 #, c-format @@ -1096,12 +1136,18 @@ msgid "" "Total Package Size: %.2f MB\n" msgstr "" "\n" -"Taille totale du paquet: %.2f Mo\n" +"Taille totale des paquets: %.2f Mo\n" #: src/pacman/util.c:337 #, c-format msgid "Total Installed Size: %.2f MB\n" -msgstr "Taille totale du paquet: %.2f Mo\n" +msgstr "Taille totale des paquets installés: %.2f Mo\n" + +#~ msgid "requires: %s" +#~ msgstr "requiert: %s" + +#~ msgid "'%s': %s\n" +#~ msgstr "'%s': %s\n" #~ msgid "is required by" #~ msgstr "est requit par" @@ -1111,7 +1157,7 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ msgstr "Taille d'installation : %ld K\n" #~ msgid "memory allocation failure\n" -#~ msgstr "erreur d'allocation mmoire\n" +#~ msgstr "erreur d'allocation mémoire\n" #~ msgid "add target %s\n" #~ msgstr "ajout de la cible %s\n" @@ -1123,7 +1169,7 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ msgstr "conflit: %s" #~ msgid "could not release transaction (%s)" -#~ msgstr "n'a pas pu librer la transaction (%s)" +#~ msgstr "n'a pas pu libérer la transaction (%s)" #~ msgid "Size : %ld\n" #~ msgstr "Taille : %ld\n" @@ -1156,65 +1202,65 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ msgstr "Conflits Avec :" #~ msgid "Size (compressed) : %ld\n" -#~ msgstr "Taille (compress) : %ld\n" +#~ msgstr "Taille (compressé) : %ld\n" #~ msgid "Size (uncompressed):%ld\n" -#~ msgstr "Taille (dcompress):%ld\n" +#~ msgstr "Taille (décompressé):%ld\n" #~ msgid " looking in the database\n" -#~ msgstr " rechercher dans la base de donnes\n" +#~ msgstr " rechercher dans la base de données\n" #~ msgid "bad root path" -#~ msgstr "mauvais rpertoire racine" +#~ msgstr "mauvais répertoire racine" #~ msgid "failed to set option LOGMASK (%s)\n" -#~ msgstr "chec d'affectation de l'option LOGMASK (%s)\n" +#~ msgstr "échec d'affectation de l'option LOGMASK (%s)\n" #~ msgid "failed to set option LOGCB (%s)\n" -#~ msgstr "chec d'affectation de l'option LOGCB (%s)\n" +#~ msgstr "échec d'affectation de l'option LOGCB (%s)\n" #, fuzzy #~ msgid "failed to set option DLCB (%s)\n" -#~ msgstr "chec d'affectation de l'option LOGCB (%s)\n" +#~ msgstr "échec d'affectation de l'option LOGCB (%s)\n" #, fuzzy #~ msgid "failed to set option DLFNM (%s)\n" -#~ msgstr "chec d'affectation de l'option LOGFILE (%s)\n" +#~ msgstr "échec d'affectation de l'option LOGFILE (%s)\n" #, fuzzy #~ msgid "failed to set option DLOFFSET (%s)\n" -#~ msgstr "chec d'affectation de l'option LOGFILE (%s)\n" +#~ msgstr "échec d'affectation de l'option LOGFILE (%s)\n" #, fuzzy #~ msgid "failed to set option DLT0 (%s)\n" -#~ msgstr "chec d'affectation de l'option DBPATH (%s)\n" +#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n" #, fuzzy #~ msgid "failed to set option DLT (%s)\n" -#~ msgstr "chec d'affectation de l'option DBPATH (%s)\n" +#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n" #, fuzzy #~ msgid "failed to set option DLRATE (%s)\n" -#~ msgstr "chec d'affectation de l'option DBPATH (%s)\n" +#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n" #, fuzzy #~ msgid "failed to set option DLXFERED1 (%s)\n" -#~ msgstr "chec d'affectation de l'option LOGFILE (%s)\n" +#~ msgstr "échec d'affectation de l'option LOGFILE (%s)\n" #, fuzzy #~ msgid "failed to set option DLETA_H (%s)\n" -#~ msgstr "chec d'affectation de l'option DBPATH (%s)\n" +#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n" #, fuzzy #~ msgid "failed to set option DLETA_M (%s)\n" -#~ msgstr "chec d'affectation de l'option DBPATH (%s)\n" +#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n" #, fuzzy #~ msgid "failed to set option DLETA_S (%s)\n" -#~ msgstr "chec d'affectation de l'option LOGMASK (%s)\n" +#~ msgstr "échec d'affectation de l'option LOGMASK (%s)\n" #~ msgid "failed to set option IGNOREPKG (%s)\n" -#~ msgstr "chec d'affectation de l'option IGNOREPKG (%s)\n" +#~ msgstr "échec d'affectation de l'option IGNOREPKG (%s)\n" #~ msgid "%s is not a file.\n" #~ msgstr "%s n'est pas un fichier.\n" @@ -1227,7 +1273,7 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ "Cibles:" #~ msgid ":: Starting local database upgrade...\n" -#~ msgstr ":: Dmarrage de la mise jour de base de donnes locale...\n" +#~ msgstr ":: Démarrage de la mise à jour de base de données locale...\n" #~ msgid "could not add target '%s': %s\n" #~ msgstr "n'a pas pu ajouter la cible '%s': %s\n" @@ -1244,13 +1290,13 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ "Total Uncompressed Package Size: %.1f MB\n" #~ msgstr "" #~ "\n" -#~ "Taille Totale du Paquet Dcompress: %.1f MB\n" +#~ "Taille Totale du Paquet Décompressé: %.1f MB\n" #~ msgid "Proceed with upgrade? [Y/n] " -#~ msgstr "Procder aux mises jour? [O/n] " +#~ msgstr "Procéder aux mises à jour? [O/n] " #~ msgid "failed to allocated %d bytes\n" -#~ msgstr "chec lors de l'allocation de %d bytes\n" +#~ msgstr "échec lors de l'allocation de %d bytes\n" #~ msgid "config: new section '%s'\n" #~ msgstr "config: nouvelle section '%s'\n" @@ -1261,7 +1307,7 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ msgid "" #~ "config: line %d: '%s' is reserved and cannot be used as a package tree\n" #~ msgstr "" -#~ "config: ligne %d: '%s' est rserv et ne peut tre utilis comme " +#~ "config: ligne %d: '%s' est réservé et ne peut être utilisé comme " #~ "arborescence de paquet\n" #~ msgid "config: line %d: syntax error\n" @@ -1269,26 +1315,26 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ msgid "config: line %d: all directives must belong to a section\n" #~ msgstr "" -#~ "config: ligne %d: toutes les instructions doivent tre relatives la " +#~ "config: ligne %d: toutes les instructions doivent être relatives à la " #~ "section\n" #~ msgid "failed to set option USESYSLOG (%s)\n" -#~ msgstr "chec d'affection de l'option USESYSLOG (%s)\n" +#~ msgstr "échec d'affection de l'option USESYSLOG (%s)\n" #~ msgid "config: including %s\n" #~ msgstr "config: inclusion de %s\n" #~ msgid "failed to set option NOUPGRADE (%s)\n" -#~ msgstr "chec d'affectation de l'option NOUPGRADE (%s)\n" +#~ msgstr "échec d'affectation de l'option NOUPGRADE (%s)\n" #~ msgid "failed to set option NOEXTRACT (%s)\n" -#~ msgstr "chec d'affectation de l'option NOEXTRACT (%s)\n" +#~ msgstr "échec d'affectation de l'option NOEXTRACT (%s)\n" #~ msgid "config: log file: %s\n" #~ msgstr "config: fichier de log: %s\n" #~ msgid "failed to set option UPGRADEDELAY (%s)\n" -#~ msgstr "chec d'affectation de l'option UPGRADEDELAY (%s)\n" +#~ msgstr "échec d'affectation de l'option UPGRADEDELAY (%s)\n" #~ msgid "" #~ "Warning: UpgradeDelay is very high.\n" @@ -1296,11 +1342,11 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ "Manually update such packages or use a lower value to avoid this " #~ "problem.\n" #~ msgstr "" -#~ "Avertissement: UpgradeDelay est trs lev.\n" -#~ "Si un paquet est mis jour souvent, ces mise jour ne seront jamais " -#~ "applique.\n" -#~ "Mettez jour ces paquets manuellement ou utilisez une valeur plus basse " -#~ "pour rsoudre ce problme.\n" +#~ "Avertissement: UpgradeDelay est très élevé.\n" +#~ "Si un paquet est mis à jour souvent, ces mise à jour ne seront jamais " +#~ "appliquée.\n" +#~ "Mettez à jour ces paquets manuellement ou utilisez une valeur plus basse " +#~ "pour résoudre ce problème.\n" #~ msgid "config: line %d: bad server location\n" #~ msgstr "config: ligne %d: mauvais adressage de serveur\n" @@ -1309,105 +1355,105 @@ msgstr "Taille totale du paquet: %.2f Mo\n" #~ msgstr "n'a pas pu allouer %d bytes\n" #~ msgid "config: line %d: protocol %s is not supported\n" -#~ msgstr "config: ligne %d: le protocole %s n'est pas support\n" +#~ msgstr "config: ligne %d: le protocole %s n'est pas supporté\n" #~ msgid "connecting to %s:21\n" -#~ msgstr "connexion %s:21\n" +#~ msgstr "connexion à %s:21\n" #~ msgid "cannot connect to %s\n" -#~ msgstr "n'a pas pu se connecter %s\n" +#~ msgstr "n'a pas pu se connecter à %s\n" #~ msgid "anonymous login failed\n" -#~ msgstr "la connexion en utilisateur anonyme choue\n" +#~ msgstr "la connexion en utilisateur anonyme à échouée\n" #~ msgid "could not cwd to %s: %s\n" -#~ msgstr "n'a pas pu excuter cwd pour %s: %s\n" +#~ msgstr "n'a pas pu exécuter cwd pour %s: %s\n" #~ msgid "failed to set passive mode\n" -#~ msgstr "chec d'application mode passif\n" +#~ msgstr "échec d'application mode passif\n" #~ msgid "FTP passive mode not set\n" -#~ msgstr "mode FTP passif non dfini\n" +#~ msgstr "mode FTP passif non défini\n" #~ msgid "connecting to %s\n" -#~ msgstr "connexion %s\n" +#~ msgstr "connexion à %s\n" #~ msgid "connecting to %s:%u\n" -#~ msgstr "connexion %s:%u\n" +#~ msgstr "connexion à %s:%u\n" #~ msgid "could not chdir to %s\n" -#~ msgstr "n'a pas pu excuter chdir vers %s\n" +#~ msgstr "n'a pas pu exécuter chdir vers %s\n" #~ msgid "running command: %s\n" -#~ msgstr "excution de la commande: %s\n" +#~ msgstr "exécution de la commande: %s\n" #~ msgid "running XferCommand: fork failed!\n" -#~ msgstr "excution de XferCommand: chec du fork!\n" +#~ msgstr "exécution de XferCommand: échec du fork!\n" #~ msgid "XferCommand command returned non-zero status code (%d)\n" #~ msgstr "" -#~ "la commande XferCommand retourn un code de statut diffrent de zro (%" +#~ "la commande XferCommand à retourné un code de statut différent de zéro (%" #~ "d)\n" #~ msgid "failed to get filesize for %s\n" -#~ msgstr "chec de rcupration de la taille de fichier pour %s\n" +#~ msgstr "échec de récupération de la taille de fichier pour %s\n" #~ msgid "failed to get mtime for %s\n" -#~ msgstr "chec de rcupration de la date de modification pour %s\n" +#~ msgstr "échec de récupération de la date de modification pour %s\n" #~ msgid "mtimes are identical, skipping %s\n" -#~ msgstr "le dates de modifications sont identiques, ignor %s\n" +#~ msgstr "le dates de modifications sont identiques, ignoré %s\n" #~ msgid "failed to resume download -- restarting\n" -#~ msgstr "chec de reprise du tlchargement -- redmarrage\n" +#~ msgstr "échec de reprise du téléchargement -- redémarrage\n" #~ msgid "" #~ "\n" #~ "failed downloading %s from %s: %s\n" #~ msgstr "" #~ "\n" -#~ "chec du tlchargement de %s depuis %s: %s\n" +#~ "échec du téléchargement de %s depuis %s: %s\n" #~ msgid "copying %s to %s/%s\n" #~ msgstr "copie %s vers %s/%s\n" #~ msgid "failed copying %s\n" -#~ msgstr "chec de copie de %s\n" +#~ msgstr "échec de copie de %s\n" #~ msgid " %s is already in the current directory\n" -#~ msgstr " %s est dj dans le rpertoire courant\n" +#~ msgstr " %s est déjà dans le répertoire courant\n" #~ msgid "failed to download %s\n" -#~ msgstr "chec lors du tlchargement de %s\n" +#~ msgstr "échec lors du téléchargement de %s\n" #~ msgid "failed to set option CACHEDIR (%s)\n" -#~ msgstr "chec d'affectation de l'option CACHEDIR (%s)\n" +#~ msgstr "échec d'affectation de l'option CACHEDIR (%s)\n" #~ msgid "failed to get lastupdate time for %s (no big deal)\n" #~ msgstr "" -#~ "chec d'obtention de la dernire mise jour pour %s (ce n'est pas un " -#~ "gros problme)\n" +#~ "échec d'obtention de la dernière mise à jour pour %s (ce n'est pas un " +#~ "gros problème)\n" #~ msgid "sync: new mtime for %s: %s\n" #~ msgstr "sync: nouvelle valeur mtime pour %s: %s\n" #~ msgid "%s-%s-%s%s is already in the cache\n" -#~ msgstr "%s-%s-%s%s est dj en cache\n" +#~ msgstr "%s-%s-%s%s est déjà en cache\n" #~ msgid "no %s cache exists. creating...\n" -#~ msgstr "aucun cache %s existant. Cration...\n" +#~ msgstr "aucun cache %s existant. Création...\n" #~ msgid "warning: no %s cache exists. creating..." -#~ msgstr "avertissement: aucun cache %s existant, cration..." +#~ msgstr "avertissement: aucun cache %s existant, création..." #~ msgid "couldn't create package cache, using /tmp instead\n" #~ msgstr "" -#~ "n'a pas pu crer le cache de paquets, utilisation de /tmp la place\n" +#~ "n'a pas pu créer le cache de paquets, utilisation de /tmp à la place\n" #~ msgid "warning: couldn't create package cache, using /tmp instead" #~ msgstr "" -#~ "avertissement: n'a pas pu crer le cache de paquets, utilisation de /tmp " -#~ " la place" +#~ "avertissement: n'a pas pu créer le cache de paquets, utilisation de /tmp " +#~ "à la place" #~ msgid "failed to retrieve some files from %s\n" -#~ msgstr "chec de rcupration de certains fichiers depuis %s\n" +#~ msgstr "échec de récupération de certains fichiers depuis %s\n" -- cgit v1.2.3-70-g09d2 From 4a6d963ae1aed944c18869e7b944a216ca8dc2db Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 25 Apr 2007 15:00:49 +0000 Subject: repo-add: Fixed bug of missing desc entries if package is in a group Fixes bug #7005 as reported and patched by Marcus Habernehl --- scripts/repo-add | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add b/scripts/repo-add index dc280161..9a134688 100755 --- a/scripts/repo-add +++ b/scripts/repo-add @@ -148,7 +148,7 @@ db_write_entry() # create desc entry echo ":: creating 'desc' db entry" - echo -e "%FILENAME%\n$(basename $1)\n" >> desc + echo -e "%FILENAME%\n$(basename $1)\n" >>desc echo -e "%NAME%\n$pkgname\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc if [ -n "$pkgdesc" ]; then @@ -157,7 +157,7 @@ db_write_entry() if [ -n "$_groups" ]; then echo "%GROUPS%" >>desc echo $_groups | tr -s ' ' '\n' >>desc - echo "" >desc + echo "" >>desc fi [ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc [ -n $size ] && echo -e "%ISIZE%\n$size\n" >>desc -- cgit v1.2.3-70-g09d2 From afec5e46a4c320c5b5e2bf7ee128490377733bef Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 28 Apr 2007 08:26:37 +0000 Subject: Bumps for pacman 3.0.3 --- NEWS | 2 ++ configure.ac | 2 +- scripts/makepkg | 2 +- scripts/repo-add | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 57a9da74..8a43ff93 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.0.3 - Updated translations + - repo-add: fixed a desc file clobbering issue 3.0.2 - fix a bug where pre/post_remove scriptlets were not ran - ensure ldconfig is ran in all operations - added a few new translations, updated existing ones diff --git a/configure.ac b/configure.ac index 6396b54d..2907d0ad 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ CFLAGS="" AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([Pacman package manager], 3.0.2, [pacman-dev@archlinux.org], [pacman]) +AC_INIT([Pacman package manager], 3.0.3, [pacman-dev@archlinux.org], [pacman]) AC_LANG([C]) AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST diff --git a/scripts/makepkg b/scripts/makepkg index ebd6b543..3ff28ee3 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -25,7 +25,7 @@ # USA. # -myver='3.0.0' +myver='3.0.3' startdir=$(pwd) BUILDSCRIPT="PKGBUILD" diff --git a/scripts/repo-add b/scripts/repo-add index 9a134688..8a06b270 100755 --- a/scripts/repo-add +++ b/scripts/repo-add @@ -19,7 +19,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. -myver='3.0.0' +myver='3.0.3' FORCE=0 REPO_DB_FILE="" -- cgit v1.2.3-70-g09d2 From 53bc96106dfe443bae333c53269d489bb66fa571 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 6 May 2007 22:56:08 +0000 Subject: repo-add: fix typo, conflicts instead of conflict --- scripts/repo-add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add b/scripts/repo-add index 8a06b270..45515d1b 100755 --- a/scripts/repo-add +++ b/scripts/repo-add @@ -117,7 +117,7 @@ db_write_entry() license=*) _licenses="$_licenses $license" ;; replaces=*) _replaces="$_replaces $replaces" ;; provides=*) _provides="$_provides $provides" ;; - conflicts=*) _conflicts="$_conflicts $conflicts" ;; + conflict=*) _conflicts="$_conflicts $conflicts" ;; esac done -- cgit v1.2.3-70-g09d2 From 337046ab7550dccfe2bb73abe7cda28000550133 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 8 May 2007 03:41:30 +0000 Subject: A ton of updates of all of the translation files. Thanks to the authors of those. --- lib/libalpm/po/de.po | 56 +++--- lib/libalpm/po/en_GB.po | 202 +++++++++++---------- lib/libalpm/po/es.po | 395 +++++++++++++++++++--------------------- lib/libalpm/po/fr.po | 6 +- lib/libalpm/po/hu.po | 202 +++++++++++---------- lib/libalpm/po/it.po | 40 ++-- lib/libalpm/po/libalpm.pot | 198 ++++++++++---------- lib/libalpm/po/pl_PL.po | 85 +++++---- lib/libalpm/po/pt_BR.po | 198 ++++++++++---------- lib/libalpm/po/ru_RU.po | 202 +++++++++++---------- src/pacman/po/de.po | 2 +- src/pacman/po/en_GB.po | 18 +- src/pacman/po/es.po | 444 +++++++++++++++++++++++++-------------------- src/pacman/po/fr.po | 2 +- src/pacman/po/hu.po | 18 +- src/pacman/po/it.po | 10 +- src/pacman/po/pacman.pot | 12 +- src/pacman/po/pl_PL.po | 210 +++++++++++---------- src/pacman/po/pt_BR.po | 18 +- src/pacman/po/ru_RU.po | 18 +- 20 files changed, 1212 insertions(+), 1124 deletions(-) diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index ea0675d4..90f9a0a7 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-04-17 20:23+0200\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: 2007-04-17 20:26+0200\n" "Last-Translator: Pierre Schmitz \n" "Language-Team: German \n" @@ -301,7 +301,8 @@ msgstr "Schließe Datenbank '%s'" #: lib/libalpm/alpm.c:232 #, c-format -msgid "adding new server to database '%s': protocol '%s', server '%s', path '%s'" +msgid "" +"adding new server to database '%s': protocol '%s', server '%s', path '%s'" msgstr "" "Füge neuen Server zur Datenbank '%s' hinzu: Protokoll '%s', Server '%s', " "Pfad '%s'" @@ -512,7 +513,8 @@ msgstr "Ungültiger Paket-Eintrag wurde an _alpm_db_read übergeben, überspring #: lib/libalpm/be_files.c:226 #, c-format -msgid "request to read database info for a file-based package '%s', skipping..." +msgid "" +"request to read database info for a file-based package '%s', skipping..." msgstr "" "Überspringe das Lesen der Datenbank-Information für das Datei-basierte Paket " "'%s'..." @@ -530,7 +532,7 @@ msgstr "Kann %s-%s nicht in der Datenbank '%s' finden" #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "Konnte Datei %s nicht öffnen: %s" @@ -707,7 +709,8 @@ msgstr "checkdeps: Abhängigkeit '%s' von installiertem Paket '%s' erfüllt" #: lib/libalpm/deps.c:289 #, c-format msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" -msgstr "checkdeps: aktualisiertes '%s' wird die Abhängigkeit von '%s' nicht erfüllen" +msgstr "" +"checkdeps: aktualisiertes '%s' wird die Abhängigkeit von '%s' nicht erfüllen" #: lib/libalpm/deps.c:359 #, c-format @@ -727,7 +730,8 @@ msgstr "Schließe %s aus -- Ausdrücklich installiert" #: lib/libalpm/deps.c:532 #, c-format msgid "cannot find package \"%s\" or anything that provides it!" -msgstr "Kann Paket \"%s\" oder irgendwas, das es zur Verfügung stellt, nicht finden!" +msgstr "" +"Kann Paket \"%s\" oder irgendwas, das es zur Verfügung stellt, nicht finden!" #: lib/libalpm/deps.c:540 lib/libalpm/deps.c:551 #, c-format @@ -745,7 +749,8 @@ msgstr "%s stellt Abhängigkeit %s zur Verfügung -- Überspringe" #: lib/libalpm/deps.c:630 #, c-format -msgid "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" +msgid "" +"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" msgstr "" "Kann Abhängigkeiten für \"%s\" nicht auflösen (\"%s\" ist nicht in " "Paketliste enthalten)" @@ -1008,70 +1013,70 @@ msgstr "%s kann nicht geöffnet werden\n" msgid "md5(%s) = %s" msgstr "MD5(%s) = %s" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)" + +#: lib/libalpm/package.c:158 #, c-format msgid "%s: forcing upgrade to version %s" msgstr "%s: Erzwungene Aktualisierung auf Version %s" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:163 #, c-format msgid "%s: local (%s) is newer than %s (%s)" msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)" -#: lib/libalpm/package.c:163 -#, c-format -msgid "%s-%s: ignoring package upgrade (%s)" -msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)" - -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "%s-%s: Verzögere die Aktualisierung von Paket (%s)" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "%s: Falscher Syntax in Beschreibungsdatei, Zeile %d" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "Konnte Paket-Beschreibungsdatei nicht analysieren" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "Fehlender Paketname in %s" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "Fehlende Paketversion in %s" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "Konnte tempfile %s nicht entfernen" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "Fehler beim Lesen des Paketes: %s" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" msgstr "Fehlende Paket-Metadaten" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "Fehlende Paket-Dateiliste in %s, erstelle eine" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "Füge '%s' zum requiredby-Feld für '%s' hinzu" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "Füge '%s' zum requiredby-Feld für '%s' hinzu (stellt bereit: %s)" @@ -1511,4 +1516,3 @@ msgstr "depcmp: %s-%s %s %s-%s => %s" #, c-format msgid "depcmp: %s-%s %s %s => %s" msgstr "depcmp: %s-%s %s %s => %s" - diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 67b53346..e1336c95 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: 2007-03-07 21:05+1100\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" @@ -40,7 +40,7 @@ msgstr "reading '%s' metadata" msgid "looking for unsatisfied dependencies" msgstr "looking for unsatisfied dependencies" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "looking for conflicts" @@ -274,7 +274,7 @@ msgstr "could not update database entry %s-%s" msgid "could not add entry '%s' in cache" msgstr "could not add entry '%s' in cache" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "running \"ldconfig -r %s\"" @@ -371,107 +371,112 @@ msgstr "could not remove lock file %s" msgid "warning: could not remove lock file %s" msgstr "warning: could not remove lock file %s" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "config: new section '%s'" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "config: nopassiveftp" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "config: usesyslog" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "config: chomp" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "config: usecolor" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "config: including %s" -#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "config: noupgrade: %s" -#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "config: noextract: %s" -#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "config: ignorepkg: %s" -#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "config: holdpkg: %s" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "config: dbpath: %s" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, fuzzy, c-format +msgid "config: rootdir: %s" +msgstr "config: cachedir: %s" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "config: logfile: %s" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "config: xfercommand: %s" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "checking for package replacements" -#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "checking replacement '%s' for package '%s'" -#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" -#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s elected for upgrade (to be replaced by %s-%s)" -#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' not found in sync db -- skipping" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' is already elected for removal -- skipping" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s elected for upgrade (%s => %s)" @@ -520,7 +525,7 @@ msgstr "cannot find '%s-%s' in db '%s'" #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "could not open file %s: %s" @@ -628,8 +633,8 @@ msgstr "\tCONFLICTS:: %s conflicts with %s" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "malloc failure: could not allocate %d bytes" @@ -856,7 +861,7 @@ msgstr "transaction aborted" msgid "operation not compatible with the transaction type" msgstr "operation not compatible with the transaction type" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" msgstr "could not commit transaction" @@ -998,70 +1003,70 @@ msgstr "%s can't be opened\n" msgid "md5(%s) = %s" msgstr "md5(%s) = %s" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: ignoring package upgrade (%s)" + +#: lib/libalpm/package.c:158 #, c-format msgid "%s: forcing upgrade to version %s" msgstr "%s: forcing upgrade to version %s" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:163 #, c-format msgid "%s: local (%s) is newer than %s (%s)" msgstr "%s: local (%s) is newer than %s (%s)" -#: lib/libalpm/package.c:163 -#, c-format -msgid "%s-%s: ignoring package upgrade (%s)" -msgstr "%s-%s: ignoring package upgrade (%s)" - -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "%s-%s: delaying upgrade of package (%s)" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "%s: syntax error in description file line %d" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "could not parse the package description file" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "missing package name in %s" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "missing package version in %s" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "could not remove tempfile %s" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "error while reading package: %s" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" msgstr "missing package metadata" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "missing package filelist in %s, generating one" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "adding '%s' in requiredby field for '%s'" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "adding '%s' in requiredby field for '%s' (provides: %s)" @@ -1184,224 +1189,224 @@ msgstr "checking for package upgrades" msgid "%s-%s elected for upgrade (%s => %s)" msgstr "%s-%s elected for upgrade (%s => %s)" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" msgstr "searching for target in repo '%s'" -#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "target '%s' not found -- looking for provisions" -#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "found '%s' as a provision for '%s'" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" msgstr "repository '%s' not found" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "%s-%s is up to date -- skipping" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" msgstr "adding target '%s' to the transaction set" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" msgstr "resolving target's dependencies" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "adding package %s-%s to the transaction targets" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" msgstr "looking for unresolvable dependencies" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "package '%s' conflicts with '%s'" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "'%s' not found in transaction set -- skipping" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" msgstr "package '%s' provides its own conflict" -#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "'%s' is in the target list -- keeping it" -#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" msgstr "removing '%s' from target list" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" msgstr "resolving package '%s' conflict" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" msgstr "electing '%s' for removal" -#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" msgstr "unresolvable package conflicts detected" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" msgstr "checking dependencies of packages designated for removal" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" msgstr "something has gone horribly wrong" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "found '%s' as a provision for '%s' -- conflict aborted" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" msgstr "%s is already in the cache\n" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" msgstr "no %s cache exists, creating...\n" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "warning: no %s cache exists, creating..." -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" msgstr "couldn't create package cache, using /tmp instead\n" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "warning: couldn't create package cache, using /tmp instead" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "failed to retrieve some files from %s\n" -#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "can't get md5 or sha1 checksum for package %s\n" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" msgstr "could not create removal transaction" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" msgstr "could not initialise the removal transaction" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" msgstr "removing conflicting and to-be-replaced packages" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" msgstr "could not prepare removal transaction" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" msgstr "could not commit removal transaction" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" msgstr "installing packages" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" msgstr "could not create transaction" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" msgstr "could not initialise transaction" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" msgstr "could not prepare transaction" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" msgstr "updating database for replaced packages' dependencies" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "could not update requiredby for database entry %s-%s" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" msgstr "could not update new database entry %s-%s" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, c-format msgid "found package '%s-%s' in sync" msgstr "found package '%s-%s' in sync" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" msgstr "package '%s' not found in sync" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" msgstr "updating dependency packages 'requiredby' fields for %s-%s" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" msgstr "package has no dependencies, no other packages to update" -#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "updating 'requiredby' field for package '%s'" -#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "could not update 'requiredby' database entry %s-%s" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" msgstr "could not find dependency '%s'" @@ -1480,7 +1485,12 @@ msgstr "call to waitpid failed (%s)" msgid "could not remove tmpdir %s" msgstr "could not remove tmpdir %s" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "" + +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "check_freespace: total pkg size: %lld, disk space: %lld" diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index 6ae01122..b5d861b3 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -1,8 +1,16 @@ +# translation of es.fix.po to +# Spanish translation for libalpm package. +# Copyright (C) 2002-2007 Judd Vinet +# This file is distributed under the same license as the Pacman package manager package. +# +# Juan Pablo González Tognarelli , 2007. +# Juan Pablo González Tognarelli , 2007. msgid "" msgstr "" "Project-Id-Version: libalpm\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2007-04-20 21:19-0300\n" +"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"PO-Revision-Date: 2007-04-29 11:12-0300\n" "Last-Translator: Juan Pablo González Tognarelli \n" "Language-Team: juan pablo gonzález tognarelli \n" "MIME-Version: 1.0\n" @@ -25,34 +33,32 @@ msgstr "reemplazando la versión antigua %s-%s por %s en la lista de objetivos" #: lib/libalpm/add.c:131 #, c-format msgid "newer version %s-%s is in the target list -- skipping" -msgstr "una nueva versión %s-%s esta en la lista de objetivos list -- saltándola" +msgstr "" +"una nueva versión %s-%s esta en la lista de objetivos list -- saltándola" #: lib/libalpm/add.c:138 #, c-format msgid "reading '%s' metadata" msgstr "leyendo los metadatos '%s'" -#: lib/libalpm/add.c:191 -#: lib/libalpm/remove.c:111 +#: lib/libalpm/add.c:191 lib/libalpm/remove.c:111 msgid "looking for unsatisfied dependencies" msgstr "buscando por dependencias no satisfechas" -#: lib/libalpm/add.c:203 -#: lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "buscando por conflictos" #: lib/libalpm/add.c:208 msgid "replacing packages with -A and -U is not supported yet" -msgstr "el reemplazo de paqutes con -A y -U aún no esta soportado" +msgstr "el reemplazo de paquetes con -A y -U aún no esta soportado" #: lib/libalpm/add.c:209 #, c-format msgid "please remove '%s' first, using -Rd" msgstr "por favor quitar '%s' primero, usando -Rd" -#: lib/libalpm/add.c:250 -#: lib/libalpm/remove.c:147 +#: lib/libalpm/add.c:250 lib/libalpm/remove.c:147 msgid "sorting by dependencies" msgstr "ordenando por dependencias" @@ -88,13 +94,11 @@ msgstr "agregando %s al arreglo NoUpgrade temporalmente" msgid "extracting files" msgstr "descomprimiendo archivos" -#: lib/libalpm/add.c:444 -#: lib/libalpm/util.c:465 +#: lib/libalpm/add.c:444 lib/libalpm/util.c:465 msgid "could not get current working directory" msgstr "no se pudo obtener el directorio de trabajo actual" -#: lib/libalpm/add.c:500 -#: lib/libalpm/add.c:501 +#: lib/libalpm/add.c:500 lib/libalpm/add.c:501 #, c-format msgid "%s is in NoExtract, skipping extraction" msgstr "%s está en NoExtract. Saltando la extracción" @@ -104,9 +108,7 @@ msgstr "%s está en NoExtract. Saltando la extracción" msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s esta en la extracción trans->skip_add, skipping" -#: lib/libalpm/add.c:554 -#: lib/libalpm/add.c:555 -#: lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 #, c-format msgid "could not extract %s (%s)" msgstr "no se pudo extraer %s (%s)" @@ -146,8 +148,7 @@ msgstr "no se pudo renombrar %s (%s)" msgid "error: could not rename %s (%s)" msgstr "error: no se pudo renombrar %s (%s)" -#: lib/libalpm/add.c:623 -#: lib/libalpm/add.c:642 +#: lib/libalpm/add.c:623 lib/libalpm/add.c:642 #, c-format msgid "could not copy tempfile to %s (%s)" msgstr "no se pudo copiar el archivo temporal a %s (%s)" @@ -157,8 +158,7 @@ msgstr "no se pudo copiar el archivo temporal a %s (%s)" msgid "error: could not copy tempfile to %s (%s)" msgstr "error: no se pudo copiar el archivo temporal a %s (%s)" -#: lib/libalpm/add.c:628 -#: lib/libalpm/remove.c:247 +#: lib/libalpm/add.c:628 lib/libalpm/remove.c:247 #, c-format msgid "%s saved as %s" msgstr "%s guardado como %s" @@ -173,15 +173,15 @@ msgstr "advertencia: %s guardado como %s" msgid "action: installing new file: %s" msgstr "acción: instalando nuevo archivo: %s" -#: lib/libalpm/add.c:649 -#: lib/libalpm/add.c:655 -#: lib/libalpm/add.c:660 +#: lib/libalpm/add.c:649 lib/libalpm/add.c:655 lib/libalpm/add.c:660 msgid "action: leaving existing file in place" msgstr "acción: dejando el archivo existente en su lugar" #: lib/libalpm/add.c:663 msgid "action: keeping current file and installing new one with .pacnew ending" -msgstr "action:manteniendo el archivo actual e instalando un no nuevo con postfijo .pacnew" +msgstr "" +"action:manteniendo el archivo actual e instalando un no nuevo con postfijo ." +"pacnew" #: lib/libalpm/add.c:666 #, c-format @@ -233,19 +233,16 @@ msgstr "error: no se pudo descomprimir %s (%s)" msgid "appending backup entry for %s" msgstr "agregando la entrada de respaldo para %s" -#: lib/libalpm/add.c:749 -#: lib/libalpm/add.c:751 +#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 #, c-format msgid "errors occurred while %s %s" msgstr "ocurrieron errores mientras %s %s" -#: lib/libalpm/add.c:750 -#: lib/libalpm/add.c:752 +#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 msgid "upgrading" msgstr "actualizando" -#: lib/libalpm/add.c:750 -#: lib/libalpm/add.c:752 +#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 msgid "installing" msgstr "instalando" @@ -259,14 +256,12 @@ msgstr "el provisional '%s' ha sido eliminado desde el paquete %s (%s => %s)" msgid "updating '%s' due to provision change (%s)" msgstr "actualizando '%s' debido a un cambio de provisiones (%s)" -#: lib/libalpm/add.c:785 -#: lib/libalpm/add.c:786 +#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "no se pudo actualizar la provisión '%s' desde '%s'" -#: lib/libalpm/add.c:799 -#: lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 msgid "updating database" msgstr "actualizando la base de datos" @@ -275,8 +270,7 @@ msgstr "actualizando la base de datos" msgid "adding database entry '%s'" msgstr "agregando a la base de datos '%s'" -#: lib/libalpm/add.c:803 -#: lib/libalpm/add.c:805 +#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 #, c-format msgid "could not update database entry %s-%s" msgstr "no se pudo actualizar en la base de datos la entrada %s-%s" @@ -286,9 +280,7 @@ msgstr "no se pudo actualizar en la base de datos la entrada %s-%s" msgid "could not add entry '%s' in cache" msgstr "no se pudo agregar '%s' en la cache" -#: lib/libalpm/add.c:841 -#: lib/libalpm/remove.c:363 -#: lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "ejecutando \"ldconfig -r %s\"" @@ -310,8 +302,11 @@ msgstr "cerrando la base de datos '%s'" #: lib/libalpm/alpm.c:232 #, c-format -msgid "adding new server to database '%s': protocol '%s', server '%s', path '%s'" -msgstr "agregando un nuevo servidor a la base de datos '%s': protocolo '%s', servidor '%s', ruta '%s'" +msgid "" +"adding new server to database '%s': protocol '%s', server '%s', path '%s'" +msgstr "" +"agregando un nuevo servidor a la base de datos '%s': protocolo '%s', " +"servidor '%s', ruta '%s'" #: lib/libalpm/alpm.c:236 #, c-format @@ -321,7 +316,9 @@ msgstr "lista de servidores se ha barrido para '%s'" #: lib/libalpm/alpm.c:279 #, c-format msgid "failed to get lastupdate time for %s (no big deal)" -msgstr "fallo al obtener la última fecha de actualización para %s (no es un gran problema)" +msgstr "" +"fallo al obtener la última fecha de actualización para %s (no es un gran " +"problema)" #: lib/libalpm/alpm.c:298 #, c-format @@ -383,118 +380,113 @@ msgstr "no se pudo quitar el archivo de bloqueo %s" msgid "warning: could not remove lock file %s" msgstr "advertencia: no se pudo eliminar el archivo de bloqueo %s" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "config: nueva sección '%s'" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "config: nopassiveftp" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "config: usesyslog" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "config: chomp" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "config: usecolor" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "config: incluyendo %s" -#: lib/libalpm/alpm.c:976 -#: lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "config: noupgrade: %s" -#: lib/libalpm/alpm.c:989 -#: lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "config: noextract: %s" -#: lib/libalpm/alpm.c:1002 -#: lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "config: ignorepkg: %s" -#: lib/libalpm/alpm.c:1015 -#: lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "config: holdpkg: %s" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "config: dbpath: %s" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, fuzzy, c-format +msgid "config: rootdir: %s" +msgstr "config: cachedir: %s" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "config: logfile: %s" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "config: xfercommand: %s" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1083 -#: lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "verificando si hay reemplazo de paquetes" -#: lib/libalpm/alpm.c:1094 -#: lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "verificando el reemplazo '%s' para el paquete '%s'" -#: lib/libalpm/alpm.c:1097 -#: lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" -msgstr "%s-%s: ignorando la actualización del paquete(para ser reemplazado por %s-%s)" +msgstr "" +"%s-%s: ignorando la actualización del paquete(para ser reemplazado por %s-%s)" -#: lib/libalpm/alpm.c:1127 -#: lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s escogido para actualizar (para ser reemplazado por %s-%s)" -#: lib/libalpm/alpm.c:1149 -#: lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' not encontrado en la base -- saltando" -#: lib/libalpm/alpm.c:1163 -#: lib/libalpm/sync.c:208 -#: lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' está ya seleccionado para quitar -- saltando" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s seleccionado para actualizar (%s => %s)" @@ -525,8 +517,11 @@ msgstr "entrada de paquete invalida a _alpm_db_read, saltando" #: lib/libalpm/be_files.c:226 #, c-format -msgid "request to read database info for a file-based package '%s', skipping..." -msgstr "petición para leer la información de la base para el paquete basado en archivo '%s', saltando..." +msgid "" +"request to read database info for a file-based package '%s', skipping..." +msgstr "" +"petición para leer la información de la base para el paquete basado en " +"archivo '%s', saltando..." #: lib/libalpm/be_files.c:239 #, c-format @@ -538,13 +533,10 @@ msgstr "cargando la información del paquete para %s : nivel=%d" msgid "cannot find '%s-%s' in db '%s'" msgstr "no se pudo encontrar '%s-%s' en la base '%s'" -#: lib/libalpm/be_files.c:255 -#: lib/libalpm/be_files.c:401 -#: lib/libalpm/be_files.c:424 -#: lib/libalpm/be_files.c:515 -#: lib/libalpm/be_files.c:605 -#: lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "no se pudo abrir el archivo %s: %s" @@ -602,7 +594,9 @@ msgstr "no se pudo quitar '%s' de la cache '%s': no encontrado" #: lib/libalpm/cache.c:178 #, c-format msgid "error: failed to get '%s' from NULL pkgcache" -msgstr "error: se produjo un fallo al obtener '%s' desde la cache de paquetes \"NULL\"" +msgstr "" +"error: se produjo un fallo al obtener '%s' desde la cache de paquetes \"NULL" +"\"" #: lib/libalpm/cache.c:201 #, c-format @@ -619,8 +613,7 @@ msgstr " se ha encontrado un conflicto '%s' : paquete '%s'" msgid " found conflict '%s' : package '%s' provides '%s'" msgstr " se ha encontrado un conflicto '%s' : paquete '%s' provee '%s'" -#: lib/libalpm/conflict.c:101 -#: lib/libalpm/conflict.c:143 +#: lib/libalpm/conflict.c:101 lib/libalpm/conflict.c:143 #, c-format msgid "package '%s' conflicts with itself - packaging error" msgstr "el paquete '%s' posee conflictos con si mismo- error del paquete" @@ -643,34 +636,24 @@ msgstr "checkconflicts: la base de datos vs el objetivo '%s'" #: lib/libalpm/conflict.c:201 #, c-format msgid "target '%s' is also in target list, using NEW conflicts" -msgstr "'%s' esta también en la lista de objetivos, usando NEW provoca conflictos" +msgstr "" +"'%s' esta también en la lista de objetivos, usando NEW provoca conflictos" #: lib/libalpm/conflict.c:257 #, c-format msgid "\tCONFLICTS:: %s conflicts with %s" msgstr "\tCONFLICTS:: %s posee conflictos con %s" -#: lib/libalpm/conflict.c:349 -#: lib/libalpm/deps.c:60 -#: lib/libalpm/deps.c:438 -#: lib/libalpm/deps.c:634 -#: lib/libalpm/deps.c:674 -#: lib/libalpm/group.c:45 -#: lib/libalpm/handle.c:51 -#: lib/libalpm/package.c:82 -#: lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 -#: lib/libalpm/sync.c:622 -#: lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 -#: lib/libalpm/util.c:612 -#: lib/libalpm/util.c:619 +#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 +#: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 +#: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "falla en malloc: no se pudo alocar %d bytes" -#: lib/libalpm/db.c:64 -#: lib/libalpm/db.c:71 +#: lib/libalpm/db.c:64 lib/libalpm/db.c:71 #, c-format msgid "malloc failed: could not allocate %d bytes" msgstr "malloc falló: no se pudo alocar %d bytes" @@ -711,8 +694,7 @@ msgstr "posible ciclo de dependencias detectado" msgid "sorting dependencies finished" msgstr "ordenamiento de dependencias finalizado" -#: lib/libalpm/deps.c:225 -#: lib/libalpm/deps.c:310 +#: lib/libalpm/deps.c:225 lib/libalpm/deps.c:310 msgid "null package found in package list" msgstr "se ha encontrado un paquete nulo en la lista de paquetes" @@ -729,12 +711,14 @@ msgstr "checkdeps: la dependencia '%s' ha sido movida desde '%s' a '%s'" #: lib/libalpm/deps.c:280 #, c-format msgid "checkdeps: dependency '%s' satisfied by installed package '%s'" -msgstr "checkdeps: la dependencia '%s' es satisfecha por el paquete instalado '%s'" +msgstr "" +"checkdeps: la dependencia '%s' es satisfecha por el paquete instalado '%s'" #: lib/libalpm/deps.c:289 #, c-format msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" -msgstr "checkdeps: El paquete actualizado '%s' no satisfará una dependencia de'%s'" +msgstr "" +"checkdeps: El paquete actualizado '%s' no satisfará una dependencia de'%s'" #: lib/libalpm/deps.c:359 #, c-format @@ -756,8 +740,7 @@ msgstr "excluyendo %s -- instalado explícitamente" msgid "cannot find package \"%s\" or anything that provides it!" msgstr "no se pudo encontrar el paquete \"%s\" o algo que lo provea!" -#: lib/libalpm/deps.c:540 -#: lib/libalpm/deps.c:551 +#: lib/libalpm/deps.c:540 lib/libalpm/deps.c:551 #, c-format msgid "adding '%s' to the targets" msgstr "agregando '%s' a los objetivos" @@ -773,8 +756,11 @@ msgstr "%s provee la dependencia %s -- saltando" #: lib/libalpm/deps.c:630 #, c-format -msgid "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" -msgstr "no se pudo resolver dependecias para \"%s\" (\"%s\" no está en las listas de paquetes)" +msgid "" +"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" +msgstr "" +"no se pudo resolver dependecias para \"%s\" (\"%s\" no está en las listas de " +"paquetes)" #: lib/libalpm/deps.c:647 #, c-format @@ -872,8 +858,7 @@ msgstr "no se pudo fijar el parámetro" msgid "transaction already initialized" msgstr "la operación ya se inicializó" -#: lib/libalpm/error.c:85 -#: lib/libalpm/error.c:89 +#: lib/libalpm/error.c:85 lib/libalpm/error.c:89 msgid "transaction not initialized" msgstr "operación no inicializada" @@ -893,8 +878,7 @@ msgstr "operación abortada" msgid "operation not compatible with the transaction type" msgstr "la operación no es compatible con el tipo de transacción" -#: lib/libalpm/error.c:97 -#: lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" msgstr "no se pudo hacer la transacción" @@ -984,7 +968,8 @@ msgstr "nombre de sección de configuración erróneo" #: lib/libalpm/error.c:147 msgid "'local' is reserved and cannot be used as a repository name" -msgstr "'local' esta reservado y no puede ser utilizado como nombre de repositorio" +msgstr "" +"'local' esta reservado y no puede ser utilizado como nombre de repositorio" #: lib/libalpm/error.c:149 msgid "syntax error in config file" @@ -992,7 +977,7 @@ msgstr "error de sintaxis en el archivo de configuración" #: lib/libalpm/error.c:151 msgid "all directives must belong to a section" -msgstr "todas las directivas deben pertener a una sección" +msgstr "todas las directivas deben pertenecer a una sección" #: lib/libalpm/error.c:153 msgid "invalid regular expression" @@ -1037,72 +1022,70 @@ msgstr "%s no puede ser abierto\n" msgid "md5(%s) = %s" msgstr "md5(%s) = %s" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: ignorando la actualización del paquete (%s)" + +#: lib/libalpm/package.c:158 #, c-format msgid "%s: forcing upgrade to version %s" msgstr "%s: forzando la actualización a la versión %s" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:163 #, c-format msgid "%s: local (%s) is newer than %s (%s)" msgstr "%s: local (%s) es más nuevo que %s (%s)" -#: lib/libalpm/package.c:163 -#, c-format -msgid "%s-%s: ignoring package upgrade (%s)" -msgstr "%s-%s: ignorando la actualización del paquete (%s)" - -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "%s-%s: aplazando la actualización del paquete (%s)" -#: lib/libalpm/package.c:220 -#: lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "%s: error de sintaxis en la linea de descripción de archivos %d" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "no se pudo interpretar el archivo de descripción" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "nombre de paquete perdido en %s" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "versión de paquete perdida en %s" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "no se pudo quitar el archivo temporal %s" -#: lib/libalpm/package.c:409 -#: lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "error mientras se leía el paquete : %s" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" -msgstr "falta la metadata del paquete " +msgstr "faltan los metadatos del paquete " -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "falta la lita de paquetes en %s. generando una" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "agregando '%s' en el campo requiredby para '%s'" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "agregando '%s' en el campo requiredby para '%s' (provee %s)" @@ -1139,7 +1122,8 @@ msgstr "no se pudo quitar el archivo '%s': %s" #: lib/libalpm/remove.c:213 #, c-format msgid "Skipping removal of '%s' due to NoUpgrade" -msgstr "saltando la eliminación de '%s' debido a la condición de no actualización" +msgstr "" +"saltando la eliminación de '%s' debido a la condición de no actualización" #: lib/libalpm/remove.c:220 #, c-format @@ -1225,233 +1209,230 @@ msgstr "verificando actualizaciones de paquetes" msgid "%s-%s elected for upgrade (%s => %s)" msgstr "%s-%s seleccionada para actualización (%s => %s)" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" msgstr "buscando el objetivo en el repositorio '%s'" -#: lib/libalpm/sync.c:270 -#: lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "'%s' no se encontró -- buscando provisionales" -#: lib/libalpm/sync.c:275 -#: lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "encontrado '%s' como provisional para '%s'" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" msgstr "repositorio '%s' no encontrado" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "%s-%s esta al día -- saltando" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" msgstr "agregando el objetivo '%s' a la lista de transacciones" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" msgstr "resolviendo las dependencias" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "agregando el paquete %s-%s como blanco para la transacción" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" msgstr "buscando dependencias no resueltas" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "el paquete '%s' posee conflictos con '%s'" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "'%s' no se encontró en las transacciones -- saltando" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" msgstr "el paquete '%s' provee su propio conflicto" -#: lib/libalpm/sync.c:542 -#: lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "'%s' esta en la lista de objetivos -- manteniendolo" -#: lib/libalpm/sync.c:559 -#: lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" msgstr "quitando '%s' de la lista de objetivos" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" msgstr "resolviendo el conflicto del paquete '%s'" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" msgstr "escogiendo '%s' para quitarlo" -#: lib/libalpm/sync.c:602 -#: lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" msgstr "se han detectado paquetes con conflictos no resueltos" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" msgstr "verificando dependencias de paquetes indicados para quitar" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" msgstr "algo ha ido horriblemente mal" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "encontrado '%s' como provisional para '%s' -- conflicto abortado" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" msgstr "%s ya esta en la cache\n" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" msgstr "no existe la cache %s, creando...\n" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "advertencia: no existe la cache %s. creándola..." -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" -msgstr "advertencia: no se pudo crear la cache para paquetes. usando /tmp en su lugar" +msgstr "" +"advertencia: no se pudo crear la cache para paquetes. usando /tmp en su lugar" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "fallo al descargar algunos archivos desde %s\n" -#: lib/libalpm/sync.c:855 -#: lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "no se pudo verificar md5 o sha1 para el paquete %s\n" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" -msgstr "el archivo %s estaba corrupto (no coincidió la verificación MD5 o SHA1)\n" +msgstr "" +"el archivo %s estaba corrupto (no coincidió la verificación MD5 o SHA1)\n" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "el archivo %s esta corrupto (verificación MD5 o SHA1 errónea)\n" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" msgstr "no se pudo crear la operación de eliminación" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" msgstr "no se pudo iniciar la operación de eliminación" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" msgstr "quitando paquetes conflictivos y los que serán reemplazados" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" msgstr "no se pudo preparar la operación de eliminación" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" msgstr "no se pudo asignar la operación de quitado" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" msgstr "instalando paquetes" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" msgstr "no se pudo crear la operación" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" msgstr "no se pudo iniciar la operación" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" msgstr "no se pudo preparar la transacción" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" -msgstr "actuando la base de datos para las dependencias de los paquetes reemplazados" +msgstr "" +"actuando la base de datos para las dependencias de los paquetes reemplazados" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" msgstr "no se pudo actualizar la nueva entrada a la base de datos %s-%s" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, c-format msgid "found package '%s-%s' in sync" msgstr "paquete encontrado '%s-%s' en la base de sincronización" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" msgstr "el paquete '%s' no fue encontrado en la base de sincronización" # No me agrada mucho esta traducción. Habrá una mejor manera de indicarlo? -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" -msgstr "actualizando los campos 'requeridospor' de los paquetes de dependencias para %s-%s" +msgstr "" +"actualizando los campos 'requeridospor' de los paquetes de dependencias " +"para %s-%s" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" msgstr "el paquete no posee dependencias, no hay más paquetes para actualizar" -#: lib/libalpm/trans.c:310 -#: lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "actualizando el campo 'requiredby' para '%s'" -#: lib/libalpm/trans.c:325 -#: lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" msgstr "no se pudo encontrar la dependencia '%s'" @@ -1530,7 +1511,12 @@ msgstr "llamada a waitpid fallida (%s)" msgid "could not remove tmpdir %s" msgstr "no se pudo quitar el directorio temporal %s" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "" + +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "verificando espacio libre: tamaño total: %lld, espacio en disco: %lld" @@ -1544,4 +1530,3 @@ msgstr "depcmp: %s-%s %s %s-%s => %s" #, c-format msgid "depcmp: %s-%s %s %s => %s" msgstr "depcmp: %s-%s %s %s => %s" - diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index ffa291a7..a33277c9 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-04-25 00:34-0400\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: 2007-04-17 12:45+0100\n" "Last-Translator: nam <37ii11@altern.org>\n" "Language-Team: solsTiCe d'Hiver \n" @@ -645,7 +645,7 @@ msgstr "\tCONFLITS:: %s est en conflit avec %s" #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 #: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:617 lib/libalpm/util.c:624 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "erreur malloc: n'a pas pu allouer %d bytes" @@ -1512,7 +1512,7 @@ msgstr "la suppression du répertoire temporaire %s a échoué" msgid "cannot read disk space information from %s: %s" msgstr "impossible de lire l'information concernant l'espace disque de %s: %s" -#: lib/libalpm/util.c:612 +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "check_freespace: taille totale: %lld, espace disque: %lld" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index 992cea76..5320b97f 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: 2007-03-14 13:45+0100\n" "Last-Translator: Nagy Gabor \n" "Language-Team: \n" @@ -41,7 +41,7 @@ msgstr "'%s' metaadat olvas msgid "looking for unsatisfied dependencies" msgstr "elgtelen fggsgek keresse" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "konfliktusok keresse" @@ -276,7 +276,7 @@ msgstr "sikertelen a '%s-%s' adatb msgid "could not add entry '%s' in cache" msgstr "sikertelen a '%s' bejegyzs hozzadsa a gyorsttrhoz" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "az \"ldconfig -r %s\" futtatsa" @@ -376,107 +376,112 @@ msgstr "nem siker msgid "warning: could not remove lock file %s" msgstr "figyelmeztets: nem sikerlt a zrol fjl (%s) eltvoltsa" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "belltsok: j szekci '%s'" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "belltsok: nopassiveftp" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "belltsok: usesyslog" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "belltsok: chomp" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "belltsok: usecolor" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "belltsok: a %s beolvassa" -#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "belltsok: noupgrade: %s" -#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "belltsok: noextract: %s" -#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "belltsok: ignorepkg: %s" -#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "belltsok: holdpkg: %s" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "belltsok: adatbzistvonal: %s" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "belltsok: gyorsttrknyvtr: %s" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, fuzzy, c-format +msgid "config: rootdir: %s" +msgstr "belltsok: gyorsttrknyvtr: %s" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "belltsok: naplfjl: %s" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "belltsok: xfercommand: %s" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "belltsok: frissts ksleltetse: %d" -#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "csomagcserk ellenrzse" -#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "csere vizsglata: '%s' -> '%s'" -#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: frissts figyelmen kvl hagysa (a %s-%s fogja lecserlni)" -#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "a %s-%s kivlasztva frisstsre (a %s-%s fogja lecserlni)" -#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "a '%s' nem tallhat a tvoli adatbzisban -- kihagys" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "a '%s' mr kijellve eltvoltsra -- kihagys" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "a(z) %s kivlasztva frisstsre (%s => %s)" @@ -524,7 +529,7 @@ msgstr "nem tal #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "nem sikerlt megnyitni a %s fjlt: %s" @@ -634,8 +639,8 @@ msgstr "" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "malloc problma: nem sikerlt alloklni %d byte-ot" @@ -864,7 +869,7 @@ msgstr "a tranzakci msgid "operation not compatible with the transaction type" msgstr "a mvelet nem egyeztethet ssze a jelenlegi tranzakcitpussal" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" msgstr "nem sikerlt commitolni a tranzakcit" @@ -1006,70 +1011,70 @@ msgstr "nem siker msgid "md5(%s) = %s" msgstr "" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: a csomagfrissts figyelmen kvl hagysa (%s)" + +#: lib/libalpm/package.c:158 #, c-format msgid "%s: forcing upgrade to version %s" msgstr "%s: erltetett frissts a %s verzira" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:163 #, c-format msgid "%s: local (%s) is newer than %s (%s)" msgstr "%s: a helyi (%s) jabb, mint %s (%s)" -#: lib/libalpm/package.c:163 -#, c-format -msgid "%s-%s: ignoring package upgrade (%s)" -msgstr "%s-%s: a csomagfrissts figyelmen kvl hagysa (%s)" - -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "%s-%s: a csomag frisstsnek ksleltetse (%s)" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "%s: szintaktikai hiba a lerfjl %d. sorban" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "nem sikerlt rtelmezni a csomagler fjlt" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "hinyz csomagnv itt: %s" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "hinyz csomagverzi itt: %s" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "nem sikerlt eltvoltani a %s ideiglenes fjlt" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "hiba a csomag olvassa kzben: %s" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" msgstr "" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "" @@ -1193,227 +1198,227 @@ msgstr "csomagfriss msgid "%s-%s elected for upgrade (%s => %s)" msgstr "a(z) %s-%s kivlasztva frisstsre (%s => %s)" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" msgstr "cl keresse a '%s' repban" -#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "a(z) '%s' cl nem tallhat - szolglatk keresse" -#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "a(z) '%s' szolgltatja a(z) '%s' csomagot" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" msgstr "a(z) '%s' rep nem tallhat" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "a(z) %s-%s napraksz -- kihagys" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" msgstr "a '%s' hozzadsa a tranzakcihoz" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" msgstr "a clok fggsgeinek feloldsa" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "a '%s-%s' hozzadsa a clcsomagokhoz" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" msgstr "elgtelen fggsgek keresse" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "a(z) '%s' csomag tkzik a(z) '%s' csomaggal" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "a '%s' nem tallhat a tranzakciban -- kihagys" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" msgstr "a(z) '%s' csomag sajt magval tkzik" -#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "a(z) '%s' mr a cl listban -- megtarts" -#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" msgstr "a(z) '%s' bejegyzs eltvoltsa a cllistbl" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" msgstr "konfliktus feloldsa a(z) '%s' csomag szmra" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" msgstr "a(z) '%s' kivlasztsa eltvoltsra" -#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" msgstr "feloldhatatlan csomagtkzsek" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" msgstr "az eltvoltand csomagok fggsgeinek ellenrzse" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" msgstr "valami nagyon rosszul ment" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "a(z) '%s' szolgltatja a(z) '%s' csomagot - konfliktus flbeszaktva" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" msgstr "%s mr a gyorsttrban\n" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" msgstr "nem ltezik a(z) %s gyorsttr. ltrehozs...\n" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "figyelmeztets: a(z) %s gyorsttr nem ltezik. ltrehozs..." -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" msgstr "nem sikerlt ltrehozni a csomag gyorsttrat, a /tmp hasznlata\n" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "" "figyelmeztets: nem sikerlt ltrehozni a csomag gyorsttrat, a /tmp " "hasznlata" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "nem sikerlt nhny fjlt letlteni innen: %s\n" -#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "" "sikertelen az md5 vagy sha1 ellenrz sszeg elrse a %s csomag szmra\n" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "a(z) %s archvum srlt volt (rossz MD5 vagy SHA1 szumma)\n" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "a(z) %s archvum srlt (rossz MD5 vagy SHA1 szumma)\n" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" msgstr "nem sikerlt ltrehozni az eltvoltsi tranzakcit" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" msgstr "nem sikerlt inicializlni az eltvoltsi tranzakcit" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" msgstr "az tkz s lecserlend csomagok eltvoltsa" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" msgstr "nem sikerlt ltrehozni az eltvoltsi tranzakcit" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" msgstr "nem sikerlt commitolni az eltvolt tranzakcit" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" msgstr "csomagok teleptse" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" msgstr "nem sikerlt ltrehozni a tranzakcit" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" msgstr "nem sikerlt inicializlni a tranzakcit" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" msgstr "nem sikerlt elkszteni a tranzakcit" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" msgstr "a lecserlt csomagok fggsgeinek frisstse az adatbzisban" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "sikertelen a %s-%s 'fgg tle' adatbzis-bejegyzsnek frisstse" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" msgstr "sikertelen a '%s-%s' adatbzis-bejegyzs frisstse" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, c-format msgid "found package '%s-%s' in sync" msgstr "" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" msgstr "a '%s' csomag nem tallhat a tvoli adatbzisban" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" msgstr "" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" msgstr "a csomagnak nincsenek fggsgei, nincs tbb frisstend csomag" -#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "a '%s' csomag 'fgg tle' mezjnek frisstse" -#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "sikertelen a %s-%s 'fgg tle' adatbzis-bejegyzsnek frisstse" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" msgstr "nem tallhat a '%s' fggsg" @@ -1492,7 +1497,12 @@ msgstr "a waitpid h msgid "could not remove tmpdir %s" msgstr "nem sikerlt eltvoltani a %s ideiglenes knyvtrat" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "" + +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "check_freespace: teljes csomagmret: %lld, lemezterlet: %lld" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index 46eeb77f..3fb1f79f 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-04-17 21:34+0200\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: 2007-04-17 22:00+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -534,7 +534,7 @@ msgstr "impossibile trovare '%s-%s' nel database '%s'" #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "impossibile aprire il file %s: %s" @@ -1019,70 +1019,70 @@ msgstr "impossibile aprire %s\n" msgid "md5(%s) = %s" msgstr "md5(%s) = %s" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: aggiornamento del pacchetto (%s) ignorato" + +#: lib/libalpm/package.c:158 #, c-format msgid "%s: forcing upgrade to version %s" msgstr "%s: aggiornamento forzato alla versione %s" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:163 #, c-format msgid "%s: local (%s) is newer than %s (%s)" msgstr "%s: la versione installata (%s) è più recente di %s (%s)" -#: lib/libalpm/package.c:163 -#, c-format -msgid "%s-%s: ignoring package upgrade (%s)" -msgstr "%s-%s: aggiornamento del pacchetto (%s) ignorato" - -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "%s-%s: ritardo durante l'aggiornamento del pacchetto (%s)" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "%s: errore di sintassi nel file di descrizione alla linea %d" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "impossibile analizzare il file di descrizione del pacchetto" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "manca il nome del pacchetto in %s" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "manca la versione del pacchetto in %s" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "impossibile rimuovere il file temporaneo %s" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "si è verificato un errore durante la lettura del pacchetto: %s" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" msgstr "manca il metadata del pacchetto" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "manca il filelist nel pacchetto %s, creazione in corso" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "inclusione di '%s' nel campo 'richiesto da' di '%s'" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "inclusione di '%s' nel campo 'richiesto da' di '%s' (fornisce: %s)" diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index 35648e8d..e268671b 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ msgstr "" msgid "looking for unsatisfied dependencies" msgstr "" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "" @@ -273,7 +273,7 @@ msgstr "" msgid "could not add entry '%s' in cache" msgstr "" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "" @@ -369,107 +369,112 @@ msgstr "" msgid "warning: could not remove lock file %s" msgstr "" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "" -#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "" -#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "" -#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "" -#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, c-format +msgid "config: rootdir: %s" +msgstr "" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "" -#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "" -#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "" -#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "" -#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "" -#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "" @@ -517,7 +522,7 @@ msgstr "" #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "" @@ -625,8 +630,8 @@ msgstr "" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "" @@ -852,7 +857,7 @@ msgstr "" msgid "operation not compatible with the transaction type" msgstr "" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" msgstr "" @@ -994,70 +999,70 @@ msgstr "" msgid "md5(%s) = %s" msgstr "" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 #, c-format -msgid "%s: forcing upgrade to version %s" +msgid "%s-%s: ignoring package upgrade (%s)" msgstr "" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:158 #, c-format -msgid "%s: local (%s) is newer than %s (%s)" +msgid "%s: forcing upgrade to version %s" msgstr "" #: lib/libalpm/package.c:163 #, c-format -msgid "%s-%s: ignoring package upgrade (%s)" +msgid "%s: local (%s) is newer than %s (%s)" msgstr "" -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" msgstr "" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "" @@ -1180,224 +1185,224 @@ msgstr "" msgid "%s-%s elected for upgrade (%s => %s)" msgstr "" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" msgstr "" -#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "" -#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" msgstr "" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" msgstr "" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" msgstr "" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" msgstr "" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" msgstr "" -#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "" -#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" msgstr "" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" msgstr "" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" msgstr "" -#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" msgstr "" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" msgstr "" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" msgstr "" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" msgstr "" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" msgstr "" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "" -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" msgstr "" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "" -#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" msgstr "" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" msgstr "" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" msgstr "" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" msgstr "" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" msgstr "" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" msgstr "" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" msgstr "" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" msgstr "" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" msgstr "" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" msgstr "" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" msgstr "" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, c-format msgid "found package '%s-%s' in sync" msgstr "" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" msgstr "" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" msgstr "" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" msgstr "" -#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "" -#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" msgstr "" @@ -1476,7 +1481,12 @@ msgstr "" msgid "could not remove tmpdir %s" msgstr "" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "" + +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "" diff --git a/lib/libalpm/po/pl_PL.po b/lib/libalpm/po/pl_PL.po index 35e6a56c..b1a4bf62 100644 --- a/lib/libalpm/po/pl_PL.po +++ b/lib/libalpm/po/pl_PL.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-04-03 23:07-0500\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: 2007-04-12 04:23+0200\n" "Last-Translator: Mateusz Jędrasik \n" "Language-Team: Polish \n" @@ -176,7 +176,9 @@ msgstr "czynność: zostawianie obecnych plików na miejscu" #: lib/libalpm/add.c:663 msgid "action: keeping current file and installing new one with .pacnew ending" -msgstr "czynność: zachowywanie obecnego pliku i instalowanie nowego z końcówką .pacnew" +msgstr "" +"czynność: zachowywanie obecnego pliku i instalowanie nowego z końcówką ." +"pacnew" #: lib/libalpm/add.c:666 #, c-format @@ -300,7 +302,8 @@ msgstr "zamykanie bazy danych '%s'" msgid "" "adding new server to database '%s': protocol '%s', server '%s', path '%s'" msgstr "" -"dodawanie nowego serwera do bazy danych '%s': protokół '%s', serwer '%s', ścieżka '%s'" +"dodawanie nowego serwera do bazy danych '%s': protokół '%s', serwer '%s', " +"ścieżka '%s'" #: lib/libalpm/alpm.c:236 #, c-format @@ -310,7 +313,8 @@ msgstr "lista serwerów spuszczona(?) dla '%s'" #: lib/libalpm/alpm.c:279 #, c-format msgid "failed to get lastupdate time for %s (no big deal)" -msgstr "nie udało się otrzymać czasu ostatniej aktualizacji dla %s (nic wielkiego)" +msgstr "" +"nie udało się otrzymać czasu ostatniej aktualizacji dla %s (nic wielkiego)" #: lib/libalpm/alpm.c:298 #, c-format @@ -511,7 +515,8 @@ msgstr "dostarczono nieprawidłowy wpis pakietu do _alpm_db_read, pomijanie" msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" -"żądanie odczytania informacji bazy danych dla pakietu '%s' bazowanego na pliku, pomijanie..." +"żądanie odczytania informacji bazy danych dla pakietu '%s' bazowanego na " +"pliku, pomijanie..." #: lib/libalpm/be_files.c:239 #, c-format @@ -526,7 +531,7 @@ msgstr "nie udało się odnaleźć '%s-%s' w bd '%s'" #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "nie udało się otworzyć pliku %s: %s" @@ -579,7 +584,8 @@ msgstr "usuwanie wpisu '%s' z pamięci podręcznej '%s'" #: lib/libalpm/cache.c:156 #, c-format msgid "cannot remove entry '%s' from '%s' cache: not found" -msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej '%s': nie znaleziono" +msgstr "" +"nie udało się usunąć wpisu '%s' z pamięci podręcznej '%s': nie znaleziono" #: lib/libalpm/cache.c:178 #, c-format @@ -698,7 +704,8 @@ msgstr "checkdeps: zależność '%s' została przesunięta z '%s' do '%s'" #: lib/libalpm/deps.c:280 #, c-format msgid "checkdeps: dependency '%s' satisfied by installed package '%s'" -msgstr "checkdeps: zależność '%s' satysfakcjonowana przez zainstalowany pakiet '%s'" +msgstr "" +"checkdeps: zależność '%s' satysfakcjonowana przez zainstalowany pakiet '%s'" #: lib/libalpm/deps.c:289 #, c-format @@ -744,7 +751,8 @@ msgstr "%s dostarcza zależność %s -- pomijanie" msgid "" "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" msgstr "" -"nie udało się rozwiązać zależności dla \"%s\" (\"%s\" nie znajduje się w zbiorze pakietów)" +"nie udało się rozwiązać zależności dla \"%s\" (\"%s\" nie znajduje się w " +"zbiorze pakietów)" #: lib/libalpm/deps.c:647 #, c-format @@ -952,7 +960,9 @@ msgstr "zła nazwa sekcji konfiguracji" #: lib/libalpm/error.c:147 msgid "'local' is reserved and cannot be used as a repository name" -msgstr "'local' jest nazwą zarezerwowaną i nie może zostać użyty jako nazwa repozytorium" +msgstr "" +"'local' jest nazwą zarezerwowaną i nie może zostać użyty jako nazwa " +"repozytorium" #: lib/libalpm/error.c:149 msgid "syntax error in config file" @@ -1004,70 +1014,70 @@ msgstr "%s nie może być otwarte\n" msgid "md5(%s) = %s" msgstr "md5(%s) = %s" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "%s-%s: ignorowanie aktualizacji pakietu (%s)" + +#: lib/libalpm/package.c:158 #, c-format msgid "%s: forcing upgrade to version %s" msgstr "%s: wymuszanie aktualizacji do wersji %s" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:163 #, c-format msgid "%s: local (%s) is newer than %s (%s)" msgstr "%s: local (%s) jest nowsze niż %s (%s)" -#: lib/libalpm/package.c:163 -#, c-format -msgid "%s-%s: ignoring package upgrade (%s)" -msgstr "%s-%s: ignorowanie aktualizacji pakietu (%s)" - -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "%s-%s: opóźnianie aktualizacji pakietu (%s)" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "%s: błąd składni w pliku opisu linia %d" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "nie udało się przeczytać pliku opisu" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "brak nazwy pakietu w %s" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "brak wersji pakietu w %s" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "nie udało się usunąć pliku tymczasowego %s" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "błąd odczytywania pakietu: %s" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" msgstr "brak metadanych pakietu" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "brak listy plików pakietu w %s, generowanie" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "dodawanie '%s' w polu requiredby dla '%s'" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "dodawanie '%s' w polu requiredby dla '%s' (dostarcza: %s)" @@ -1129,7 +1139,8 @@ msgstr "%s jest w trans->skip_remove, pomijanie usunięcia" #: lib/libalpm/remove.c:250 #, c-format msgid "transaction is set to NOSAVE, not backing up '%s'" -msgstr "tranzakcja ustawiona jako NOSAVE, brak tworzenia kopii zapasowej dla '%s'" +msgstr "" +"tranzakcja ustawiona jako NOSAVE, brak tworzenia kopii zapasowej dla '%s'" #: lib/libalpm/remove.c:254 #, c-format @@ -1149,7 +1160,8 @@ msgstr "usuwanie pakietu %s-%s" #: lib/libalpm/remove.c:309 #, c-format msgid "not removing package '%s', can't remove all files" -msgstr "pakiet '%s' nie zostanie usunięty, nie udało się usunąć wszystkich plików" +msgstr "" +"pakiet '%s' nie zostanie usunięty, nie udało się usunąć wszystkich plików" #: lib/libalpm/remove.c:316 #, c-format @@ -1302,11 +1314,14 @@ msgstr "uwaga: brak pamięci podręcznej dla %s, tworzenie..." #: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" -msgstr "nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian\n" +msgstr "" +"nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian\n" #: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" -msgstr "uwaga: nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian" +msgstr "" +"uwaga: nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w " +"zamian" #: lib/libalpm/sync.c:833 #, c-format @@ -1395,7 +1410,8 @@ msgstr "aktualizowanie pól 'requiredby' pakietów zależności dla %s-%s" #: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" -msgstr "pakiet nie ma żadnych zależności, brak innych pakietów do zaktualizowania" +msgstr "" +"pakiet nie ma żadnych zależności, brak innych pakietów do zaktualizowania" #: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format @@ -1405,7 +1421,8 @@ msgstr "aktualizowanie pola 'requiredby' dla pakietu '%s'" #: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" -msgstr "nie udało się zaktualizować wpisu do bazy danych 'requiredby' dla %s-%s" +msgstr "" +"nie udało się zaktualizować wpisu do bazy danych 'requiredby' dla %s-%s" #: lib/libalpm/trans.c:333 #, c-format diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index 08f8e6a4..f865a057 100644 --- a/lib/libalpm/po/pt_BR.po +++ b/lib/libalpm/po/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: 2007-03-07 01:18-0300\n" "Last-Translator: Douglas Soares de Andrade \n" "Language-Team: Português do Brasil \n" @@ -46,7 +46,7 @@ msgstr "lendo os metadados de '%s'" msgid "looking for unsatisfied dependencies" msgstr "procurando por dependências não satisfeitas" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "procurando por conflitos" @@ -281,7 +281,7 @@ msgstr "não foi possível atualizar a entrada na base de dados %s-%s" msgid "could not add entry '%s' in cache" msgstr "não foi possível adicionar a entrada '%s' ao cache" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "executando \"ldconfig -r %s\"" @@ -380,107 +380,112 @@ msgstr "não foi possível remover o arquivo de lock %s" msgid "warning: could not remove lock file %s" msgstr "aviso: não foi possível remover o arquivo de lock %s" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "configuração: nova seção '%s'" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "configuração: nopassiveftp" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "configuração: usesyslog" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "configuração: chomp" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "configuração: usecolor" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "configuração: including %s" -#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "configuração: noupgrade: %s" -#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "configuração: noextract: %s" -#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "configuração: ignorepkg: %s" -#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "configuração: holdpkg: %s" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "configuração: dbpath: %s" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "configuração: cachedir: %s" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, fuzzy, c-format +msgid "config: rootdir: %s" +msgstr "configuração: cachedir: %s" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "configuração: logfile: %s" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "configuração: xfercommand: %s" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "configuração: upgradedelay: %d" -#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "verificando por substitutos do pacote" -#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "verificando substituto '%s' para o pacote '%s'" -#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "" -#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "" -#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "" @@ -528,7 +533,7 @@ msgstr "" #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "não foi possível abrir o arquivo %s: %s" @@ -636,8 +641,8 @@ msgstr "" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "" @@ -863,7 +868,7 @@ msgstr "" msgid "operation not compatible with the transaction type" msgstr "" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" msgstr "" @@ -1005,70 +1010,70 @@ msgstr "" msgid "md5(%s) = %s" msgstr "" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 #, c-format -msgid "%s: forcing upgrade to version %s" +msgid "%s-%s: ignoring package upgrade (%s)" msgstr "" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:158 #, c-format -msgid "%s: local (%s) is newer than %s (%s)" +msgid "%s: forcing upgrade to version %s" msgstr "" #: lib/libalpm/package.c:163 #, c-format -msgid "%s-%s: ignoring package upgrade (%s)" +msgid "%s: local (%s) is newer than %s (%s)" msgstr "" -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" msgstr "" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "" @@ -1191,224 +1196,224 @@ msgstr "" msgid "%s-%s elected for upgrade (%s => %s)" msgstr "" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" msgstr "" -#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "" -#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" msgstr "" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" msgstr "" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" msgstr "" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" msgstr "" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "pacote '%s' conflita com '%s'" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" msgstr "" -#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "" -#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" msgstr "removendo '%s' da lista de alvos" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" msgstr "" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" msgstr "" -#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" msgstr "" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" msgstr "" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" msgstr "" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" msgstr "" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" msgstr "" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "" -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" msgstr "" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "" -#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" msgstr "" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" msgstr "" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" msgstr "" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" msgstr "" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" msgstr "" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" msgstr "" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" msgstr "" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" msgstr "" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" msgstr "" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" msgstr "" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" msgstr "" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, fuzzy, c-format msgid "found package '%s-%s' in sync" msgstr "atualizando pacote %s-%s" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" msgstr "" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" msgstr "" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" msgstr "" -#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "" -#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" msgstr "não foi possível encontrar a dependência '%s'" @@ -1487,7 +1492,12 @@ msgstr "" msgid "could not remove tmpdir %s" msgstr "" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "" + +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "" diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru_RU.po index 1550593d..0a227b81 100644 --- a/lib/libalpm/po/ru_RU.po +++ b/lib/libalpm/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-05-07 23:36-0400\n" "PO-Revision-Date: 2007-03-16 02:52+1000\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgstr "читаю метаданные из '%s'" msgid "looking for unsatisfied dependencies" msgstr "поиск неразрешенных зависимостей" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483 msgid "looking for conflicts" msgstr "поиск конфликтов" @@ -275,7 +275,7 @@ msgstr "не могу обновить в базе данных запись %s- msgid "could not add entry '%s' in cache" msgstr "не могу добавить запись '%s' в кэш" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "запускаю \"ldconfig -r %s\"" @@ -374,107 +374,112 @@ msgstr "не могу удалить lock-файл %s" msgid "warning: could not remove lock file %s" msgstr "предупреждение: не могу удалить lock-файл %s" -#: lib/libalpm/alpm.c:919 +#: lib/libalpm/alpm.c:920 #, c-format msgid "config: new section '%s'" msgstr "config: новая секция '%s'" -#: lib/libalpm/alpm.c:948 +#: lib/libalpm/alpm.c:950 msgid "config: nopassiveftp" msgstr "" -#: lib/libalpm/alpm.c:951 +#: lib/libalpm/alpm.c:953 msgid "config: usesyslog" msgstr "" -#: lib/libalpm/alpm.c:954 +#: lib/libalpm/alpm.c:956 msgid "config: chomp" msgstr "" -#: lib/libalpm/alpm.c:957 +#: lib/libalpm/alpm.c:959 msgid "config: usecolor" msgstr "" -#: lib/libalpm/alpm.c:966 +#: lib/libalpm/alpm.c:968 #, c-format msgid "config: including %s" msgstr "" -#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981 +#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 #, c-format msgid "config: noupgrade: %s" msgstr "" -#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994 +#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 #, c-format msgid "config: noextract: %s" msgstr "" -#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007 +#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 #, c-format msgid "config: ignorepkg: %s" msgstr "" -#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020 +#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 #, c-format msgid "config: holdpkg: %s" msgstr "" -#: lib/libalpm/alpm.c:1027 +#: lib/libalpm/alpm.c:1029 #, c-format msgid "config: dbpath: %s" msgstr "" -#: lib/libalpm/alpm.c:1034 +#: lib/libalpm/alpm.c:1036 #, c-format msgid "config: cachedir: %s" msgstr "" -#: lib/libalpm/alpm.c:1037 +#: lib/libalpm/alpm.c:1043 +#, fuzzy, c-format +msgid "config: rootdir: %s" +msgstr "config: новая секция '%s'" + +#: lib/libalpm/alpm.c:1046 #, c-format msgid "config: logfile: %s" msgstr "" -#: lib/libalpm/alpm.c:1040 +#: lib/libalpm/alpm.c:1049 #, c-format msgid "config: xfercommand: %s" msgstr "" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1054 #, c-format msgid "config: upgradedelay: %d" msgstr "" -#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "проверяю замены для пакетов" -#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "проверяю замену '%s' для пакета '%s'" -#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)" -#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s выбран для обновления (будет заменен на %s-%s)" -#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' не найден в базе данных -- пропускаю" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 +#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' уже выбран для удаления -- пропускаю" -#: lib/libalpm/alpm.c:1169 +#: lib/libalpm/alpm.c:1178 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s выбран для обновления (%s => %s)" @@ -522,7 +527,7 @@ msgstr "" #: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 #: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 #: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 -#: lib/libalpm/package.c:206 +#: lib/libalpm/package.c:208 #, c-format msgid "could not open file %s: %s" msgstr "" @@ -630,8 +635,8 @@ msgstr "" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 +#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "" @@ -857,7 +862,7 @@ msgstr "" msgid "operation not compatible with the transaction type" msgstr "" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994 msgid "could not commit transaction" msgstr "" @@ -1001,70 +1006,70 @@ msgstr "" msgid "md5(%s) = %s" msgstr "" -#: lib/libalpm/package.c:150 +#: lib/libalpm/package.c:147 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s)" +msgstr "" + +#: lib/libalpm/package.c:158 #, c-format msgid "%s: forcing upgrade to version %s" msgstr "%s: принудительно обновляю до версии %s" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:163 #, c-format msgid "%s: local (%s) is newer than %s (%s)" msgstr "%s: установленная версия (%s) новее, чем в %s (%s)" -#: lib/libalpm/package.c:163 -#, c-format -msgid "%s-%s: ignoring package upgrade (%s)" -msgstr "" - -#: lib/libalpm/package.c:169 +#: lib/libalpm/package.c:171 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "" -#: lib/libalpm/package.c:220 lib/libalpm/package.c:279 +#: lib/libalpm/package.c:222 lib/libalpm/package.c:281 #, c-format msgid "%s: syntax error in description file line %d" msgstr "" -#: lib/libalpm/package.c:353 +#: lib/libalpm/package.c:355 msgid "could not parse the package description file" msgstr "" -#: lib/libalpm/package.c:357 +#: lib/libalpm/package.c:359 #, c-format msgid "missing package name in %s" msgstr "" -#: lib/libalpm/package.c:361 +#: lib/libalpm/package.c:363 #, c-format msgid "missing package version in %s" msgstr "" -#: lib/libalpm/package.c:396 +#: lib/libalpm/package.c:398 #, c-format msgid "could not remove tempfile %s" msgstr "не могу удалить временный файл %s" -#: lib/libalpm/package.c:409 lib/libalpm/package.c:416 +#: lib/libalpm/package.c:411 lib/libalpm/package.c:418 #, c-format msgid "error while reading package: %s" msgstr "ошибка при чтении пакета: %s" -#: lib/libalpm/package.c:422 +#: lib/libalpm/package.c:424 msgid "missing package metadata" msgstr "" -#: lib/libalpm/package.c:429 +#: lib/libalpm/package.c:431 #, c-format msgid "missing package filelist in %s, generating one" msgstr "отсутствует список файлов пакета в %s, генерирую его" -#: lib/libalpm/package.c:568 +#: lib/libalpm/package.c:570 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "добавляю '%s' в поле requiredby для '%s'" -#: lib/libalpm/package.c:582 +#: lib/libalpm/package.c:584 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "добавляю '%s' в поле requiredby для '%s' (обеспечивает :%s)" @@ -1187,224 +1192,224 @@ msgstr "проверяю наличие обновлений" msgid "%s-%s elected for upgrade (%s => %s)" msgstr "%s-%s выбран для обновления (%s => %s)" -#: lib/libalpm/sync.c:262 +#: lib/libalpm/sync.c:270 #, c-format msgid "searching for target in repo '%s'" msgstr "" -#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 +#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "" -#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "" -#: lib/libalpm/sync.c:282 +#: lib/libalpm/sync.c:290 #, c-format msgid "repository '%s' not found" msgstr "репозиторий '%s' не найден" -#: lib/libalpm/sync.c:323 +#: lib/libalpm/sync.c:331 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "%s-%s не устарел -- пропускаю" -#: lib/libalpm/sync.c:346 +#: lib/libalpm/sync.c:354 #, c-format msgid "adding target '%s' to the transaction set" msgstr "" -#: lib/libalpm/sync.c:394 +#: lib/libalpm/sync.c:402 msgid "resolving target's dependencies" msgstr "разрешаю зависимости пакетов" -#: lib/libalpm/sync.c:414 +#: lib/libalpm/sync.c:422 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "" -#: lib/libalpm/sync.c:455 +#: lib/libalpm/sync.c:463 msgid "looking for unresolvable dependencies" msgstr "ищу неразрешимые зависимости" -#: lib/libalpm/sync.c:486 +#: lib/libalpm/sync.c:494 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "пакет '%s' конфликтует с '%s'" -#: lib/libalpm/sync.c:508 +#: lib/libalpm/sync.c:516 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "" -#: lib/libalpm/sync.c:519 +#: lib/libalpm/sync.c:527 #, c-format msgid "package '%s' provides its own conflict" msgstr "" -#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547 +#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "" -#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 +#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604 #, c-format msgid "removing '%s' from target list" msgstr "" -#: lib/libalpm/sync.c:568 +#: lib/libalpm/sync.c:576 #, c-format msgid "resolving package '%s' conflict" msgstr "разрешаю конфликт пакета '%s'" -#: lib/libalpm/sync.c:591 +#: lib/libalpm/sync.c:599 #, c-format msgid "electing '%s' for removal" msgstr "помечаю '%s' для удаления" -#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 +#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626 msgid "unresolvable package conflicts detected" msgstr "обнаружен неразрешимый конфликт пакетов" -#: lib/libalpm/sync.c:670 +#: lib/libalpm/sync.c:678 msgid "checking dependencies of packages designated for removal" msgstr "проверяю зависимости пакетов отмеченных для удаления" -#: lib/libalpm/sync.c:684 +#: lib/libalpm/sync.c:692 msgid "something has gone horribly wrong" msgstr "произошло что-то ужасное и непонятное" -#: lib/libalpm/sync.c:704 +#: lib/libalpm/sync.c:712 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "" -#: lib/libalpm/sync.c:800 +#: lib/libalpm/sync.c:808 #, c-format msgid "%s is already in the cache\n" msgstr "%s уже есть в кэше\n" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:819 #, c-format msgid "no %s cache exists, creating...\n" msgstr "кэш %s не существует, создаю...\n" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:820 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "предупреждение: кэш %s не существует, создаю..." -#: lib/libalpm/sync.c:817 +#: lib/libalpm/sync.c:825 msgid "couldn't create package cache, using /tmp instead\n" msgstr "не могу создать кэш пакета, будет использован /tmp\n" -#: lib/libalpm/sync.c:818 +#: lib/libalpm/sync.c:826 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "предупреждение: не могу создать кэш пакета, будет использован /tmp" -#: lib/libalpm/sync.c:825 +#: lib/libalpm/sync.c:833 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "не удалось получить некоторые файлы с %s\n" -#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 +#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "не удалось получить md5 или sha1 контрольную сумму для пакета %s\n" -#: lib/libalpm/sync.c:886 +#: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "архив %s был поврежден (не сходится MD5 или SHA1 контрольная сумма)\n" -#: lib/libalpm/sync.c:888 +#: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "архив %s поврежден (не сходится MD5 или SHA1 контрольная сумма)\n" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:917 msgid "could not create removal transaction" msgstr "" -#: lib/libalpm/sync.c:915 +#: lib/libalpm/sync.c:923 msgid "could not initialize the removal transaction" msgstr "" -#: lib/libalpm/sync.c:935 +#: lib/libalpm/sync.c:943 msgid "removing conflicting and to-be-replaced packages" msgstr "" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:945 msgid "could not prepare removal transaction" msgstr "" -#: lib/libalpm/sync.c:943 +#: lib/libalpm/sync.c:951 msgid "could not commit removal transaction" msgstr "" -#: lib/libalpm/sync.c:950 +#: lib/libalpm/sync.c:958 msgid "installing packages" msgstr "устанавливаю пакеты" -#: lib/libalpm/sync.c:953 +#: lib/libalpm/sync.c:961 msgid "could not create transaction" msgstr "" -#: lib/libalpm/sync.c:958 +#: lib/libalpm/sync.c:966 msgid "could not initialize transaction" msgstr "" -#: lib/libalpm/sync.c:981 +#: lib/libalpm/sync.c:989 msgid "could not prepare transaction" msgstr "" -#: lib/libalpm/sync.c:993 +#: lib/libalpm/sync.c:1001 msgid "updating database for replaced packages' dependencies" msgstr "" -#: lib/libalpm/sync.c:1022 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "" -#: lib/libalpm/sync.c:1031 +#: lib/libalpm/sync.c:1039 #, c-format msgid "could not update new database entry %s-%s" msgstr "" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1079 #, c-format msgid "found package '%s-%s' in sync" msgstr "" -#: lib/libalpm/sync.c:1077 +#: lib/libalpm/sync.c:1085 #, c-format msgid "package '%s' not found in sync" msgstr "пакет '%s' не найден в базе данных" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:271 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" msgstr "" -#: lib/libalpm/trans.c:273 +#: lib/libalpm/trans.c:274 msgid "package has no dependencies, no other packages to update" msgstr "" -#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 +#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "" -#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 +#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "" -#: lib/libalpm/trans.c:332 +#: lib/libalpm/trans.c:333 #, c-format msgid "could not find dependency '%s'" msgstr "" @@ -1483,7 +1488,12 @@ msgstr "" msgid "could not remove tmpdir %s" msgstr "" -#: lib/libalpm/util.c:607 +#: lib/libalpm/util.c:568 +#, c-format +msgid "cannot read disk space information from %s: %s" +msgstr "" + +#: lib/libalpm/util.c:609 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "" diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index 4d502dcc..9aaf220d 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-04-17 20:23+0200\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: 2007-04-17 20:18+0200\n" "Last-Translator: Pierre Schmitz \n" "Language-Team: German \n" diff --git a/src/pacman/po/en_GB.po b/src/pacman/po/en_GB.po index e7f0cb91..153fed83 100644 --- a/src/pacman/po/en_GB.po +++ b/src/pacman/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: 2007-03-07 21:16+1100\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" @@ -90,11 +90,6 @@ msgstr "failed to commit transaction (%s)\n" msgid "failed to release transaction (%s)\n" msgstr "failed to release transaction (%s)\n" -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "requires: %s" - #: src/pacman/log.c:63 #, c-format msgid "debug" @@ -879,11 +874,6 @@ msgstr ":: Upgrade pacman first? [Y/n] " msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Install whole content? [Y/n] " @@ -1081,6 +1071,12 @@ msgstr "" msgid "Total Installed Size: %.2f MB\n" msgstr "Total Installed Size: %.2f MB\n" +#~ msgid "requires: %s" +#~ msgstr "requires: %s" + +#~ msgid "'%s': %s\n" +#~ msgstr "'%s': %s\n" + #~ msgid "Installed Size : %ld K\n" #~ msgstr "Installed Size : %ld K\n" diff --git a/src/pacman/po/es.po b/src/pacman/po/es.po index 22a14bce..a8302012 100644 --- a/src/pacman/po/es.po +++ b/src/pacman/po/es.po @@ -1,20 +1,26 @@ +# translation of es.fix.po to +# Spanish translation for pacman package. +# Copyright (C) 2002-2007 Judd Vinet +# This file is distributed under the same license as the Pacman package manager package. +# +# Juan Pablo González Tognarelli , 2007. +# Juan Pablo González Tognarelli , 2007. msgid "" msgstr "" -"Project-Id-Version: pacman 3.0\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2007-04-03 12:12-0300\n" -"Last-Translator: Gustavo Chaín \n" -"Language-Team: Juan Pablo GOnzález Tognarelli\n" +"Project-Id-Version: es.fix\n" +"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" +"PO-Revision-Date: 2007-04-29 11:20-0400\n" +"Last-Translator: Juan Pablo González Tognarelli \n" +"Language-Team: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: CHILE\n" +"X-Generator: KBabel 1.11.4\n" -#"Content-Type: text/plain; charset=utf-8\n" -#: src/pacman/add.c:72 -#: src/pacman/remove.c:82 -#: src/pacman/sync.c:482 +#: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 #: src/pacman/sync.c:531 #, c-format msgid "" @@ -31,23 +37,15 @@ msgstr "Cargando información del paquete..." #: src/pacman/add.c:83 #, c-format msgid "failed to add target '%s' (%s)" -msgstr "fallo al agregar objetivo '%s' (%s)" - -#: src/pacman/add.c:88 -#: src/pacman/sync.c:196 -#: src/pacman/trans.c:73 -#: src/pacman/trans.c:80 -#: src/pacman/trans.c:91 -#: src/pacman/trans.c:105 -#: src/pacman/trans.c:119 -#: src/pacman/trans.c:131 -#: src/pacman/trans.c:142 +msgstr "fallo al procesar '%s' (%s)" + +#: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 +#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105 +#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142 msgid "done.\n" msgstr "Hecho.\n" -#: src/pacman/add.c:95 -#: src/pacman/remove.c:101 -#: src/pacman/sync.c:616 +#: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616 #, c-format msgid "failed to prepare transaction (%s)\n" msgstr "fallo al preparar operación (%s)\n" @@ -57,122 +55,102 @@ msgstr "fallo al preparar operación (%s)\n" msgid ":: %s: requires %s" msgstr ":: %s: necesita %s" -#: src/pacman/add.c:125 -#: src/pacman/sync.c:643 +#: src/pacman/add.c:125 src/pacman/sync.c:643 #, c-format msgid ":: %s: conflicts with %s" msgstr ":: %s: tiene conflictos con %s" -#: src/pacman/add.c:134 -#: src/pacman/sync.c:707 +#: src/pacman/add.c:134 src/pacman/sync.c:707 #, c-format msgid "%s exists in both '%s' and '%s'\n" msgstr "%s existe en '%s' y '%s'\n" -#: src/pacman/add.c:140 -#: src/pacman/sync.c:713 +#: src/pacman/add.c:140 src/pacman/sync.c:713 #, c-format msgid "%s: %s exists in filesystem\n" msgstr "%s: %s existe en el sistema de archivos\n" -#: src/pacman/add.c:146 -#: src/pacman/sync.c:719 -#: src/pacman/sync.c:725 +#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725 +#, fuzzy msgid "" "\n" "errors occurred, no packages were upgraded.\n" -msgstr "" -"\n" -"ocurrieron errores, ningún paquete fue actualizado.\n" +msgstr "ocurrieron errores, los paquetes no fueron actualizados\n" -#: src/pacman/add.c:156 -#: src/pacman/sync.c:650 +#: src/pacman/add.c:156 src/pacman/sync.c:650 #, c-format msgid ":: %.1f MB required, have %.1f MB" -msgstr ":: %.1f MB son necesarios, se dispone de %.1f MB" +msgstr "" -#: src/pacman/add.c:169 -#: src/pacman/remove.c:141 -#: src/pacman/sync.c:700 -#, c-format +#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700 +#, fuzzy, c-format msgid "failed to commit transaction (%s)\n" -msgstr "fallo al realizar la transacción (%s)\n" +msgstr "no se pudo iniciar la operación (%s)\n" -#: src/pacman/add.c:179 -#: src/pacman/remove.c:151 -#: src/pacman/sync.c:524 +#: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524 #: src/pacman/sync.c:741 -#, c-format +#, fuzzy, c-format msgid "failed to release transaction (%s)\n" -msgstr "fallo al liberar la transacción (%s)\n" - -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "necesita: %s" +msgstr "fallo al preparar operación (%s)\n" #: src/pacman/log.c:63 #, c-format msgid "debug" -msgstr "depuración" +msgstr "" #: src/pacman/log.c:66 #, c-format msgid "error" -msgstr "error" +msgstr "" #: src/pacman/log.c:69 #, c-format msgid "warning" -msgstr "advertencia" +msgstr "" #: src/pacman/log.c:75 #, c-format msgid "function" -msgstr "función" +msgstr "" #: src/pacman/log.c:194 msgid "Y" -msgstr "S" +msgstr "" #: src/pacman/log.c:194 msgid "YES" -msgstr "SI" +msgstr "" #: src/pacman/log.h:30 msgid "error: " -msgstr "error: " +msgstr "" #: src/pacman/log.h:34 msgid "warning: " -msgstr "advertencia: " +msgstr "" #: src/pacman/package.c:60 msgid "Explicitly installed" -msgstr "Explícitamente instalado" +msgstr "" #: src/pacman/package.c:63 msgid "Installed as a dependency for another package" -msgstr "instalado como una dependencia para otro paquete" +msgstr "" -#: src/pacman/package.c:66 -#: src/pacman/package.c:90 +#: src/pacman/package.c:66 src/pacman/package.c:90 msgid "Unknown" -msgstr "Desconocido" +msgstr "" -#: src/pacman/package.c:70 -#: src/pacman/package.c:121 +#: src/pacman/package.c:70 src/pacman/package.c:121 msgid "Description : " -msgstr "Descripción : " +msgstr "" -#: src/pacman/package.c:73 -#: src/pacman/package.c:127 -#, c-format +#: src/pacman/package.c:73 src/pacman/package.c:127 +#, fuzzy, c-format msgid "Name : %s\n" -msgstr "Nombre : %s\n" +msgstr "URL : %s\n" -#: src/pacman/package.c:74 -#: src/pacman/package.c:128 +#: src/pacman/package.c:74 src/pacman/package.c:128 #, c-format msgid "Version : %s\n" msgstr "Versión : %s\n" @@ -186,23 +164,19 @@ msgstr "URL : %s\n" msgid "License :" msgstr "Licencia :" -#: src/pacman/package.c:77 -#: src/pacman/package.c:129 +#: src/pacman/package.c:77 src/pacman/package.c:129 msgid "Groups :" msgstr "Grupos :" -#: src/pacman/package.c:78 -#: src/pacman/package.c:130 +#: src/pacman/package.c:78 src/pacman/package.c:130 msgid "Provides :" msgstr "Provee :" -#: src/pacman/package.c:79 -#: src/pacman/package.c:131 +#: src/pacman/package.c:79 src/pacman/package.c:131 msgid "Depends On :" msgstr "Depende De :" -#: src/pacman/package.c:80 -#: src/pacman/package.c:132 +#: src/pacman/package.c:80 src/pacman/package.c:132 msgid "Removes :" msgstr "Elimina :" @@ -210,13 +184,11 @@ msgstr "Elimina :" msgid "Required By :" msgstr "Requerido por :" -#: src/pacman/package.c:85 -#: src/pacman/package.c:133 +#: src/pacman/package.c:85 src/pacman/package.c:133 msgid "Conflicts With :" msgstr "Conflictos con :" -#: src/pacman/package.c:86 -#: src/pacman/package.c:136 +#: src/pacman/package.c:86 src/pacman/package.c:136 #, c-format msgid "Installed Size : %6.2f K\n" msgstr "Tamaño instalado : %6.2f K\n" @@ -326,42 +298,42 @@ msgstr "No hay registro de cambios para '%s'.\n" #: src/pacman/pacman.c:90 #, c-format msgid "usage: %s {-h --help}\n" -msgstr "uso: %s {-h --help}\n" +msgstr "" #: src/pacman/pacman.c:91 #, c-format msgid " %s {-V --version}\n" -msgstr " %s {-V --version}\n" +msgstr "" #: src/pacman/pacman.c:92 #, c-format msgid " %s {-A --add} [options] \n" -msgstr " %s {-A --add} [opciones] \n" +msgstr "" #: src/pacman/pacman.c:93 -#, c-format +#, fuzzy, c-format msgid " %s {-F --freshen} [options] \n" -msgstr " %s {-F --freshen} [opciones] \n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:94 -#, c-format +#, fuzzy, c-format msgid " %s {-Q --query} [options] [package]\n" -msgstr " %s {-Q --query} [opciones] [archivo]\n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:95 -#, c-format +#, fuzzy, c-format msgid " %s {-R --remove} [options] \n" -msgstr " %s {-R --remove} [opciones] \n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:96 -#, c-format +#, fuzzy, c-format msgid " %s {-S --sync} [options] [package]\n" -msgstr " %s {-S --sync} [opciones] [paquete]\n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:97 -#, c-format +#, fuzzy, c-format msgid " %s {-U --upgrade} [options] \n" -msgstr " %s {-U --upgrade} [opciones] \n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:98 #, c-format @@ -373,33 +345,28 @@ msgstr "" "digite '%s --help' con otra opción para ayuda más específica\n" #: src/pacman/pacman.c:101 -#, c-format +#, fuzzy, c-format msgid "usage: %s {-A --add} [options] \n" -msgstr "uso: %s {-A --add} [opciones] \n" +msgstr "uso: %s {-R --remove} [opciones] \n" -#: src/pacman/pacman.c:102 -#: src/pacman/pacman.c:107 -#: src/pacman/pacman.c:119 -#: src/pacman/pacman.c:124 -#: src/pacman/pacman.c:138 -#, c-format +#: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 +#: src/pacman/pacman.c:124 src/pacman/pacman.c:138 +#, fuzzy, c-format msgid "options:\n" -msgstr "opciones:\n" +msgstr "opciones" -#: src/pacman/pacman.c:103 -#: src/pacman/pacman.c:109 -#: src/pacman/pacman.c:120 +#: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 #: src/pacman/pacman.c:140 #, c-format msgid " -d, --nodeps skip dependency checks\n" msgstr " -d, --nodeps se salta la verificación de dependencias \n" -#: src/pacman/pacman.c:104 -#: src/pacman/pacman.c:121 -#: src/pacman/pacman.c:142 +#: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr " -f, --force fuerza la instalación, sobreescribiendo los archivos en conflicto\n" +msgstr "" +" -f, --force fuerza la instalación, sobreescribiendo los archivos " +"en conflicto\n" #: src/pacman/pacman.c:106 #, c-format @@ -408,13 +375,19 @@ msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:108 #, c-format -msgid " -c, --cascade remove packages and all packages that depend on them\n" -msgstr " -c, --cascade quita paquetes, junto a todos los paquetes que dependan de ellos\n" +msgid "" +" -c, --cascade remove packages and all packages that depend on them\n" +msgstr "" +" -c, --cascade quita paquetes, junto a todos los que dependan de " +"estos\n" #: src/pacman/pacman.c:110 #, c-format -msgid " -k, --dbonly only remove database entry, do not remove files\n" -msgstr " -k, --dbonly sólo quita la referencia en la base de datos. No quita los archivos\n" +msgid "" +" -k, --dbonly only remove database entry, do not remove files\n" +msgstr "" +" -k, --dbonly sólo quita la referencia en la base de datos. No " +"elimina archivos\n" #: src/pacman/pacman.c:111 #, c-format @@ -423,23 +396,26 @@ msgstr " -n, --nosave quita también los archivos de configuración\n" #: src/pacman/pacman.c:112 #, c-format -msgid " -s, --recursive remove dependencies also (that won't break packages)\n" -msgstr " -s, --recursive quita también las dependencias (que no rompen dependencias de otros paquetes)\n" +msgid "" +" -s, --recursive remove dependencies also (that won't break packages)\n" +msgstr "" +" -s, --recursive quita también las dependencias (que no quiebren a " +"otros paquetes)\n" #: src/pacman/pacman.c:115 -#, c-format +#, fuzzy, c-format msgid "usage: %s {-F --freshen} [options] \n" -msgstr "uso: %s {-F --freshen} [opciones] \n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:117 -#, c-format +#, fuzzy, c-format msgid "usage: %s {-U --upgrade} [options] \n" -msgstr "uso: %s {-U --upgrade} [opciones] \n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:123 -#, c-format +#, fuzzy, c-format msgid "usage: %s {-Q --query} [options] [package]\n" -msgstr "uso: %s {-Q --query} [opciones] [paquete]\n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:125 #, c-format @@ -447,23 +423,27 @@ msgid " -c, --changelog view the changelog of a package\n" msgstr " -c, --changelog muestra el registro de cambios de un paquete\n" #: src/pacman/pacman.c:126 -#, c-format -msgid " -e, --orphans list all packages installed as dependencies but no longer\n" -msgstr " -e, --orphans lista todos los paquetes instalados como dependencias pero que ya no lo son mas\n" +#, fuzzy, c-format +msgid "" +" -e, --orphans list all packages installed as dependencies but no " +"longer\n" +msgstr "" +" -e, --orphans lista todos los paquetes instalados como " +"dependencias, que ya no lo son\n" +" requerido por cualquier paquete\n" #: src/pacman/pacman.c:127 #, c-format msgid " required by any package\n" -msgstr " requerido por cualquier paquete\n" +msgstr "" -#: src/pacman/pacman.c:128 -#: src/pacman/pacman.c:143 +#: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format msgid " -g, --groups view all members of a package group\n" -msgstr " -g, --groups muestra todos los elementos del grupo de paquetes \n" +msgstr "" +" -g, --groups muestra todos los elementos del grupo de paquetes \n" -#: src/pacman/pacman.c:129 -#: src/pacman/pacman.c:144 +#: src/pacman/pacman.c:129 src/pacman/pacman.c:144 #, c-format msgid " -i, --info view package information\n" msgstr " -i, --info ver la información del paquete\n" @@ -471,42 +451,61 @@ msgstr " -i, --info ver la información del paquete\n" #: src/pacman/pacman.c:130 #, c-format msgid " -l, --list list the contents of the queried package\n" -msgstr " -l, --list lista los archivos contenidos en los paquetes consultados\n" +msgstr "" +" -l, --list lista los archivos contenidos en los paquetes " +"consultados\n" #: src/pacman/pacman.c:131 #, c-format -msgid " -m, --foreign list installed packages not found in sync db(s)\n" -msgstr " -m, --foreign lista paquetes no encontrados en las bases de datos de sincronización\n" +msgid "" +" -m, --foreign list installed packages not found in sync db(s)\n" +msgstr "" +" -m, --foreign lista paquetes instalados no encontrados en las " +"listas de paquetes\n" #: src/pacman/pacman.c:132 #, c-format msgid " -o, --owns query the package that owns \n" -msgstr " -o, --owns consulta el paquete que contiene el archivo indicado\n" +msgstr "" +" -o, --owns consulta el paquete que contiene el archivo " +"indicado\n" #: src/pacman/pacman.c:133 #, c-format msgid " -p, --file query a package file instead of the database\n" -msgstr " -p, --file consulta un archivo de paquetes en lugar de la base de datos\n" +msgstr "" +" -p, --file consulta un archivo de paquetes en lugar de la base " +"de datos\n" #: src/pacman/pacman.c:134 #, c-format -msgid " -s, --search search locally-installed packages for matching strings\n" -msgstr " -s, --search busca paquetes instalados localmente que coincidan con la cadena\n" +msgid "" +" -s, --search search locally-installed packages for matching " +"strings\n" +msgstr "" +" -s, --search busca paquetes instalados localmente que coincidan " +"con la cadena\n" #: src/pacman/pacman.c:135 #, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr " -u, --upgrades muestra todos los paquetes que pueden ser actualizados\n" +msgstr "" +" -u, --upgrades muestra todos los paquetes que pueden ser " +"actualizados\n" #: src/pacman/pacman.c:137 -#, c-format +#, fuzzy, c-format msgid "usage: %s {-S --sync} [options] [package]\n" -msgstr "uso: %s {-S --sync} [opciones] [paquete]\n" +msgstr "uso: %s {-R --remove} [opciones] \n" #: src/pacman/pacman.c:139 #, c-format -msgid " -c, --clean remove old packages from cache directory (-cc for all)\n" -msgstr " -c, --clean elimina paquetes antiguos del directorio de la cache (-cc para todos los paquetes)\n" +msgid "" +" -c, --clean remove old packages from cache directory (-cc for " +"all)\n" +msgstr "" +" -c, --clean elimina paquetes antiguos del directorio de la cache " +"(-cc para todos los paquetes)\n" #: src/pacman/pacman.c:141 #, c-format @@ -520,33 +519,52 @@ msgstr " -l, --list ve una lista de paquetes en un repositorio\n" #: src/pacman/pacman.c:146 #, c-format -msgid " -p, --print-uris print out URIs for given packages and their dependencies\n" -msgstr " -p, --print-uris muestra las URIs (nombres de paquetes) para los archivos indicados y sus dependencias\n" +msgid "" +" -p, --print-uris print out URIs for given packages and their " +"dependencies\n" +msgstr "" +" -p, --print-uris muestra las URIs (nombres de paquetes) para los " +"archivos indicados y sus dependencias\n" #: src/pacman/pacman.c:147 #, c-format -msgid " -s, --search search remote repositories for matching strings\n" -msgstr " -s, --search busca en los repositorios remotos por coincidencias de la cadena especificada.\n" +msgid "" +" -s, --search search remote repositories for matching strings\n" +msgstr "" +" -s, --search busca en los repositorios remotos por coincidencias " +"de la cadena especificada.\n" #: src/pacman/pacman.c:148 #, c-format msgid " -u, --sysupgrade upgrade all packages that are out of date\n" -msgstr " -u, --sysupgrade actualiza todos los paquetes que no están al día\n" +msgstr "" +" -u, --sysupgrade actualiza todos los paquetes que no están al día\n" #: src/pacman/pacman.c:149 #, c-format -msgid " -w, --downloadonly download packages but do not install/upgrade anything\n" -msgstr " -w, --downloadonly sólo descarga los paquetes, sin instalar/actualizar nada\n" +msgid "" +" -w, --downloadonly download packages but do not install/upgrade " +"anything\n" +msgstr "" +" -w, --downloadonly sólo descarga los paquetes, sin instalar/actualizar " +"nada\n" #: src/pacman/pacman.c:150 #, c-format -msgid " -y, --refresh download fresh package databases from the server\n" -msgstr " -y, --refresh descarga bases de datos actualizadas desde el servidor\n" +msgid "" +" -y, --refresh download fresh package databases from the server\n" +msgstr "" +" -y, --refresh descarga bases de datos actualizadas desde el " +"servidor\n" #: src/pacman/pacman.c:151 #, c-format -msgid " --ignore ignore a package upgrade (can be used more than once)\n" -msgstr " --ignore ignora una actualización de paquete (puede ser usado más de una vez)\n" +msgid "" +" --ignore ignore a package upgrade (can be used more than " +"once)\n" +msgstr "" +" --ignore ignora una actualización de paquete (puede ser usado " +"más de una vez)\n" #: src/pacman/pacman.c:153 #, c-format @@ -560,18 +578,25 @@ msgstr " --noconfirm no solicita confirmación alguna\n" #: src/pacman/pacman.c:155 #, c-format -msgid " --ask pre-specify answers for questions (see manpage)\n" -msgstr " --ask pre-define respuestas para preguntas (ver el manual)\n" +msgid "" +" --ask pre-specify answers for questions (see manpage)\n" +msgstr "" +" --ask pre-define respuestas para preguntas (ver el manual)\n" #: src/pacman/pacman.c:156 #, c-format -msgid " --noprogressbar do not show a progress bar when downloading files\n" -msgstr " --noprogressbar no muestra la barra de progreso cuando descarga archivos\n" +msgid "" +" --noprogressbar do not show a progress bar when downloading files\n" +msgstr "" +" --noprogressbar no muestra la barra de progreso cuando descarga " +"archivos\n" #: src/pacman/pacman.c:157 -#, c-format -msgid " --noscriptlet do not execute the install scriptlet if there is any\n" -msgstr " --noscriptlet no ejecuta el script de instalación. si es que existe\n" +#, fuzzy, c-format +msgid "" +" --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr "" +" --noscriptlet no ejecuta el script de instalación si existe alguno\n" #: src/pacman/pacman.c:158 #, c-format @@ -586,22 +611,32 @@ msgstr " -r, --root define una raiz alterna para la instalación\n" #: src/pacman/pacman.c:160 #, c-format msgid " -b, --dbpath set an alternate database location\n" -msgstr " -b, --dbpath define una localización alternativa de la base de datos\n" +msgstr "" +" -b, --dbpath define una localización alternativa de la base de " +"datos\n" #: src/pacman/pacman.c:161 #, c-format msgid " --cachedir set an alternate package cache location\n" -msgstr " --cachedir define una ruta alternativa para la localización de los archivos\n" +msgstr "" +" --cachedir define una ruta alternativa para la localización de " +"los archivos\n" #: src/pacman/pacman.c:174 -#, c-format +#, fuzzy, c-format msgid " This program may be freely redistributed under\n" -msgstr " Este programa puede ser libremente distribuido bajo\n" +msgstr "" +" Este programa puede ser libremente distribuido bajo\n" +" los términos de la licencia GNU General Public " +"License\n" #: src/pacman/pacman.c:175 -#, c-format +#, fuzzy, c-format msgid " the terms of the GNU General Public License\n" -msgstr " los términos de la licencia GNU. General Public License\n" +msgstr "" +" Este programa puede ser libremente distribuido bajo\n" +" los términos de la licencia GNU General Public " +"License\n" #: src/pacman/pacman.c:300 #, c-format @@ -629,7 +664,7 @@ msgstr "sólo una operación puede utilizarse a la vez\n" #: src/pacman/pacman.c:436 msgid "warning: current locale is invalid; using default \"C\" locale" -msgstr "advertencia: la configuración \"locale\" es inválida: usando el locale por defecto \"C\"" +msgstr "" #: src/pacman/pacman.c:456 #, c-format @@ -647,7 +682,7 @@ msgstr "falló al analizar la configuración (%s)\n" #: src/pacman/pacman.c:516 msgid "Targets :" -msgstr "Objetivos :" +msgstr "Objetivos : " #: src/pacman/pacman.c:522 #, c-format @@ -690,8 +725,7 @@ msgstr "%s es propiedad de %s %s\n" msgid "No package owns %s\n" msgstr "Ningún paquete posee %s\n" -#: src/pacman/query.c:170 -#: src/pacman/sync.c:453 +#: src/pacman/query.c:170 src/pacman/sync.c:453 msgid "no usable package repositories configured.\n" msgstr "no se encontraron repositorios útiles configurados.\n" @@ -717,14 +751,12 @@ msgstr "no se especificó un archivo de paquetes para --file\n" msgid "failed to load package '%s' (%s)\n" msgstr "error al cargar el paquete '%s' (%s)\n" -#: src/pacman/query.c:273 -#: src/pacman/query.c:305 +#: src/pacman/query.c:273 src/pacman/query.c:305 #, c-format msgid "package \"%s\" not found\n" msgstr "el paquete \"%s\" no fue encontrado\n" -#: src/pacman/remove.c:61 -#: src/pacman/sync.c:568 +#: src/pacman/remove.c:61 src/pacman/sync.c:568 #, c-format msgid ":: group %s:\n" msgstr ":: grupo %s:\n" @@ -738,9 +770,7 @@ msgstr " ¿Quitar todo el contenido? [S/n] " msgid ":: Remove %s from group %s? [Y/n] " msgstr ":: ¿Quitar %s del grupo %s? [S/n] " -#: src/pacman/remove.c:80 -#: src/pacman/sync.c:480 -#: src/pacman/sync.c:529 +#: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format msgid "failed to init transaction (%s)\n" msgstr "no se pudo iniciar la operación (%s)\n" @@ -748,15 +778,14 @@ msgstr "no se pudo iniciar la operación (%s)\n" #: src/pacman/remove.c:92 #, c-format msgid "failed to add target '%s' (%s)\n" -msgstr "error al agregar el paquete '%s' (%s)\n" +msgstr "fallo al procesar '%s' (%s)\n" #: src/pacman/remove.c:106 #, c-format msgid ":: %s is required by %s\n" msgstr ":: %s es requerido por %s\n" -#: src/pacman/remove.c:128 -#: src/pacman/util.c:324 +#: src/pacman/remove.c:128 src/pacman/util.c:324 msgid "Targets:" msgstr "A instalar:" @@ -865,7 +894,9 @@ msgstr ":: es recomendado que permita a pacman actualizarse a si mismo\n" #: src/pacman/sync.c:520 msgid ":: first, then you can re-run the operation with the newer version.\n" -msgstr ":: primero, después puedes volver a ejecutar la operación con la nueva versión.\n" +msgstr "" +":: primero, después puedes volver a ejecutar la operación con la nueva " +"versión.\n" #: src/pacman/sync.c:522 msgid ":: Upgrade pacman first? [Y/n] " @@ -876,11 +907,6 @@ msgstr ":: ¿Actualizar pacman primero? [S/n] " msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: ¿Instalar el todo el contenido? [S/n] " @@ -893,7 +919,7 @@ msgstr ":: ¿Instalar %s del grupo %s? [S/n] " #: src/pacman/sync.c:603 #, c-format msgid "'%s': not found in sync db\n" -msgstr "'%s': no encontrado en la base de datos de sincronización\n" +msgstr "'%s': no encontrado en la lista de paquetes\n" #: src/pacman/sync.c:621 msgid "requires" @@ -901,7 +927,7 @@ msgstr "necesita" #: src/pacman/sync.c:663 msgid " local database is up to date\n" -msgstr " la base de datos local esta actualizada\n" +msgstr " el sistema está actualizado\n" #: src/pacman/sync.c:672 msgid "" @@ -993,7 +1019,9 @@ msgstr ":: Descargando paquetes desde %s...\n" #: src/pacman/trans.c:172 #, c-format msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " -msgstr ":: %1$s requiere %2$s que está en los paquetes ignorados . ¿Instalar %2$s? [S/n] " +msgstr "" +":: %1$s requiere %2$s que en los paquetes a ignorar (IgnorePkg). ¿Instalar %2" +"$s? [S/n] " #: src/pacman/trans.c:177 #, c-format @@ -1003,7 +1031,8 @@ msgstr ":: %s esta en la lista a ignorar. ¿Instalar de todas formas? [S/n] " #: src/pacman/trans.c:190 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr ":: %s esta indicado como paquete a mantener. ¿Quitar de todas formas? [S/n] " +msgstr "" +":: %s esta indicado como paquete a mantener. ¿Quitar de todas formas? [S/n] " #: src/pacman/trans.c:203 #, c-format @@ -1018,12 +1047,16 @@ msgstr ":: %s provoca conflictos con %s. ¿Quitar %s? [S/n]" #: src/pacman/trans.c:234 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " -msgstr ":: %s-%s: la versión local es mas reciente. ¿Actualizar de todas formas? [S/n] " +msgstr "" +":: %s-%s: la versión local es mas reciente. ¿Actualizar de todas formas? [S/" +"n] " #: src/pacman/trans.c:252 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " -msgstr ":: %s-%s: la versión local esta actualizada. ¿Actualizar de todas formas? [S/n] " +msgstr "" +":: %s-%s: la versión local esta actualizada. ¿Actualizar de todas formas? [S/" +"n] " #: src/pacman/trans.c:270 #, c-format @@ -1078,3 +1111,14 @@ msgstr "" msgid "Total Installed Size: %.2f MB\n" msgstr "Tamaño total instalado: %.2f MB\n" +#~ msgid "file" +#~ msgstr "archivo" + +#~ msgid "package" +#~ msgstr "paquete" + +#~ msgid "usage" +#~ msgstr "uso" + +#~ msgid "operation" +#~ msgstr "operación" diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po index 146e9d6e..85efa2a0 100644 --- a/src/pacman/po/fr.po +++ b/src/pacman/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-04-25 00:37-0400\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: 2007-04-20 15:02+0100\n" "Last-Translator: nam <37ii11@altern.org>\n" "Language-Team: solsTiCe d'Hiver \n" diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po index 629abbec..5dc52696 100644 --- a/src/pacman/po/hu.po +++ b/src/pacman/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: 2006-09-03 13:52+0200\n" "Last-Translator: Nagy Gabor \n" "Language-Team: Hungarian \n" @@ -90,11 +90,6 @@ msgstr "nem siker msgid "failed to release transaction (%s)\n" msgstr "nem sikerlt lezrni a tranzakcit (%s)\n" -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "ignyli a kvetkezt: %s" - #: src/pacman/log.c:63 #, c-format msgid "debug" @@ -879,11 +874,6 @@ msgstr ":: El msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: A teljes tartalom teleptse? [I/n] " @@ -1080,3 +1070,9 @@ msgstr "" #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Teljes teleptett mret: %.2f MB\n" + +#~ msgid "requires: %s" +#~ msgstr "ignyli a kvetkezt: %s" + +#~ msgid "'%s': %s\n" +#~ msgstr "'%s': %s\n" diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po index 1714bd40..f6cef831 100644 --- a/src/pacman/po/it.po +++ b/src/pacman/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-31 03:37+0200\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: 2007-03-31 04:00+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -92,11 +92,6 @@ msgstr "impossibile eseguire l'operazione richiesta (%s)\n" msgid "failed to release transaction (%s)\n" msgstr "impossibile annullare l'operazione richiesta (%s)\n" -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "richiede: %s" - #: src/pacman/log.c:63 #, c-format msgid "debug" @@ -1086,6 +1081,9 @@ msgstr "" msgid "Total Installed Size: %.2f MB\n" msgstr "Dimensione totale dei pacchetti installati: %.2f MB\n" +#~ msgid "requires: %s" +#~ msgstr "richiede: %s" + #~ msgid "'%s': %s\n" #~ msgstr "'%s': %s\n" diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot index 465c21f5..f7b7f1c3 100644 --- a/src/pacman/po/pacman.pot +++ b/src/pacman/po/pacman.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -86,11 +86,6 @@ msgstr "" msgid "failed to release transaction (%s)\n" msgstr "" -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "" - #: src/pacman/log.c:63 #, c-format msgid "debug" @@ -846,11 +841,6 @@ msgstr "" msgid "pacman: %s\n" msgstr "" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr "" diff --git a/src/pacman/po/pl_PL.po b/src/pacman/po/pl_PL.po index 7ac16c53..71c0c232 100644 --- a/src/pacman/po/pl_PL.po +++ b/src/pacman/po/pl_PL.po @@ -2,21 +2,23 @@ # Polskie tłumaczenia dla pakietu Pacman package manager. # Copyright (C) 2007 Judd Vinet # This file is distributed under the same license as the Pacman package manager package. -# Mateusz Jędrasik , 2007. # +# Mateusz Jędrasik , 2007. +# Jaroslaw Swierczynski , 2007. msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-04-03 23:07-0500\n" -"PO-Revision-Date: 2007-04-12 04:22+0200\n" -"Last-Translator: Mateusz Jędrasik \n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" +"PO-Revision-Date: 2007-05-08 00:32+0200\n" +"Last-Translator: Jaroslaw Swierczynski \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: KBabel 1.11.4\n" #: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 #: src/pacman/sync.c:531 @@ -24,8 +26,9 @@ msgstr "" msgid "" " if you're sure a package manager is not already running,\n" " you can remove %s%s\n" -msgstr "jeśli jesteś pewien że menedżer pakietów nie jest już uruchomiony,\n" -" możesz usunąć %s%s\n" +msgstr "" +"\tjeśli jesteś pewien, że menedżer pakietów nie jest już\n" +"\turuchomiony, możesz usunąć %s%s\n" #: src/pacman/add.c:79 msgid "loading package data... " @@ -91,11 +94,6 @@ msgstr "nie udało się dokonać tranzakcji (%s)\n" msgid "failed to release transaction (%s)\n" msgstr "nie udało się wyswobodzić transaction (%s)\n" -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "wymaga: %s" - #: src/pacman/log.c:63 #, c-format msgid "debug" @@ -134,50 +132,50 @@ msgstr "ostrzeżenie: " #: src/pacman/package.c:60 msgid "Explicitly installed" -msgstr "Explicitly installed" +msgstr "zainstalowano na żądanie" #: src/pacman/package.c:63 msgid "Installed as a dependency for another package" -msgstr "Zainstalowano jako wymóg innej paczki" +msgstr "zainstalowano jako zależność" #: src/pacman/package.c:66 src/pacman/package.c:90 msgid "Unknown" -msgstr "Nieznane" +msgstr "nieznany" #: src/pacman/package.c:70 src/pacman/package.c:121 msgid "Description : " -msgstr "Opis : " +msgstr "Opis : " #: src/pacman/package.c:73 src/pacman/package.c:127 #, c-format msgid "Name : %s\n" -msgstr "Nazwa : %s\n" +msgstr "Nazwa : %s\n" #: src/pacman/package.c:74 src/pacman/package.c:128 #, c-format msgid "Version : %s\n" -msgstr "Wersja : %s\n" +msgstr "Wersja : %s\n" #: src/pacman/package.c:75 #, c-format msgid "URL : %s\n" -msgstr "URL : %s\n" +msgstr "URL : %s\n" #: src/pacman/package.c:76 msgid "License :" -msgstr "Licencja :" +msgstr "Licencja :" #: src/pacman/package.c:77 src/pacman/package.c:129 msgid "Groups :" -msgstr "Grupy :" +msgstr "Grupy :" #: src/pacman/package.c:78 src/pacman/package.c:130 msgid "Provides :" -msgstr "Dostarcza :" +msgstr "Dostarcza :" #: src/pacman/package.c:79 src/pacman/package.c:131 msgid "Depends On :" -msgstr "Zależy od :" +msgstr "Zależy od :" #: src/pacman/package.c:80 src/pacman/package.c:132 msgid "Removes :" @@ -185,51 +183,51 @@ msgstr "Usuwa :" #: src/pacman/package.c:83 msgid "Required By :" -msgstr "Wymagane przez :" +msgstr "Wymag. przez :" #: src/pacman/package.c:85 src/pacman/package.c:133 msgid "Conflicts With :" -msgstr "Konfliktuje z :" +msgstr "Konflikty : " #: src/pacman/package.c:86 src/pacman/package.c:136 #, c-format msgid "Installed Size : %6.2f K\n" -msgstr "Rozmiar po instalacji : %6.2f K\n" +msgstr "Zajmuje : %6.2f K\n" #: src/pacman/package.c:87 #, c-format msgid "Packager : %s\n" -msgstr "Pakujący : %s\n" +msgstr "Pakujący : %s\n" #: src/pacman/package.c:88 #, c-format msgid "Architecture : %s\n" -msgstr "Architektura : %s\n" +msgstr "Architektura : %s\n" #: src/pacman/package.c:89 #, c-format msgid "Build Date : %s %s\n" -msgstr "Data budowy : %s %s\n" +msgstr "Data budowy : %s %s\n" #: src/pacman/package.c:90 #, c-format msgid "Build Type : %s\n" -msgstr "Typ budowy : %s\n" +msgstr "Typ budowy : %s\n" #: src/pacman/package.c:92 #, c-format msgid "Install Date : %s %s\n" -msgstr "Data instalacji : %s %s\n" +msgstr "Data inst. : %s %s\n" #: src/pacman/package.c:93 #, c-format msgid "Install Reason : %s\n" -msgstr "Powód ku instalacji : %s\n" +msgstr "Powód inst. : %s\n" #: src/pacman/package.c:95 #, c-format msgid "Install Script : %s\n" -msgstr "Skrypt instalacyjny : %s\n" +msgstr "Skrypt inst. : %s\n" #: src/pacman/package.c:96 msgid "Yes" @@ -242,31 +240,31 @@ msgstr "Nie" #: src/pacman/package.c:126 #, c-format msgid "Repository : %s\n" -msgstr "Repozytorium : %s\n" +msgstr "Repozytorium : %s\n" #: src/pacman/package.c:134 msgid "Replaces :" -msgstr "Zastępuje :" +msgstr "Zastępuje :" #: src/pacman/package.c:135 #, c-format msgid "Download Size : %6.2f K\n" -msgstr "Ilość danych do pobrania : %6.2f K\n" +msgstr "Do pobrania : %6.2f K\n" #: src/pacman/package.c:144 #, c-format msgid "MD5 Sum : %s" -msgstr "Suma MD5 : %s" +msgstr "Suma MD5 : %s" #: src/pacman/package.c:147 #, c-format msgid "SHA1 Sum : %s" -msgstr "Suma SHA1 : %s" +msgstr "Suma SHA1 : %s" #: src/pacman/package.c:158 #, c-format msgid "Backup Files:\n" -msgstr "Pliki kopii zapasowej:\n" +msgstr "Kopie zapas. :\n" #: src/pacman/package.c:180 #, c-format @@ -291,12 +289,12 @@ msgstr "BRAKUJĄCE\t\t%s\n" #: src/pacman/package.c:206 #, c-format msgid "(none)\n" -msgstr "(żadnych)\n" +msgstr "(brak)\n" #: src/pacman/package.c:246 #, c-format msgid "No changelog available for '%s'.\n" -msgstr "Brak dostępnego changelog'a dla '%s'.\n" +msgstr "Dziennik zmian dla '%s' nie jest dostępny.\n" #: src/pacman/pacman.c:90 #, c-format @@ -311,12 +309,12 @@ msgstr " %s {-V --version}\n" #: src/pacman/pacman.c:92 #, c-format msgid " %s {-A --add} [options] \n" -msgstr " %s {-A --add} [opcje] \n" +msgstr " %s {-A --add} [opcje] \n" #: src/pacman/pacman.c:93 #, c-format msgid " %s {-F --freshen} [options] \n" -msgstr " %s {-F --freshen} [opcje] \n" +msgstr " %s {-F --freshen} [opcje] \n" #: src/pacman/pacman.c:94 #, c-format @@ -326,7 +324,7 @@ msgstr " %s {-Q --query} [opcje] [pakiet]\n" #: src/pacman/pacman.c:95 #, c-format msgid " %s {-R --remove} [options] \n" -msgstr " %s {-R --remove} [opcje] \n" +msgstr " %s {-R --remove} [opcje] \n" #: src/pacman/pacman.c:96 #, c-format @@ -336,7 +334,7 @@ msgstr " %s {-S --sync} [opcje] [pakiet]\n" #: src/pacman/pacman.c:97 #, c-format msgid " %s {-U --upgrade} [options] \n" -msgstr " %s {-U --upgrade} [opcje] \n" +msgstr " %s {-U --upgrade} [opcje] \n" #: src/pacman/pacman.c:98 #, c-format @@ -350,7 +348,7 @@ msgstr "" #: src/pacman/pacman.c:101 #, c-format msgid "usage: %s {-A --add} [options] \n" -msgstr "składnia: %s {-A --add} [options] \n" +msgstr "składnia: %s {-A --add} [opcje] \n" #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138 @@ -367,12 +365,13 @@ msgstr " -d, --nodeps pomija sprawdzanie zależności\n" #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr " -f, --force wymusza instalację, nadpisując konfliktujące pliki\n" +msgstr "" +" -f, --force wymusza instalację, nadpisując konfliktujące pliki\n" #: src/pacman/pacman.c:106 #, c-format msgid "usage: %s {-R --remove} [options] \n" -msgstr "składnia: %s {-R --remove} [opcje] \n" +msgstr "składnia: %s {-R --remove} [opcje] \n" #: src/pacman/pacman.c:108 #, c-format @@ -386,7 +385,7 @@ msgstr "" msgid "" " -k, --dbonly only remove database entry, do not remove files\n" msgstr "" -" -k, --dbonly usuwa jedynie wpis w bazie danych, bez zmian na plikach \n" +" -k, --dbonly usuwa jedynie wpis w bazie danych, nie usuwa plików\n" #: src/pacman/pacman.c:111 #, c-format @@ -398,17 +397,18 @@ msgstr " -n, --nosave usuwa także pliki konfiguracyjne\n" msgid "" " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" -" -s, --recursive usuwa także zależności (które nie złamią działania innych pakietów)\n" +" -s, --recursive usuwa także zależności (nie wymagane przez inne " +"pakiety)\n" #: src/pacman/pacman.c:115 #, c-format msgid "usage: %s {-F --freshen} [options] \n" -msgstr "składnia: %s {-F --freshen} [opcje] \n" +msgstr "składnia: %s {-F --freshen} [opcje] \n" #: src/pacman/pacman.c:117 #, c-format msgid "usage: %s {-U --upgrade} [options] \n" -msgstr "składnia: %s {-U --upgrade} [opcje] \n" +msgstr "składnia: %s {-U --upgrade} [opcje] \n" #: src/pacman/pacman.c:123 #, c-format @@ -418,21 +418,20 @@ msgstr "składnia: %s {-Q --query} [opcje] [pakiet]\n" #: src/pacman/pacman.c:125 #, c-format msgid " -c, --changelog view the changelog of a package\n" -msgstr " -c, --changelog wyświetla changelog dla pakietu\n" +msgstr " -c, --changelog wyświetla dziennik zmian dla pakietu\n" #: src/pacman/pacman.c:126 #, c-format msgid "" " -e, --orphans list all packages installed as dependencies but no " "longer\n" -msgstr "" -" -e, --orphans wylistowywuje wszystkie pakiety zainstalowane jako zależności " -"ale nie\n" +msgstr " -e, --orphans pokazuje wszystkie pakiety zainstalowane jako\n" #: src/pacman/pacman.c:127 #, c-format msgid " required by any package\n" -msgstr " wymagane już przez jakikolwiek pakiet\n" +msgstr "" +" zależności, ale nie wymagane już przez żaden pakiet\n" #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format @@ -447,24 +446,28 @@ msgstr " -i, --info wyświetla informację o pakiecie\n" #: src/pacman/pacman.c:130 #, c-format msgid " -l, --list list the contents of the queried package\n" -msgstr " -l, --list wylistowywuje zawartość pytanego pakietu\n" +msgstr " -l, --list pokazuje zawartość wybranego pakietu\n" #: src/pacman/pacman.c:131 #, c-format msgid "" " -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" -" -m, --foreign wylistowywuje zainstalowane paczki nie znalezione w bazach sync\n" +" -m, --foreign pokazuje zainstalowane pakiety nie znalezione w " +"bazach\n" +" synchronizacji\n" #: src/pacman/pacman.c:132 #, c-format msgid " -o, --owns query the package that owns \n" -msgstr " -o, --owns pyta pakiet zawierającą \n" +msgstr " -o, --owns pokazuje pakiet zawierający \n" #: src/pacman/pacman.c:133 #, c-format msgid " -p, --file query a package file instead of the database\n" -msgstr " -p, --file pyta plik pakietu zamiast bazy danych\n" +msgstr "" +" -p, --file pokazuje informacje z pliku pakietu zamiast bazy " +"danych\n" #: src/pacman/pacman.c:134 #, c-format @@ -472,18 +475,19 @@ msgid "" " -s, --search search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search przeszukuje lokalnie zainstalowane pakiety według " -"pasujących ciągów\n" +" -s, --search przeszukuje lokalnie zainstalowane pakiety według\n" +" pasujących łańcuchów znaków\n" #: src/pacman/pacman.c:135 #, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr " -u, --upgrades wylistowywuje wszystkie pakiety które można uaktualnić\n" +msgstr "" +" -u, --upgrades pokazuje wszystkie pakiety, które można uaktualnić\n" #: src/pacman/pacman.c:137 #, c-format msgid "usage: %s {-S --sync} [options] [package]\n" -msgstr "składnia: %s {-S --sync} [opcje] [paczka]\n" +msgstr "składnia: %s {-S --sync} [opcje] [pakiet]\n" #: src/pacman/pacman.c:139 #, c-format @@ -491,8 +495,8 @@ msgid "" " -c, --clean remove old packages from cache directory (-cc for " "all)\n" msgstr "" -" -c, --clean usuwa stare pakiety z katalogu pamięci podręcznej " -"(-cc dla wszystkich)\n" +" -c, --clean usuwa stare pakiety z katalogu pamięci podręcznej\n" +" (-cc usuwa wszystkie)\n" #: src/pacman/pacman.c:141 #, c-format @@ -502,7 +506,7 @@ msgstr " -e, --dependsonly instaluje tylko zależności\n" #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list view a list of packages in a repo\n" -msgstr " -l, --list przegląda listę pakietów w repozytorium \n" +msgstr " -l, --list pokazuje listę pakietów w repozytorium\n" #: src/pacman/pacman.c:146 #, c-format @@ -510,15 +514,16 @@ msgid "" " -p, --print-uris print out URIs for given packages and their " "dependencies\n" msgstr "" -" -p, --print-uris wykazuje URI dla danych pakietów oraz ich " -"zależności\n" +" -p, --print-uris wyświetla adresy URI dla danych pakietów oraz ich\n" +" zależności\n" #: src/pacman/pacman.c:147 #, c-format msgid "" " -s, --search search remote repositories for matching strings\n" msgstr "" -" -s, --search przeszukuje zdalne repozytoria wedle pasujących ciągów\n" +" -s, --search przeszukuje zdalne repozytoria według pasujących\n" +" łańcuchów znaków\n" #: src/pacman/pacman.c:148 #, c-format @@ -531,15 +536,14 @@ msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" msgstr "" -" -w, --downloadonly pobiera jedynie pakiety bez instalacji/uaktualniania" -"czegokolwiek\n" +" -w, --downloadonly tylko pobiera pakiety bez instalacji/uaktualniania\n" +" czegokolwiek\n" #: src/pacman/pacman.c:150 #, c-format msgid "" " -y, --refresh download fresh package databases from the server\n" -msgstr "" -" -y, --refresh pobiera świeże bazy danych pakietów z serwera\n" +msgstr " -y, --refresh pobiera świeże bazy danych pakietów z serwera\n" #: src/pacman/pacman.c:151 #, c-format @@ -547,25 +551,28 @@ msgid "" " --ignore ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore ignoruje uaktualnienie pakietu (może zostać użyte " -"więcej niż raz)\n" +" --ignore ignoruje uaktualnienie pakietu (można użyć więcej " +"niż\n" +" raz)\n" #: src/pacman/pacman.c:153 #, c-format msgid " --config set an alternate configuration file\n" -msgstr " --config ustawia alternatywny plik konfiguracji\n" +msgstr " --config <ścżk> ustawia alternatywny plik konfiguracji\n" #: src/pacman/pacman.c:154 #, c-format msgid " --noconfirm do not ask for any confirmation\n" -msgstr " --noconfirm nie pyta o potwierdzenie ze strony użytkownika\n" +msgstr "" +" --noconfirm nie pyta o potwierdzenie ze strony użytkownika\n" #: src/pacman/pacman.c:155 #, c-format msgid "" " --ask pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask zadaje pytania z góry (zobacz stronę podręcznika)\n" +" --ask pozwala z góry udzielić odpowiedzi na pytania\n" +" (zobacz stronę podręcznika)\n" #: src/pacman/pacman.c:156 #, c-format @@ -579,7 +586,8 @@ msgstr "" msgid "" " --noscriptlet do not execute the install scriptlet if there is any\n" msgstr "" -" --noscriptlet nie wykonuje skryptu instalacyjnego jeśli takowy istnieje\n" +" --noscriptlet nie wykonuje skryptu instalacyjnego jeśli takowy " +"istnieje\n" #: src/pacman/pacman.c:158 #, c-format @@ -589,48 +597,51 @@ msgstr " -v, --verbose włącza tryb wypisywania szczegółów\n" #: src/pacman/pacman.c:159 #, c-format msgid " -r, --root set an alternate installation root\n" -msgstr " -r, --root ustawia alternatywny cel instalacji\n" +msgstr " -r, --root <ścżk> ustawia alternatywne drzewo instalacji\n" #: src/pacman/pacman.c:160 #, c-format msgid " -b, --dbpath set an alternate database location\n" -msgstr " -b, --dbpath ustawia alternatywną lokalizację bazy danych\n" +msgstr " -b, --dbpath <ścżk> ustawia alternatywną lokalizację bazy danych\n" #: src/pacman/pacman.c:161 #, c-format msgid " --cachedir set an alternate package cache location\n" -msgstr " --cachedir ustawia alternatywną lokalizację pliku " -"podręcznego pakietów\n" +msgstr "" +" --cachedir ustawia alternatywną lokalizację pamięci podręcznej\n" +" pakietów\n" #: src/pacman/pacman.c:174 #, c-format msgid " This program may be freely redistributed under\n" -msgstr " Ten program może być wolno rozpowszechniany na\n" +msgstr "" +" Ten program może być swobodnie rozpowszechniany na\n" #: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr " zasadach Licencji Publicznej GNU (GPL)\n" +msgstr "" +" zasadach Powszechnej Licencji Publicznej GNU (GPL)\n" #: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" -msgstr "'%s' nie jest ważnym poziomem debug'owania" +msgstr "'%s' nie jest poprawnym poziomem odpluskwiania" #: src/pacman/pacman.c:315 #, c-format msgid "'%s' is not a valid cache directory\n" -msgstr "'%s' nie jest ważnym katalogiem pamięci podręcznej\n" +msgstr "'%s' nie jest poprawnym katalogiem pamięci podręcznej\n" #: src/pacman/pacman.c:333 #, c-format msgid "'%s' is not a valid db path\n" -msgstr "'%s' nie jest ważną ścieżką db (bazy danych)\n" +msgstr "'%s' nie jest poprawną ścieżką db (bazy danych)\n" #: src/pacman/pacman.c:363 #, c-format msgid "'%s' is not a valid root path\n" -msgstr "'%s' nie jest ważną ścieżką docelową\n" +msgstr "'%s' nie jest poprawną ścieżką docelową\n" #: src/pacman/pacman.c:390 msgid "only one operation may be used at a time\n" @@ -761,7 +772,7 @@ msgstr ":: %s jest wymagane przez %s\n" #: src/pacman/remove.c:128 src/pacman/util.c:324 msgid "Targets:" -msgstr "Celuje:" +msgstr "Cele:" #: src/pacman/remove.c:131 msgid "" @@ -1001,7 +1012,7 @@ msgstr ":: %s jest w IgnorePkg. Zainstalować mimo to? [T/n] " #: src/pacman/trans.c:190 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr ":: %s desygnowany jest jako HoldPkg. Usunąć mimo tego? [T/n] " +msgstr ":: %s jest oznaczony jako HoldPkg. Usunąć mimo to? [T/n] " #: src/pacman/trans.c:203 #, c-format @@ -1016,12 +1027,14 @@ msgstr ":: %s konfliktuje z %s. Usunąć %s? [T/n] " #: src/pacman/trans.c:234 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " -msgstr ":: %s-%s: lokalna wersja jest nowsza. Aktualizować pomimo tego? [T/n] " +msgstr ":: %s-%s: lokalna wersja jest nowsza. Aktualizować pomimo to? [T/n] " #: src/pacman/trans.c:252 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " -msgstr ":: %s-%s: lokalny pakiet jest już w najnowszej wersji. Aktualizować mimo tego? [T/n] " +msgstr "" +":: %s-%s: lokalny pakiet jest już w najnowszej wersji. Aktualizować mimo to? " +"[T/n] " #: src/pacman/trans.c:270 #, c-format @@ -1047,7 +1060,7 @@ msgstr "sprawdzanie konfliktów plików" #: src/pacman/util.c:259 #, c-format msgid "None\n" -msgstr "Żadnych\n" +msgstr "brak\n" #: src/pacman/util.c:311 msgid "Remove:" @@ -1075,3 +1088,6 @@ msgstr "" #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Całkowity rozmiar po instalacji: %.2f MB\n" + +#~ msgid "requires: %s" +#~ msgstr "wymaga: %s" diff --git a/src/pacman/po/pt_BR.po b/src/pacman/po/pt_BR.po index a8618101..e8f53785 100644 --- a/src/pacman/po/pt_BR.po +++ b/src/pacman/po/pt_BR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: 2007-03-22 13:52-0300\n" "Last-Translator: Douglas Soares de Andrade \n" "Language-Team: Archlinux-br \n" @@ -95,11 +95,6 @@ msgstr "falha ao terminar a transação (%s)\n" msgid "failed to release transaction (%s)\n" msgstr "falha ao liberar a transação (%s)\n" -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "requer: %s" - #: src/pacman/log.c:63 #, c-format msgid "debug" @@ -903,11 +898,6 @@ msgstr ":: Atualizar o pacman primeiro? [S/n] " msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Instalar todo o conteúdo? [S/n] " @@ -1111,3 +1101,9 @@ msgstr "" #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Tamanho total da instalação: %.2f MB\n" + +#~ msgid "requires: %s" +#~ msgstr "requer: %s" + +#~ msgid "'%s': %s\n" +#~ msgstr "'%s': %s\n" diff --git a/src/pacman/po/ru_RU.po b/src/pacman/po/ru_RU.po index 36cf2501..c25fef02 100644 --- a/src/pacman/po/ru_RU.po +++ b/src/pacman/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-25 17:41+0600\n" +"POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: 2007-03-07 11:45-0500\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n" "Language-Team: Russian\n" @@ -91,11 +91,6 @@ msgstr "не удалось завершить операцию (%s)\n" msgid "failed to release transaction (%s)\n" msgstr "не удалось продолжить операцию (%s)\n" -#: src/pacman/deptest.c:84 -#, c-format -msgid "requires: %s" -msgstr "требуется: %s" - #: src/pacman/log.c:63 #, c-format msgid "debug" @@ -891,11 +886,6 @@ msgstr ":: Обновить pacman в первую очередь? [Y/n] " msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Установить в полном объеме? [Y/n] " @@ -1092,3 +1082,9 @@ msgstr "" #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Итого установлено: %.2f МБ\n" + +#~ msgid "requires: %s" +#~ msgstr "требуется: %s" + +#~ msgid "'%s': %s\n" +#~ msgstr "'%s': %s\n" -- cgit v1.2.3-70-g09d2 From 48c840fb76609046f1ecc1f3a2c83d288563e541 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 8 May 2007 08:11:59 +0000 Subject: minor: Remove trailing slashes from Server urls to prevent double slashes in paths --- lib/libalpm/server.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c index 519c5084..b8635629 100644 --- a/lib/libalpm/server.c +++ b/lib/libalpm/server.c @@ -72,6 +72,10 @@ pmserver_t *_alpm_server_new(const char *url) strcpy(u->pwd, "libalpm@guest"); } + /* remove trailing slashes, just to clean up the rest of the code */ + for(int i = strlen(u->doc) - 1; u->doc[i] == '/'; --i) + u->doc[i] = '\0'; + server->s_url = u; return server; @@ -126,6 +130,7 @@ static struct url *url_for_file(pmserver_t *server, const char *filename) } snprintf(doc, doclen, "%s/%s", server->s_url->doc, filename); + _alpm_log(PM_LOG_DEBUG, "file path: '%s'", doc); ret = downloadMakeURL(server->s_url->scheme, server->s_url->host, server->s_url->port, -- cgit v1.2.3-70-g09d2 From 8be3f1f62f7649c8cbad3d2095dc3e92b2469e6b Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 8 May 2007 08:13:13 +0000 Subject: Version bumped to 3.0.4 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2907d0ad..4aec3475 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ CFLAGS="" AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([Pacman package manager], 3.0.3, [pacman-dev@archlinux.org], [pacman]) +AC_INIT([Pacman package manager], 3.0.4, [pacman-dev@archlinux.org], [pacman]) AC_LANG([C]) AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST -- cgit v1.2.3-70-g09d2 From a01b2ad8e6a1bf3c1a56d04ae37f3b3321cbc681 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 May 2007 04:29:05 +0000 Subject: Corrections to Spanish translation --- src/pacman/po/es.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/pacman/po/es.po b/src/pacman/po/es.po index a8302012..3ee3f6e3 100644 --- a/src/pacman/po/es.po +++ b/src/pacman/po/es.po @@ -148,7 +148,7 @@ msgstr "" #: src/pacman/package.c:73 src/pacman/package.c:127 #, fuzzy, c-format msgid "Name : %s\n" -msgstr "URL : %s\n" +msgstr "Nombre : %s\n" #: src/pacman/package.c:74 src/pacman/package.c:128 #, c-format @@ -763,12 +763,12 @@ msgstr ":: grupo %s:\n" #: src/pacman/remove.c:63 msgid " Remove whole content? [Y/n] " -msgstr " ¿Quitar todo el contenido? [S/n] " +msgstr " ¿Quitar todo el contenido? [Y/n] " #: src/pacman/remove.c:67 #, c-format msgid ":: Remove %s from group %s? [Y/n] " -msgstr ":: ¿Quitar %s del grupo %s? [S/n] " +msgstr ":: ¿Quitar %s del grupo %s? [Y/n] " #: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format @@ -795,11 +795,11 @@ msgid "" "Do you want to remove these packages? [Y/n] " msgstr "" "\n" -"¿Quiere eliminar estos paquetes? [S/n] " +"¿Quiere eliminar estos paquetes? [Y/n] " #: src/pacman/sync.c:115 msgid "Do you want to remove old packages from cache? [Y/n] " -msgstr "Desea quitar los paquetes antiguos de la cache? [S/n] " +msgstr "Desea quitar los paquetes antiguos de la cache? [Y/n] " #: src/pacman/sync.c:117 msgid "removing old packages from cache... " @@ -811,7 +811,7 @@ msgstr "no se pudo acceder al directorio de la cache de paquetes\n" #: src/pacman/sync.c:181 msgid "Do you want to remove all packages from cache? [Y/n] " -msgstr "Desea borrar todos los paquetes de la cache? [S/n] " +msgstr "Desea borrar todos los paquetes de la cache? [Y/n] " #: src/pacman/sync.c:183 msgid "removing all packages from cache... " @@ -900,7 +900,7 @@ msgstr "" #: src/pacman/sync.c:522 msgid ":: Upgrade pacman first? [Y/n] " -msgstr ":: ¿Actualizar pacman primero? [S/n] " +msgstr ":: ¿Actualizar pacman primero? [Y/n] " #: src/pacman/sync.c:537 #, c-format @@ -909,12 +909,12 @@ msgstr "pacman: %s\n" #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " -msgstr ":: ¿Instalar el todo el contenido? [S/n] " +msgstr ":: ¿Instalar el todo el contenido? [Y/n] " #: src/pacman/sync.c:579 #, c-format msgid ":: Install %s from group %s? [Y/n] " -msgstr ":: ¿Instalar %s del grupo %s? [S/n] " +msgstr ":: ¿Instalar %s del grupo %s? [Y/n] " #: src/pacman/sync.c:603 #, c-format @@ -939,7 +939,7 @@ msgstr "" #: src/pacman/sync.c:676 msgid "Proceed with download? [Y/n] " -msgstr "¿Continuar con la descarga? [S/n] " +msgstr "¿Continuar con la descarga? [Y/n] " #: src/pacman/sync.c:684 msgid "" @@ -951,7 +951,7 @@ msgstr "" #: src/pacman/sync.c:688 msgid "Proceed with installation? [Y/n] " -msgstr "¿Continuar con la instalación? [S/n] " +msgstr "¿Continuar con la instalación? [Y/n] " #: src/pacman/trans.c:55 msgid "checking dependencies... " @@ -1021,47 +1021,47 @@ msgstr ":: Descargando paquetes desde %s...\n" msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " msgstr "" ":: %1$s requiere %2$s que en los paquetes a ignorar (IgnorePkg). ¿Instalar %2" -"$s? [S/n] " +"$s? [Y/n] " #: src/pacman/trans.c:177 #, c-format msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " -msgstr ":: %s esta en la lista a ignorar. ¿Instalar de todas formas? [S/n] " +msgstr ":: %s esta en la lista a ignorar. ¿Instalar de todas formas? [Y/n] " #: src/pacman/trans.c:190 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " msgstr "" -":: %s esta indicado como paquete a mantener. ¿Quitar de todas formas? [S/n] " +":: %s esta indicado como paquete a mantener. ¿Quitar de todas formas? [Y/n] " #: src/pacman/trans.c:203 #, c-format msgid ":: Replace %s with %s/%s? [Y/n] " -msgstr ":: ¿Reemplazar %s con %s/%s? [S/n] " +msgstr ":: ¿Reemplazar %s con %s/%s? [Y/n] " #: src/pacman/trans.c:218 #, c-format msgid ":: %s conflicts with %s. Remove %s? [Y/n] " -msgstr ":: %s provoca conflictos con %s. ¿Quitar %s? [S/n]" +msgstr ":: %s provoca conflictos con %s. ¿Quitar %s? [Y/n]" #: src/pacman/trans.c:234 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " msgstr "" -":: %s-%s: la versión local es mas reciente. ¿Actualizar de todas formas? [S/" +":: %s-%s: la versión local es mas reciente. ¿Actualizar de todas formas? [Y/" "n] " #: src/pacman/trans.c:252 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " msgstr "" -":: %s-%s: la versión local esta actualizada. ¿Actualizar de todas formas? [S/" +":: %s-%s: la versión local esta actualizada. ¿Actualizar de todas formas? [Y/" "n] " #: src/pacman/trans.c:270 #, c-format msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " -msgstr ":: El Archivo %s esta corrupto. Desea borrarlo? [S/n] " +msgstr ":: El Archivo %s esta corrupto. Desea borrarlo? [Y/n] " #: src/pacman/trans.c:326 msgid "installing" -- cgit v1.2.3-70-g09d2 From 2c74e0ad8a426ad58ebaa1a71ba76918d3734cb5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 May 2007 04:40:13 +0000 Subject: * Updated German translation Pierre Schmitz --- src/pacman/po/de.po | 57 +++++++++++++++++------------------------------------ 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index 9aaf220d..09990b95 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2007-04-28 04:02-0400\n" -"PO-Revision-Date: 2007-04-17 20:18+0200\n" +"PO-Revision-Date: 2007-05-09 17:38+0200\n" "Last-Translator: Pierre Schmitz \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -364,8 +364,7 @@ msgstr " -d, --nodeps Überspringt die Abhängigkeitsprüfung\n" #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr "" -" -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" +msgstr " -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" #: src/pacman/pacman.c:106 #, c-format @@ -374,15 +373,12 @@ msgstr "Verwendung: %s {-R --remove} [Optionen] \n" #: src/pacman/pacman.c:108 #, c-format -msgid "" -" -c, --cascade remove packages and all packages that depend on them\n" -msgstr "" -" -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" +msgid " -c, --cascade remove packages and all packages that depend on them\n" +msgstr " -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" #: src/pacman/pacman.c:110 #, c-format -msgid "" -" -k, --dbonly only remove database entry, do not remove files\n" +msgid " -k, --dbonly only remove database entry, do not remove files\n" msgstr "" " -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien " "entfernen\n" @@ -394,8 +390,7 @@ msgstr " -n, --nosave Auch Konfigurationsdateien entfernen\n" #: src/pacman/pacman.c:112 #, c-format -msgid "" -" -s, --recursive remove dependencies also (that won't break packages)\n" +msgid " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" " -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine " "Pakete)\n" @@ -451,8 +446,7 @@ msgstr " -l, --list Zeigt den Inhalt des abgefragten Paketes an\n" #: src/pacman/pacman.c:131 #, 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 Zeigt alle Pakete an, die nicht in den Sync-db(s)\n" " gefunden wurden\n" @@ -474,8 +468,7 @@ msgstr "" msgid "" " -s, --search search locally-installed packages for matching " "strings\n" -msgstr "" -" -s, --search Durchsucht lokal installierte Pakete nach einem Wort\n" +msgstr " -s, --search Durchsucht lokal installierte Pakete nach einem Wort\n" #: src/pacman/pacman.c:135 #, c-format @@ -504,8 +497,7 @@ msgstr " -e, --dependsonly Nur Abhängigkeiten installieren\n" #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list view a list of packages in a repo\n" -msgstr "" -" -l, --list Zeigt eine Liste aller Pakete eines Repositoriums an\n" +msgstr " -l, --list Zeigt eine Liste aller Pakete eines Repositoriums an\n" #: src/pacman/pacman.c:146 #, c-format @@ -518,10 +510,8 @@ msgstr "" #: src/pacman/pacman.c:147 #, c-format -msgid "" -" -s, --search search remote repositories for matching strings\n" -msgstr "" -" -s, --search Durchsucht entfernte Repositorien nach einem Wort\n" +msgid " -s, --search search remote repositories for matching strings\n" +msgstr " -s, --search Durchsucht entfernte Repositorien nach einem Wort\n" #: src/pacman/pacman.c:148 #, c-format @@ -540,8 +530,7 @@ msgstr "" #: src/pacman/pacman.c:150 #, 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 Lädt frische Paketdatenbank vom Server\n" #: src/pacman/pacman.c:151 @@ -565,25 +554,20 @@ msgstr " --noconfirm Niemals nach einer Bestätigung fragen\n" #: src/pacman/pacman.c:155 #, c-format -msgid "" -" --ask pre-specify answers for questions (see manpage)\n" -msgstr "" -" --ask Antworten für Fragen vorherbestimmen (Siehe manpage)\n" +msgid " --ask pre-specify answers for questions (see manpage)\n" +msgstr " --ask Antworten für Fragen vorherbestimmen (Siehe manpage)\n" #: src/pacman/pacman.c:156 #, 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 Keine Fortschrittsanzeige anzeigen, wenn Dateien\n" " heruntergeladen werden\n" #: src/pacman/pacman.c:157 #, c-format -msgid "" -" --noscriptlet do not execute the install scriptlet if there is any\n" -msgstr "" -" --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" +msgid " --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr " --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" #: src/pacman/pacman.c:158 #, c-format @@ -1076,15 +1060,10 @@ msgid "" "Total Package Size: %.2f MB\n" msgstr "" "\n" -"Gesamte Paketgröße : %.2f MB\n" +"Gesamte Paketgröße: %.2f MB\n" #: src/pacman/util.c:337 #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Gesamtgröße der installierten Pakete : %.2f MB\n" -#~ msgid "requires: %s" -#~ msgstr "Erfordert: %s" - -#~ msgid "'%s': %s\n" -#~ msgstr "'%s':%s\n" -- cgit v1.2.3-70-g09d2 From 6a0059ddd5e96617adf4200ad1f9f74545031c85 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 16 May 2007 17:14:19 +0000 Subject: Ensure MAKEFLAGS and DISTCC_HOSTS are exported if required --- scripts/makepkg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg b/scripts/makepkg index 3ff28ee3..c192855f 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -862,9 +862,10 @@ else # use distcc if it is requested (check buildenv and PKGBUILD opts) if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH + export DISTCC_HOSTS elif [ "$(check_option distcc)" = "n" ]; then # if it is not wanted, clear the makeflags too - export MAKEFLAGS="" + MAKEFLAGS="" fi # use ccache if it is requested (check buildenv and PKGBUILD opts) @@ -874,7 +875,7 @@ else # clear user-specified makeflags if requested if [ "$(check_option makeflags)" = "n" ]; then - export MAKEFLAGS="" + MAKEFLAGS="" fi # build @@ -884,9 +885,8 @@ else unset LC_ALL LC_MESSAGES LANG umask 0022 - # ensure CFLAGS and CXXFLAGS are used - export CFLAGS - export CXXFLAGS + # ensure all necessary build variables are exported + export CFLAGS CXXFLAGS MAKEFLAGS #check for "exit on syntax error" shell option echo $SHELLOPTS | grep errexit 2>&1 >/dev/null -- cgit v1.2.3-70-g09d2 From 5786c6e4a31b75fdb07f1e1e43741910053f559f Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 18 May 2007 03:26:24 +0000 Subject: Fix libarchive permission extraction Hackish fix to ensure libarchive extracts files and dirs with the right permissions. For some reason extracting /tmp on install wasn't handled properly by librachive, so an explicit chmod will fix this. Signed-off-by: Aaron Griffin --- lib/libalpm/add.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ddeca317..c2b1286a 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -704,6 +704,8 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), filename, strerror(errno)); alpm_logaction(_("error: could not extract %s (%s)"), filename, strerror(errno)); errors++; + } else { + chmod(filename, archive_entry_mode(entry)); } /* calculate an hash if this is in newpkg's backup */ -- cgit v1.2.3-70-g09d2 From 0cfb412220f3513e23aba9105d756246e5866ca6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 18 Jun 2007 00:15:36 +0000 Subject: Check in changes for 3.0.5 release (mostly backports) * Update the mirrorlist * Fix FS7338- the previous repo-add fix didn't quite do the job, but it should be fixed now. * Small updates to translations files * Add -mtune=generic to default CFLAGS (req'd by GCC 4.2) --- NEWS | 6 ++++++ configure.ac | 2 +- etc/makepkg.conf.in | 4 ++-- etc/pacman.d/mirrorlist.in | 8 ++++++++ lib/libalpm/po/de.po | 26 ++++++++++++------------ lib/libalpm/po/en_GB.po | 26 ++++++++++++------------ lib/libalpm/po/es.po | 26 ++++++++++++------------ lib/libalpm/po/fr.po | 26 ++++++++++++------------ lib/libalpm/po/hu.po | 26 ++++++++++++------------ lib/libalpm/po/it.po | 26 ++++++++++++------------ lib/libalpm/po/libalpm.pot | 26 ++++++++++++------------ lib/libalpm/po/pl_PL.po | 34 ++++++++++++++++---------------- lib/libalpm/po/pt_BR.po | 26 ++++++++++++------------ lib/libalpm/po/ru_RU.po | 26 ++++++++++++------------ scripts/repo-add | 2 +- src/pacman/po/de.po | 49 ++++++++++++++++++++++++++++++---------------- src/pacman/po/pl_PL.po | 10 +++++----- 17 files changed, 189 insertions(+), 160 deletions(-) diff --git a/NEWS b/NEWS index 8a43ff93..efe58270 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.0.5 - Add -mtune=generic to default CFLAGS in makepkg.conf + - Small updates to translations + - repo-add: fix conflicts issue for real this time + - Fix issue with libarchive incorrectly setting permissions +3.0.4 - Updated translations + - repo-add: fix issue where conflicts were not put in database 3.0.3 - Updated translations - repo-add: fixed a desc file clobbering issue 3.0.2 - fix a bug where pre/post_remove scriptlets were not ran diff --git a/configure.ac b/configure.ac index 4aec3475..5138ed6a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ CFLAGS="" AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([Pacman package manager], 3.0.4, [pacman-dev@archlinux.org], [pacman]) +AC_INIT([Pacman package manager], 3.0.5, [pacman-dev@archlinux.org], [pacman]) AC_LANG([C]) AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9ac0ef2d..90623c9d 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -21,8 +21,8 @@ CHOST="@CHOST@" #-- Exclusive: will only run on @CARCHFLAGS@ # -mtune builds exclusively for an architecture # -mcpu optimizes for an architecture, but builds for the whole processor family -CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe" -CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe" +CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe" +CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index 53fefa67..c9f0da88 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -11,6 +11,10 @@ Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@ Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@ +# South America +# - Brazil +Server = http://archlinux.c3sl.ufpr.br/@@REPO@@/os/@CARCH@ + # Europe # - Austria Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@@REPO@@/os/@CARCH@ @@ -67,6 +71,10 @@ Server = ftp://ftp.linux.org.tr/pub/archlinux/@@REPO@@/os/@CARCH@ # - Ukraine Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@@REPO@@/os/@CARCH@ +# Asia +# - Israel +Server = http://mirror.isoc.org.il/pub/archlinux/@@REPO@@/os/@CARCH@ + # Australia Server = ftp://mirror.pacific.net.au/linux/archlinux/@@REPO@@/os/@CARCH@ diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 90f9a0a7..1f664122 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-04-17 20:26+0200\n" "Last-Translator: Pierre Schmitz \n" "Language-Team: German \n" @@ -227,59 +227,59 @@ msgstr "Entpacke %s" msgid "error: could not extract %s (%s)" msgstr "Fehler: Konnte %s nicht entpacken (%s)" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "Hänge Sicherungseintrag für %s an" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "Fehler traten auf, während %s %s" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "Aktualisiere" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "Installiere" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "'%s' wird nicht mehr von %s bereitgestellt (%s => %s)" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "Aktualisiere '%s' aufgrund einer Bereitstellungsänderung (%s)" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "Konnte Bereitstellung '%s' von '%s' nicht aktualisieren" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "Aktualisiere Datenbank" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "Füge Datenbankeintrag '%s' hinzu" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "Führe \"ldconfig -r %s\" aus" diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index e1336c95..fae162cf 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-03-07 21:05+1100\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" @@ -222,59 +222,59 @@ msgstr "extracting %s" msgid "error: could not extract %s (%s)" msgstr "error: could not extract %s (%s)" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "appending backup entry for %s" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "errors occurred while %s %s" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "upgrading" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "installing" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "provision '%s' has been removed from package %s (%s => %s)" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "updating '%s' due to provision change (%s)" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "could not update provision '%s' from '%s'" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "updating database" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "adding database entry '%s'" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "could not update database entry %s-%s" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "could not add entry '%s' in cache" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "running \"ldconfig -r %s\"" diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index b5d861b3..11376832 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-04-29 11:12-0300\n" "Last-Translator: Juan Pablo González Tognarelli \n" "Language-Team: juan pablo gonzález tognarelli \n" @@ -228,59 +228,59 @@ msgstr "descomprimiendo %s" msgid "error: could not extract %s (%s)" msgstr "error: no se pudo descomprimir %s (%s)" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "agregando la entrada de respaldo para %s" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "ocurrieron errores mientras %s %s" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "actualizando" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "instalando" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "el provisional '%s' ha sido eliminado desde el paquete %s (%s => %s)" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "actualizando '%s' debido a un cambio de provisiones (%s)" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "no se pudo actualizar la provisión '%s' desde '%s'" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "actualizando la base de datos" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "agregando a la base de datos '%s'" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "no se pudo actualizar en la base de datos la entrada %s-%s" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "no se pudo agregar '%s' en la cache" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "ejecutando \"ldconfig -r %s\"" diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index a33277c9..4f396b21 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-04-17 12:45+0100\n" "Last-Translator: nam <37ii11@altern.org>\n" "Language-Team: solsTiCe d'Hiver \n" @@ -225,59 +225,59 @@ msgstr "extraction de %s" msgid "error: could not extract %s (%s)" msgstr "erreur: l'extraction de %s (%s) a échoué" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "ajoute une entrée de sauvegarde pour %s" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "des erreurs sont survenues pendant %s %s" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "mise à jour" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "installation" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "la condition '%s' a été supprimée du paquet %s (%s => %s)" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "mise à jour de '%s' suite à un changement de contenu (%s)" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "la mise à jour du contenu '%s' dans '%s' a échoué" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "mise à jour de la base de données" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "ajout de l'entrée de base de données '%s'" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "la mise à jour l'entrée de base de données %s-%s a échoué" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "l'ajout au cache de l'entrée '%s' a échoué" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "exécution de \"ldconfig -r %s\"" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index 5320b97f..e0468cbf 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-03-14 13:45+0100\n" "Last-Translator: Nagy Gabor \n" "Language-Team: \n" @@ -224,59 +224,59 @@ msgstr "a %s kit msgid "error: could not extract %s (%s)" msgstr "hiba: nem sikerlt kitmrteni: %s (%s)" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "hiba %s kzben: %s" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "frissts" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "telepts" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "az adatbzis frisstse" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "adatbzis mez hozzadsa '%s'" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "sikertelen a '%s-%s' adatbzis-bejegyzs frisstse" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "sikertelen a '%s' bejegyzs hozzadsa a gyorsttrhoz" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "az \"ldconfig -r %s\" futtatsa" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index 3fb1f79f..9f528756 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-04-17 22:00+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -224,59 +224,59 @@ msgstr "estrazione di %s in corso" msgid "error: could not extract %s (%s)" msgstr "errore: impossibile estrarre %s (%s)" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "aggiunta in corso della voce di backup per %s" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "si sono verificati degli errori durante %s %s" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "l'aggiornamento" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "l'installazione" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "'%s' è stato rimosso dal pacchetto %s (%s => %s)" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "aggiornamento in corso di '%s' dovuto ad un cambiamento (%s)" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "impossibile aggiornare '%s' da '%s'" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "aggiornamento del database in corso" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "inclusione della voce '%s' nel database" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "impossibile aggiornare la voce %s-%s nel database" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "impossible includere la voce '%s' nella cache" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "esecuzione in corso di \"ldconfig -r %s\"" diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index e268671b..fd9b1c99 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -221,59 +221,59 @@ msgstr "" msgid "error: could not extract %s (%s)" msgstr "" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "" diff --git a/lib/libalpm/po/pl_PL.po b/lib/libalpm/po/pl_PL.po index b1a4bf62..0ea1d982 100644 --- a/lib/libalpm/po/pl_PL.po +++ b/lib/libalpm/po/pl_PL.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-04-12 04:23+0200\n" "Last-Translator: Mateusz Jędrasik \n" "Language-Team: Polish \n" @@ -225,59 +225,59 @@ msgstr "rozpakowywanie %s" msgid "error: could not extract %s (%s)" msgstr "błąd: nie udało się rozpakować %s (%s)" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "dodawanie pozycji kopii zapasowej dla %s" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "wystąpiły błędy podczas %s %s" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "aktualizowanie" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "instalowanie" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "zasób '%s' został usunięty z pakietu %s (%s => %s)" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "aktualizowanie '%s' z powodu zmiany zasobu (%s)" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "nie udało się zaktualizować zasobu '%s' z '%s'" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "aktualizowanie bazy danych" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "dodawanie pozycji bazy danych '%s'" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "uruchamianie \"ldconfig -r %s\"" @@ -884,7 +884,7 @@ msgstr "nie udało się znaleźć bądź odczytać pakietu" #: lib/libalpm/error.c:104 msgid "invalid or corrupted package" -msgstr "nieprawidłowy bądź skorumpowany pakiet" +msgstr "nieprawidłowy bądź uszkodzony pakiet" #: lib/libalpm/error.c:106 msgid "cannot open package file" @@ -912,7 +912,7 @@ msgstr "nieprawidłowa nazwa pakietu" #: lib/libalpm/error.c:118 msgid "corrupted package" -msgstr "skorumpowany pakiet" +msgstr "uszkodzony pakiet" #: lib/libalpm/error.c:120 msgid "no such repository" @@ -1336,12 +1336,12 @@ msgstr "nie udało się otrzymać sum kontrolnych md5 lub sha1 dla pakietu %s\n" #: lib/libalpm/sync.c:894 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" -msgstr "archiwum %s było skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n" +msgstr "archiwum %s było uszkodzone (błąd sumy kontrolnej MD5 lub SHA1)\n" #: lib/libalpm/sync.c:896 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" -msgstr "archiwum %s jest skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n" +msgstr "archiwum %s jest uszkodzone (błąd sumy kontrolnej MD5 lub SHA1)\n" #: lib/libalpm/sync.c:917 msgid "could not create removal transaction" diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index f865a057..e2754e29 100644 --- a/lib/libalpm/po/pt_BR.po +++ b/lib/libalpm/po/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-03-07 01:18-0300\n" "Last-Translator: Douglas Soares de Andrade \n" "Language-Team: Português do Brasil \n" @@ -229,59 +229,59 @@ msgstr "extraindo %s" msgid "error: could not extract %s (%s)" msgstr "erro: não foi possível descompactar %s (%s)" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "adicionando entrada de backup para %s" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "erros ocorreram durante %s %s" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "atualizando" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "instalando" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "a provisão '%s' foi removida do pacote %s (%s => %s)" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "atualizando '%s' devido a uma mudança de provisão (%s)" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "não foi possível atualizar a provisão '%s' para '%s'" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "atualizando base de dados" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "adicionando a entrada de base de dados '%s'" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "não foi possível atualizar a entrada na base de dados %s-%s" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "não foi possível adicionar a entrada '%s' ao cache" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "executando \"ldconfig -r %s\"" diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru_RU.po index 0a227b81..445c120d 100644 --- a/lib/libalpm/po/ru_RU.po +++ b/lib/libalpm/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-05-07 23:36-0400\n" +"POT-Creation-Date: 2007-06-17 20:11-0400\n" "PO-Revision-Date: 2007-03-16 02:52+1000\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n" "MIME-Version: 1.0\n" @@ -223,59 +223,59 @@ msgstr "извлекаю %s" msgid "error: could not extract %s (%s)" msgstr "ошибка: не могу извлечь %s (%s)" -#: lib/libalpm/add.c:717 +#: lib/libalpm/add.c:719 #, c-format msgid "appending backup entry for %s" msgstr "добавляю запись для отката для %s" -#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 +#: lib/libalpm/add.c:751 lib/libalpm/add.c:753 #, c-format msgid "errors occurred while %s %s" msgstr "во время %s %s произошли ошибки" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "upgrading" msgstr "обновляю" -#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 +#: lib/libalpm/add.c:752 lib/libalpm/add.c:754 msgid "installing" msgstr "устанавливаю" -#: lib/libalpm/add.c:769 +#: lib/libalpm/add.c:771 #, fuzzy, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "'%s' был удален из пакета %s (%s => %s)" -#: lib/libalpm/add.c:781 +#: lib/libalpm/add.c:783 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "обновляю '%s' в связи с изменениями в (%s)" -#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 +#: lib/libalpm/add.c:787 lib/libalpm/add.c:788 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "не могу обновить '%s' из '%s'" -#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336 msgid "updating database" msgstr "обновляю базу данных" -#: lib/libalpm/add.c:800 +#: lib/libalpm/add.c:802 #, c-format msgid "adding database entry '%s'" msgstr "добавляю в базу данных запись '%s'" -#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 +#: lib/libalpm/add.c:805 lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "не могу обновить в базе данных запись %s-%s" -#: lib/libalpm/add.c:811 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "не могу добавить запись '%s' в кэш" -#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 +#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "запускаю \"ldconfig -r %s\"" diff --git a/scripts/repo-add b/scripts/repo-add index 45515d1b..642100d0 100755 --- a/scripts/repo-add +++ b/scripts/repo-add @@ -117,7 +117,7 @@ db_write_entry() license=*) _licenses="$_licenses $license" ;; replaces=*) _replaces="$_replaces $replaces" ;; provides=*) _provides="$_provides $provides" ;; - conflict=*) _conflicts="$_conflicts $conflicts" ;; + conflict=*) _conflicts="$_conflicts $conflict" ;; esac done diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index 09990b95..1ac7f934 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -364,7 +364,8 @@ msgstr " -d, --nodeps Überspringt die Abhängigkeitsprüfung\n" #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr " -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" +msgstr "" +" -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" #: src/pacman/pacman.c:106 #, c-format @@ -373,12 +374,15 @@ msgstr "Verwendung: %s {-R --remove} [Optionen] \n" #: src/pacman/pacman.c:108 #, c-format -msgid " -c, --cascade remove packages and all packages that depend on them\n" -msgstr " -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" +msgid "" +" -c, --cascade remove packages and all packages that depend on them\n" +msgstr "" +" -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" #: src/pacman/pacman.c:110 #, c-format -msgid " -k, --dbonly only remove database entry, do not remove files\n" +msgid "" +" -k, --dbonly only remove database entry, do not remove files\n" msgstr "" " -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien " "entfernen\n" @@ -390,7 +394,8 @@ msgstr " -n, --nosave Auch Konfigurationsdateien entfernen\n" #: src/pacman/pacman.c:112 #, c-format -msgid " -s, --recursive remove dependencies also (that won't break packages)\n" +msgid "" +" -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" " -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine " "Pakete)\n" @@ -446,7 +451,8 @@ msgstr " -l, --list Zeigt den Inhalt des abgefragten Paketes an\n" #: src/pacman/pacman.c:131 #, 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 Zeigt alle Pakete an, die nicht in den Sync-db(s)\n" " gefunden wurden\n" @@ -468,7 +474,8 @@ msgstr "" msgid "" " -s, --search search locally-installed packages for matching " "strings\n" -msgstr " -s, --search Durchsucht lokal installierte Pakete nach einem Wort\n" +msgstr "" +" -s, --search Durchsucht lokal installierte Pakete nach einem Wort\n" #: src/pacman/pacman.c:135 #, c-format @@ -497,7 +504,8 @@ msgstr " -e, --dependsonly Nur Abhängigkeiten installieren\n" #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list view a list of packages in a repo\n" -msgstr " -l, --list Zeigt eine Liste aller Pakete eines Repositoriums an\n" +msgstr "" +" -l, --list Zeigt eine Liste aller Pakete eines Repositoriums an\n" #: src/pacman/pacman.c:146 #, c-format @@ -510,8 +518,10 @@ msgstr "" #: src/pacman/pacman.c:147 #, c-format -msgid " -s, --search search remote repositories for matching strings\n" -msgstr " -s, --search Durchsucht entfernte Repositorien nach einem Wort\n" +msgid "" +" -s, --search search remote repositories for matching strings\n" +msgstr "" +" -s, --search Durchsucht entfernte Repositorien nach einem Wort\n" #: src/pacman/pacman.c:148 #, c-format @@ -530,7 +540,8 @@ msgstr "" #: src/pacman/pacman.c:150 #, 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 Lädt frische Paketdatenbank vom Server\n" #: src/pacman/pacman.c:151 @@ -554,20 +565,25 @@ msgstr " --noconfirm Niemals nach einer Bestätigung fragen\n" #: src/pacman/pacman.c:155 #, c-format -msgid " --ask pre-specify answers for questions (see manpage)\n" -msgstr " --ask Antworten für Fragen vorherbestimmen (Siehe manpage)\n" +msgid "" +" --ask pre-specify answers for questions (see manpage)\n" +msgstr "" +" --ask Antworten für Fragen vorherbestimmen (Siehe manpage)\n" #: src/pacman/pacman.c:156 #, 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 Keine Fortschrittsanzeige anzeigen, wenn Dateien\n" " heruntergeladen werden\n" #: src/pacman/pacman.c:157 #, c-format -msgid " --noscriptlet do not execute the install scriptlet if there is any\n" -msgstr " --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" +msgid "" +" --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr "" +" --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" #: src/pacman/pacman.c:158 #, c-format @@ -1066,4 +1082,3 @@ msgstr "" #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Gesamtgröße der installierten Pakete : %.2f MB\n" - diff --git a/src/pacman/po/pl_PL.po b/src/pacman/po/pl_PL.po index 71c0c232..a8f33c36 100644 --- a/src/pacman/po/pl_PL.po +++ b/src/pacman/po/pl_PL.po @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2007-04-28 04:02-0400\n" "PO-Revision-Date: 2007-05-08 00:32+0200\n" -"Last-Translator: Jaroslaw Swierczynski \n" +"Last-Translator: Mateusz Jędrasik \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +48,7 @@ msgstr "gotowe.\n" #: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616 #, c-format msgid "failed to prepare transaction (%s)\n" -msgstr "nie udało się przygotować tranzakcji (%s)\n" +msgstr "nie udało się przygotować transakcji (%s)\n" #: src/pacman/add.c:104 #, c-format @@ -86,7 +86,7 @@ msgstr ":: %.1f MB wymagane, dostępnych %.1f MB" #: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700 #, c-format msgid "failed to commit transaction (%s)\n" -msgstr "nie udało się dokonać tranzakcji (%s)\n" +msgstr "nie udało się dokonać transakcji (%s)\n" #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524 #: src/pacman/sync.c:741 @@ -758,7 +758,7 @@ msgstr ":: Usunąć %s z grupy %s? [T/n] " #: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format msgid "failed to init transaction (%s)\n" -msgstr "nie udało się zainicjować tranzakcji (%s)\n" +msgstr "nie udało się zainicjować transakcji (%s)\n" #: src/pacman/remove.c:92 #, c-format @@ -1039,7 +1039,7 @@ msgstr "" #: src/pacman/trans.c:270 #, c-format msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " -msgstr ":: Archiwum %s jest skorumpowane. Czy chcesz je usunąć? [T/n] " +msgstr ":: Archiwum %s jest uszkodzone. Czy chcesz je usunąć? [T/n] " #: src/pacman/trans.c:326 msgid "installing" -- cgit v1.2.3-70-g09d2 From 4b00fdeef0607916d4f6442f777b83b4cd4d0f83 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 20 Jun 2007 21:52:24 +0000 Subject: Revert erroneous chmod 'fix'. --- lib/libalpm/add.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index c2b1286a..ddeca317 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -704,8 +704,6 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), filename, strerror(errno)); alpm_logaction(_("error: could not extract %s (%s)"), filename, strerror(errno)); errors++; - } else { - chmod(filename, archive_entry_mode(entry)); } /* calculate an hash if this is in newpkg's backup */ -- cgit v1.2.3-70-g09d2 From 51aeac33e9ab34c926dd9c3371e3d287c7dde9d3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 26 Jun 2007 19:35:00 +0000 Subject: Add fix for config parsing issue in case of another pacman 3.0.X release --- lib/libalpm/alpm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 227cd5e9..afb6226b 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -940,6 +940,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } _alpm_strtrim(key); strncpy(origkey, key, min(255, strlen(key))); + origkey[min(255, strlen(key))] = '\0'; key = _alpm_strtoupper(key); if(!strlen(section) && strcmp(key, "INCLUDE")) { RET_ERR(PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, -1); -- cgit v1.2.3-70-g09d2 From d8b57fcb76e3de6899b500db42706bce75dfd7fe Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 10 Jul 2007 15:08:33 +0000 Subject: backport fix for FS 7578 --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 5138ed6a..f85c5193 100644 --- a/configure.ac +++ b/configure.ac @@ -148,6 +148,9 @@ if test -z "$LIBDOWNLOAD"; then AC_MSG_ERROR("libdownload is needed to compile pacman!"); fi +# Enable large file support if available +AC_SYS_LARGEFILE + dnl Set config location AC_MSG_CHECKING(for configuration file name) if test -n "$configfile"; then -- cgit v1.2.3-70-g09d2 From 9ea7c5c402fd6686cfa3cefeb80c115109538701 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 17 Aug 2007 20:07:05 +0000 Subject: Fix symlink overwrite issue in CVS --- lib/libalpm/add.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ddeca317..afe7a45b 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -700,7 +700,9 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) archive_entry_set_pathname(entry, filename); - if(archive_read_extract(archive, entry, ARCHIVE_EXTRACT_FLAGS) != ARCHIVE_OK) { + int ret = archive_read_extract(archive, entry, + ARCHIVE_EXTRACT_FLAGS | ARCHIVE_EXTRACT_NO_OVERWRITE); + if(ret != ARCHIVE_OK && ret != ARCHIVE_WARN) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), filename, strerror(errno)); alpm_logaction(_("error: could not extract %s (%s)"), filename, strerror(errno)); errors++; -- cgit v1.2.3-70-g09d2 From 05346af459c7eaeddf1542acb6f13f8ffd9f6695 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 16 Sep 2007 21:20:19 +0000 Subject: Make current -> core updates --- etc/abs/Makefile.am | 2 +- etc/abs/abs.conf | 2 +- etc/abs/supfile.arch | 15 --------------- etc/abs/supfile.core | 15 +++++++++++++++ etc/pacman.conf.in | 4 ++-- etc/pacman.d/Makefile.am | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 etc/abs/supfile.arch create mode 100644 etc/abs/supfile.core diff --git a/etc/abs/Makefile.am b/etc/abs/Makefile.am index 69727e91..1c10d0b7 100644 --- a/etc/abs/Makefile.am +++ b/etc/abs/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = abs.conf \ - supfile.arch \ supfile.community \ + supfile.core \ supfile.extra \ supfile.testing \ supfile.unstable diff --git a/etc/abs/abs.conf b/etc/abs/abs.conf index 66ba5277..782b269b 100644 --- a/etc/abs/abs.conf +++ b/etc/abs/abs.conf @@ -9,5 +9,5 @@ # Supfiles to be parsed by abs (in this order) # (prefix a module with a ! to disable it) # -SUPFILES=(arch extra !unstable !community !testing) +SUPFILES=(core extra !unstable !community !testing) diff --git a/etc/abs/supfile.arch b/etc/abs/supfile.arch deleted file mode 100644 index e23a785d..00000000 --- a/etc/abs/supfile.arch +++ /dev/null @@ -1,15 +0,0 @@ -# -# /etc/abs/supfile.arch -# - -# this is the host containing the current PKGBUILD files -*default host=cvs.archlinux.org - -*default release=cvs -*default delete -*default use-rel-suffix -*default compress -#*default umask=002 - -*default tag=CURRENT -arch diff --git a/etc/abs/supfile.core b/etc/abs/supfile.core new file mode 100644 index 00000000..1d34b69c --- /dev/null +++ b/etc/abs/supfile.core @@ -0,0 +1,15 @@ +# +# /etc/abs/supfile.arch +# + +# this is the host containing the core PKGBUILD files +*default host=cvs.archlinux.org + +*default release=cvs +*default delete +*default use-rel-suffix +*default compress +#*default umask=002 + +*default tag=CURRENT +core diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 56b1f833..f76c2acf 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -22,9 +22,9 @@ HoldPkg = pacman glibc #[testing] #Include = /etc/pacman.d/testing -[current] +[core] # Add your preferred servers here, they will be used first -Include = /etc/pacman.d/current +Include = /etc/pacman.d/core [extra] # Add your preferred servers here, they will be used first diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am index c8dded4b..341b3efa 100644 --- a/etc/pacman.d/Makefile.am +++ b/etc/pacman.d/Makefile.am @@ -1,5 +1,5 @@ pkgsysconfdir = ${sysconfdir}/pacman.d -dist_pkgsysconf_DATA = community current extra release testing unstable +dist_pkgsysconf_DATA = community core extra release testing unstable $(dist_pkgsysconf_DATA): mirrorlist sed "s|@@REPO@@|$@|g" <$< >$@ -- cgit v1.2.3-70-g09d2 From 3166257396e2e7c657e3a170e7f12d24541d0741 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 16 Sep 2007 21:44:00 +0000 Subject: A few more core updates and revise the mirrorlist --- etc/abs/supfile.core | 2 +- etc/abs/supfile.testing | 2 +- etc/pacman.d/mirrorlist.in | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/etc/abs/supfile.core b/etc/abs/supfile.core index 1d34b69c..e7867f10 100644 --- a/etc/abs/supfile.core +++ b/etc/abs/supfile.core @@ -1,5 +1,5 @@ # -# /etc/abs/supfile.arch +# /etc/abs/supfile.core # # this is the host containing the core PKGBUILD files diff --git a/etc/abs/supfile.testing b/etc/abs/supfile.testing index 92c9f2ea..92862af2 100644 --- a/etc/abs/supfile.testing +++ b/etc/abs/supfile.testing @@ -12,5 +12,5 @@ #*default umask=002 *default tag=TESTING -arch +core extra diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index c9f0da88..ddfd1917 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -6,6 +6,7 @@ Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@ Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://locke.suu.edu/linux/dist/archlinux/@@REPO@@/os/@CARCH@ +Server = ftp://mirrors.unixheads.org/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@ Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@ @@ -35,6 +36,7 @@ Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@C Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@ Server = ftp://ftp.archlinuxppc.org/i686/@@REPO@@/os/@CARCH@ +Server = http://mirror.archlinux.de/@@REPO@@/os/@CARCH@ # - Great Britain Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@ # - Greece @@ -61,6 +63,7 @@ Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@ # - Russia Server = http://archlinux.freeside.ru/@@REPO@@/os/@CARCH@ +Server = ftp://mirror.yandex.ru/archlinux/@@REPO@@/os/@CARCH@ # - Sweden Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@ @@ -70,6 +73,7 @@ Server = ftp://archlinux.puzzle.ch/@@REPO@@/os/@CARCH@ Server = ftp://ftp.linux.org.tr/pub/archlinux/@@REPO@@/os/@CARCH@ # - Ukraine Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@@REPO@@/os/@CARCH@ +Server = ftp://hell.org.ua/archlinux/@@REPO@@/os/@CARCH@ # Asia # - Israel -- cgit v1.2.3-70-g09d2 From a06d91f7f9b2e895c5dcfff314632919e417e864 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 16 Sep 2007 22:15:03 +0000 Subject: A few final changes for the 3.0.6 release * Updated all message catalogs * Bump version in configure.ac * Remove a dead mirror --- configure.ac | 2 +- etc/pacman.d/mirrorlist.in | 1 - lib/libalpm/po/de.po | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/en_GB.po | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/es.po | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/fr.po | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/hu.po | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/it.po | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/libalpm.pot | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/pl_PL.po | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/pt_BR.po | 50 +++++++++++++++++++++++----------------------- lib/libalpm/po/ru_RU.po | 50 +++++++++++++++++++++++----------------------- 12 files changed, 251 insertions(+), 252 deletions(-) diff --git a/configure.ac b/configure.ac index f85c5193..ecc13034 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ CFLAGS="" AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([Pacman package manager], 3.0.5, [pacman-dev@archlinux.org], [pacman]) +AC_INIT([Pacman package manager], 3.0.6, [pacman-dev@archlinux.org], [pacman]) AC_LANG([C]) AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index ddfd1917..39716a6d 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -36,7 +36,6 @@ Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@C Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@ Server = ftp://ftp.archlinuxppc.org/i686/@@REPO@@/os/@CARCH@ -Server = http://mirror.archlinux.de/@@REPO@@/os/@CARCH@ # - Great Britain Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@ # - Greece diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 1f664122..6e699fa1 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-04-17 20:26+0200\n" "Last-Translator: Pierre Schmitz \n" "Language-Team: German \n" @@ -107,7 +107,7 @@ msgstr "%s ist in NoExtract, wird nicht entpackt" msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s ist in trans->skip_add, wird nicht entpackt" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "Konnte %s nicht entpacken (%s)" @@ -222,7 +222,7 @@ msgstr "Warnung: Entpacke %s als %s.pacnew" msgid "extracting %s" msgstr "Entpacke %s" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "Fehler: Konnte %s nicht entpacken (%s)" @@ -382,107 +382,107 @@ msgstr "Warnung: Konnte Sperrdatei %s nicht entfernen" msgid "config: new section '%s'" msgstr "Konfiguration: Neuer Abschnitt '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "Konfiguration: nopassiveftp" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "Konfiguration: usesyslog" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "Konfiguration: chomp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "Konfiguration: usecolor" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "Konfiguration: including %s" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "Konfiguration: noupgrade: %s" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "Konfiguration: noextract: %s" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "Konfiguration: ignorepkg: %s" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "Konfiguration: holdpkg: %s" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "Konfiguration: dbpath: %s" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "Konfiguration: cachedir: %s" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, c-format msgid "config: rootdir: %s" msgstr "Konfiguration: rootdir: %s" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "Konfiguration: logfile: %s" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "Konfiguration: xfercommand: %s" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "Konfiguration: upgradedelay: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "Prüfe auf Paketersetzungen" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "Prüfe Ersetzung '%s' für Paket '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: Ignoriere zu aktualisierendes Packet (zu ersetzen durch %s-%s)" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s wurde zur Aktualisierung ausgewählt (wird durch %s-%s ersetzt)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' nicht in Sync-DB gefunden -- Überspringe" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' ist bereits zum Entfernen ausgewählt -- Überspringe" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s wurde zur Aktualisierung ausgewählt (%s => %s)" diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index fae162cf..f4428e48 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-03-07 21:05+1100\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" @@ -103,7 +103,7 @@ msgstr "%s is in NoExtract, skipping extraction" msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s is in trans->skip_add, skipping extraction" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "could not extract %s (%s)" @@ -217,7 +217,7 @@ msgstr "warning: extracting %s as %s.pacnew" msgid "extracting %s" msgstr "extracting %s" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "error: could not extract %s (%s)" @@ -376,107 +376,107 @@ msgstr "warning: could not remove lock file %s" msgid "config: new section '%s'" msgstr "config: new section '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "config: nopassiveftp" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "config: usesyslog" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "config: chomp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "config: usecolor" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "config: including %s" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "config: noupgrade: %s" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "config: noextract: %s" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "config: ignorepkg: %s" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "config: holdpkg: %s" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "config: dbpath: %s" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, fuzzy, c-format msgid "config: rootdir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "config: logfile: %s" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "config: xfercommand: %s" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "checking for package replacements" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "checking replacement '%s' for package '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s elected for upgrade (to be replaced by %s-%s)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' not found in sync db -- skipping" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' is already elected for removal -- skipping" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s elected for upgrade (%s => %s)" diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index 11376832..60acc003 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-04-29 11:12-0300\n" "Last-Translator: Juan Pablo González Tognarelli \n" "Language-Team: juan pablo gonzález tognarelli \n" @@ -108,7 +108,7 @@ msgstr "%s está en NoExtract. Saltando la extracción" msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s esta en la extracción trans->skip_add, skipping" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "no se pudo extraer %s (%s)" @@ -223,7 +223,7 @@ msgstr "advertencia: descomprimiendo %s como %s.pacnew" msgid "extracting %s" msgstr "descomprimiendo %s" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "error: no se pudo descomprimir %s (%s)" @@ -385,108 +385,108 @@ msgstr "advertencia: no se pudo eliminar el archivo de bloqueo %s" msgid "config: new section '%s'" msgstr "config: nueva sección '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "config: nopassiveftp" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "config: usesyslog" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "config: chomp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "config: usecolor" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "config: incluyendo %s" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "config: noupgrade: %s" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "config: noextract: %s" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "config: ignorepkg: %s" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "config: holdpkg: %s" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "config: dbpath: %s" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, fuzzy, c-format msgid "config: rootdir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "config: logfile: %s" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "config: xfercommand: %s" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "verificando si hay reemplazo de paquetes" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "verificando el reemplazo '%s' para el paquete '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "" "%s-%s: ignorando la actualización del paquete(para ser reemplazado por %s-%s)" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s escogido para actualizar (para ser reemplazado por %s-%s)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' not encontrado en la base -- saltando" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' está ya seleccionado para quitar -- saltando" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s seleccionado para actualizar (%s => %s)" diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index 4f396b21..d317e575 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-04-17 12:45+0100\n" "Last-Translator: nam <37ii11@altern.org>\n" "Language-Team: solsTiCe d'Hiver \n" @@ -105,7 +105,7 @@ msgstr "%s est dans la liste des paquets NoExtract -- extraction non effectuée" msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s est dans trans->skip_add, extraction ignorée" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "l'extraction de %s (%s) a échoué" @@ -220,7 +220,7 @@ msgstr "avertissement: extraction de %s comme %s.pacnew" msgid "extracting %s" msgstr "extraction de %s" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "erreur: l'extraction de %s (%s) a échoué" @@ -382,107 +382,107 @@ msgstr "avertissement: la suppression du fichier de verrouillage %s a échoué" msgid "config: new section '%s'" msgstr "config: nouvelle section '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "config: nopassiveftp" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "config: usesyslog" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "config: chomp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "config: usecolor" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "config: inclusion de %s" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "config: noupgrade: %s" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "config: noextract: %s" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "config: ignorepkg: %s" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "config: holdpkg: %s" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "config: dbpath: %s" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, c-format msgid "config: rootdir: %s" msgstr "config: rootdir: %s" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "config: logfile: %s" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "config: xfercommand: %s" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "analyse de remplacements possibles pour le paquet" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "analyse du remplacement '%s' pour le paquet '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s sélectionné pour mise à jour (à remplacer par %s-%s)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' non trouvé dans la liste de synchronisation -- ignoré" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' est déjà sélectionné pour suppression -- ignoré" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s sélectionné pour mise à jour (%s => %s)" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index e0468cbf..2caf23fe 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-03-14 13:45+0100\n" "Last-Translator: Nagy Gabor \n" "Language-Team: \n" @@ -104,7 +104,7 @@ msgstr "%s a NoExtractben van, kit msgid "%s is in trans->skip_add, skipping extraction" msgstr "" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "nem sikerlt kitmrteni: %s (%s)" @@ -219,7 +219,7 @@ msgstr "figyelmeztet msgid "extracting %s" msgstr "a %s kitmrtse" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "hiba: nem sikerlt kitmrteni: %s (%s)" @@ -381,107 +381,107 @@ msgstr "figyelmeztet msgid "config: new section '%s'" msgstr "belltsok: j szekci '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "belltsok: nopassiveftp" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "belltsok: usesyslog" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "belltsok: chomp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "belltsok: usecolor" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "belltsok: a %s beolvassa" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "belltsok: noupgrade: %s" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "belltsok: noextract: %s" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "belltsok: ignorepkg: %s" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "belltsok: holdpkg: %s" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "belltsok: adatbzistvonal: %s" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "belltsok: gyorsttrknyvtr: %s" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, fuzzy, c-format msgid "config: rootdir: %s" msgstr "belltsok: gyorsttrknyvtr: %s" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "belltsok: naplfjl: %s" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "belltsok: xfercommand: %s" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "belltsok: frissts ksleltetse: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "csomagcserk ellenrzse" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "csere vizsglata: '%s' -> '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: frissts figyelmen kvl hagysa (a %s-%s fogja lecserlni)" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "a %s-%s kivlasztva frisstsre (a %s-%s fogja lecserlni)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "a '%s' nem tallhat a tvoli adatbzisban -- kihagys" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "a '%s' mr kijellve eltvoltsra -- kihagys" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "a(z) %s kivlasztva frisstsre (%s => %s)" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index 9f528756..557e4f24 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-04-17 22:00+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -104,7 +104,7 @@ msgstr "%s è in NoExtract, estrazione ignorata" msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s è in trans->skip_add, estrazione ignorata" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "impossibile estrarre %s (%s)" @@ -219,7 +219,7 @@ msgstr "attenzione: estrazione in corso di %s come %s.pacnew" msgid "extracting %s" msgstr "estrazione di %s in corso" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "errore: impossibile estrarre %s (%s)" @@ -381,109 +381,109 @@ msgstr "attenzione: impossibile rimuovere il file di lock %s" msgid "config: new section '%s'" msgstr "config: nuova sezione '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "config: nopassiveftp" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "config: usesyslog" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "config: chomp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "config: usecolor" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "config: including %s" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "config: noupgrade: %s" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "config: noextract:·%s" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "config: ignorepkg: %s" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "config: holdpkg: %s" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "config: dbpath: %s" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "config: cachedir: %s" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, c-format msgid "config: rootdir: %s" msgstr "config: rootdir: %s" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "config: logfile: %s" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "config: xfercommand: %s" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "controllo della sostituzione dei pacchetti in corso" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "controllo in corso della sostituzione di '%s' con il pacchetto '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "" "%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%s)" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "" "%s-%s selezionato per l'aggiornamento (per essere sostituito con %s-%s)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "impossibile trovare '%s' nel database, sarà ignorato" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' è già selezionato per la rimozione, sarà ignorato" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s selezionato per l'aggiornamento (%s => %s)" diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index fd9b1c99..4f7a1bf3 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -103,7 +103,7 @@ msgstr "" msgid "%s is in trans->skip_add, skipping extraction" msgstr "" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "" @@ -216,7 +216,7 @@ msgstr "" msgid "extracting %s" msgstr "" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "" @@ -374,107 +374,107 @@ msgstr "" msgid "config: new section '%s'" msgstr "" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, c-format msgid "config: rootdir: %s" msgstr "" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "" diff --git a/lib/libalpm/po/pl_PL.po b/lib/libalpm/po/pl_PL.po index 0ea1d982..0790a611 100644 --- a/lib/libalpm/po/pl_PL.po +++ b/lib/libalpm/po/pl_PL.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-04-12 04:23+0200\n" "Last-Translator: Mateusz Jędrasik \n" "Language-Team: Polish \n" @@ -105,7 +105,7 @@ msgstr "%s znajduje się w NoExtract, pomijanie rozpakowywania" msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s znajduje się w trans->skip_add, pomijanie rozpakowywania" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "nie udało się rozpakować %s (%s)" @@ -220,7 +220,7 @@ msgstr "uwaga: rozpakowywanie %s jako %s.pacnew" msgid "extracting %s" msgstr "rozpakowywanie %s" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "błąd: nie udało się rozpakować %s (%s)" @@ -381,107 +381,107 @@ msgstr "uwaga: nie udało się usunąć pliku blokującego %s" msgid "config: new section '%s'" msgstr "konfiguracja: nowa sekcja '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "konfiguracja: nopassiveftp" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "konfiguracja: usesyslog" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "konfiguracja: chomp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "konfiguracja: usecolor" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "konfiguracja: zawieranie %s" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "konfiguracja: noupgrade: %s" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "konfiguracja: noextract: %s" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "konfiguracja: ignorepkg: %s" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "konfiguracja: holdpkg: %s" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "konfiguracja: dbpath: %s" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "konfiguracja: cachedir: %s" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, c-format msgid "config: rootdir: %s" msgstr "konfiguracja: rootdir: %s" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "konfiguracja: logfile: %s" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "konfiguracja: xfercommand: %s" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "konfiguracja: upgradedelay: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "sprawdzanie potencjalnych pakietów zastępczych" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "sprawdzanie zastępcy '%s' dla pakietu '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s wybrany do zaktualizowania (do zastąpienia przez %s-%s)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' nie odnaleziony w bd sync -- pomijanie" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' jest już wybrany do usunięcia -- pomijanie" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s wybrany do zaktualizowania (%s => %s)" diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index e2754e29..5d734e38 100644 --- a/lib/libalpm/po/pt_BR.po +++ b/lib/libalpm/po/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-03-07 01:18-0300\n" "Last-Translator: Douglas Soares de Andrade \n" "Language-Team: Português do Brasil \n" @@ -109,7 +109,7 @@ msgstr "%s está incluso em NoExtract -- não descompactando" msgid "%s is in trans->skip_add, skipping extraction" msgstr "o pacote %s está incluso em trans->skip_add, não descompactando" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "não foi possível extrair %s (%s)" @@ -224,7 +224,7 @@ msgstr "aviso: extraindo %s como %s.pacnew" msgid "extracting %s" msgstr "extraindo %s" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "erro: não foi possível descompactar %s (%s)" @@ -385,107 +385,107 @@ msgstr "aviso: não foi possível remover o arquivo de lock %s" msgid "config: new section '%s'" msgstr "configuração: nova seção '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "configuração: nopassiveftp" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "configuração: usesyslog" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "configuração: chomp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "configuração: usecolor" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "configuração: including %s" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "configuração: noupgrade: %s" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "configuração: noextract: %s" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "configuração: ignorepkg: %s" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "configuração: holdpkg: %s" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "configuração: dbpath: %s" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "configuração: cachedir: %s" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, fuzzy, c-format msgid "config: rootdir: %s" msgstr "configuração: cachedir: %s" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "configuração: logfile: %s" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "configuração: xfercommand: %s" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "configuração: upgradedelay: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "verificando por substitutos do pacote" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "verificando substituto '%s' para o pacote '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "" diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru_RU.po index 445c120d..ec5eb0d7 100644 --- a/lib/libalpm/po/ru_RU.po +++ b/lib/libalpm/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-06-17 20:11-0400\n" +"POT-Creation-Date: 2007-09-16 16:55-0500\n" "PO-Revision-Date: 2007-03-16 02:52+1000\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n" "MIME-Version: 1.0\n" @@ -103,7 +103,7 @@ msgstr "%s в списке NoExtract, пропускаю при распаков msgid "%s is in trans->skip_add, skipping extraction" msgstr "" -#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:706 #, c-format msgid "could not extract %s (%s)" msgstr "не могу извлечь %s (%s)" @@ -218,7 +218,7 @@ msgstr "предупреждение: извлекаю %s как %s.pacnew" msgid "extracting %s" msgstr "извлекаю %s" -#: lib/libalpm/add.c:705 +#: lib/libalpm/add.c:707 #, c-format msgid "error: could not extract %s (%s)" msgstr "ошибка: не могу извлечь %s (%s)" @@ -379,107 +379,107 @@ msgstr "предупреждение: не могу удалить lock-файл msgid "config: new section '%s'" msgstr "config: новая секция '%s'" -#: lib/libalpm/alpm.c:950 +#: lib/libalpm/alpm.c:951 msgid "config: nopassiveftp" msgstr "" -#: lib/libalpm/alpm.c:953 +#: lib/libalpm/alpm.c:954 msgid "config: usesyslog" msgstr "" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:957 msgid "config: chomp" msgstr "" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:960 msgid "config: usecolor" msgstr "" -#: lib/libalpm/alpm.c:968 +#: lib/libalpm/alpm.c:969 #, c-format msgid "config: including %s" msgstr "" -#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983 +#: lib/libalpm/alpm.c:979 lib/libalpm/alpm.c:984 #, c-format msgid "config: noupgrade: %s" msgstr "" -#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996 +#: lib/libalpm/alpm.c:992 lib/libalpm/alpm.c:997 #, c-format msgid "config: noextract: %s" msgstr "" -#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009 +#: lib/libalpm/alpm.c:1005 lib/libalpm/alpm.c:1010 #, c-format msgid "config: ignorepkg: %s" msgstr "" -#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022 +#: lib/libalpm/alpm.c:1018 lib/libalpm/alpm.c:1023 #, c-format msgid "config: holdpkg: %s" msgstr "" -#: lib/libalpm/alpm.c:1029 +#: lib/libalpm/alpm.c:1030 #, c-format msgid "config: dbpath: %s" msgstr "" -#: lib/libalpm/alpm.c:1036 +#: lib/libalpm/alpm.c:1037 #, c-format msgid "config: cachedir: %s" msgstr "" -#: lib/libalpm/alpm.c:1043 +#: lib/libalpm/alpm.c:1044 #, fuzzy, c-format msgid "config: rootdir: %s" msgstr "config: новая секция '%s'" -#: lib/libalpm/alpm.c:1046 +#: lib/libalpm/alpm.c:1047 #, c-format msgid "config: logfile: %s" msgstr "" -#: lib/libalpm/alpm.c:1049 +#: lib/libalpm/alpm.c:1050 #, c-format msgid "config: xfercommand: %s" msgstr "" -#: lib/libalpm/alpm.c:1054 +#: lib/libalpm/alpm.c:1055 #, c-format msgid "config: upgradedelay: %d" msgstr "" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:107 msgid "checking for package replacements" msgstr "проверяю замены для пакетов" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123 +#: lib/libalpm/alpm.c:1104 lib/libalpm/sync.c:123 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "проверяю замену '%s' для пакета '%s'" -#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125 +#: lib/libalpm/alpm.c:1107 lib/libalpm/sync.c:125 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)" -#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160 +#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:160 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s выбран для обновления (будет заменен на %s-%s)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194 +#: lib/libalpm/alpm.c:1159 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' не найден в базе данных -- пропускаю" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 +#: lib/libalpm/alpm.c:1173 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' уже выбран для удаления -- пропускаю" -#: lib/libalpm/alpm.c:1178 +#: lib/libalpm/alpm.c:1179 #, c-format msgid "%s elected for upgrade (%s => %s)" msgstr "%s выбран для обновления (%s => %s)" -- cgit v1.2.3-70-g09d2 From 09253b48d60589d42d9486dd361eaaf30e364e59 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 27 Mar 2007 21:06:31 -0400 Subject: Move .cvsignore -> .gitignore * Move all .cvsignore files to .gitignore for switch in VCS. In addition, delete ones that were unnecessary because they only contained Makefile and Makefile.am. Signed-off-by: Dan McGee (cherry picked from commit 8cacc46f8bcfe5b2325a2fae2af9b1fc5b09139e) --- .cvsignore | 24 ------------------------ .gitignore | 26 ++++++++++++++++++++++++++ contrib/.cvsignore | 2 -- contrib/.gitignore | 2 ++ doc/.cvsignore | 4 ---- doc/.gitignore | 4 ++++ etc/.cvsignore | 4 ---- etc/.gitignore | 4 ++++ etc/abs/.cvsignore | 2 -- etc/pacman.d/.cvsignore | 9 --------- etc/pacman.d/.gitignore | 9 +++++++++ lib/libalpm/.cvsignore | 6 ------ lib/libalpm/.gitignore | 6 ++++++ lib/libalpm/po/.cvsignore | 6 ------ lib/libalpm/po/.gitignore | 6 ++++++ pactest/.cvsignore | 4 ---- pactest/.gitignore | 4 ++++ scripts/.cvsignore | 2 -- src/pacman/.cvsignore | 6 ------ src/pacman/.gitignore | 6 ++++++ src/pacman/po/.cvsignore | 6 ------ src/pacman/po/.gitignore | 6 ++++++ src/util/.cvsignore | 6 ------ src/util/.gitignore | 6 ++++++ 24 files changed, 79 insertions(+), 81 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 contrib/.cvsignore create mode 100644 contrib/.gitignore delete mode 100644 doc/.cvsignore create mode 100644 doc/.gitignore delete mode 100644 etc/.cvsignore create mode 100644 etc/.gitignore delete mode 100644 etc/abs/.cvsignore delete mode 100644 etc/pacman.d/.cvsignore create mode 100644 etc/pacman.d/.gitignore delete mode 100644 lib/libalpm/.cvsignore create mode 100644 lib/libalpm/.gitignore delete mode 100644 lib/libalpm/po/.cvsignore create mode 100644 lib/libalpm/po/.gitignore delete mode 100644 pactest/.cvsignore create mode 100644 pactest/.gitignore delete mode 100644 scripts/.cvsignore delete mode 100644 src/pacman/.cvsignore create mode 100644 src/pacman/.gitignore delete mode 100644 src/pacman/po/.cvsignore create mode 100644 src/pacman/po/.gitignore delete mode 100644 src/util/.cvsignore create mode 100644 src/util/.gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 407e92fa..00000000 --- a/.cvsignore +++ /dev/null @@ -1,24 +0,0 @@ -Makefile -Makefile.in -mkinstalldirs -aclocal.m4 -autom4te.cache -config.guess -config.h -config.h.in -config.log -config.status -config.rpath -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -stamp-h1 - -root -tags -cscope.out -pacman-*.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..5545617e --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Makefile +Makefile.in +mkinstalldirs +aclocal.m4 +autom4te.cache +config.guess +config.h +config.h.in +config.log +config.status +config.rpath +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +missing +stamp-h1 + +*.o +*~ +root +tags +cscope.out +pacman-*.tar.gz diff --git a/contrib/.cvsignore b/contrib/.cvsignore deleted file mode 100644 index 282522db..00000000 --- a/contrib/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/contrib/.gitignore b/contrib/.gitignore new file mode 100644 index 00000000..282522db --- /dev/null +++ b/contrib/.gitignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index b6ab6ec3..00000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -*.html -man3 diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000..b6ab6ec3 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.html +man3 diff --git a/etc/.cvsignore b/etc/.cvsignore deleted file mode 100644 index 19f2216d..00000000 --- a/etc/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -makepkg.conf -pacman.conf diff --git a/etc/.gitignore b/etc/.gitignore new file mode 100644 index 00000000..19f2216d --- /dev/null +++ b/etc/.gitignore @@ -0,0 +1,4 @@ +Makefile +Makefile.in +makepkg.conf +pacman.conf diff --git a/etc/abs/.cvsignore b/etc/abs/.cvsignore deleted file mode 100644 index 282522db..00000000 --- a/etc/abs/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/etc/pacman.d/.cvsignore b/etc/pacman.d/.cvsignore deleted file mode 100644 index 32b2d700..00000000 --- a/etc/pacman.d/.cvsignore +++ /dev/null @@ -1,9 +0,0 @@ -Makefile -Makefile.in -community -current -extra -mirrorlist -release -unstable -testing diff --git a/etc/pacman.d/.gitignore b/etc/pacman.d/.gitignore new file mode 100644 index 00000000..32b2d700 --- /dev/null +++ b/etc/pacman.d/.gitignore @@ -0,0 +1,9 @@ +Makefile +Makefile.in +community +current +extra +mirrorlist +release +unstable +testing diff --git a/lib/libalpm/.cvsignore b/lib/libalpm/.cvsignore deleted file mode 100644 index 09980ae6..00000000 --- a/lib/libalpm/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -*.la diff --git a/lib/libalpm/.gitignore b/lib/libalpm/.gitignore new file mode 100644 index 00000000..09980ae6 --- /dev/null +++ b/lib/libalpm/.gitignore @@ -0,0 +1,6 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +*.la diff --git a/lib/libalpm/po/.cvsignore b/lib/libalpm/po/.cvsignore deleted file mode 100644 index 50a7b2a4..00000000 --- a/lib/libalpm/po/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -*.gmo -POTFILES -stamp-po -remove-potcdate.sed diff --git a/lib/libalpm/po/.gitignore b/lib/libalpm/po/.gitignore new file mode 100644 index 00000000..50a7b2a4 --- /dev/null +++ b/lib/libalpm/po/.gitignore @@ -0,0 +1,6 @@ +Makefile +Makefile.in +*.gmo +POTFILES +stamp-po +remove-potcdate.sed diff --git a/pactest/.cvsignore b/pactest/.cvsignore deleted file mode 100644 index 59a0622c..00000000 --- a/pactest/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -*.pyc -root diff --git a/pactest/.gitignore b/pactest/.gitignore new file mode 100644 index 00000000..59a0622c --- /dev/null +++ b/pactest/.gitignore @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.pyc +root diff --git a/scripts/.cvsignore b/scripts/.cvsignore deleted file mode 100644 index 282522db..00000000 --- a/scripts/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/pacman/.cvsignore b/src/pacman/.cvsignore deleted file mode 100644 index f8247c5e..00000000 --- a/src/pacman/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -pacman -pacman.static diff --git a/src/pacman/.gitignore b/src/pacman/.gitignore new file mode 100644 index 00000000..f8247c5e --- /dev/null +++ b/src/pacman/.gitignore @@ -0,0 +1,6 @@ +.deps +.libs +Makefile +Makefile.in +pacman +pacman.static diff --git a/src/pacman/po/.cvsignore b/src/pacman/po/.cvsignore deleted file mode 100644 index 50a7b2a4..00000000 --- a/src/pacman/po/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -*.gmo -POTFILES -stamp-po -remove-potcdate.sed diff --git a/src/pacman/po/.gitignore b/src/pacman/po/.gitignore new file mode 100644 index 00000000..50a7b2a4 --- /dev/null +++ b/src/pacman/po/.gitignore @@ -0,0 +1,6 @@ +Makefile +Makefile.in +*.gmo +POTFILES +stamp-po +remove-potcdate.sed diff --git a/src/util/.cvsignore b/src/util/.cvsignore deleted file mode 100644 index 8bfb0085..00000000 --- a/src/util/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -vercmp -testpkg diff --git a/src/util/.gitignore b/src/util/.gitignore new file mode 100644 index 00000000..8bfb0085 --- /dev/null +++ b/src/util/.gitignore @@ -0,0 +1,6 @@ +.deps +.libs +Makefile +Makefile.in +vercmp +testpkg -- cgit v1.2.3-70-g09d2