summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-06-04 13:36:38 -0500
committerDan McGee <dan@archlinux.org>2010-06-04 13:36:38 -0500
commitf60db581a7676dc0d2341177216fccb566dfb3d0 (patch)
tree66f94d93db42a6695ac5a391339f323df4a6e574
parenta8a6eed9e8d3be200ddbe193b2c80640b5d81f6c (diff)
translation: update pot/po files for libalpm in prep for release
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/po/ca.po162
-rw-r--r--lib/libalpm/po/cs.po136
-rw-r--r--lib/libalpm/po/de.po140
-rw-r--r--lib/libalpm/po/el.po137
-rw-r--r--lib/libalpm/po/en_GB.po136
-rw-r--r--lib/libalpm/po/es.po154
-rw-r--r--lib/libalpm/po/fr.po139
-rw-r--r--lib/libalpm/po/hu.po136
-rw-r--r--lib/libalpm/po/it.po148
-rw-r--r--lib/libalpm/po/kk.po138
-rw-r--r--lib/libalpm/po/libalpm.pot83
-rw-r--r--lib/libalpm/po/nb_NO.po136
-rw-r--r--lib/libalpm/po/pl.po142
-rw-r--r--lib/libalpm/po/pt_BR.po141
-rw-r--r--lib/libalpm/po/ro.po140
-rw-r--r--lib/libalpm/po/ru.po144
-rw-r--r--lib/libalpm/po/sv_SE.po136
-rw-r--r--lib/libalpm/po/tr.po136
-rw-r--r--lib/libalpm/po/uk.po136
-rw-r--r--lib/libalpm/po/zh_CN.po136
20 files changed, 1396 insertions, 1360 deletions
diff --git a/lib/libalpm/po/ca.po b/lib/libalpm/po/ca.po
index 05ee007a..1957b70a 100644
--- a/lib/libalpm/po/ca.po
+++ b/lib/libalpm/po/ca.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-11-15 23:05+0100\n"
"Last-Translator: Manuel Tortosa <manutortosa@gmail.com>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,30 +21,12 @@ msgstr ""
#, c-format
msgid "replacing older version %s-%s by %s in target list\n"
msgstr ""
-"s'està reemplaçant l'antiga versió %s-%s per %s en la llista "
-"d'objectius\n"
+"s'està reemplaçant l'antiga versió %s-%s per %s en la llista d'objectius\n"
#, c-format
msgid "skipping %s-%s because newer version %s is in target list\n"
msgstr ""
-"s'ometrà %s-%s perquè la versió més nova %s és en la llista "
-"d'objectius\n"
-
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "s'han trobat paquets conflictius en la llista d'objectius\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "no podeu instal·lar dos paquets amb conflictes alhora\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "no està implementat reemplaçar paquets amb -U\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "podeu reemplaçar paquets manualment usant -Rd i -U\n"
+"s'ometrà %s-%s perquè la versió més nova %s és en la llista d'objectius\n"
#, c-format
msgid ""
@@ -99,8 +82,7 @@ msgstr "ha ocorregut un problema en instal·lar %s\n"
#, c-format
msgid "could not update database entry %s-%s\n"
-msgstr ""
-"no s'ha pogut actualitzar l'entrada de la base de dades %s-%s\n"
+msgstr "no s'ha pogut actualitzar l'entrada de la base de dades %s-%s\n"
#, c-format
msgid "could not add entry '%s' in cache\n"
@@ -111,6 +93,14 @@ msgid "removing invalid database: %s\n"
msgstr "s'està eliminant la base de dades invàlida: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "no s'ha pogut obrir %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "no s'ha pogut eliminar la entrada de la base de dades %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "no s'ha pogut eliminar la base de dades %s\n"
@@ -118,6 +108,10 @@ msgstr "no s'ha pogut eliminar la base de dades %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "nom invàlid per l'entrada de la base de dades '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada de la base de dades corrupta '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "entrada de la base de dades corrupta '%s'\n"
@@ -128,13 +122,11 @@ msgstr "no es pot obrir el fitxer %s: %s\n"
#, c-format
msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"la base de dades %s és inconsistent: nom erroni en el paquet %s\n"
+msgstr "la base de dades %s és inconsistent: nom erroni en el paquet %s\n"
#, c-format
msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"la base de dades %s és inconsistent: versió errònia en el paquet %s\n"
+msgstr "la base de dades %s és inconsistent: versió errònia en el paquet %s\n"
#, c-format
msgid "could not create directory %s: %s\n"
@@ -142,8 +134,7 @@ msgstr "no s'ha pogut crear el directori %s: %s\n"
#, c-format
msgid "could not parse package description file in %s\n"
-msgstr ""
-"no s'ha pogut analitzar el fitxers de descripció de paquet en %s\n"
+msgstr "no s'ha pogut analitzar el fitxers de descripció de paquet en %s\n"
#, c-format
msgid "missing package name in %s\n"
@@ -162,14 +153,14 @@ msgid "missing package metadata in %s\n"
msgstr "falten les metadades del paquet en %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "intent de re-registre de la BD 'local'\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "no s'ha definit la ruta de la base de dades\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "intent de re-registre de la BD 'local'\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "s'ha detectat una dependència cíclica:\n"
@@ -194,30 +185,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "no es pot resoldre \"%s\", una dependència de \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "l'url '%s' és invàlid\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "no s'ha especificat l'esquema url, s'està assumint HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disc"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' és invàlid\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "ha fallat en recuperar el fitxer '%s' des de %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "no es pot la reprendre la baixada, s'està iniciant de nou\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "no s'ha pogut escriure al fitxer '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "error en escriure al fitxer '%s': %s\n"
@@ -332,8 +315,7 @@ msgstr "l'operació no és compatible amb el tipus de transacció"
#, c-format
msgid "transaction commit attempt when database is not locked"
msgstr ""
-"intent de publicació de la transacció amb la base de dades no "
-"bloquejada"
+"intent de publicació de la transacció amb la base de dades no bloquejada"
#, c-format
msgid "could not find or read package"
@@ -359,9 +341,13 @@ msgstr "no s'han pogut eliminar tots els fitxers del paquet"
msgid "package filename is not valid"
msgstr "el nom de fitxer del paquet no és vàlid"
-#, c-format
-msgid "no such repository"
-msgstr "no existeix aquest repositori"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "el nom de fitxer del paquet no és vàlid"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "no s'ha pogut trobar o llegir el paquet"
#, c-format
msgid "invalid or corrupted delta"
@@ -452,10 +438,6 @@ msgid "cannot replace %s by %s\n"
msgstr "no s'ha pogut reemplaçar %s per %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "no s'ha trobat el repositori '%s'\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s és al dia -- s'ignorarà\n"
@@ -469,40 +451,19 @@ msgstr "desactualitzant paquet %s (%s => %s)\n"
#, c-format
msgid "unresolvable package conflicts detected\n"
-msgstr ""
-"s'ha detectat un paquet amb un conflicte impossible de resoldre\n"
+msgstr "s'ha detectat un paquet amb un conflicte impossible de resoldre\n"
#, c-format
msgid "removing '%s' from target list because it conflicts with '%s'\n"
msgstr ""
-"s'està eliminant '%s' de la llista d'objectius perquè té conflictes "
-"amb '%s'\n"
+"s'està eliminant '%s' de la llista d'objectius perquè té conflictes amb "
+"'%s'\n"
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr "ha fallat en recuperar alguns fitxers de %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "no s'ha pogut crear la transacció d'eliminació\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "no s'ha pogut crear la transacció\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "no s'ha pogut inicialitzar la transacció d'eliminació\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "no s'ha pogut inicialitzar la transacció\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "no s'ha pogut preparar la transacció d'eliminació\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "no s'ha pogut publicar la transacció d'eliminació\n"
@@ -527,10 +488,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "no s'ha pogut eliminar el directori temporal %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "no s'ha pogut obrir %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "no s'ha pogut canviar el directori a %s (%s)\n"
@@ -566,4 +523,41 @@ msgstr "no existeix memòria cau %s, s'està creant...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "no s'ha pogut crear la memòria cau del paquet, s'usarà /tmp\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "s'han trobat paquets conflictius en la llista d'objectius\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "no podeu instal·lar dos paquets amb conflictes alhora\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "no està implementat reemplaçar paquets amb -U\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "podeu reemplaçar paquets manualment usant -Rd i -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "no s'ha especificat l'esquema url, s'està assumint HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "no s'ha pogut escriure al fitxer '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "no existeix aquest repositori"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "no s'ha trobat el repositori '%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "no s'ha pogut crear la transacció d'eliminació\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "no s'ha pogut crear la transacció\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "no s'ha pogut inicialitzar la transacció d'eliminació\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "no s'ha pogut inicialitzar la transacció\n"
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "no s'ha pogut preparar la transacció d'eliminació\n"
diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po
index 7930dc15..d0517810 100644
--- a/lib/libalpm/po/cs.po
+++ b/lib/libalpm/po/cs.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:08+0200\n"
"Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,22 +27,6 @@ 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 target list\n"
-msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nelze instalovat dva konfliktní balíčky současně\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "nahrazování balíčků pomocí -U není nyní podporováno\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "balíčky lze nahradit ručně použitím -Rd a -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -106,6 +91,14 @@ msgid "removing invalid database: %s\n"
msgstr "odstraňuje se chybná databáze: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nelze otevřít %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nelze odstranit záznam databáze %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "nelze odstranit záznam v databázi %s\n"
@@ -113,6 +106,10 @@ msgstr "nelze odstranit záznam v databázi %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "chybný název záznamu v databázi '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "poškozený záznam v databázi '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "poškozený záznam v databázi '%s'\n"
@@ -154,14 +151,14 @@ msgid "missing package metadata in %s\n"
msgstr "chybí metadata balíčku v %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "pokus o opětovné zaregistrování databáze 'local'\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "cesta k databázi není definována\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "pokus o opětovné zaregistrování databáze 'local'\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "zjištěna cyklická závislost:\n"
@@ -186,30 +183,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "nelze vyřešit \"%s\", závislost \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' je chybná\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "schéma URL nedefinováno, předpokládá se HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disk"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' je chybná\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "selhalo získání souboru '%s' z %s: %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "nelze navázat stahování, začíná se znovu\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nelze zapisovat do souboru '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "chyba při zápisu do souboru '%s': %s\n"
@@ -349,9 +338,13 @@ msgstr "nelze odstranit všechny soubory balíčku"
msgid "package filename is not valid"
msgstr "jméno souboru balíčku není platné"
-#, c-format
-msgid "no such repository"
-msgstr "takový repositář není nastaven"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "jméno souboru balíčku není platné"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "nelze nalézt nebo přečíst balíček"
#, c-format
msgid "invalid or corrupted delta"
@@ -442,10 +435,6 @@ msgid "cannot replace %s by %s\n"
msgstr "nelze nahradit soubor %s souborem %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repositář '%s' nebyl nalezen\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s je aktuální -- vynechat\n"
@@ -470,26 +459,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "selhalo získání některých souborů z %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nelze vytvořit transakci pro odstranění\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nelze vytvořit transakci\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nelze inicializovat transakci pro odstranění\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nelze inicializovat transakci\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nelze připravit transakci pro odstranění\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "nelze provést transakci pro odstranění\n"
@@ -514,10 +483,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "nelze odstranit dočasný adresář %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nelze otevřít %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "nelze změnit adresář na %s (%s)\n"
@@ -553,6 +518,45 @@ msgstr "neexistuje cache %s, vytváří se...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "nelze vytvořit cache balíčků, používá se /tmp\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "nelze instalovat dva konfliktní balíčky současně\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "nahrazování balíčků pomocí -U není nyní podporováno\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "balíčky lze nahradit ručně použitím -Rd a -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "schéma URL nedefinováno, předpokládá se HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "nelze zapisovat do souboru '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "takový repositář není nastaven"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositář '%s' nebyl nalezen\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "nelze vytvořit transakci pro odstranění\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "nelze vytvořit transakci\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "nelze inicializovat transakci pro odstranění\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "nelze inicializovat transakci\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "nelze připravit transakci pro odstranění\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "chyba při stahování '%s': %s\n"
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 7f6d6742..a92da4e3 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -11,10 +11,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:08+0200\n"
"Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
"Language-Team: German <archlinux.de>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -31,24 +32,6 @@ msgstr ""
"Überspringe %s-%s, da sich die neuere Version %s in der Ziel-Liste befindet\n"
#, c-format
-msgid "conflicting packages were found in target list\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"
-msgstr ""
-"Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit "
-"installieren\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "Das Ersetzen von Paketen mit -U wird noch nicht unterstützt\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "Sie können Pakete manuell mit -Rd und -U ersetzen\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -113,6 +96,14 @@ msgid "removing invalid database: %s\n"
msgstr "Entferne die ungültige Datenbank: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "Konnte Datei %s nicht öffnen: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "Konnte Datenbank-Eintrag %s-%s nicht entfernen\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "Konnte Datenbank %s nicht entfernen\n"
@@ -120,6 +111,10 @@ msgstr "Konnte Datenbank %s nicht entfernen\n"
msgid "invalid name for database entry '%s'\n"
msgstr "Ungültiger Name für Datenbank-Eintrag '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "Beschädigter Datenbank-Eintrag '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "Beschädigter Datenbank-Eintrag '%s'\n"
@@ -165,14 +160,14 @@ msgid "missing package metadata in %s\n"
msgstr "Fehlende Paket-Metadaten in %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "Versuche die lokale Datenbank neu zu registrieren\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "Datenbank-Pfad ist nicht definiert\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "Versuche die lokale Datenbank neu zu registrieren\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "Abhängigkeits-Zyklus entdeckt:\n"
@@ -197,30 +192,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "Kann \"%s\" nicht auflösen (eine Abhängigkeit von \"%s\")\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' ist ungültig\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "URL-Schema nicht spezifiziert, vermute HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "Platte"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' ist ungültig\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "Kann den Download nicht wieder aufnehmen, starte neu\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "Kann Datei '%s' nicht beschreiben\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "Fehler beim Beschreiben von Datei '%s': %s\n"
@@ -361,9 +348,13 @@ msgstr "Konnte nicht alle Dateien des Paketes entfernen"
msgid "package filename is not valid"
msgstr "Der Dateiname des Paketes ist nicht gültig"
-#, c-format
-msgid "no such repository"
-msgstr "Kein solches Repositorium"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "Der Dateiname des Paketes ist nicht gültig"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "Konnte Paket nicht finden oder lesen"
#, c-format
msgid "invalid or corrupted delta"
@@ -454,10 +445,6 @@ msgid "cannot replace %s by %s\n"
msgstr "Kann %s nicht durch %s ersetzen\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "Repositorium '%s' nicht gefunden\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s ist aktuell -- Überspringe\n"
@@ -482,26 +469,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "Konnte manche Dateien von %s nicht übertragen\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "Konnte den Lösch-Vorgang nicht erstellen\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "Konnte den Vorgang nicht erstellen\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "Konnte den Lösch-Vorgang nicht beginnen\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "Konnte den Vorgang nicht beginnen\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "Konnte Lösch-Vorgang nicht vorbereiten\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "Konnte Lösch-Vorgang nicht durchführen\n"
@@ -526,10 +493,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "Konnte temporäres Verzeichnis %s nicht entfernen\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "Konnte Datei %s nicht öffnen: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)\n"
@@ -564,3 +527,44 @@ msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
#, c-format
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "In Konflikt stehende Pakete wurden in der Ziel-Liste gefunden\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit "
+#~ "installieren\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "Das Ersetzen von Paketen mit -U wird noch nicht unterstützt\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "Sie können Pakete manuell mit -Rd und -U ersetzen\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "URL-Schema nicht spezifiziert, vermute HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "Kann Datei '%s' nicht beschreiben\n"
+
+#~ msgid "no such repository"
+#~ msgstr "Kein solches Repositorium"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "Repositorium '%s' nicht gefunden\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "Konnte den Lösch-Vorgang nicht erstellen\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "Konnte den Vorgang nicht erstellen\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "Konnte den Lösch-Vorgang nicht beginnen\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "Konnte den Vorgang nicht beginnen\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "Konnte Lösch-Vorgang nicht vorbereiten\n"
diff --git a/lib/libalpm/po/el.po b/lib/libalpm/po/el.po
index f5c86e54..701f1965 100644
--- a/lib/libalpm/po/el.po
+++ b/lib/libalpm/po/el.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-06 19:21+0200\n"
"Last-Translator: Christos Nouskas <nous@archlinux.us>\n"
"Language-Team: greek <el@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,22 +28,6 @@ msgstr ""
"παράλειψη %s-%s καθώς υπάρχει νεότερη έκδοση %s στην λίστα διεκπεραίωσης\n"
#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "βρέθηκαν αντιτιθέμενα πακέτα στην λίστα διεκπεραίωσης\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "δεν επιτρέπεται η ταυτόχρονη εγκατάσταση δύο αντιτιθεμένων πακέτων\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "η αντικατάσταση πακέτων με όρισμα -U δεν υποστηρίζεται ακόμη\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "η αντικατάσταση πακέτων μπορεί να γίνει χειροκίνητα με -Rd and -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -107,6 +92,14 @@ msgid "removing invalid database: %s\n"
msgstr "διαγραφή άκυρης βάσης: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "αδυναμία ανοίγματος %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "αδυναμία κατάργησης εγγραφής βάσης %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "αδυναμία διαγραφής βάσης %s\n"
@@ -114,6 +107,10 @@ msgstr "αδυναμία διαγραφής βάσης %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "άκυρο όνομα εγγραφής βάσης '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "κατεστραμμένο όνομα εγγραφής βάσης '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "κατεστραμμένο όνομα εγγραφής βάσης '%s'\n"
@@ -155,14 +152,14 @@ msgid "missing package metadata in %s\n"
msgstr "απόντα μετα-δεδομένα πακέτου στο %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "προσπάθεια επανακαταχώρησης 'τοπικής' βάσης\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "ακαθόριστη διαδρομή βάσης\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "προσπάθεια επανακαταχώρησης 'τοπικής' βάσης\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "εντοπισμός κυκλικής εξάρτησης:\n"
@@ -187,30 +184,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "αδυναμία εύρεσης του \"%s\", εξάρτησης του \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "άκυρο url '%s'\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "ακαθόριστο πρωτόκολλο url, εικάζεται HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "δίσκο(ς)"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "άκυρο url '%s'\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "αποτυχία λήψης αρχείου '%s' από %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "αδυναμία συνέχισης λήψης, επανάληψη\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "αδυναμία εγγραφής στο '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "σφάλμα εγγραφής στο '%s': %s\n"
@@ -350,9 +339,13 @@ msgstr "αδυναμία κατάργησης όλων των αρχείων τ
msgid "package filename is not valid"
msgstr "μη έγκυρο όνομα πακέτου"
-#, c-format
-msgid "no such repository"
-msgstr "δεν υπάρχει τέτοια αποθήκη"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "μη έγκυρο όνομα πακέτου"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "αδυναμία εύρεσης ή ανάγνωσης πακέτου"
#, c-format
msgid "invalid or corrupted delta"
@@ -443,10 +436,6 @@ msgid "cannot replace %s by %s\n"
msgstr "αδυναμία αντικατάστασης του %s από το %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "δεν βρέθηκε αποθήκη'%s'\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "το %s-%s είναι ενημερωμένο -- παράλειψη\n"
@@ -472,26 +461,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "αποτυχία λήψεως κάποιων αρχείων από το %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "αδυναμία διεκπεραίωσης κατάργησης\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "αδυναμία δημιουργίας διεκπεραίωσης\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "αδυναμία εκκίνησης κατάργησης\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "αδυναμία εκκίνησης διεκπεραίωσης\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "αδυναμία προετοιμασίας κατάργησης\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "αδυναμία ολοκλήρωσης κατάργησης\n"
@@ -516,10 +485,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "αδυναμία διαγραφής προσωρινού καταλόγου %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "αδυναμία ανοίγματος %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "αδυναμία αλλαγής καταλόγου σε %s (%s)\n"
@@ -554,3 +519,43 @@ msgstr "δεν υπάρχει κρύπτη %s, δημιουργία...\n"
#, c-format
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "αδυναμία δημιουργίας κρύπτης πακέτων, χρήση /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "βρέθηκαν αντιτιθέμενα πακέτα στην λίστα διεκπεραίωσης\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "δεν επιτρέπεται η ταυτόχρονη εγκατάσταση δύο αντιτιθεμένων πακέτων\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "η αντικατάσταση πακέτων με όρισμα -U δεν υποστηρίζεται ακόμη\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "η αντικατάσταση πακέτων μπορεί να γίνει χειροκίνητα με -Rd and -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "ακαθόριστο πρωτόκολλο url, εικάζεται HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "αδυναμία εγγραφής στο '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "δεν υπάρχει τέτοια αποθήκη"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "δεν βρέθηκε αποθήκη'%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "αδυναμία διεκπεραίωσης κατάργησης\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "αδυναμία δημιουργίας διεκπεραίωσης\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "αδυναμία εκκίνησης κατάργησης\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "αδυναμία εκκίνησης διεκπεραίωσης\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "αδυναμία προετοιμασίας κατάργησης\n"
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index 3427079c..6dcf0cc5 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:08+0200\n"
"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
"Language-Team: English <en_gb@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -25,22 +26,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
msgstr "skipping %s-%s because newer version %s is in target list\n"
#, c-format
-msgid "conflicting packages were found in 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"
-msgstr "you cannot install two conflicting packages at the same time\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "replacing packages with -U is not supported yet\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "you can replace packages manually using -Rd and -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -105,6 +90,14 @@ msgid "removing invalid database: %s\n"
msgstr "removing invalid database: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "could not open %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "could not remove database entry %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "could not remove database %s\n"
@@ -112,6 +105,10 @@ msgstr "could not remove database %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "invalid name for database entry '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "corrupted database entry '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "corrupted database entry '%s'\n"
@@ -153,14 +150,14 @@ msgid "missing package metadata in %s\n"
msgstr "missing package metadata in %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "attempt to re-register the 'local' DB\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "database path is undefined\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "attempt to re-register the 'local' DB\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "dependency cycle detected:\n"
@@ -185,30 +182,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' is invalid\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "URL scheme not specified, assuming HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disk"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' is invalid\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "failed retrieving file '%s' from %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "cannot resume download, starting over\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "cannot write to file '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "error writing to file '%s': %s\n"
@@ -348,9 +337,13 @@ msgstr "cannot remove all files for package"
msgid "package filename is not valid"
msgstr "package filename is not valid"
-#, c-format
-msgid "no such repository"
-msgstr "no such repository"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "package filename is not valid"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "could not find or read package"
#, c-format
msgid "invalid or corrupted delta"
@@ -441,10 +434,6 @@ msgid "cannot replace %s by %s\n"
msgstr "cannot replace %s by %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repository '%s' not found\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s is up to date -- skipping\n"
@@ -469,26 +458,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "failed to retrieve some files from %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "could not create removal transaction\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "could not create transaction\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "could not initialise the removal transaction\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "could not initialise transaction\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "could not prepare removal transaction\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "could not commit removal transaction\n"
@@ -513,10 +482,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "could not remove tmpdir %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "could not open %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "could not change directory to %s (%s)\n"
@@ -552,6 +517,45 @@ msgstr "no %s cache exists, creating...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "couldn't create package cache, using /tmp instead\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "conflicting packages were found in target list\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "you cannot install two conflicting packages at the same time\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "replacing packages with -U is not supported yet\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "you can replace packages manually using -Rd and -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "URL scheme not specified, assuming HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "cannot write to file '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "no such repository"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repository '%s' not found\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "could not create removal transaction\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "could not create transaction\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "could not initialise the removal transaction\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "could not initialise transaction\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "could not prepare removal transaction\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "error downloading '%s': %s\n"
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index fd0a69bc..aacaa5f8 100644
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
@@ -4,10 +4,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:08+0200\n"
"Last-Translator: Juan Pablo González Tognarelli <jotapesan@gmail.com>\n"
"Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,25 +30,6 @@ msgstr ""
"saltando %s-%s debido a la nueva versión de %s esta en la lista de "
"objetivos\n"
-# , c-format
-#, c-format
-msgid "conflicting packages were found in target list\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"
-msgstr ""
-"usted no puede instalar simultáneamente dos paquetes que poseen conflictos "
-"entre si\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "reemplazar paquetes con -U aún no esta soportado\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "usted puede reemplazar manualmente los paquetes usando -Rd y -U\n"
-
#, c-format
msgid ""
"directory permissions differ on %s\n"
@@ -114,6 +96,14 @@ msgid "removing invalid database: %s\n"
msgstr "quitando la base de datos inválida: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "no se pudo abrir %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "no se pudo quitar de la base de datos %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "no se pudo quitar la base de datos %s\n"
@@ -121,6 +111,10 @@ msgstr "no se pudo quitar la base de datos %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "nombre invalido para la entrada de la base de datos '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada corrupta en la base de datos '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "entrada corrupta en la base de datos '%s'\n"
@@ -132,14 +126,14 @@ msgstr "no se pudo abrir el archivo %s: %s\n"
#, c-format
msgid "%s database is inconsistent: name mismatch on package %s\n"
msgstr ""
-"la base de datos %s es inconsistente: nombre mal emparejado en el paquete %"
-"s\n"
+"la base de datos %s es inconsistente: nombre mal emparejado en el paquete "
+"%s\n"
#, c-format
msgid "%s database is inconsistent: version mismatch on package %s\n"
msgstr ""
-"la base de datos %s es inconsistente: versión mal emparejada en el paquete %"
-"s\n"
+"la base de datos %s es inconsistente: versión mal emparejada en el paquete "
+"%s\n"
#, c-format
msgid "could not create directory %s: %s\n"
@@ -166,14 +160,14 @@ msgid "missing package metadata in %s\n"
msgstr "faltan los metadatos del paquete en %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "intento para re-registrar la base de datos 'local'\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "la ruta para la base de datos no está definida\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "intento para re-registrar la base de datos 'local'\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "ciclo de dependencias detectado:\n"
@@ -198,30 +192,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "no se pudo resolver \"%s\", una dependencia para \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "la url %s no es válida\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "no fue especificado el esquema de url, asumiendo HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disco"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "la url %s no es válida\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "falló al obtener archivo '%s' desde %s: %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "no se puede resumir la descarga, empezando de nuevo\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "no se puede escribir en el archivo '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "no se pudo escribir al archivo '%s': %s\n"
@@ -362,9 +348,13 @@ msgstr "no se pudo quitar todos los archivos del paquete"
msgid "package filename is not valid"
msgstr "el nombre de archivo del paquete no es válido"
-#, c-format
-msgid "no such repository"
-msgstr "no existe el repositorio"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "el nombre de archivo del paquete no es válido"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "no se pudo encontrar o leer el paquete"
#, c-format
msgid "invalid or corrupted delta"
@@ -456,10 +446,6 @@ msgid "cannot replace %s by %s\n"
msgstr "no se pudo reemplazar el archivo %s por %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repositorio '%s' no encontrado\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s esta al día -- saltando\n"
@@ -478,34 +464,14 @@ msgstr "se han detectado paquetes con conflictos no resueltos\n"
#, c-format
msgid "removing '%s' from target list because it conflicts with '%s'\n"
msgstr ""
-"quitando '%s' de la lista de objetivos debido a que posee conflictos con '%"
-"s'\n"
+"quitando '%s' de la lista de objetivos debido a que posee conflictos con "
+"'%s'\n"
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr "falló al descargar algunos archivos desde %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "no se pudo crear la operación de eliminación\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "no se pudo crear la operación\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "no se pudo iniciar la operación de eliminación\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "no se pudo iniciar la operación\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "no se pudo preparar la operación de eliminación\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "no se pudo enviar la operación de eliminación\n"
@@ -530,10 +496,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "no se pudo eliminar el directorio temporal %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "no se pudo abrir %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "no se pudo cambiar el directorio a %s (%s)\n"
@@ -569,3 +531,45 @@ msgstr "no existe la cache %s, creando...\n"
#, c-format
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"
+
+# , c-format
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "se encontraron paquetes con conflictos en la lista de objetivos\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "usted no puede instalar simultáneamente dos paquetes que poseen "
+#~ "conflictos entre si\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "reemplazar paquetes con -U aún no esta soportado\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "usted puede reemplazar manualmente los paquetes usando -Rd y -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "no fue especificado el esquema de url, asumiendo HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "no se puede escribir en el archivo '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "no existe el repositorio"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositorio '%s' no encontrado\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "no se pudo crear la operación de eliminación\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "no se pudo crear la operación\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "no se pudo iniciar la operación de eliminación\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "no se pudo iniciar la operación\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "no se pudo preparar la operación de eliminación\n"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index 4147bbeb..e0123125 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -5,10 +5,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:08+0200\n"
"Last-Translator: Xavier <shiningxc@gmail.com>\n"
"Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,23 +28,6 @@ msgstr ""
"cibles\n"
#, 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
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "vous ne pouvez pas installer deux paquets en conflit en même temps\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "remplacer un paquet avec -U n'est pas encore possible\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-"vous pouvez remplacer les paquets manuellement en utilisant -Rd et -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -109,6 +93,14 @@ msgid "removing invalid database: %s\n"
msgstr "suppression d'une base de données invalide: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "l'ouverture de %s: %s a échoué\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "la suppression de l'entrée de base de données %s-%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"
@@ -116,6 +108,10 @@ msgstr "la suppression de la base de données %s a échoué\n"
msgid "invalid name for database entry '%s'\n"
msgstr "nom invalide pour l'entrée de base de données '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "l'entrée '%s' de la base de données est corrompue\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "l'entrée '%s' de la base de données est corrompue\n"
@@ -157,14 +153,14 @@ msgid "missing package metadata in %s\n"
msgstr "méta-données du paquet manquantes dans %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentative de ré-enregistrer la base de données locale\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "base de données non initialisée\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "tentative de ré-enregistrer la base de données locale\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "cycle de dépendances détecté:\n"
@@ -189,30 +185,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "impossible de résoudre \"%s\", une dépendance de \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "l'url '%s' est invalide\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "Le protocole n'a pas été spécifié dans l'url, assume http\n"
-
-#, c-format
msgid "disk"
msgstr "disque"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' est invalide\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "échec de récupération du fichier '%s' depuis %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "le téléchargement ne peut pas être repris, relance\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "écriture dans le fichier '%s' impossible\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "écriture dans le fichier '%s' impossible: %s\n"
@@ -354,9 +342,13 @@ msgstr "suppression de certains fichiers du paquet impossible"
msgid "package filename is not valid"
msgstr "nom de paquet invalide"
-#, c-format
-msgid "no such repository"
-msgstr "ce dépôt n'existe pas"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "nom de paquet invalide"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "trouver ou de lire le paquet a échoué"
#, c-format
msgid "invalid or corrupted delta"
@@ -447,10 +439,6 @@ msgid "cannot replace %s by %s\n"
msgstr "le remplacement de %s par %s est impossible\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "dépôt '%s' non trouvé\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s est à jour -- ignoré\n"
@@ -475,26 +463,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "échec de récupération de certains fichiers depuis %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "la création de la transaction de suppression a échoué\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "la création de la transaction a échoué\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "l'initialisation de la transaction de suppression a échoué\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "l'initialisation de la transaction a échoué\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "la préparation de la transaction de suppression a échoué\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "appliquer la transaction de suppression a échoué\n"
@@ -519,10 +487,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "la suppression du répertoire temporaire %s a échoué\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "l'ouverture de %s: %s a échoué\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "changer de répertoire vers %s a échoué (%s)\n"
@@ -557,3 +521,44 @@ msgstr "le cache %s n'existe pas, création...\n"
#, c-format
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "des paquets en conflit ont été trouvés dans la liste des cibles\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "vous ne pouvez pas installer deux paquets en conflit en même temps\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "remplacer un paquet avec -U n'est pas encore possible\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "vous pouvez remplacer les paquets manuellement en utilisant -Rd et -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "Le protocole n'a pas été spécifié dans l'url, assume http\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "écriture dans le fichier '%s' impossible\n"
+
+#~ msgid "no such repository"
+#~ msgstr "ce dépôt n'existe pas"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "dépôt '%s' non trouvé\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "la création de la transaction de suppression a échoué\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "la création de la transaction a échoué\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "l'initialisation de la transaction de suppression a échoué\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "l'initialisation de la transaction a échoué\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "la préparation de la transaction de suppression a échoué\n"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index 53a5a005..698dbc3d 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:08+0200\n"
"Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n"
"Language-Team: <hu@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,22 +27,6 @@ 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 target list\n"
-msgstr "ütköző csomagokat találtam a célok között\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nem telepíthető két ütköző csomag egyszerre\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "csomagok lecserélése még nem támogatott -U esetén\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "a -Rd és -U használatával elvégezhető a csere\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -106,6 +91,14 @@ msgid "removing invalid database: %s\n"
msgstr "hibás adatbázis eltávolítása: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nem sikerült eltávolítani a(z) %s-%s adatbázis-bejegyzést\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "sikertelen a(z) %s adatbázis eltávolítása\n"
@@ -113,6 +106,10 @@ msgstr "sikertelen a(z) %s adatbázis eltávolítása\n"
msgid "invalid name for database entry '%s'\n"
msgstr "hibás név a '%s' adatbázis-bejegyzés számára\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "sérült adatbázis bejegyzés: '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "sérült adatbázis bejegyzés: '%s'\n"
@@ -154,14 +151,14 @@ msgid "missing package metadata in %s\n"
msgstr "hiányzó csomaginformációs fájl itt: %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "kísérlet a 'local' adatbázis újraregisztrálására\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "az adatbázis-útvonal nincs megadva\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "kísérlet a 'local' adatbázis újraregisztrálására\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "körkörös függőséget észleltem:\n"
@@ -186,30 +183,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "nem sikerült a(z) \"%2$s\" csomag \"%1$s\" függőségét feloldani\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "a '%s' URL hibás\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "az URL séma nem definiált, http feltételezése\n"
-
-#, c-format
msgid "disk"
msgstr "diszk"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "a '%s' URL hibás\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "nem tudom folytatni a letöltést, újrakezdem\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nem sikerült a(z) '%s' fájlba írni\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "hiba a(z) '%s' fájl írása során: %s\n"
@@ -349,9 +338,13 @@ msgstr "nem sikerült eltávolítani a csomag összes fájlját"
msgid "package filename is not valid"
msgstr "érvénytelen csomagnév"
-#, c-format
-msgid "no such repository"
-msgstr "nincs ilyen repó"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "érvénytelen csomagnév"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "nem található vagy nem olvasható a csomag"
#, c-format
msgid "invalid or corrupted delta"
@@ -442,10 +435,6 @@ msgid "cannot replace %s by %s\n"
msgstr "nem lehet lecserélni a(z) %s csomagot a(z) %s csomaggal\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "a(z) '%s' repó nem található\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "a(z) %s-%s naprakész -- kihagyás\n"
@@ -470,26 +459,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "nem sikerült néhány fájlt letölteni innen: %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nem sikerült létrehozni az eltávolító tranzakciót\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nem sikerült létrehozni a tranzakciót\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nem sikerült inicializálni az eltávolító tranzakciót\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nem sikerült inicializálni a tranzakciót\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nem sikerült előkészíteni az eltávolító tranzakciót\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "nem sikerült végrehajtani az eltávolító tranzakciót\n"
@@ -514,10 +483,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "nem sikerült eltávolítani a %s ideiglenes könyvtárat\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "nem sikerült a könyvtárváltás ide: %s (%s)\n"
@@ -552,3 +517,42 @@ msgstr "nem létezik a(z) %s gyorsítótár. létrehozás...\n"
#, c-format
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "nem sikerült létrehozni a csomaggyorsítótárat, a /tmp használata\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "ütköző csomagokat találtam a célok között\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "nem telepíthető két ütköző csomag egyszerre\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "csomagok lecserélése még nem támogatott -U esetén\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "a -Rd és -U használatával elvégezhető a csere\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "az URL séma nem definiált, http feltételezése\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "nem sikerült a(z) '%s' fájlba írni\n"
+
+#~ msgid "no such repository"
+#~ msgstr "nincs ilyen repó"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "a(z) '%s' repó nem található\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "nem sikerült létrehozni az eltávolító tranzakciót\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "nem sikerült létrehozni a tranzakciót\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "nem sikerült inicializálni az eltávolító tranzakciót\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "nem sikerült inicializálni a tranzakciót\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "nem sikerült előkészíteni az eltávolító tranzakciót\n"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index 3548ab0f..a2cad2e2 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -10,10 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:08+0200\n"
"Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
"Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,25 +30,6 @@ msgstr ""
"pacchetti\n"
#, c-format
-msgid "conflicting packages were found in target list\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 ""
-"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 l'opzione -U non è ancora supportata\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "puoi sostituire i pacchetti manualmente, usando le opzioni -Rd e -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -112,6 +94,14 @@ msgid "removing invalid database: %s\n"
msgstr "rimozione del database: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "impossibile aprire %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "impossibile rimuovere la voce %s-%s dal database\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "impossibile rimuovere il database %s\n"
@@ -119,6 +109,10 @@ msgstr "impossibile rimuovere il database %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "nome non valido per la voce del database '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "la voce nel database '%s' è corrotta\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "la voce nel database '%s' è corrotta\n"
@@ -163,14 +157,14 @@ msgid "missing package metadata in %s\n"
msgstr "manca il metadata del pacchetto in %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentativo in corso di registrare di nuovo il DB 'locale'\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "il percorso del database non è stato definito\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "tentativo in corso di registrare di nuovo il DB 'locale'\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "individuato un possibile ciclo di dipendenze:\n"
@@ -195,30 +189,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "l'url '%s' non è esatto\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "il protocollo dell'url non è stato specificato, sarà usato HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disco"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' non è esatto\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "impossibile scaricare il pacchetto '%s' da %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "impossibile riprendere il download\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "impossibile scrivere nel file '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "si è verificato un errore durante la scrittura nel file '%s': %s\n"
@@ -358,9 +344,13 @@ msgstr "impossibile rimuovere tutti i file del pacchetto"
msgid "package filename is not valid"
msgstr "il nome del pacchetto non è valido"
-#, c-format
-msgid "no such repository"
-msgstr "nessun repository corrispondente"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "il nome del pacchetto non è valido"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "impossibile trovare o leggere il pacchetto"
#, c-format
msgid "invalid or corrupted delta"
@@ -452,10 +442,6 @@ msgid "cannot replace %s by %s\n"
msgstr "impossibile sostituire %s con %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "impossibile trovare il repository '%s'\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s è aggiornato, sarà ignorato\n"
@@ -466,8 +452,8 @@ msgstr "%s-%s è aggiornato, sarà reinstallato\n"
#, c-format
msgid "downgrading package %s (%s => %s)\n"
msgstr ""
-"installazione in corso di una versione meno recente del pacchetto %s (%s => %"
-"s)\n"
+"installazione in corso di una versione meno recente del pacchetto %s (%s => "
+"%s)\n"
#, c-format
msgid "unresolvable package conflicts detected\n"
@@ -483,26 +469,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "impossibile scaricare alcuni file da %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "impossibile eseguire l'operazione di rimozione\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "impossibile eseguire l'operazione\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "impossibile inizializzare l'operazione di rimozione\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "impossibile inizializzare l'operazione\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "impossibile preparare l'operazione di rimozione\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "impossibile eseguire l'operazione di rimozione\n"
@@ -527,10 +493,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "impossibile rimuovere la directory temporanea %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "impossibile aprire %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "impossibile spostarsi nella directory %s (%s)\n"
@@ -566,3 +528,47 @@ msgstr "la cache di %s non esiste, creazione in corso...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
"impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr ""
+#~ "ci sono dei pacchetti in conflitto all'interno della lista dei pacchetti\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "non puoi installare contemporaneamente due pacchetti che vanno in "
+#~ "conflitto\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr ""
+#~ "la sostituzione dei pacchetti con l'opzione -U non è ancora supportata\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "puoi sostituire i pacchetti manualmente, usando le opzioni -Rd e -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "il protocollo dell'url non è stato specificato, sarà usato HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "impossibile scrivere nel file '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "nessun repository corrispondente"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "impossibile trovare il repository '%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "impossibile eseguire l'operazione di rimozione\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "impossibile eseguire l'operazione\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "impossibile inizializzare l'operazione di rimozione\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "impossibile inizializzare l'operazione\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "impossibile preparare l'operazione di rimozione\n"
diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po
index 0b05cc2a..b4fc6f1c 100644
--- a/lib/libalpm/po/kk.po
+++ b/lib/libalpm/po/kk.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:09+0200\n"
"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
"Language-Team: Kazakh\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,23 +27,6 @@ msgstr ""
"%s-%s өткізіледі, өйткені жаңа %s нұсқасы мақсаттар тізімінде бар болып тұр\n"
#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "мақсаттар тізімінде ерегісетін дестелер табылды\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "сіз екі екі ерегісетін дестені орната алмайсыз\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "дестелерді -A мен -U опцияларын қолданып алмастыру әлі жасалмаған\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-"сіз дестелерді қолмен алмастыра аласыз, ол үшін -Rd мен -U қолданыңыз\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -107,6 +91,14 @@ msgid "removing invalid database: %s\n"
msgstr "қате дерекқорды өшіру: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "%s ашу мүмкін емес: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "дерекқордан %s-%s жазбасын өшіру мүмкін емес\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "%s дерекқорын өшіру мүмкін емес\n"
@@ -114,6 +106,10 @@ msgstr "%s дерекқорын өшіру мүмкін емес\n"
msgid "invalid name for database entry '%s'\n"
msgstr "дерекқордағы '%s' жазбасының аты қате\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "дерекқордағы '%s' жазбасы зақымдалған\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "дерекқордағы '%s' жазбасы зақымдалған\n"
@@ -155,14 +151,14 @@ msgid "missing package metadata in %s\n"
msgstr "%s ішінде дестенің мета мәліметтері жоқ\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "дерекқорды қайта тіркеу талабы\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "дерекқорға жол анықталмаған\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "дерекқорды қайта тіркеу талабы\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "циклдік тәуелділік табылды:\n"
@@ -187,30 +183,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "\"%s\" шешу мүмкін емес, ол \"%s\" тәуелділігі болып тұр\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "'%s' сілтемесі қате\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "сілтеменің түрі анықталмады, HTTP деп саналады\n"
-
-#, c-format
msgid "disk"
msgstr "дискі"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "'%s' сілтемесі қате\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "'%s' файлын %s адресінен алу қатемен аяқталды : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "жүктемені жалғастыру мүмкін емес, басынан басталады\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "'%s' файлына жазу мүмкін емес\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "'%s' файлына жазу қатесі: %s\n"
@@ -350,9 +338,13 @@ msgstr "дестенің барлық файлдарын өшіру мүмкін
msgid "package filename is not valid"
msgstr "десте файлдың аты қате"
-#, c-format
-msgid "no such repository"
-msgstr "мұндай репозиторий жоқ"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "десте файлдың аты қате"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "дестені табу не оқу мүмкін емес"
#, c-format
msgid "invalid or corrupted delta"
@@ -443,10 +435,6 @@ msgid "cannot replace %s by %s\n"
msgstr "%s жаңа %s нұсқасымен алмастыру мүмкін емес\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "'%s' репозиторийі табылмады\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s ескірмеді -- өткізіледі\n"
@@ -472,26 +460,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "%s адресінен кейбір файлдарды алу мүмкін емес\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "өшіруге сұранымды құру мүмкін емес\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "сұранымды жасау мүмкін емес\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "өшіруге сұранымды іске қосу мүмкін емес\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "сұранымды іске қосу мүмкін емес\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "өшіруге сұранымды дайындау мүмкін емес\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "өшіруге сұранымды орындау мүмкін емес\n"
@@ -516,10 +484,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "tmpdir %s өшіру мүмкін емес\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "%s ашу мүмкін емес: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "%s бумасына ауысу мүмкін емес (%s)\n"
@@ -555,6 +519,46 @@ msgstr "%s кэші жоқ болып тұр, құрылады...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "дестелер кэшін құру мүмкін емес, оның орнына /tmp қолданылады\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "мақсаттар тізімінде ерегісетін дестелер табылды\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "сіз екі екі ерегісетін дестені орната алмайсыз\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "дестелерді -A мен -U опцияларын қолданып алмастыру әлі жасалмаған\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "сіз дестелерді қолмен алмастыра аласыз, ол үшін -Rd мен -U қолданыңыз\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "сілтеменің түрі анықталмады, HTTP деп саналады\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "'%s' файлына жазу мүмкін емес\n"
+
+#~ msgid "no such repository"
+#~ msgstr "мұндай репозиторий жоқ"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "'%s' репозиторийі табылмады\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "өшіруге сұранымды құру мүмкін емес\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "сұранымды жасау мүмкін емес\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "өшіруге сұранымды іске қосу мүмкін емес\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "сұранымды іске қосу мүмкін емес\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "өшіруге сұранымды дайындау мүмкін емес\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "'%s' жүктеп алу қатесі: %s\n"
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index b77137d3..c3c9065b 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,10 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -25,22 +26,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
msgstr ""
#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr ""
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr ""
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -103,6 +88,14 @@ msgid "removing invalid database: %s\n"
msgstr ""
#, c-format
+msgid "could not open %s: %s\n"
+msgstr ""
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr ""
+
+#, c-format
msgid "could not remove database %s\n"
msgstr ""
@@ -111,6 +104,10 @@ msgid "invalid name for database entry '%s'\n"
msgstr ""
#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr ""
+
+#, c-format
msgid "corrupted database entry '%s'\n"
msgstr ""
@@ -151,11 +148,11 @@ msgid "missing package metadata in %s\n"
msgstr ""
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
+msgid "database path is undefined\n"
msgstr ""
#, c-format
-msgid "database path is undefined\n"
+msgid "attempt to re-register the 'local' DB\n"
msgstr ""
#, c-format
@@ -183,27 +180,19 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr ""
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr ""
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr ""
-
-#, c-format
msgid "disk"
msgstr ""
#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
+msgid "url '%s' is invalid\n"
msgstr ""
#, c-format
-msgid "cannot resume download, starting over\n"
+msgid "failed retrieving file '%s' from %s : %s\n"
msgstr ""
#, c-format
-msgid "cannot write to file '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
msgstr ""
#, c-format
@@ -347,7 +336,11 @@ msgid "package filename is not valid"
msgstr ""
#, c-format
-msgid "no such repository"
+msgid "package architecture is not valid"
+msgstr ""
+
+#, c-format
+msgid "could not find repository for target"
msgstr ""
#, c-format
@@ -439,10 +432,6 @@ msgid "cannot replace %s by %s\n"
msgstr ""
#, c-format
-msgid "repository '%s' not found\n"
-msgstr ""
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr ""
@@ -467,26 +456,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr ""
#, c-format
-msgid "could not create removal transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr ""
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr ""
@@ -511,10 +480,6 @@ msgid "could not remove tmpdir %s\n"
msgstr ""
#, c-format
-msgid "could not open %s: %s\n"
-msgstr ""
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr ""
diff --git a/lib/libalpm/po/nb_NO.po b/lib/libalpm/po/nb_NO.po
index 685c4034..053f1755 100644
--- a/lib/libalpm/po/nb_NO.po
+++ b/lib/libalpm/po/nb_NO.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:09+0200\n"
"Last-Translator: <maister@archlinux.us>\n"
"Language-Team: Language libalpm\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,22 +25,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
msgstr "hopper over %s-%s siden nyere versjon %s finnes i liste\n"
#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "motstridige pakker ble funnet i målliste\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "du kan ikke installere to motstridige pakker samtidig\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "å bytte ut pakker med -U er ikke støttet enda\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "du kan bytte ut pakker manuelt ved å bruke -Rd og -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -104,6 +89,14 @@ msgid "removing invalid database: %s\n"
msgstr "fjerner ugyldig database: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "kunne ikke åpne %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "kunne ikke fjerne databaseelement %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "kunne ikke fjerne database %s\n"
@@ -111,6 +104,10 @@ msgstr "kunne ikke fjerne database %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "ugyldig navn for databaseelement '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "korrupt databaseelement '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "korrupt databaseelement '%s'\n"
@@ -152,14 +149,14 @@ msgid "missing package metadata in %s\n"
msgstr "mangler metadata i %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "forsøker å re-registrere den lokale databasen\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "databaseplassering er udefinert\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "forsøker å re-registrere den lokale databasen\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "avhengighetssyklus oppdaget\n"
@@ -184,30 +181,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "kan ikke avgjøre \"%s\", en avhengighet av \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' er ugyldig\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "url-protokoll ikke gitt, bruker HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disk"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' er ugyldig\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "mottakelse av fil '%s' fra %s : %s feilet\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "kan ikke fortsette nedlasting, starter på nytt\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "kan ikke skrive til fil '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "skriving til fil '%s': %s feilet\n"
@@ -347,9 +336,13 @@ msgstr "kan ikke fjerne alle filer for pakke"
msgid "package filename is not valid"
msgstr "pakkens filnavn er ikke gyldig"
-#, c-format
-msgid "no such repository"
-msgstr "ingen slik pakkebrønn"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "pakkens filnavn er ikke gyldig"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "kunne ikke finne eller lese pakke"
#, c-format
msgid "invalid or corrupted delta"
@@ -440,10 +433,6 @@ msgid "cannot replace %s by %s\n"
msgstr "kan ikke bytte ut %s med %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "pakkebrønn '%s' ikke funnet\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s er allerede oppdatert -- hopper over\n"
@@ -468,26 +457,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "feilet å motta noen filer fra %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "kunne ikke opprette fjerningstransaksjon\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "kunne ikke opprette transaksjon\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "kunne ikke initialisere fjerningstransaksjonen\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "kunne ikke initialisere transaksjon\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "kunne ikke forberede fjerningstransaksjon\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "kunne ikke begå fjerningstransaksjon\n"
@@ -512,10 +481,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "kunne ikke fjerne midlertidig mappe %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "kunne ikke åpne %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "kunne ikke endre mappe til %s (%s)\n"
@@ -550,3 +515,42 @@ msgstr "ingen %s cache eksisterer, lager en ...\n"
#, c-format
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "kunne ikke danne pakke-cache, bruker /tmp istedenfor\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "motstridige pakker ble funnet i målliste\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "du kan ikke installere to motstridige pakker samtidig\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "å bytte ut pakker med -U er ikke støttet enda\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "du kan bytte ut pakker manuelt ved å bruke -Rd og -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "url-protokoll ikke gitt, bruker HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "kan ikke skrive til fil '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "ingen slik pakkebrønn"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "pakkebrønn '%s' ikke funnet\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "kunne ikke opprette fjerningstransaksjon\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "kunne ikke opprette transaksjon\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "kunne ikke initialisere fjerningstransaksjonen\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "kunne ikke initialisere transaksjon\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "kunne ikke forberede fjerningstransaksjon\n"
diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po
index 36106fe7..5cc23ae2 100644
--- a/lib/libalpm/po/pl.po
+++ b/lib/libalpm/po/pl.po
@@ -9,10 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:09+0200\n"
"Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,25 +29,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
msgstr "pomijam %s-%s ponieważ nowsza wersja %s jest na liście celów\n"
#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "konfliktujące pakiety zostały znalezione na liście celów\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"nie możesz mieć zainstalowanych dwóch konfliktujących ze sobą pakietów w tym "
-"samym czasie\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "zastępowanie pakietów za pomocą -U nie jest już wspierane\n"
-
-# hmm
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "możesz zastąpić pakiety ręcznie, używając opcji -Rd oraz -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -111,6 +93,14 @@ msgid "removing invalid database: %s\n"
msgstr "usuwanie niepoprawnej bazy danych: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nie udało się otworzyć %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nie udało się usunąć wpisu %s-%s z bazy danych\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "nie można usunąć bazy danych %s\n"
@@ -118,6 +108,10 @@ msgstr "nie można usunąć bazy danych %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "zepsuty wpis w bazie danych '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "zepsuty wpis w bazie danych '%s'\n"
@@ -159,14 +153,14 @@ msgid "missing package metadata in %s\n"
msgstr "brak metadanych pakietu w %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "próba ponownej rejestracji 'lokalnej' BD\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "ścieżka bazy danych jest niezdefiniowana\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "próba ponownej rejestracji 'lokalnej' BD\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "wykryto cykl zależności:\n"
@@ -191,30 +185,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "nie można rozwiązać \"%s\", zależności od \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' jest błędny\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "schemat url nie został sprecyzowany, wybieranie HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "dysk"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' jest błędny\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "nie udało się pobrać pliku '%s' z %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "nie można kontynuować pobieranie, zaczynanie od początku\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nie można zapisywać do pliku '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "Błąd podczas zapisywania do pliku '%s': %s\n"
@@ -354,9 +340,13 @@ msgstr "nie udało się usunąć wszystkich plików pakietu"
msgid "package filename is not valid"
msgstr "nazwa pakietu jest nieprawidłowa"
-#, c-format
-msgid "no such repository"
-msgstr "nie ma takiego repozytorium"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "nazwa pakietu jest nieprawidłowa"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "nie udało się znaleźć bądź odczytać pakietu"
#, c-format
msgid "invalid or corrupted delta"
@@ -448,10 +438,6 @@ msgid "cannot replace %s by %s\n"
msgstr "nie udało się zastąpić %s przez %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repozytorium '%s' nie zostało znalezione\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s jest w najnowszej wersji -- pomijanie\n"
@@ -476,26 +462,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "nie udało się pobrać niektórych plików z %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nie udało się utworzyć tranzakcji usuwania\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nie udało się stworzyć tranzakcji\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nie udało się zainicjować tranzakcji usuwania\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nie udało się zainicjować tranzakcji\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nie udało się przygotować tranzakcji usuwania\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "nie udało się wykonać tranzakcji usuwania\n"
@@ -520,10 +486,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "nie udało się usunąć katalogu tymczasowego %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nie udało się otworzyć %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "nie udało się zmienić katalogu na %s (%s)\n"
@@ -560,6 +522,48 @@ msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
"nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "konfliktujące pakiety zostały znalezione na liście celów\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "nie możesz mieć zainstalowanych dwóch konfliktujących ze sobą pakietów w "
+#~ "tym samym czasie\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "zastępowanie pakietów za pomocą -U nie jest już wspierane\n"
+
+# hmm
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "możesz zastąpić pakiety ręcznie, używając opcji -Rd oraz -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "schemat url nie został sprecyzowany, wybieranie HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "nie można zapisywać do pliku '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "nie ma takiego repozytorium"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repozytorium '%s' nie zostało znalezione\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "nie udało się utworzyć tranzakcji usuwania\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "nie udało się stworzyć tranzakcji\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "nie udało się zainicjować tranzakcji usuwania\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "nie udało się zainicjować tranzakcji\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "nie udało się przygotować tranzakcji usuwania\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "błąd podczas pobierania '%s': %s\n"
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 1b33397a..d6bf73e0 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -13,10 +13,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:09+0200\n"
"Last-Translator: Rodrigo L. M. Flores <flores@archlinux-br.org>\n"
"Language-Team: Português do Brasil <www.archlinux-br.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -35,24 +36,6 @@ msgstr ""
"serem atualizados\n"
#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr ""
-"pacotes conflitantes foram encontrados na lista de pacotes a serem "
-"atualizados\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "você não pode instalar dois pacotes conflitantes ao mesmo tempo\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "substituir pacotes com -U ainda não é suportado\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "você pode substituir pacotes manualmente usando as opções -Rd e -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -117,6 +100,14 @@ msgid "removing invalid database: %s\n"
msgstr "removendo banco de dados inválido: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "não foi possível abrir %s : %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "não foi possível remover a entrada da base de dados %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "não foi possível remover a base de dados %s\n"
@@ -124,6 +115,10 @@ msgstr "não foi possível remover a base de dados %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "nome inválido para a entrada na base de dados '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada corrompida da base de dados '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "entrada corrompida da base de dados '%s'\n"
@@ -166,14 +161,14 @@ msgid "missing package metadata in %s\n"
msgstr "faltando metadados do pacote em %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentativa de registrar a base de dados 'local' novamente\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "caminho da base de dados não definido\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "tentativa de registrar a base de dados 'local' novamente\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "dependência cíclica detectada:\n"
@@ -198,30 +193,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' é inválida\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "esquema da url não especificado, assumindo HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disco"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' é inválida\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "falha ao obter arquivo '%s' de %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "não foi possível retomar o download, reiniciando\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "não foi possível escrever no arquivo '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "erro ao escrever no arquivo '%s': %s\n"
@@ -361,9 +348,13 @@ msgstr "não foi possível remover todos os arquivos para o pacote"
msgid "package filename is not valid"
msgstr "o nome do arquivo do pacote não é valido"
-#, c-format
-msgid "no such repository"
-msgstr "repositório não existe"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "o nome do arquivo do pacote não é valido"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "não foi possível ler ou escrever o pacote"
#, c-format
msgid "invalid or corrupted delta"
@@ -454,10 +445,6 @@ msgid "cannot replace %s by %s\n"
msgstr "não foi possível substituir %s por %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repositório '%s' não encontrado\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s está atualizado -- pulando\n"
@@ -482,26 +469,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "falha ao obter alguns arquivos de %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "não foi possível criar transação de remoção\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "não foi possível criar a transação\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "não foi possível inicializar a transação de remoção\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "não foi possível inicializar a transação\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "não foi possível preparar a transação de remoção\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "não foi possível efetuar a transação de remoção\n"
@@ -526,10 +493,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "não foi possível remover o diretório temporário %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "não foi possível abrir %s : %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "não foi possível mudar diretório para %s (%s)\n"
@@ -565,6 +528,48 @@ msgstr "cache %s não existe, criando...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "não foi possível criar cache de pacotes, usando /tmp em seu lugar\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr ""
+#~ "pacotes conflitantes foram encontrados na lista de pacotes a serem "
+#~ "atualizados\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "você não pode instalar dois pacotes conflitantes ao mesmo tempo\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "substituir pacotes com -U ainda não é suportado\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "você pode substituir pacotes manualmente usando as opções -Rd e -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "esquema da url não especificado, assumindo HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "não foi possível escrever no arquivo '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "repositório não existe"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositório '%s' não encontrado\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "não foi possível criar transação de remoção\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "não foi possível criar a transação\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "não foi possível inicializar a transação de remoção\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "não foi possível inicializar a transação\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "não foi possível preparar a transação de remoção\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "erro no download de '%s': %s\n"
diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po
index f0dbaf4d..ce7f3633 100644
--- a/lib/libalpm/po/ro.po
+++ b/lib/libalpm/po/ro.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:09+0200\n"
"Last-Translator: volodia macovei <blog@volodia.ro>\n"
"Language-Team: Romanian SbLUG for Arch <blog@volodia.ro>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,22 +27,6 @@ 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 target list\n"
-msgstr "s-au găsit pachete în conflict în lista ţintă\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nu puteţi instala două pachete aflate în conflict în acelaşi timp\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "înlocuirea pachetelor cu -U nu este suportată încă\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "puteţi înlocui manual pachetele folosind -Rd şi -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -106,6 +91,14 @@ msgid "removing invalid database: %s\n"
msgstr "se elimină baza de date nevalidă %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nu se poate deschide %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nu se poate elimina intrarea în baza de date %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "nu poate fi eliminată baza de date %s\n"
@@ -113,6 +106,10 @@ msgstr "nu poate fi eliminată baza de date %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "nume pentru intrarea în baza de date nevalid '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "intrare în baza de date coruptă '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "intrare în baza de date coruptă '%s'\n"
@@ -129,8 +126,8 @@ msgstr ""
#, c-format
msgid "%s database is inconsistent: version mismatch on package %s\n"
msgstr ""
-"baza de date %s este inconsistentă: versiunea nu se potriveşte cu pachetul %"
-"s\n"
+"baza de date %s este inconsistentă: versiunea nu se potriveşte cu pachetul "
+"%s\n"
#, c-format
msgid "could not create directory %s: %s\n"
@@ -157,14 +154,14 @@ msgid "missing package metadata in %s\n"
msgstr "lipsă metadata pentru pachet în %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "încercare de a reînregistra 'local' DB\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "calea bazei de date este nedefinită\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "încercare de a reînregistra 'local' DB\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "a fost detectat ciclul de dependenţă:\n"
@@ -189,30 +186,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "nu se poate rezolva \"%s\", o dependenţă a \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' este nevalid\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "schemă URL nespecificată, se presupune HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disk"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' este nevalid\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "eşec la regăsirea fişierului '%s' din %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "nu se poate relua descărcare, se începe peste\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nu se poate scrie în fişierul '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "eroare la scriere în fişierul '%s': %s\n"
@@ -352,9 +341,13 @@ msgstr "nu pot fi eliminate toate fişierele din pachet"
msgid "package filename is not valid"
msgstr "numele de fişier pachet este nevalid"
-#, c-format
-msgid "no such repository"
-msgstr "nu există astfel de depozit"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "numele de fişier pachet este nevalid"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "pachetul nu poate fi găsit sau citit"
#, c-format
msgid "invalid or corrupted delta"
@@ -445,10 +438,6 @@ msgid "cannot replace %s by %s\n"
msgstr "nu poate fi înlocuit %s de %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "depozit '%s' negăsit\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s este actualizat -- se trece peste\n"
@@ -473,26 +462,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "eşec în refacerea unor fişiere din %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nu poate fi creată tranzacţia de eliminare\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nu poate fi creată tranzacţia\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nu poate fi iniţializată tranzacţia de eliminare\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nu poate fi iniţializată tranzacţia\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nu poate fi pregătită tranzacţia de eliminare\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "nu poate fi efectuată tranzacţia de eliminare\n"
@@ -517,10 +486,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "nu poate fi eliminat tmpdir %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nu se poate deschide %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "nu poate fi schimbat directorul la %s (%s)\n"
@@ -555,3 +520,42 @@ msgstr "nu există %s cache, se crează...\n"
#, c-format
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "nu se poate crea cache pachet, se foloseşte mai degrabă /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "s-au găsit pachete în conflict în lista ţintă\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "nu puteţi instala două pachete aflate în conflict în acelaşi timp\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "înlocuirea pachetelor cu -U nu este suportată încă\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "puteţi înlocui manual pachetele folosind -Rd şi -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "schemă URL nespecificată, se presupune HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "nu se poate scrie în fişierul '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "nu există astfel de depozit"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "depozit '%s' negăsit\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "nu poate fi creată tranzacţia de eliminare\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "nu poate fi creată tranzacţia\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "nu poate fi iniţializată tranzacţia de eliminare\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "nu poate fi iniţializată tranzacţia\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "nu poate fi pregătită tranzacţia de eliminare\n"
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index d5df8aa3..ff5afecd 100644
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.po
@@ -7,15 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:10+0200\n"
"Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
"Language-Team: Russian\n"
+"Language: \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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#, c-format
msgid "replacing older version %s-%s by %s in target list\n"
@@ -26,24 +27,6 @@ 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 target list\n"
-msgstr "в списке целей найдены конфликтующие пакеты\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"вы не можете одновременно установить конфликтующие между собой пакеты\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr ""
-"замещение пакетов с использованием параметров -A и -U еще не реализовано\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "вы можете заменить пакеты вручную, используя -Rd и -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -108,6 +91,14 @@ msgid "removing invalid database: %s\n"
msgstr "удаление некорректной базы данных %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "не удалось открыть %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "не удалось удалить из базы данных запись %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "не удалось удалить базу данных %s\n"
@@ -115,6 +106,10 @@ msgstr "не удалось удалить базу данных %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "неправильное имя для записи в базе данных '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "повреждённая запись в базе данных '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "повреждённая запись в базе данных '%s'\n"
@@ -158,14 +153,14 @@ msgid "missing package metadata in %s\n"
msgstr "отсутствуют метаданные пакета в %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "попытка перерегистрировать локальную БД\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "путь к базе данных не определён\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "попытка перерегистрировать локальную БД\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "обнаружена циклическая зависимость:\n"
@@ -190,30 +185,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "не удалось разрешить \"%s\", зависимость \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "ссылка '%s' некорректна\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "схема ссылки не определена, подразумевается HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "диск"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "ссылка '%s' некорректна\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "не удалось получить файл '%s' из %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "не удалось продолжить закачку, начинаю заново\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "не удалось записать в файл '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "ошибка записи в файл '%s': %s\n"
@@ -353,9 +340,13 @@ msgstr "не удалось удалить все файлы пакета"
msgid "package filename is not valid"
msgstr "неверное имя файла пакета"
-#, c-format
-msgid "no such repository"
-msgstr "нет такого репозитория"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "неверное имя файла пакета"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "не удалось найти или прочитать пакет"
#, c-format
msgid "invalid or corrupted delta"
@@ -446,10 +437,6 @@ msgid "cannot replace %s by %s\n"
msgstr "не удалось заменить %s на %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "репозиторий '%s' не найден\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s не устарел -- пропускается\n"
@@ -474,26 +461,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "не удалось получить некоторые файлы с %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "не удалось создать запрос на удаление\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "не удалось создать запрос\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "не удалось инициализировать запрос на удаление\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "не удалось инициализировать запрос\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "не удалось подготовить запрос на удаление\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "не удалось совершить запрос на удаление\n"
@@ -518,10 +485,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "не удалось удалить временный каталог %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "не удалось открыть %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "не удалось изменить каталог на %s (%s)\n"
@@ -557,6 +520,47 @@ msgstr "кэш %s не существует, создается...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "не удалось создать кэш пакетов, будет использован /tmp\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "в списке целей найдены конфликтующие пакеты\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "вы не можете одновременно установить конфликтующие между собой пакеты\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr ""
+#~ "замещение пакетов с использованием параметров -A и -U еще не реализовано\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "вы можете заменить пакеты вручную, используя -Rd и -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "схема ссылки не определена, подразумевается HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "не удалось записать в файл '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "нет такого репозитория"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "репозиторий '%s' не найден\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "не удалось создать запрос на удаление\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "не удалось создать запрос\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "не удалось инициализировать запрос на удаление\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "не удалось инициализировать запрос\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "не удалось подготовить запрос на удаление\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "ошибка загрузки '%s': %s\n"
diff --git a/lib/libalpm/po/sv_SE.po b/lib/libalpm/po/sv_SE.po
index 7fe0f7a6..f4317e3a 100644
--- a/lib/libalpm/po/sv_SE.po
+++ b/lib/libalpm/po/sv_SE.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-06 21:10+0200\n"
"Last-Translator: Christian Larsson <congacx@gmail.com>\n"
"Language-Team: Northern Sami\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,22 +25,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
msgstr "hoppar över %s-%s för en nyare version %s finns i mållistan\n"
#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "motstridande paket hittades i mållistan\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "du kan inte installera två motstridiga paket på samma gång\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "erstätta paket med -U stödjs inte än\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "du kan ersätta paket manuellt genom att använda -Rd och -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -104,6 +89,14 @@ msgid "removing invalid database: %s\n"
msgstr "tar bort ogiltig databas: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "kunde inte öppna %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "kunde inte ta bort databasinlägget %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "kunde inte ta bort databasen %s\n"
@@ -111,6 +104,10 @@ msgstr "kunde inte ta bort databasen %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "ogiltigt namn för databasinlägget '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "korrupt databasinlägg '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "korrupt databasinlägg '%s'\n"
@@ -152,14 +149,14 @@ msgid "missing package metadata in %s\n"
msgstr "saknar metadata för paketet i %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "försöker att återregistrera den 'lokala' DB\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "sökväg till databasen är odefinierad\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "försöker att återregistrera den 'lokala' DB\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "beroende cykel upptäckt:\n"
@@ -184,30 +181,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "kan inte lösa \"%s\", beroende till \"%s\", \n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' är ogiltigt\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "url schema inte specifierat, antar HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "disk"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' är ogiltigt\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "misslyckades hämta filen '%s' från %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "kan inte återuppta nerladdning, börjar om\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "kan inte skriva till filen '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "fel vid skrivning till filen '%s': %s\n"
@@ -347,9 +336,13 @@ msgstr "kan inte ta bort alla filer för paketet"
msgid "package filename is not valid"
msgstr "paketnamn är inte giltigt"
-#, c-format
-msgid "no such repository"
-msgstr "inget sådant förråd"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "paketnamn är inte giltigt"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "kunde inte hitta eller förbereda paket"
#, c-format
msgid "invalid or corrupted delta"
@@ -440,10 +433,6 @@ msgid "cannot replace %s by %s\n"
msgstr "kan inte ersätta %s med %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "förrådet '%s' hittades inte\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s är senaste versionen -- hoppar över\n"
@@ -468,26 +457,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "misslyckades att hämta vissa filer från %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "kunde inte skapa överföring för borttagning\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "kunde inte skapa överföring\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "kunde inte påbörja överföring för borttagning\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "kunde inte påbörja överföring\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "kunde inte förbereda överföring för borttagning\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "kunde inte skicka överföring för borttagning\n"
@@ -512,10 +481,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "kunde inte ta bort tmpdir %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "kunde inte öppna %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "kunde inte byta katalog till %s (%s)\n"
@@ -550,3 +515,42 @@ msgstr "ingen %s cache existerar, skapar...\n"
#, c-format
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "kunde inte skapa paket-cache, använder /tmp istället\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "motstridande paket hittades i mållistan\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "du kan inte installera två motstridiga paket på samma gång\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "erstätta paket med -U stödjs inte än\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "du kan ersätta paket manuellt genom att använda -Rd och -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "url schema inte specifierat, antar HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "kan inte skriva till filen '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "inget sådant förråd"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "förrådet '%s' hittades inte\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "kunde inte skapa överföring för borttagning\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "kunde inte skapa överföring\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "kunde inte påbörja överföring för borttagning\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "kunde inte påbörja överföring\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "kunde inte förbereda överföring för borttagning\n"
diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po
index 5d5ecf97..0b310a2a 100644
--- a/lib/libalpm/po/tr.po
+++ b/lib/libalpm/po/tr.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 18:02+0200\n"
"Last-Translator: Samed Beyribey <ras0ir@eventualis.org>\n"
"Language-Team: Turkish Arch Linux Users <tr@archlinuxtr.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,22 +25,6 @@ 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 target list\n"
-msgstr "hedef listesinde çakışan paketler bulundu\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "çakışan iki paketi aynı anda kuramazsınız\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "-U kullanarak paket değiştirme henüz desteklenmemektedir\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "paketleri -Rd ve -U kullanarak değiştirebilirsiniz\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -104,6 +89,14 @@ msgid "removing invalid database: %s\n"
msgstr "geçersiz veritabanı siliniyor: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "%s açılamadı: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "veritabanı kaydı %s-%s silinemedi\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "veritabanı kaldırılamıyor %s\n"
@@ -111,6 +104,10 @@ msgstr "veritabanı kaldırılamıyor %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "geçersiz bir veritabanı kaydı '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "bozuk veritabanı kaydı '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "bozuk veritabanı kaydı '%s'\n"
@@ -152,14 +149,14 @@ msgid "missing package metadata in %s\n"
msgstr "%s içerisinde eksik paket bilgisi\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "'yerel' veritabanı tekrar kaydedilmeye çalışılıyor\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "veritabanı yolu belirtilmemiş\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "'yerel' veritabanı tekrar kaydedilmeye çalışılıyor\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "dolaylı bağımlılıklar bulundu:\n"
@@ -184,30 +181,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "\"%s\" paketi \"%s\" paketinin bağımlılığı olarak çözümlenemiyor\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "'%s' adresi geçersiz\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "adres şeması belirtilmemiş, HTTP kullanılacak\n"
-
-#, c-format
msgid "disk"
msgstr "disk"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "'%s' adresi geçersiz\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "%3$s hatası nedeniyle '%1$s' dosyası %2$s adresinden alınamadı\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "indirme işlemine devam edilemiyor, baştan başlanıyor\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "'%s' dosyasına yazılamıyor\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "'%s' dosyasına yazılamıyor: %s\n"
@@ -347,9 +336,13 @@ msgstr "paketle alakalı tüm dosyalar kaldırılamadı"
msgid "package filename is not valid"
msgstr "paket dosya adı geçerli değil"
-#, c-format
-msgid "no such repository"
-msgstr "depo bulunmuyor"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "paket dosya adı geçerli değil"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "paket bulunamadı veya okunamadı"
#, c-format
msgid "invalid or corrupted delta"
@@ -441,10 +434,6 @@ msgid "cannot replace %s by %s\n"
msgstr "%s ile %s değiştirilemiyor\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "'%s' deposu bulunamadı\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s güncel -- atlanıyor\n"
@@ -469,26 +458,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "%s deposundan bazı dosyalar alınamadı\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "kaldırma işlemi oluşturulamadı\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "işlem oluşturulamadı\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "kaldırma işlemi başlatılamadı\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "işlem başlatılamadı\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "kaldırma işlemi hazırlanamadı\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "kaldırma işlemi teslim edilemedi\n"
@@ -513,10 +482,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "geçici dizin %s kaldırılamadı\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "%s açılamadı: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "%s dizinine geçilemedi (%s)\n"
@@ -552,6 +517,45 @@ msgstr "%s önbelleği yok, oluşturuluyor...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "paket önbelleği oluşturulamadı, /tmp kullanılacak\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "hedef listesinde çakışan paketler bulundu\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "çakışan iki paketi aynı anda kuramazsınız\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "-U kullanarak paket değiştirme henüz desteklenmemektedir\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "paketleri -Rd ve -U kullanarak değiştirebilirsiniz\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "adres şeması belirtilmemiş, HTTP kullanılacak\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "'%s' dosyasına yazılamıyor\n"
+
+#~ msgid "no such repository"
+#~ msgstr "depo bulunmuyor"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "'%s' deposu bulunamadı\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "kaldırma işlemi oluşturulamadı\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "işlem oluşturulamadı\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "kaldırma işlemi başlatılamadı\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "işlem başlatılamadı\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "kaldırma işlemi hazırlanamadı\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "'%s' indirilirken hata oluştu: %s\n"
diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po
index 1437e308..8315c982 100644
--- a/lib/libalpm/po/uk.po
+++ b/lib/libalpm/po/uk.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-04 17:15+0200\n"
"Last-Translator: Roman Kyrylych <roman@archlinux.org>\n"
"Language-Team: http://archlinux.org.ua\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,22 +28,6 @@ msgstr ""
"%s-%s пропускається, бо в списку цільових пакунків є новіша версія %s\n"
#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "в списку цільових пакунків були знайдені конфліктуючі пакунки\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "ви не можете одночасно встановити два пакунки, що конфліктують\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "заміна пакунків за допомогою -U поки-що не підтримується\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "ви можете власноруч замінити пакунки використавши -Rd та -U\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -107,6 +92,14 @@ msgid "removing invalid database: %s\n"
msgstr "вилучення невірної бази даних: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "неможливо відкрити %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "неможливо вилучити запис бази даних %s-%s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "неможливо вилучити базу даних %s\n"
@@ -114,6 +107,10 @@ msgstr "неможливо вилучити базу даних %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "невірне ім'я для запису бази даних '%s'\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "пошкоджений запис у базі даних '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "пошкоджений запис у базі даних '%s'\n"
@@ -155,14 +152,14 @@ msgid "missing package metadata in %s\n"
msgstr "бракує метаданих пакунку в %s\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "спроба перереєструвати базу даних 'local'\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "шлях до бази даних не вказано\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "спроба перереєструвати базу даних 'local'\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "виявлено цикл залежностей:\n"
@@ -187,30 +184,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "неможливо розв'язати \"%s\", залежність \"%s\"\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "посилання '%s' невірне\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "протокол посилання не вказано, вважається HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "диск"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "посилання '%s' невірне\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "не вдалося отримати файл '%s' з %s : %s\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "неможливо продовжити завантаження, починається з початку\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "неможливо писати у файл '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "помилка при запису до файлу '%s': %s\n"
@@ -350,9 +339,13 @@ msgstr "неможливо вилучити всі файли для пакун
msgid "package filename is not valid"
msgstr "ім'я файлу пакунку невірне"
-#, c-format
-msgid "no such repository"
-msgstr "немає такого репозиторію"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "ім'я файлу пакунку невірне"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "неможливо знайти чи прочитати пакунок"
#, c-format
msgid "invalid or corrupted delta"
@@ -443,10 +436,6 @@ msgid "cannot replace %s by %s\n"
msgstr "неможливо замінити %s на %s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "репозиторій '%s' не знайдено\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s не потребує оновлення -- пропущено\n"
@@ -471,26 +460,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "не вдалося отримати деякі файли з %s\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "неможливо створити транзакцію вилучення\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "неможливо створити транзакцію\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "неможливо почати транзакцію вилучення\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "неможливо почати транзакцію\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "неможливо підготувати транзакцію вилучення\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "неможливо здійснити транзакцію вилучення\n"
@@ -515,10 +484,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "неможливо вилучити тимчасовий каталог %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "неможливо відкрити %s: %s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "неможливо змінити каталог на %s (%s)\n"
@@ -554,6 +519,45 @@ msgstr "кеш %s не існує, створюється...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "неможливо створити кеш пакунку, використовуватиметься /tmp\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "в списку цільових пакунків були знайдені конфліктуючі пакунки\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "ви не можете одночасно встановити два пакунки, що конфліктують\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "заміна пакунків за допомогою -U поки-що не підтримується\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "ви можете власноруч замінити пакунки використавши -Rd та -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "протокол посилання не вказано, вважається HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "неможливо писати у файл '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "немає такого репозиторію"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "репозиторій '%s' не знайдено\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "неможливо створити транзакцію вилучення\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "неможливо створити транзакцію\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "неможливо почати транзакцію вилучення\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "неможливо почати транзакцію\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "неможливо підготувати транзакцію вилучення\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "помилка при завантаженні '%s': %s\n"
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index c9447c49..5bbcfa81 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -9,10 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
"PO-Revision-Date: 2009-10-08 20:48+0700\n"
"Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,22 +27,6 @@ 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 target list\n"
-msgstr "目标清单中发现有冲突的软件包\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "你不能同时安装有冲突的两个软件包\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "目前尚不支持用 -U 参数替换软件包\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "你可以使用 -Rd 及 -U 来手动替换软件包\n"
-
-#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
@@ -106,6 +91,14 @@ msgid "removing invalid database: %s\n"
msgstr "正在删除无效的数据库: %s\n"
#, c-format
+msgid "could not open %s: %s\n"
+msgstr "无法打开 %1$s: %2$s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "无法删除数据库记录 %1$s-%2$s\n"
+
+#, c-format
msgid "could not remove database %s\n"
msgstr "无法删除数据库 %s\n"
@@ -113,6 +106,10 @@ msgstr "无法删除数据库 %s\n"
msgid "invalid name for database entry '%s'\n"
msgstr "数据库记录 '%s' 名字无效\n"
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "损坏的数据库记录 '%s'\n"
+
#, c-format
msgid "corrupted database entry '%s'\n"
msgstr "损坏的数据库记录 '%s'\n"
@@ -154,14 +151,14 @@ msgid "missing package metadata in %s\n"
msgstr "%s 中缺少软件包元数据\n"
#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "尝试重新登记“本地”数据库\n"
-
-#, c-format
msgid "database path is undefined\n"
msgstr "数据库路径未定义\n"
#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "尝试重新登记“本地”数据库\n"
+
+#, c-format
msgid "dependency cycle detected:\n"
msgstr "检测到依赖关系环:\n"
@@ -186,30 +183,22 @@ msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "无法解决 \"%1$s\",\"%2$s\" 的一个依赖关系\n"
#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' 无效\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "url scheme 未指定,假定为 HTTP\n"
-
-#, c-format
msgid "disk"
msgstr "硬盘"
#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' 无效\n"
+
+#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "无法从 %2$s : %3$s 获取文件 '%1$s'\n"
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
msgstr "无法恢复下载,重新开始\n"
#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "无法写入文件 '%s'\n"
-
-#, c-format
msgid "error writing to file '%s': %s\n"
msgstr "写入文件 '%1$s' 时出错: %2$s\n"
@@ -349,9 +338,13 @@ msgstr "无法为软件包删除全部文件"
msgid "package filename is not valid"
msgstr "软件包文件名无效"
-#, c-format
-msgid "no such repository"
-msgstr "没有该软件库"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "软件包文件名无效"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "无法找到或读取软件包"
#, c-format
msgid "invalid or corrupted delta"
@@ -442,10 +435,6 @@ msgid "cannot replace %s by %s\n"
msgstr "无法用文件 '%2$s' 替代 %1$s\n"
#, c-format
-msgid "repository '%s' not found\n"
-msgstr "没有找到软件库 '%s'\n"
-
-#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%1$s-%2$s 已经为最新 -- 跳过\n"
@@ -470,26 +459,6 @@ msgid "failed to retrieve some files from %s\n"
msgstr "无法从 %s 获取某些文件\n"
#, c-format
-msgid "could not create removal transaction\n"
-msgstr "无法生成可撤销处理\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "无法创建处理\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "无法初始化可撤销处理\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "无法初始化处理\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "无法准备可撤销处理\n"
-
-#, c-format
msgid "could not commit removal transaction\n"
msgstr "无法交付可撤销处理\n"
@@ -514,10 +483,6 @@ msgid "could not remove tmpdir %s\n"
msgstr "无法删除临时目录 %s\n"
#, c-format
-msgid "could not open %s: %s\n"
-msgstr "无法打开 %1$s: %2$s\n"
-
-#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "无法更改目录到 %1$s (%2$s)\n"
@@ -553,6 +518,45 @@ msgstr "没有 %s 缓存存在,正在创建...\n"
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "无法创建软件包缓存,正在使用 /tmp 代替\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "目标清单中发现有冲突的软件包\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "你不能同时安装有冲突的两个软件包\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "目前尚不支持用 -U 参数替换软件包\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "你可以使用 -Rd 及 -U 来手动替换软件包\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "url scheme 未指定,假定为 HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "无法写入文件 '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "没有该软件库"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "没有找到软件库 '%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "无法生成可撤销处理\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "无法创建处理\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "无法初始化可撤销处理\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "无法初始化处理\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "无法准备可撤销处理\n"
+
#~ msgid "error downloading '%s': %s\n"
#~ msgstr "下载 '%1$s' 时出错: %2$s\n"