From 08ee4059b5935ab0b378a40dcfb127f169e96f83 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Tue, 15 Sep 2009 12:55:19 +0200 Subject: Catch an untranslated warning in lib/remove.c Signed-off-by: Nagy Gabor Signed-off-by: Dan McGee --- lib/libalpm/remove.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index aa6a5cc7..0eaa8363 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -126,7 +126,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, &vpkg); pkg = vpkg; if(pkg) { - _alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n", + _alpm_log(PM_LOG_WARNING, _("removing %s from the target-list\n"), alpm_pkg_get_name(pkg)); _alpm_pkg_free(pkg); } -- cgit v1.2.3-24-g4f1b From 1df3b91931ea28fa6b279a976339f099a111238d Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Thu, 17 Sep 2009 02:03:23 +0200 Subject: String improvements Add more untranslated strings, improve consistency, etc. Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/add.c | 4 ++-- lib/libalpm/be_files.c | 2 +- lib/libalpm/remove.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 1b228b2d..1d143c6f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -81,7 +81,7 @@ int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) _alpm_pkg_free(i->data); i->data = pkg; } else { - _alpm_log(PM_LOG_WARNING, _("skipping %s-%s because newer version %s is in the target list\n"), + _alpm_log(PM_LOG_WARNING, _("skipping %s-%s because newer version %s is in target list\n"), pkgname, pkgver, transpkg->version); _alpm_pkg_free(pkg); } @@ -142,7 +142,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) alpm_list_free(lp); } if(inner) { - _alpm_log(PM_LOG_ERROR, _("conflicting packages were found in the target list\n")); + _alpm_log(PM_LOG_ERROR, _("conflicting packages were found in target list\n")); _alpm_log(PM_LOG_ERROR, _("you cannot install two conflicting packages at the same time\n")); } if(outer) { diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 9bb7b3dc..bfe10867 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -125,7 +125,7 @@ static int checkdbdir(pmdb_t *db) RET_ERR(PM_ERR_SYSTEM, -1); } } else if(!S_ISDIR(buf.st_mode)) { - _alpm_log(PM_LOG_WARNING, "removing bogus database: %s\n", path); + _alpm_log(PM_LOG_WARNING, _("removing invalid database: %s\n"), path); if(unlink(path) != 0 || _alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, -1); } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0eaa8363..1e8f9156 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -74,7 +74,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } - _alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name); + _alpm_log(PM_LOG_DEBUG, "adding %s in target list\n", info->name); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); return(0); @@ -92,7 +92,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target); if(info) { if(!_alpm_pkg_find(trans->packages, alpm_pkg_get_name(info))) { - _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", + _alpm_log(PM_LOG_DEBUG, "pulling %s in target list\n", alpm_pkg_get_name(info)); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); } @@ -112,7 +112,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, { ALPM_LOG_FUNC; - /* Remove needed packages (which break dependencies) from the target list */ + /* Remove needed packages (which break dependencies) from target list */ while(lp != NULL) { alpm_list_t *i; for(i = lp; i; i = i->next) { @@ -126,7 +126,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, &vpkg); pkg = vpkg; if(pkg) { - _alpm_log(PM_LOG_WARNING, _("removing %s from the target-list\n"), + _alpm_log(PM_LOG_WARNING, _("removing %s from target list\n"), alpm_pkg_get_name(pkg)); _alpm_pkg_free(pkg); } @@ -167,7 +167,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) remove_prepare_cascade(trans, db, lp); } else if (trans->flags & PM_TRANS_FLAG_UNNEEDED) { /* Remove needed packages (which would break dependencies) - * from the target list */ + * from target list */ remove_prepare_keep_needed(trans, db, lp); } else { if(data) { -- cgit v1.2.3-24-g4f1b From 9505c594fd1b32c768ccffcd77808049ea6491e4 Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Thu, 17 Sep 2009 02:07:42 +0200 Subject: Update all pot and po files for 3.3.1 release Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/po/cs.po | 22 +++++++++++++++------- lib/libalpm/po/de.po | 22 +++++++++++++++------- lib/libalpm/po/en_GB.po | 22 +++++++++++++++------- lib/libalpm/po/es.po | 24 +++++++++++++++++------- lib/libalpm/po/fr.po | 22 +++++++++++++++------- lib/libalpm/po/hu.po | 22 +++++++++++++++------- lib/libalpm/po/it.po | 23 ++++++++++++++++------- lib/libalpm/po/kk.po | 23 ++++++++++++++++------- lib/libalpm/po/libalpm.pot | 16 ++++++++++++---- lib/libalpm/po/pl.po | 22 +++++++++++++++------- lib/libalpm/po/pt_BR.po | 22 +++++++++++++++------- lib/libalpm/po/ro.po | 22 +++++++++++++++------- lib/libalpm/po/ru.po | 22 +++++++++++++++------- lib/libalpm/po/tr.po | 22 +++++++++++++++------- lib/libalpm/po/uk.po | 22 +++++++++++++++------- lib/libalpm/po/zh_CN.po | 22 +++++++++++++++------- 16 files changed, 241 insertions(+), 109 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po index 7a081707..2141372f 100644 --- a/lib/libalpm/po/cs.po +++ b/lib/libalpm/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-29 14:14+0200\n" "Last-Translator: Vojtěch Gondžala \n" "Language-Team: Czech \n" @@ -21,12 +21,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "v seznamu cílů nahrazena starší verze %s-%s za %s\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "vynechává se %s-%s, protože v seznamu cílů je novější veze %s\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n" #, c-format @@ -101,6 +101,10 @@ msgstr "nelze aktualizovat záznam databáze %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "nelze přidat položku '%s' do cache\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "nelze odstranit záznam v databázi %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "nelze odstranit záznam v databázi %s\n" @@ -393,6 +397,10 @@ msgstr "neočekávaná chyba" msgid "could not find %s in database -- skipping\n" msgstr "nelze nalézt %s v databázi -- vynechat\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "'%s' odstraněn ze seznamu cílů, protože je konfliktní s '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "nelze odstranit soubor '%s': %s\n" @@ -521,8 +529,8 @@ msgstr "nelze změnit kořenový adresář (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "nelze změnit adresář na / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "volání popen selhalo (%s)" #, c-format diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 0a339164..3802c4dc 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-29 16:09+0100\n" "Last-Translator: Matthias Gorissen \n" "Language-Team: German \n" @@ -25,12 +25,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "Überspringe %s-%s, da die Ziel-Liste die neuere Version %s enthält\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "In Konflikt stehende Pakete wurden in Ziel-Liste gefunden\n" #, c-format @@ -107,6 +107,10 @@ msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren\n" msgid "could not add entry '%s' in cache\n" msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "Konnte Datenbank %s nicht entfernen\n" + #, c-format msgid "could not remove database %s\n" msgstr "Konnte Datenbank %s nicht entfernen\n" @@ -404,6 +408,10 @@ msgstr "Unerwarteter Fehler" msgid "could not find %s in database -- skipping\n" msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "Entferne '%s' aus der Ziel-Liste, da es mit '%s' in Konflikt steht\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "Kann Datei '%s' nicht entfernen: %s\n" @@ -532,8 +540,8 @@ msgstr "Konnte Root-Verzeichnis nicht wechseln (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "Konnte nicht zu Verzeichnis / (%s) wechseln\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "Aufruf von 'popen' fehlgeschlagen (%s)" #, c-format diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 8e1c56fd..a96ea3fd 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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-30 18:37+1000\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" @@ -20,12 +20,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "replacing older version %s-%s by %s in target list\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "skipping %s-%s because newer version %s is in the target list\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "conflicting packages were found in the target list\n" #, c-format @@ -100,6 +100,10 @@ msgstr "could not update database entry %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "could not add entry '%s' in cache\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "could not remove database %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "could not remove database %s\n" @@ -392,6 +396,10 @@ msgstr "unexpected error" msgid "could not find %s in database -- skipping\n" msgstr "could not find %s in database -- skipping\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "removing '%s' from target list because it conflicts with '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "cannot remove file '%s': %s\n" @@ -520,8 +528,8 @@ msgstr "could not change the root directory (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "could not change directory to / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "call to popen failed (%s)" #, c-format diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index 54eb6040..e914fbff 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-29 11:51+0200\n" "Last-Translator: Juan Pablo González Tognarelli \n" @@ -23,12 +23,12 @@ msgid "replacing older version %s-%s by %s in target list\n" msgstr "" "reemplazando la versión antigua %s-%s por %s en la lista de objetivos\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "saltando %s-%s debido a que una nueva versión de %s esta en la lista\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "paquetes con conflictos fueron encontrados en la lista\n" #, c-format @@ -105,6 +105,10 @@ msgstr "no se pudo actualizar en la base de datos la entrada %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "no se pudo agregar '%s' en la cache\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "no se pudo quitar la base de datos %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "no se pudo quitar la base de datos %s\n" @@ -402,6 +406,12 @@ msgstr "error inesperado" msgid "could not find %s in database -- skipping\n" msgstr "no se pudo encontrar %s en la base de datos -- saltando\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "" +"quitando '%s' de la lista de objetivos debido a que posee conflictos con '%" +"s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "no se pudo quitar el archivo '%s': %s\n" @@ -532,8 +542,8 @@ msgstr "no se pudo cambiar el directorio raíz (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "no se pudo cambiar el directorio a / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "llamada a popen fallida (%s)" #, c-format diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index 810e1aaf..7a681a9b 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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-28 14:01+0200\n" "Last-Translator: Xavier \n" "Language-Team: solsTiCe d'Hiver \n" @@ -20,14 +20,14 @@ msgid "replacing older version %s-%s by %s in target list\n" msgstr "" "remplacement de l'ancienne version %s-%s par %s dans la liste des cibles\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "ignore le paquet %s-%s car une version plus récente %s est dans la liste des " "cibles\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "des paquets en conflit ont été trouvés dans la liste des cibles\n" #, c-format @@ -104,6 +104,10 @@ msgstr "la mise à jour l'entrée de base de données %s-%s a échoué\n" msgid "could not add entry '%s' in cache\n" msgstr "l'ajout au cache de l'entrée '%s' a échoué\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "la suppression de la base de données %s a échoué\n" + #, c-format msgid "could not remove database %s\n" msgstr "la suppression de la base de données %s a échoué\n" @@ -398,6 +402,10 @@ msgstr "erreur non prévue" msgid "could not find %s in database -- skipping\n" msgstr "trouver %s dans la base de données a échoué -- ignoré\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "supprime '%s' de la liste de cible car il est en conflit avec '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "suppression du fichier '%s' impossible: %s\n" @@ -526,8 +534,8 @@ msgstr "changer le répertoire racine a échoué (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "changer de répertoire vers / a échoué (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "l'appel de popen a échoué (%s)" #, c-format diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index be6e52be..fc59e026 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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2007-03-14 13:45+0100\n" "Last-Translator: Nagy Gabor \n" "Language-Team: \n" @@ -21,12 +21,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "régebbi verzió (%s-%s) lecserélése %s verzióra a célok listájában\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "%s-%s kihagyása, mert újabb verzió (%s) van a célok között\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "ütköző csomagokat találtam a célok között\n" #, c-format @@ -101,6 +101,10 @@ msgstr "nem sikerült a(z) %s-%s adatbázisbejegyzés frissítése\n" msgid "could not add entry '%s' in cache\n" msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "sikertelen a %s adatbázis-bejegyzés eltávolítása\n" + #, c-format msgid "could not remove database %s\n" msgstr "sikertelen a %s adatbázis-bejegyzés eltávolítása\n" @@ -393,6 +397,10 @@ msgstr "nemvárt hiba" msgid "could not find %s in database -- skipping\n" msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "'%s' kihagyása, mert ütközik a következővel: '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "nem sikerült eltávolítani a '%s' fájlt : %s\n" @@ -521,8 +529,8 @@ msgstr "nem sikerült a chroot (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "nem sikerült a könyvtárat a /-re váltani (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "popen hívás sikertelen (%s)" #, c-format diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index 6816a280..930fca61 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-28 15:00+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -22,14 +22,14 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "sostituzione in corso della vecchia versione di %s-%s con %s\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "ignoro %s-%s perché la nuova versione %s è già presente nella lista dei " "pacchetti\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "sono stati individuati dei pacchetti che vanno in conflitto\n" #, c-format @@ -104,6 +104,10 @@ msgstr "impossibile aggiornare la voce %s-%s nel database\n" msgid "could not add entry '%s' in cache\n" msgstr "impossible includere la voce '%s' nella cache\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "impossibile rimuovere il database %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "impossibile rimuovere il database %s\n" @@ -399,6 +403,11 @@ msgstr "errore inaspettato" msgid "could not find %s in database -- skipping\n" msgstr "impossibile trovare %s nel database, sarà ignorato\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "" +"rimozione di '%s' dalla lista dei pacchetti perché va in conflitto con '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "impossibile rimuovere il file '%s': %s\n" @@ -531,8 +540,8 @@ msgstr "impossibile cambiare la root directory (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "impossibile spostarsi nella directory / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "chiamata a popen non riuscita (%s)" #, c-format diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po index 1114510e..5d60a218 100644 --- a/lib/libalpm/po/kk.po +++ b/lib/libalpm/po/kk.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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-28 19:05+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh\n" @@ -20,14 +20,14 @@ msgid "replacing older version %s-%s by %s in target list\n" msgstr "" "мақсаттар тізімінде ескірген %s-%s нұсқасы жаңа %s нұсқасымен алмастырылады\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "%s-%s өткізіледі, өйткені оның жаңа %s нұсқасы мақсаттар тізімінде бар болып " "тұр\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "мақсаттар тізімінде ерегісетін дестелер табылды\n" #, c-format @@ -103,6 +103,10 @@ msgstr "дерекқорда жазбаны жаңарту мүмкін емес msgid "could not add entry '%s' in cache\n" msgstr "кэш ішіне '%s' жазбасын қосу мүмкін емес\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "%s дерекқорын өшіру мүмкін емес\n" + #, c-format msgid "could not remove database %s\n" msgstr "%s дерекқорын өшіру мүмкін емес\n" @@ -395,6 +399,11 @@ msgstr "күтпеген қате кетті" msgid "could not find %s in database -- skipping\n" msgstr "дерекқор ішінде %s табылмады -- өткізіп жібереміз\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "" +"мақсаттар тізімінен '%s' өшіріледі, өйткені ол '%s' дестесімен ерегіседі\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr " '%s' файлын өшіру мүмкін емес: %s\n" @@ -524,8 +533,8 @@ msgstr "түбірлік буманы ауыстыру мүмкін емес (%s msgid "could not change directory to / (%s)\n" msgstr "/ бумасына ауысу мүмкін емес (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "popen шақыру қатемен аяқталды (%s)" #, c-format diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index 34106630..fed05bb6 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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,11 +21,11 @@ msgid "replacing older version %s-%s by %s in target list\n" msgstr "" #, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" #, c-format -msgid "conflicting packages were found in the target list\n" +msgid "conflicting packages were found in target list\n" msgstr "" #, c-format @@ -98,6 +98,10 @@ msgstr "" msgid "could not add entry '%s' in cache\n" msgstr "" +#, c-format +msgid "removing invalid database: %s\n" +msgstr "" + #, c-format msgid "could not remove database %s\n" msgstr "" @@ -390,6 +394,10 @@ msgstr "" msgid "could not find %s in database -- skipping\n" msgstr "" +#, c-format +msgid "removing %s from target list\n" +msgstr "" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "" @@ -519,7 +527,7 @@ msgid "could not change directory to / (%s)\n" msgstr "" #, c-format -msgid "call to popen failed (%s)" +msgid "call to popen failed (%s)\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po index bf212f63..7163afc6 100644 --- a/lib/libalpm/po/pl.po +++ b/lib/libalpm/po/pl.po @@ -9,7 +9,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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-29 10:39+0100\n" "Last-Translator: Mateusz Herych \n" "Language-Team: Polish \n" @@ -23,12 +23,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "pomijam %s-%s ponieważ na liście celów znajduje się nowsza wersja %s\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "" "konfliktujące pakiety znalazły się na liście pakietów do zainstalowania\n" @@ -107,6 +107,10 @@ msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "nie można usunąć bazy danych %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "nie można usunąć bazy danych %s\n" @@ -400,6 +404,10 @@ msgstr "niespodziewany błąd" msgid "could not find %s in database -- skipping\n" msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "usuwanie '%s' z listy celów ponieważ konfliktuje z '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "nie udało się usunąć pliku '%s': %s\n" @@ -528,8 +536,8 @@ msgstr "nie udało się zmienić katalogu głównego (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "nie udało się zmienić katalogu na / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "zawołanie do popen nieudane (%s)" #, c-format diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index bc29efb8..5dc6576d 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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-28 23:17-0300\n" "Last-Translator: Armando M. Baratti \n" "Language-Team: Português do Brasil \n" @@ -27,14 +27,14 @@ msgstr "" "substituindo a versão antiga %s-%s por %s na lista de pacotes a serem " "atualizados\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "ignorando %s-%s porque uma nova versão %s está na lista de pacotes a serem " "atualizados\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "" "pacotes conflitantes foram encontrados na lista de pacotes a serem " "atualizados\n" @@ -111,6 +111,10 @@ msgstr "não foi possível atualizar a entrada na base de dados %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "não foi possível adicionar a entrada '%s' ao cache\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "não foi possível remover a base de dados %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "não foi possível remover a base de dados %s\n" @@ -404,6 +408,10 @@ msgstr "erro inesperado" msgid "could not find %s in database -- skipping\n" msgstr "não foi possível encontrar %s na base de dados - pulando\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "removendo '%s' da lista de pacotes porque ele conflita com '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "não foi possível remover o arquivo '%s': %s\n" @@ -532,8 +540,8 @@ msgstr "não foi possível mudar o diretório raiz (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "não foi possível mudar o diretório para / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "chamada para popen falhou (%s)" #, c-format diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po index 367ff47b..06f5938c 100644 --- a/lib/libalpm/po/ro.po +++ b/lib/libalpm/po/ro.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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-06-28 14:30+0700\n" "Last-Translator: volodia macovei \n" "Language-Team: Romanian SbLUG for Arch \n" @@ -20,13 +20,13 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "se înlocuieşte versiunea veche %s-%s cu %s în lista ţintă\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "se trece peste %s-%s deoarece o versiune mai nouă %s există în lista ţintă\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "s-au găsit pachete în conflict în lista ţintă\n" #, c-format @@ -101,6 +101,10 @@ msgstr "nu se poate actualiza intrarea în baza de date %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "nu se poate adăuga intrarea '%s' în cache\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "nu poate fi eliminată baza de date %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "nu poate fi eliminată baza de date %s\n" @@ -396,6 +400,10 @@ msgstr "eroare neaşteptată" msgid "could not find %s in database -- skipping\n" msgstr "nu poate fi găsit %s în baza de date -- se trece peste\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "se elimină '%s' din lista ţintă deoarece este în conflict cu '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "nu poate fi eliminat fişierul '%s': %s\n" @@ -524,8 +532,8 @@ msgstr "nu poate fi schimbat directorul root (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "nu poate fi schimbat directorul la / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "cererea către popen a eşuat (%s)" #, c-format diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po index 5d1b1e5e..c8835c01 100644 --- a/lib/libalpm/po/ru.po +++ b/lib/libalpm/po/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: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-29 20:29+0300\n" "Last-Translator: Sergey Tereschenko \n" "Language-Team: Russian\n" @@ -21,12 +21,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "заменяется устаревшая версия %s-%s на %s в списке целей\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "пропускается %s-%s, поскольку новая версия %s в списке целей\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "в списке целей найдены конфликтующие пакеты\n" #, c-format @@ -103,6 +103,10 @@ msgstr "не удалось обновить в базе данных запис msgid "could not add entry '%s' in cache\n" msgstr "не удалось добавить запись '%s' в кэш\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "не удалось удалить базу данных %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "не удалось удалить базу данных %s\n" @@ -397,6 +401,10 @@ msgstr "непредвиденная ошибка" msgid "could not find %s in database -- skipping\n" msgstr "не удалось найти %s в базе данных -- пропускается\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "удаление '%s' из списка целей, поскольку он конфликтует с '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "не удалось удалить файл '%s': %s\n" @@ -525,8 +533,8 @@ msgstr "не удалось изменить корневой каталог (%s msgid "could not change directory to / (%s)\n" msgstr "не удалось изменить каталог на / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "вызов popen не удался (%s)" #, c-format diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po index 78fb6102..20f89f47 100644 --- a/lib/libalpm/po/tr.po +++ b/lib/libalpm/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 3.1.4-1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-29 03:26+0200\n" "Last-Translator: Samed Beyribey \n" "Language-Team: Turkish Arch Linux Users \n" @@ -19,12 +19,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "eski sürüm %s-%s hedef listesindeki %s ile değiştiriliyor\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "%s-%s yeni sürüm %s hedef listesinde olduğundan atlanıyor\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "hedef listesinde çakışan paketler bulundu\n" #, c-format @@ -99,6 +99,10 @@ msgstr "%s-%s veritabanı kaydı güncellenemedi\n" msgid "could not add entry '%s' in cache\n" msgstr "'%s' kaydı tampona eklenemedi\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "veritabanı kaldırılamıyor %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "veritabanı kaldırılamıyor %s\n" @@ -391,6 +395,10 @@ msgstr "beklenmedik hata" msgid "could not find %s in database -- skipping\n" msgstr "%s veritabanında bulunamadı -- atlanıyor\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "'%s' hedef listesindeki '%s' ile çakıştığı için kaldırıldı\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "'%s' dosyası silinemiyor: %s\n" @@ -520,8 +528,8 @@ msgstr "kök dizini değiştirilemedi (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "/ dizinine geçilemedi (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "popen çağrısı başarısız (%s)" #, c-format diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po index c3f4e4d5..80a53670 100644 --- a/lib/libalpm/po/uk.po +++ b/lib/libalpm/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm 3.2.2\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: \n" "Last-Translator: Roman Kyrylych \n" "Language-Team: http://archlinux.org.ua\n" @@ -21,13 +21,13 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "старіша версія %s-%s замінюється на %s в цільовому списку пакунків\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "%s-%s пропускається, бо в списку цільових пакунків є новіша версія %s\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "в списку цільових пакунків були знайдені конфліктуючі пакунки\n" #, c-format @@ -102,6 +102,10 @@ msgstr "неможливо поновити запис бази даних %s-%s msgid "could not add entry '%s' in cache\n" msgstr "неможливо додати запис '%s' у кеш\n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "неможливо видалити базу даних %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "неможливо видалити базу даних %s\n" @@ -394,6 +398,10 @@ msgstr "неочікувана помилка" msgid "could not find %s in database -- skipping\n" msgstr "неможливо знайти %s в базі даних -- пропускається\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "видалення '%s' з списку пакунків, бо він конфліктує з '%s'\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "неможливо видалити файл '%s': %s\n" @@ -522,8 +530,8 @@ msgstr "неможливо змінити кореневий каталог (%s) msgid "could not change directory to / (%s)\n" msgstr "неможливо змінити каталог на / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "виклик popen невдалий (%s)" #, c-format diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po index c12dd961..f22fdb74 100644 --- a/lib/libalpm/po/zh_CN.po +++ b/lib/libalpm/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.2.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2009-07-27 21:15-0500\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" "PO-Revision-Date: 2009-07-30 20:39+0700\n" "Last-Translator: 甘露(Gan Lu) \n" "Language-Team: Chinese/Simplified \n" @@ -21,12 +21,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "正在用目标清单中的 %3$s 替换老版本 %1$s-%2$s\n" -#, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" +#, fuzzy, c-format +msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "跳过 %1$s-%2$s，因为较新版本的 %3$s 在目标清单中\n" -#, c-format -msgid "conflicting packages were found in the target list\n" +#, fuzzy, c-format +msgid "conflicting packages were found in target list\n" msgstr "目标清单中发现有冲突的软件包\n" #, c-format @@ -101,6 +101,10 @@ msgstr "无法更新数据库记录 %1$s-%2$s\n" msgid "could not add entry '%s' in cache\n" msgstr "无法在缓存中添加记录 '%s' \n" +#, fuzzy, c-format +msgid "removing invalid database: %s\n" +msgstr "无法删除数据库 %s\n" + #, c-format msgid "could not remove database %s\n" msgstr "无法删除数据库 %s\n" @@ -393,6 +397,10 @@ msgstr "未预期的错误" msgid "could not find %s in database -- skipping\n" msgstr "无法在数据库中找到 %s -- 跳过\n" +#, fuzzy, c-format +msgid "removing %s from target list\n" +msgstr "正在从目标清单中删除 '%1$s' ，因为它和 '%2$s' 冲突\n" + #, c-format msgid "cannot remove file '%s': %s\n" msgstr "无法删除文件 '%1$s': %2$s\n" @@ -521,8 +529,8 @@ msgstr "无法更改根目录 (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "无法切换目录到 / (%s)\n" -#, c-format -msgid "call to popen failed (%s)" +#, fuzzy, c-format +msgid "call to popen failed (%s)\n" msgstr "调用 popen 失败 (%s)" #, c-format -- cgit v1.2.3-24-g4f1b From 9d4448dc7f559a3048f270f439927f67dbbfd5df Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Thu, 17 Sep 2009 02:21:53 +0200 Subject: Update french translation Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/po/fr.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index 7a681a9b..abb24840 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2009-09-17 02:04+0200\n" -"PO-Revision-Date: 2009-07-28 14:01+0200\n" +"PO-Revision-Date: 2009-09-17 02:17+0200\n" "Last-Translator: Xavier \n" "Language-Team: solsTiCe d'Hiver \n" "MIME-Version: 1.0\n" @@ -20,13 +20,13 @@ msgid "replacing older version %s-%s by %s in target list\n" msgstr "" "remplacement de l'ancienne version %s-%s par %s dans la liste des cibles\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "ignore le paquet %s-%s car une version plus récente %s est dans la liste des " "cibles\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" msgstr "des paquets en conflit ont été trouvés dans la liste des cibles\n" @@ -104,9 +104,9 @@ msgstr "la mise à jour l'entrée de base de données %s-%s a échoué\n" msgid "could not add entry '%s' in cache\n" msgstr "l'ajout au cache de l'entrée '%s' a échoué\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "la suppression de la base de données %s a échoué\n" +msgstr "suppression d'une base de données invalide: %s\n" #, c-format msgid "could not remove database %s\n" @@ -402,9 +402,9 @@ msgstr "erreur non prévue" msgid "could not find %s in database -- skipping\n" msgstr "trouver %s dans la base de données a échoué -- ignoré\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "supprime '%s' de la liste de cible car il est en conflit avec '%s'\n" +msgstr "supprime %s de la liste de cible\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -534,9 +534,9 @@ msgstr "changer le répertoire racine a échoué (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "changer de répertoire vers / a échoué (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "l'appel de popen a échoué (%s)" +msgstr "l'appel de popen a échoué (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From 922448a9bf097ccdca176e952c240a1e4ca69992 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 16 Sep 2009 19:44:01 -0500 Subject: Update en_GB translation Signed-off-by: Dan McGee --- lib/libalpm/po/en_GB.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index a96ea3fd..2237eb37 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2009-09-17 02:04+0200\n" -"PO-Revision-Date: 2009-07-30 18:37+1000\n" -"Last-Translator: Jeff Bailes \n" +"PO-Revision-Date: 2009-09-16 19:39-0600\n" +"Last-Translator: Dan McGee \n" "Language-Team: English \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,13 +20,13 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "replacing older version %s-%s by %s in target list\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" -msgstr "skipping %s-%s because newer version %s is in the target list\n" +msgstr "skipping %s-%s because newer version %s is in target list\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" -msgstr "conflicting packages were found in the target list\n" +msgstr "conflicting packages were found in target list\n" #, c-format msgid "you cannot install two conflicting packages at the same time\n" @@ -100,9 +100,9 @@ msgstr "could not update database entry %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "could not add entry '%s' in cache\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "could not remove database %s\n" +msgstr "removing invalid database: %s\n" #, c-format msgid "could not remove database %s\n" @@ -396,9 +396,9 @@ msgstr "unexpected error" msgid "could not find %s in database -- skipping\n" msgstr "could not find %s in database -- skipping\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "removing '%s' from target list because it conflicts with '%s'\n" +msgstr "removing %s from target list\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -528,9 +528,9 @@ msgstr "could not change the root directory (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "could not change directory to / (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "call to popen failed (%s)" +msgstr "call to popen failed (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From 9424197b420f9c2fe41acaa3072df96369fe5b49 Mon Sep 17 00:00:00 2001 From: Matthias Gorissen Date: Fri, 18 Sep 2009 13:37:51 -0700 Subject: Update German translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/de.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 3802c4dc..4a08eaac 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2009-09-17 02:04+0200\n" -"PO-Revision-Date: 2009-07-29 16:09+0100\n" +"PO-Revision-Date: 2009-09-17 16:47+0100\n" "Last-Translator: Matthias Gorissen \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -25,13 +25,14 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" -msgstr "Überspringe %s-%s, da die Ziel-Liste die neuere Version %s enthält\n" +msgstr "" +"Überspringe %s-%s, da sich die neuere Version %s in der Ziel-Liste befindet\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" -msgstr "In Konflikt stehende Pakete wurden in Ziel-Liste gefunden\n" +msgstr "In Konflikt stehende Pakete wurden in der Ziel-Liste gefunden\n" #, c-format msgid "you cannot install two conflicting packages at the same time\n" @@ -107,9 +108,9 @@ msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren\n" msgid "could not add entry '%s' in cache\n" msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "Konnte Datenbank %s nicht entfernen\n" +msgstr "Entferne die ungültige Datenbank: %s\n" #, c-format msgid "could not remove database %s\n" @@ -408,9 +409,9 @@ msgstr "Unerwarteter Fehler" msgid "could not find %s in database -- skipping\n" msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "Entferne '%s' aus der Ziel-Liste, da es mit '%s' in Konflikt steht\n" +msgstr "Entferne '%s' aus der Ziel-Liste\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -540,9 +541,9 @@ msgstr "Konnte Root-Verzeichnis nicht wechseln (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "Konnte nicht zu Verzeichnis / (%s) wechseln\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "Aufruf von 'popen' fehlgeschlagen (%s)" +msgstr "Aufruf von 'popen' fehlgeschlagen (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From 5d0734861fee40132d6830dfb940e5ef12165fa4 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Fri, 18 Sep 2009 13:48:17 -0700 Subject: Update Hungarian translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/hu.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index fc59e026..4accf287 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -21,11 +21,11 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "régebbi verzió (%s-%s) lecserélése %s verzióra a célok listájában\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "%s-%s kihagyása, mert újabb verzió (%s) van a célok között\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" msgstr "ütköző csomagokat találtam a célok között\n" @@ -101,13 +101,13 @@ msgstr "nem sikerült a(z) %s-%s adatbázisbejegyzés frissítése\n" msgid "could not add entry '%s' in cache\n" msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "sikertelen a %s adatbázis-bejegyzés eltávolítása\n" +msgstr "hibás adatbázis eltávolítása: %s\n" #, c-format msgid "could not remove database %s\n" -msgstr "sikertelen a %s adatbázis-bejegyzés eltávolítása\n" +msgstr "sikertelen a(z) %s adatbázis eltávolítása\n" #, c-format msgid "invalid name for database entry '%s'\n" @@ -397,9 +397,9 @@ msgstr "nemvárt hiba" msgid "could not find %s in database -- skipping\n" msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "'%s' kihagyása, mert ütközik a következővel: '%s'\n" +msgstr "%s eltávolítása a cél listából\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -529,9 +529,9 @@ msgstr "nem sikerült a chroot (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "nem sikerült a könyvtárat a /-re váltani (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "popen hívás sikertelen (%s)" +msgstr "popen hívás sikertelen (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From 9516d5afe68dbdff69f47737e3af4e8272530303 Mon Sep 17 00:00:00 2001 From: Baurzhan Muftakhidinov Date: Fri, 18 Sep 2009 13:51:59 -0700 Subject: Update Kazakh translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/kk.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po index 5d60a218..335d297a 100644 --- a/lib/libalpm/po/kk.po +++ b/lib/libalpm/po/kk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2009-09-17 02:04+0200\n" -"PO-Revision-Date: 2009-07-28 19:05+0600\n" +"PO-Revision-Date: 2009-09-17 13:00+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh\n" "MIME-Version: 1.0\n" @@ -20,13 +20,12 @@ msgid "replacing older version %s-%s by %s in target list\n" msgstr "" "мақсаттар тізімінде ескірген %s-%s нұсқасы жаңа %s нұсқасымен алмастырылады\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" -"%s-%s өткізіледі, өйткені оның жаңа %s нұсқасы мақсаттар тізімінде бар болып " -"тұр\n" +"%s-%s өткізіледі, өйткені жаңа %s нұсқасы мақсаттар тізімінде бар болып тұр\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" msgstr "мақсаттар тізімінде ерегісетін дестелер табылды\n" @@ -103,9 +102,9 @@ msgstr "дерекқорда жазбаны жаңарту мүмкін емес msgid "could not add entry '%s' in cache\n" msgstr "кэш ішіне '%s' жазбасын қосу мүмкін емес\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "%s дерекқорын өшіру мүмкін емес\n" +msgstr "қате дерекқорды өшіру: %s\n" #, c-format msgid "could not remove database %s\n" @@ -399,10 +398,9 @@ msgstr "күтпеген қате кетті" msgid "could not find %s in database -- skipping\n" msgstr "дерекқор ішінде %s табылмады -- өткізіп жібереміз\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "" -"мақсаттар тізімінен '%s' өшіріледі, өйткені ол '%s' дестесімен ерегіседі\n" +msgstr "мақсаттар тізімінен '%s' өшіріру\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -533,9 +531,9 @@ msgstr "түбірлік буманы ауыстыру мүмкін емес (%s msgid "could not change directory to / (%s)\n" msgstr "/ бумасына ауысу мүмкін емес (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "popen шақыру қатемен аяқталды (%s)" +msgstr "popen шақыру сәтсіз аяқталды (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From 259cb3aad4d5197544158259d585c15d454d79e7 Mon Sep 17 00:00:00 2001 From: Volodia Macovei Date: Fri, 18 Sep 2009 13:54:59 -0700 Subject: Update Romanian translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/ro.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po index 06f5938c..3ffcd22a 100644 --- a/lib/libalpm/po/ro.po +++ b/lib/libalpm/po/ro.po @@ -20,12 +20,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "se înlocuieşte versiunea veche %s-%s cu %s în lista ţintă\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "se trece peste %s-%s deoarece o versiune mai nouă %s există în lista ţintă\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" msgstr "s-au găsit pachete în conflict în lista ţintă\n" @@ -101,9 +101,9 @@ msgstr "nu se poate actualiza intrarea în baza de date %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "nu se poate adăuga intrarea '%s' în cache\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "nu poate fi eliminată baza de date %s\n" +msgstr "se elimină baza de date nevalidă %s\n" #, c-format msgid "could not remove database %s\n" @@ -400,9 +400,9 @@ msgstr "eroare neaşteptată" msgid "could not find %s in database -- skipping\n" msgstr "nu poate fi găsit %s în baza de date -- se trece peste\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "se elimină '%s' din lista ţintă deoarece este în conflict cu '%s'\n" +msgstr "se elimină '%s' din lista ţintă\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -532,9 +532,9 @@ msgstr "nu poate fi schimbat directorul root (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "nu poate fi schimbat directorul la / (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "cererea către popen a eşuat (%s)" +msgstr "cererea către popen a eşuat (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From 65e7682638c23f5b8f4d4c80339f1cbeddb40e37 Mon Sep 17 00:00:00 2001 From: Sergey Tereschenko Date: Fri, 18 Sep 2009 14:00:52 -0700 Subject: Update Russian translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/ru.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po index c8835c01..8fb51cf3 100644 --- a/lib/libalpm/po/ru.po +++ b/lib/libalpm/po/ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2009-09-17 02:04+0200\n" -"PO-Revision-Date: 2009-07-29 20:29+0300\n" +"PO-Revision-Date: 2009-09-17 10:57+0300\n" "Last-Translator: Sergey Tereschenko \n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "заменяется устаревшая версия %s-%s на %s в списке целей\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "пропускается %s-%s, поскольку новая версия %s в списке целей\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" msgstr "в списке целей найдены конфликтующие пакеты\n" @@ -103,9 +103,9 @@ msgstr "не удалось обновить в базе данных запис msgid "could not add entry '%s' in cache\n" msgstr "не удалось добавить запись '%s' в кэш\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "не удалось удалить базу данных %s\n" +msgstr "удаление некорректной базы данных %s\n" #, c-format msgid "could not remove database %s\n" @@ -401,9 +401,9 @@ msgstr "непредвиденная ошибка" msgid "could not find %s in database -- skipping\n" msgstr "не удалось найти %s в базе данных -- пропускается\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "удаление '%s' из списка целей, поскольку он конфликтует с '%s'\n" +msgstr "удаление '%s' из списка целей\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -533,9 +533,9 @@ msgstr "не удалось изменить корневой каталог (%s msgid "could not change directory to / (%s)\n" msgstr "не удалось изменить каталог на / (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "вызов popen не удался (%s)" +msgstr "вызов popen не удался (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" @@ -596,4 +596,4 @@ msgstr "не удалось создать кэш пакетов, будет и #~ msgstr "не удалось подготовить запрос\n" #~ msgid "No /bin/sh in parent environment, aborting scriptlet\n" -#~ msgstr "Нету /bin/sh в родительском окружении, отмена скрипта\n" +#~ msgstr "Нет /bin/sh в родительском окружении, отмена скрипта\n" -- cgit v1.2.3-24-g4f1b From 419c4a2afa63acca0ec2e1f0a73d291aeed96358 Mon Sep 17 00:00:00 2001 From: Juan Pablo González Tognarelli Date: Fri, 18 Sep 2009 13:44:47 -0700 Subject: Update Spanish translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/es.po | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index e914fbff..84e6c2ee 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -5,9 +5,8 @@ msgstr "" "Project-Id-Version: libalpm\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2009-09-17 02:04+0200\n" -"PO-Revision-Date: 2009-07-29 11:51+0200\n" -"Last-Translator: Juan Pablo González Tognarelli \n" +"PO-Revision-Date: 2009-09-17 11:13-0400\n" +"Last-Translator: Juan Pablo González Tognarelli \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -15,7 +14,7 @@ msgstr "" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: CHILE\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Lokalize 0.3\n" +"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, c-format @@ -23,13 +22,17 @@ msgid "replacing older version %s-%s by %s in target list\n" msgstr "" "reemplazando la versión antigua %s-%s por %s en la lista de objetivos\n" -#, fuzzy, c-format +# , c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" -msgstr "saltando %s-%s debido a que una nueva versión de %s esta en la lista\n" +msgstr "" +"saltando %s-%s debido a la nueva versión de %s esta en la lista de " +"objetivos\n" -#, fuzzy, c-format +# , c-format +#, c-format msgid "conflicting packages were found in target list\n" -msgstr "paquetes con conflictos fueron encontrados en la lista\n" +msgstr "se encontraron paquetes con conflictos en la lista de objetivos\n" #, c-format msgid "you cannot install two conflicting packages at the same time\n" @@ -105,9 +108,10 @@ msgstr "no se pudo actualizar en la base de datos la entrada %s-%s\n" msgid "could not add entry '%s' in cache\n" msgstr "no se pudo agregar '%s' en la cache\n" -#, fuzzy, c-format +# , c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "no se pudo quitar la base de datos %s\n" +msgstr "quitando la base de datos inválida: %s\n" #, c-format msgid "could not remove database %s\n" @@ -251,7 +255,7 @@ msgstr "no se pudo leer el directorio" #, c-format msgid "wrong or NULL argument passed" -msgstr "argumento erroneo o NULO" +msgstr "se pasó un argumento erróneo o NULO" #, c-format msgid "library not initialized" @@ -364,7 +368,7 @@ msgstr "invalido o diferencial corrupto" #, c-format msgid "delta patch failed" -msgstr "parche delta fallado" +msgstr "parche diferencial fallado" #, c-format msgid "could not satisfy dependencies" @@ -406,11 +410,10 @@ msgstr "error inesperado" msgid "could not find %s in database -- skipping\n" msgstr "no se pudo encontrar %s en la base de datos -- saltando\n" -#, fuzzy, c-format +# , c-format +#, c-format msgid "removing %s from target list\n" -msgstr "" -"quitando '%s' de la lista de objetivos debido a que posee conflictos con '%" -"s'\n" +msgstr "quitando %s de la lista de objetivos\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -542,9 +545,10 @@ msgstr "no se pudo cambiar el directorio raíz (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "no se pudo cambiar el directorio a / (%s)\n" -#, fuzzy, c-format +# , c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "llamada a popen fallida (%s)" +msgstr "falló la llamada a popen (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From ccf7c31f52064facc3e8a57ab3e2c473efd4217c Mon Sep 17 00:00:00 2001 From: Samed Beyribey Date: Fri, 18 Sep 2009 14:05:06 -0700 Subject: Update Turkish translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/tr.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po index 20f89f47..02ee1c86 100644 --- a/lib/libalpm/po/tr.po +++ b/lib/libalpm/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 3.1.4-1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2009-09-17 02:04+0200\n" -"PO-Revision-Date: 2009-07-29 03:26+0200\n" +"PO-Revision-Date: 2009-09-17 11:16+0200\n" "Last-Translator: Samed Beyribey \n" "Language-Team: Turkish Arch Linux Users \n" "MIME-Version: 1.0\n" @@ -19,11 +19,11 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "eski sürüm %s-%s hedef listesindeki %s ile değiştiriliyor\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" -msgstr "%s-%s yeni sürüm %s hedef listesinde olduğundan atlanıyor\n" +msgstr "%s-%s yeni sürümü %s hedef listesinde olduğundan atlanıyor\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" msgstr "hedef listesinde çakışan paketler bulundu\n" @@ -99,9 +99,9 @@ msgstr "%s-%s veritabanı kaydı güncellenemedi\n" msgid "could not add entry '%s' in cache\n" msgstr "'%s' kaydı tampona eklenemedi\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "veritabanı kaldırılamıyor %s\n" +msgstr "geçersiz veritabanı siliniyor: %s\n" #, c-format msgid "could not remove database %s\n" @@ -395,9 +395,9 @@ msgstr "beklenmedik hata" msgid "could not find %s in database -- skipping\n" msgstr "%s veritabanında bulunamadı -- atlanıyor\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "'%s' hedef listesindeki '%s' ile çakıştığı için kaldırıldı\n" +msgstr "%s hedef listesinden kaldırılıyor\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -528,9 +528,9 @@ msgstr "kök dizini değiştirilemedi (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "/ dizinine geçilemedi (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "popen çağrısı başarısız (%s)" +msgstr "popen çağrısı başarısız (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From 90a06b1cf0e9579d96bc4abf52c71ee81cc7b843 Mon Sep 17 00:00:00 2001 From: Roman Kyrylych Date: Fri, 18 Sep 2009 14:08:32 -0700 Subject: Update Ukrainian translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/uk.po | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po index 80a53670..8d8fc20e 100644 --- a/lib/libalpm/po/uk.po +++ b/lib/libalpm/po/uk.po @@ -21,12 +21,12 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "старіша версія %s-%s замінюється на %s в цільовому списку пакунків\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" "%s-%s пропускається, бо в списку цільових пакунків є новіша версія %s\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" msgstr "в списку цільових пакунків були знайдені конфліктуючі пакунки\n" @@ -88,7 +88,7 @@ msgstr "неможливо отримати поточний робочий ка #, c-format msgid "problem occurred while upgrading %s\n" -msgstr "з'явилась проблема при поновленні %s\n" +msgstr "з'явилась проблема при оновленні %s\n" #, c-format msgid "problem occurred while installing %s\n" @@ -96,19 +96,19 @@ msgstr "з'явилась проблема при встановленні %s\n" #, c-format msgid "could not update database entry %s-%s\n" -msgstr "неможливо поновити запис бази даних %s-%s\n" +msgstr "неможливо оновити запис бази даних %s-%s\n" #, c-format msgid "could not add entry '%s' in cache\n" msgstr "неможливо додати запис '%s' у кеш\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "неможливо видалити базу даних %s\n" +msgstr "вилучення невірної бази даних: %s\n" #, c-format msgid "could not remove database %s\n" -msgstr "неможливо видалити базу даних %s\n" +msgstr "неможливо вилучити базу даних %s\n" #, c-format msgid "invalid name for database entry '%s'\n" @@ -168,7 +168,7 @@ msgstr "виявлено цикл залежностей:\n" #, c-format msgid "%s will be removed after its %s dependency\n" -msgstr "%s буде видалено після його залежності %s\n" +msgstr "%s буде вилучено після його залежності %s\n" #, c-format msgid "%s will be installed before its %s dependency\n" @@ -280,11 +280,11 @@ msgstr "неможливо знайти базу даних" #, c-format msgid "could not update database" -msgstr "неможливо поновити базу даних" +msgstr "неможливо оновити базу даних" #, c-format msgid "could not remove database entry" -msgstr "неможливо видалити запис з бази даних" +msgstr "неможливо вилучити запис з бази даних" #, c-format msgid "invalid url for server" @@ -340,7 +340,7 @@ msgstr "неможливо відкрити файл пакунку" #, c-format msgid "cannot remove all files for package" -msgstr "неможливо видалити всі файли для пакунку" +msgstr "неможливо вилучити всі файли для пакунку" #, c-format msgid "package filename is not valid" @@ -398,25 +398,25 @@ msgstr "неочікувана помилка" msgid "could not find %s in database -- skipping\n" msgstr "неможливо знайти %s в базі даних -- пропускається\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "видалення '%s' з списку пакунків, бо він конфліктує з '%s'\n" +msgstr "вилучення '%s' зі списку пакунків\n" #, c-format msgid "cannot remove file '%s': %s\n" -msgstr "неможливо видалити файл '%s': %s\n" +msgstr "неможливо вилучити файл '%s': %s\n" #, c-format msgid "could not remove database entry %s-%s\n" -msgstr "неможливо видалити запис бази даних %s-%s\n" +msgstr "неможливо вилучити запис бази даних %s-%s\n" #, c-format msgid "could not remove entry '%s' from cache\n" -msgstr "неможливо видалити запис '%s' з кешу\n" +msgstr "неможливо вилучити запис '%s' з кешу\n" #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" -msgstr "%s: ігнорування поновлення пакунку (%s => %s)\n" +msgstr "%s: ігнорування оновлення пакунку (%s => %s)\n" #, c-format msgid "%s: ignoring package downgrade (%s => %s)\n" @@ -444,11 +444,11 @@ msgstr "репозиторій '%s' не знайдено\n" #, c-format msgid "%s-%s is up to date -- skipping\n" -msgstr "%s-%s не потребує поновлення -- пропускається\n" +msgstr "%s-%s не потребує оновлення -- пропущено\n" #, c-format msgid "%s-%s is up to date -- reinstalling\n" -msgstr "%s-%s не потребує поновлення -- перевстановлюється\n" +msgstr "%s-%s не потребує оновлення -- перевстановлюється\n" #, c-format msgid "downgrading package %s (%s => %s)\n" @@ -460,7 +460,7 @@ msgstr "виявлені нерозв'язні конфлікти пакункі #, c-format msgid "removing '%s' from target list because it conflicts with '%s'\n" -msgstr "видалення '%s' з списку пакунків, бо він конфліктує з '%s'\n" +msgstr "вилучення '%s' з списку пакунків, бо він конфліктує з '%s'\n" #, c-format msgid "failed to retrieve some files from %s\n" @@ -468,7 +468,7 @@ msgstr "не вдалося отримати деякі файли з %s\n" #, c-format msgid "could not create removal transaction\n" -msgstr "неможливо створити транзакцію видалення\n" +msgstr "неможливо створити транзакцію вилучення\n" #, c-format msgid "could not create transaction\n" @@ -476,7 +476,7 @@ msgstr "неможливо створити транзакцію\n" #, c-format msgid "could not initialize the removal transaction\n" -msgstr "неможливо почати транзакцію видалення\n" +msgstr "неможливо почати транзакцію вилучення\n" #, c-format msgid "could not initialize transaction\n" @@ -484,11 +484,11 @@ msgstr "неможливо почати транзакцію\n" #, c-format msgid "could not prepare removal transaction\n" -msgstr "неможливо підготувати транзакцію видалення\n" +msgstr "неможливо підготувати транзакцію вилучення\n" #, c-format msgid "could not commit removal transaction\n" -msgstr "неможливо здійснити транзакцію видалення\n" +msgstr "неможливо здійснити транзакцію вилучення\n" #, c-format msgid "could not commit transaction\n" @@ -496,7 +496,7 @@ msgstr "неможливо здійснити транзакцію\n" #, c-format msgid "could not remove lock file %s\n" -msgstr "неможливо видалити файл блокування %s\n" +msgstr "неможливо вилучити файл блокування %s\n" #, c-format msgid "could not create temp directory\n" @@ -508,7 +508,7 @@ msgstr "неможливо скопіювати тимчасовий файл д #, c-format msgid "could not remove tmpdir %s\n" -msgstr "неможливо видалити тимчасовий каталог %s\n" +msgstr "неможливо вилучити тимчасовий каталог %s\n" #, c-format msgid "could not open %s: %s\n" @@ -530,9 +530,9 @@ msgstr "неможливо змінити кореневий каталог (%s) msgid "could not change directory to / (%s)\n" msgstr "неможливо змінити каталог на / (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "виклик popen невдалий (%s)" +msgstr "виклик popen невдалий (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b From 6cd8d6bd053514debbb20cc6781948225a79ab9d Mon Sep 17 00:00:00 2001 From: Giovanni Scafora Date: Thu, 17 Sep 2009 16:12:54 -0700 Subject: Update Italian translation Signed-off-by: Giovanni Scafora --- lib/libalpm/po/it.po | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index 930fca61..391bca61 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -22,27 +22,30 @@ msgstr "" msgid "replacing older version %s-%s by %s in target list\n" msgstr "sostituzione in corso della vecchia versione di %s-%s con %s\n" -#, fuzzy, c-format +#, c-format msgid "skipping %s-%s because newer version %s is in target list\n" msgstr "" -"ignoro %s-%s perché la nuova versione %s è già presente nella lista dei " +"ignoro %s-%s perché la nuova versione %s è presente nella lista dei " "pacchetti\n" -#, fuzzy, c-format +#, c-format msgid "conflicting packages were found in target list\n" -msgstr "sono stati individuati dei pacchetti che vanno in conflitto\n" +msgstr "" +"ci sono dei pacchetti in conflitto all'interno della lista dei pacchetti\n" #, c-format msgid "you cannot install two conflicting packages at the same time\n" -msgstr "impossibile installare due pacchetti che vanno in conflitto\n" +msgstr "" +"non puoi installare contemporaneamente due pacchetti che vanno in conflitto\n" #, c-format msgid "replacing packages with -U is not supported yet\n" -msgstr "la sostituzione dei pacchetti con -U non è ancora supportata\n" +msgstr "" +"la sostituzione dei pacchetti con l'opzione -U non è ancora supportata\n" #, c-format msgid "you can replace packages manually using -Rd and -U\n" -msgstr "puoi sostituire manualmente i pacchetti, usando le opzioni -Rd e -U\n" +msgstr "puoi sostituire i pacchetti manualmente, usando le opzioni -Rd e -U\n" #, c-format msgid "" @@ -104,9 +107,9 @@ msgstr "impossibile aggiornare la voce %s-%s nel database\n" msgid "could not add entry '%s' in cache\n" msgstr "impossible includere la voce '%s' nella cache\n" -#, fuzzy, c-format +#, c-format msgid "removing invalid database: %s\n" -msgstr "impossibile rimuovere il database %s\n" +msgstr "rimozione del database: %s\n" #, c-format msgid "could not remove database %s\n" @@ -197,7 +200,7 @@ msgstr "l'url '%s' non è esatto\n" #, c-format msgid "url scheme not specified, assuming HTTP\n" -msgstr "non è stato specificato il protocollo dell'url, sarà usato HTTP\n" +msgstr "il protocollo dell'url non è stato specificato, sarà usato HTTP\n" #, c-format msgid "disk" @@ -403,10 +406,9 @@ msgstr "errore inaspettato" msgid "could not find %s in database -- skipping\n" msgstr "impossibile trovare %s nel database, sarà ignorato\n" -#, fuzzy, c-format +#, c-format msgid "removing %s from target list\n" -msgstr "" -"rimozione di '%s' dalla lista dei pacchetti perché va in conflitto con '%s'\n" +msgstr "rimozione di %s dalla lista dei pacchetti\n" #, c-format msgid "cannot remove file '%s': %s\n" @@ -478,11 +480,11 @@ msgstr "impossibile scaricare alcuni file da %s\n" #, c-format msgid "could not create removal transaction\n" -msgstr "impossibile avviare l'operazione di rimozione\n" +msgstr "impossibile eseguire l'operazione di rimozione\n" #, c-format msgid "could not create transaction\n" -msgstr "impossibile avviare l'operazione\n" +msgstr "impossibile eseguire l'operazione\n" #, c-format msgid "could not initialize the removal transaction\n" @@ -540,9 +542,9 @@ msgstr "impossibile cambiare la root directory (%s)\n" msgid "could not change directory to / (%s)\n" msgstr "impossibile spostarsi nella directory / (%s)\n" -#, fuzzy, c-format +#, c-format msgid "call to popen failed (%s)\n" -msgstr "chiamata a popen non riuscita (%s)" +msgstr "chiamata a popen non riuscita (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -- cgit v1.2.3-24-g4f1b