27 files changed, 315 insertions, 509 deletions
diff --git a/lib/libalpm/po/ca.po b/lib/libalpm/po/ca.po
index 0fdb1b12..5dd3cb06 100644
--- a/lib/libalpm/po/ca.po
+++ b/lib/libalpm/po/ca.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Hector Mtz-Seara <hseara@gmail.com>, 2011.
@@ -9,17 +9,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-11 14:03+0000\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/ca/)\n"
-"Language: ca\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/archlinux-pacman/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -45,9 +44,7 @@ msgstr "no es pot extreure %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"els permisos del directori difereixen en %s\n"
-"sistema de fitxers: %o paquet: %o\n"
+msgstr "els permisos del directori difereixen en %s\nsistema de fitxers: %o paquet: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -167,9 +164,7 @@ msgstr "no s'ha pogut eliminar el fitxer de bloqueig %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"no s'ha pogut analitzar el fitxer de descripció de paquet '%s' de la base de "
-"dades '%s'\n"
+msgstr "no s'ha pogut analitzar el fitxer de descripció de paquet '%s' de la base de dades '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -221,9 +216,7 @@ msgstr "La partició %s està muntat només en mode lectura\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"La partició %s està molt plena: nombre de blocs requerits %jd, nombre de "
-"blocs lliures %jd\n"
+msgstr "La partició %s està molt plena: nombre de blocs requerits %jd, nombre de blocs lliures %jd\n"
 
 #, c-format
 msgid "disk"
@@ -363,8 +356,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"
+msgstr "intent de publicació de la transacció amb la base de dades no bloquejada"
 
 #, c-format
 msgid "could not find or read package"
@@ -520,9 +512,7 @@ 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"
+msgstr "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"
@@ -586,5 +576,4 @@ msgstr "no existeix memòria cau %s, s'està creant...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"no s'ha trobat o creat packet de memòria cau, usant alternativaent %s\n"
+msgstr "no s'ha trobat o creat packet de memòria cau, usant alternativaent %s\n"
diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po
index 5bd9e69e..12433bb8 100644
--- a/lib/libalpm/po/cs.po
+++ b/lib/libalpm/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # David Kolibáč <david@kolibac.cz>, 2011.
@@ -10,17 +10,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-15 08:43+0000\n"
 "Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/cs/)\n"
-"Language: cs\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/archlinux-pacman/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -46,9 +45,7 @@ msgstr "nelze rozbalit %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"přístupová práva adresáře %s se neshodují\n"
-"souborový systém: %o   balíček: %o\n"
+msgstr "přístupová práva adresáře %s se neshodují\nsouborový systém: %o   balíček: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -580,6 +577,4 @@ msgstr "neexistuje mezipaměť %s, vytváří se...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nepodařilo se najít nebo vytvořit mezipaměť pro balíčky, používám místo toho "
-"%s\n"
+msgstr "nepodařilo se najít nebo vytvořit mezipaměť pro balíčky, používám místo toho %s\n"
diff --git a/lib/libalpm/po/da.po b/lib/libalpm/po/da.po
index 72bdb43e..aca2e6ec 100644
--- a/lib/libalpm/po/da.po
+++ b/lib/libalpm/po/da.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 #   <jakob.wadsager@gmail.com>, 2012.
 # Joe Hansen <joedalton2@yahoo.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2012-04-01 12:21+0000\n"
 "Last-Translator: jakobw <jakob.wadsager@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/da/)\n"
-"Language: da\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/archlinux-pacman/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -44,9 +43,7 @@ msgstr "kunne ikke udpakke %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"mapperettigheder er forskellige for %s\n"
-"filsystem: %o  pakke: %o\n"
+msgstr "mapperettigheder er forskellige for %s\nfilsystem: %o  pakke: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 075f5235..703b0f46 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Matthias Gorissen <matthias@archlinux.de>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-07 09:26+0000\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/de/)\n"
-"Language: de\n"
+"Language-Team: German (http://www.transifex.com/projects/p/archlinux-pacman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -44,9 +43,7 @@ msgstr "Konnte %s nicht entpacken (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"Verzeichnis-Berechtigungen unterscheiden sich für %s\n"
-"Dateisystem: %o Paket: %o\n"
+msgstr "Verzeichnis-Berechtigungen unterscheiden sich für %s\nDateisystem: %o Paket: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -126,15 +123,11 @@ msgstr "Konnte Datei %s nicht öffnen: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"Die Datenbank von %s ist inkonsistent: Die Paketnamen für %s stimmen nicht "
-"überein\n"
+msgstr "Die Datenbank von %s ist inkonsistent: Die Paketnamen für %s stimmen nicht überein\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"Die Datenbank von %s ist inkonsistent: Die Versionsnummern für das Paket %s "
-"stimmen nicht überein\n"
+msgstr "Die Datenbank von %s ist inkonsistent: Die Versionsnummern für das Paket %s stimmen nicht überein\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -170,8 +163,7 @@ msgstr "Konnte Sperrdatei %s nicht entfernen\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"Konnte Paket-Beschreibungsdatei '%s' der Datenbank '%s' nicht analysieren\n"
+msgstr "Konnte Paket-Beschreibungsdatei '%s' der Datenbank '%s' nicht analysieren\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -223,9 +215,7 @@ msgstr "Die Partition %s ist so eingehängt, daß sie nur gelesen werden kann\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Partition %s ist überfüllt: %jd Blöcke werden benötigt, %jd Blöcke sind "
-"frei\n"
+msgstr "Partition %s ist überfüllt: %jd Blöcke werden benötigt, %jd Blöcke sind frei\n"
 
 #, c-format
 msgid "disk"
@@ -365,8 +355,7 @@ msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"Vorgang sollte übertragen werden, während die Datenbank nicht geschlossen war"
+msgstr "Vorgang sollte übertragen werden, während die Datenbank nicht geschlossen war"
 
 #, c-format
 msgid "could not find or read package"
@@ -586,5 +575,4 @@ msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"Konnte den Paket-Puffer nicht finden oder erstellen, benutze stattdessen %s\n"
+msgstr "Konnte den Paket-Puffer nicht finden oder erstellen, benutze stattdessen %s\n"
diff --git a/lib/libalpm/po/el.po b/lib/libalpm/po/el.po
index aaf16937..b92d73dd 100644
--- a/lib/libalpm/po/el.po
+++ b/lib/libalpm/po/el.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Christos Nouskas <nous@archlinux.us>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
@@ -9,17 +9,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-06 10:43+0000\n"
 "Last-Translator: Christos Nouskas <nous@archlinux.us>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/el/)\n"
-"Language: el\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/archlinux-pacman/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -45,9 +44,7 @@ msgstr "αδυναμία εξαγωγής %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"τα δικαιώματα καταλόγου διαφέρουν στο %s\n"
-"σύστημα αρχείων: %o  πακέτο: %o\n"
+msgstr "τα δικαιώματα καταλόγου διαφέρουν στο %s\nσύστημα αρχείων: %o  πακέτο: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -515,8 +512,7 @@ msgstr "εντοπισμός ανεπίλυτων διενέξεων πακέτ�
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"αφαίρεση του '%s' από την λίστα διεκπεραίωσης λόγω διένεξης με το '%s'\n"
+msgstr "αφαίρεση του '%s' από την λίστα διεκπεραίωσης λόγω διένεξης με το '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index 8fca5af2..ebbb49a7 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -1,22 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-06 03:57+0000\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en_GB\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/archlinux-pacman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -42,9 +42,7 @@ msgstr "could not extract %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"directory permissions differ on %s\n"
-"filesystem: %o  package: %o\n"
+msgstr "directory permissions differ on %s\nfilesystem: %o  package: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index e5ee820a..a8193669 100644
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Angel Velasquez <angvp@archlinux.org>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
@@ -11,17 +11,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-06 16:10+0000\n"
 "Last-Translator: juantascon <juantascon@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/language/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/archlinux-pacman/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -47,9 +46,7 @@ msgstr "no se pudo extraer %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"los permisos de directorio difieren en %s\n"
-"sistema de archivos: %o  paquete: %o\n"
+msgstr "los permisos de directorio difieren en %s\nsistema de archivos: %o  paquete: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -129,15 +126,11 @@ 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"
+msgstr "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"
+msgstr "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"
@@ -173,9 +166,7 @@ msgstr "no se pudo eliminar el archivo de bloqueo %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"error al leer el archivo de descripción '%s' del paquete de la base de datos "
-"'%s'\n"
+msgstr "error al leer el archivo de descripción '%s' del paquete de la base de datos '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -207,9 +198,7 @@ msgstr "no se pudo obtener información del sistema de archivos\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"no se pudo obtener información del sistema de archivos para %s: %s\n"
-"\n"
+msgstr "no se pudo obtener información del sistema de archivos para %s: %s\n\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
@@ -229,9 +218,7 @@ msgstr "La partición %s está montada como sólo lectura\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Partición %s demasiado llena: %jd bloques son necesarios, %jd bloques "
-"libres\n"
+msgstr "Partición %s demasiado llena: %jd bloques son necesarios, %jd bloques libres\n"
 
 #, c-format
 msgid "disk"
@@ -371,8 +358,7 @@ msgstr "la operación no es compatible con el tipo de transacción"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"intento de envío de la transación cuando la base de datos no está bloqueada"
+msgstr "intento de envío de la transación cuando la base de datos no está bloqueada"
 
 #, c-format
 msgid "could not find or read package"
@@ -528,9 +514,7 @@ msgstr "se han detectado paquetes con conflictos no resolvibles\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 tiene conflictos con "
-"'%s'\n"
+msgstr "quitando '%s' de la lista de objetivos debido a que tiene conflictos con '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -594,5 +578,4 @@ msgstr "no existe la caché %s, creando...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"no se pudo encontrar o crear la caché del paquete, en lugar se utilizará %s\n"
+msgstr "no se pudo encontrar o crear la caché del paquete, en lugar se utilizará %s\n"
diff --git a/lib/libalpm/po/fi.po b/lib/libalpm/po/fi.po
index c5c1f7ba..bc7777df 100644
--- a/lib/libalpm/po/fi.po
+++ b/lib/libalpm/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # apuasi <kaannokset.hellberg@gmail.com>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
@@ -12,17 +12,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-07 18:48+0000\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/fi/)\n"
-"Language: fi\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/archlinux-pacman/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -48,9 +47,7 @@ msgstr "tiedostoa %s ei voitu purkaa (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"kansion oikeuksissa eroavaisuuksia kohdassa %s\n"
-"tiedostojärjestelmä: %o   paketti: %o\n"
+msgstr "kansion oikeuksissa eroavaisuuksia kohdassa %s\ntiedostojärjestelmä: %o   paketti: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -518,9 +515,7 @@ msgstr "ratkaisemattomia pakettiristiriitoja havaittu\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"poistetaan '%s' kohteiden listasta, koska se on ristiriidassa paketin '%s' "
-"kanssa\n"
+msgstr "poistetaan '%s' kohteiden listasta, koska se on ristiriidassa paketin '%s' kanssa\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -584,6 +579,4 @@ msgstr "välimuistia %s ei ole olemassa, luodaan...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"pakettivälimuistia ei ollut olemassa eikä sitä voitu luoda. Käytetään %s sen "
-"sijaan\n"
+msgstr "pakettivälimuistia ei ollut olemassa eikä sitä voitu luoda. Käytetään %s sen sijaan\n"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index 14405143..03e15550 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -1,8 +1,9 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+#   <antoine@lubignon.info>, 2012.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 #   <ma.jiehong@gmail.com>, 2011, 2012.
 # shining <chantry.xavier@gmail.com>, 2011.
@@ -10,17 +11,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
-"PO-Revision-Date: 2012-02-06 20:08+0000\n"
-"Last-Translator: jiehong <ma.jiehong@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/fr/)\n"
-"Language: fr\n"
+"PO-Revision-Date: 2012-10-01 11:47+0000\n"
+"Last-Translator: alub <antoine@lubignon.info>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/archlinux-pacman/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -46,9 +46,7 @@ msgstr "l'extraction de %s a échoué (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"Les permissions pour le répertoire %s sont différentes\n"
-"système de fichier : %o paquet : %o\n"
+msgstr "les permissions pour le répertoire %s sont différentes\nsystème de fichier : %o paquet : %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -100,7 +98,7 @@ msgstr "des erreurs sont survenues pendant l'installation de %s\n"
 
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "la mise à jour l'entrée de base de données %s-%s a échoué\n"
+msgstr "la mise à jour de l'entrée de base de données %s-%s a échoué\n"
 
 #, c-format
 msgid "could not add entry '%s' in cache\n"
@@ -128,12 +126,11 @@ msgstr "l'ouverture du fichier %s a échoué : %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr "Le dépôt %s est inconsistant : noms différents pour le paquet %s\n"
+msgstr "le dépôt %s est inconsistant : noms différents pour le paquet %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"Le dépôt %s est inconsistant : versions différentes pour le paquet %s\n"
+msgstr "le dépôt %s est inconsistant : versions différentes pour le paquet %s\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -169,9 +166,7 @@ msgstr "la suppression du fichier de verrouillage %s a échoué\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"impossible d'analyser le fichier « %s » de description du paquet depuis la "
-"base de données « %s »\n"
+msgstr "impossible d'analyser le fichier « %s » de description du paquet depuis la base de données « %s »\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -203,8 +198,7 @@ msgstr "impossible de récupérer les informations du système de fichier\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"impossible de récupérer les informations du système de fichier pour %s : %s\n"
+msgstr "impossible de récupérer les informations du système de fichier pour %s : %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
@@ -236,7 +230,7 @@ msgstr "échec de création d'un fichier temporaire pour le téléchargement\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "l'url « %s » est invalide\n"
+msgstr "l'URL « %s » est invalide\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
@@ -244,7 +238,7 @@ msgstr "échec de récupération du fichier « %s » depuis %s : %s\n"
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
-msgstr "%s est apparemment tronqué : %jd/%jd bytes\n"
+msgstr "%s est apparemment tronqué : %jd/%jd octets\n"
 
 #, c-format
 msgid "failed to download %s\n"
@@ -280,11 +274,11 @@ msgstr "pas assez d'espace libre"
 
 #, c-format
 msgid "library not initialized"
-msgstr "librairie non initialisée"
+msgstr "bibliothèque non initialisée"
 
 #, c-format
 msgid "library already initialized"
-msgstr "librairie déjà initialisée"
+msgstr "bibliothèque déjà initialisée"
 
 #, c-format
 msgid "unable to lock database"
@@ -316,7 +310,7 @@ msgstr "base de données invalide ou corrompue"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr "base de données invalide ou corrompue (Signature PGP)"
+msgstr "base de données invalide ou corrompue (signature PGP)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -364,9 +358,7 @@ msgstr "opération incompatible avec le type de transaction"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"tentative de réalisation d'une transaction alors que le dépôt n'est pas "
-"verrouillé"
+msgstr "tentative de réalisation d'une transaction alors que le dépôt n'est pas verrouillé"
 
 #, c-format
 msgid "could not find or read package"
@@ -414,7 +406,7 @@ msgstr "signature PGP manquante"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr "siganture PGP invalide"
+msgstr "signature PGP invalide"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -466,9 +458,7 @@ msgstr "erreur non prévue"
 
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"Les métadonnées pour le paquet %s-%s n'ont pas pu êtres totalement "
-"chargées.\n"
+msgstr "les métadonnées pour le paquet %s-%s n'ont pas pu être totalement chargées.\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -524,8 +514,7 @@ msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"supprime « %s » de la liste de cible car il est en conflit avec « %s »\n"
+msgstr "supprime « %s » de la liste de cible car il est en conflit avec « %s »\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -589,6 +578,4 @@ msgstr "le cache %s n'existe pas, création…\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"Impossible de trouver ou de créer le cache des paquets, utilisation de %s à "
-"la place\n"
+msgstr "impossible de trouver ou de créer le cache des paquets, utilisation de %s à la place\n"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index f67e8ac4..f642d1d5 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # György Balló <ballogy@freestart.hu>, 2011.
 # ngaba <ngaba@bibl.u-szeged.hu>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-08 10:04+0000\n"
 "Last-Translator: György Balló <ballogy@freestart.hu>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/language/hu/)\n"
-"Language: hu\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/archlinux-pacman/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -44,9 +43,7 @@ msgstr "nem sikerült kibontani: %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"eltérő könyvtárjogosultságok: %s\n"
-"fájlrendszer: %o  csomag: %o\n"
+msgstr "eltérő könyvtárjogosultságok: %s\nfájlrendszer: %o  csomag: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -166,9 +163,7 @@ msgstr "nem sikerült a zárolófájl (%s) eltávolítása\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"nem sikerült értelmezni a(z) '%s' csomagleíró fájlját a(z) '%s' "
-"adatbázisból\n"
+msgstr "nem sikerült értelmezni a(z) '%s' csomagleíró fájlját a(z) '%s' adatbázisból\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -220,8 +215,7 @@ msgstr "A %s partíció csak olvashatóként van csatolva\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"A %s partíció túlságosan tele van: %jd blokk szükséges, %jd blokk szabad\n"
+msgstr "A %s partíció túlságosan tele van: %jd blokk szükséges, %jd blokk szabad\n"
 
 #, c-format
 msgid "disk"
@@ -461,8 +455,7 @@ msgstr "nem várt hiba"
 
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"nem sikerült teljesen betölteni az információs fájlt a(z) %s-%s csomaghoz\n"
+msgstr "nem sikerült teljesen betölteni az információs fájlt a(z) %s-%s csomaghoz\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -582,6 +575,4 @@ msgstr "nem létezik a(z) %s gyorsítótár, létrehozás...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nem található vagy nem hozható létre a csomaggyorsítótár, a %s könyvtárat "
-"használom helyette\n"
+msgstr "nem található vagy nem hozható létre a csomaggyorsítótár, a %s könyvtárat használom helyette\n"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index 9673169b..738c4f34 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Giovanni Scafora <giovanni@archlinux.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2012-02-16 15:25+0000\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/it/)\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/archlinux-pacman/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -30,9 +29,7 @@ msgstr "%s-%s è aggiornato ma 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"
+msgstr "installazione in corso di una versione meno recente del pacchetto %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
@@ -46,9 +43,7 @@ msgstr "impossibile estrarre %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"i permessi delle directory differiscono su %s\n"
-"filesystem: %o pacchetto: %o\n"
+msgstr "i permessi delle directory differiscono su %s\nfilesystem: %o pacchetto: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -128,14 +123,11 @@ msgstr "impossibile aprire il file %s: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"il database %s è inconsistente: il nome non corrisponde con il pacchetto %s\n"
+msgstr "il database %s è inconsistente: il nome non corrisponde con il pacchetto %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"il database %s è inconsistente: la versione non corrisponde con il pacchetto "
-"%s\n"
+msgstr "il database %s è inconsistente: la versione non corrisponde con il pacchetto %s\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -171,9 +163,7 @@ msgstr "impossibile rimuovere il file di lock %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"impossibile analizzare il file della descrizione del pacchetto '%s' dal "
-"database '%s'\n"
+msgstr "impossibile analizzare il file della descrizione del pacchetto '%s' dal database '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -205,8 +195,7 @@ msgstr "impossibile ottenere le informazioni relative al filesystem\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"impossibile ottenere le informazione relative al filesystem di %s: %s\n"
+msgstr "impossibile ottenere le informazione relative al filesystem di %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
@@ -226,8 +215,7 @@ msgstr "La partizione %s è montata in sola lettura\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"La partizione %s è troppo piena: %jd blocchi necessari, %jd blocchi liberi\n"
+msgstr "La partizione %s è troppo piena: %jd blocchi necessari, %jd blocchi liberi\n"
 
 #, c-format
 msgid "disk"
@@ -507,8 +495,7 @@ msgstr "%s: è in corso il downgrade dalla versione %s alla versione %s\n"
 
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-"%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
+msgstr "%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
 
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
@@ -524,8 +511,7 @@ msgstr "sono stati rilevati dei conflitti irrisolvibili tra i pacchetti\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"rimozione di '%s' dalla lista dei pacchetti perché va in conflitto con '%s'\n"
+msgstr "rimozione di '%s' dalla lista dei pacchetti perché va in conflitto con '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -589,6 +575,4 @@ msgstr "la cache di %s non esiste, creazione in corso...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"impossibile trovare o creare la cache del pacchetto, al suo posto sarà usato "
-"%s\n"
+msgstr "impossibile trovare o creare la cache del pacchetto, al suo posto sarà usato %s\n"
diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po
index a238e532..8c2cd8fd 100644
--- a/lib/libalpm/po/kk.po
+++ b/lib/libalpm/po/kk.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-06 03:39+0000\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/kk/)\n"
-"Language: kk\n"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/archlinux-pacman/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -44,9 +43,7 @@ msgstr "%s тарқату қатесі (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"%s бумасының қатынау рұқсаттары әр түрлі\n"
-"файлдық жүйе: %o  десте: %o\n"
+msgstr "%s бумасының қатынау рұқсаттары әр түрлі\nфайлдық жүйе: %o  десте: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -514,8 +511,7 @@ msgstr "дестелердің шешілмейтін ерегісі табыл�
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"мақсаттар тізімінен '%s' өшіріледі, өйткені ол '%s' дестесімен ерегіседі\n"
+msgstr "мақсаттар тізімінен '%s' өшіріледі, өйткені ол '%s' дестесімен ерегіседі\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
diff --git a/lib/libalpm/po/lt.po b/lib/libalpm/po/lt.po
index 0dcf6f9c..22c98ceb 100644
--- a/lib/libalpm/po/lt.po
+++ b/lib/libalpm/po/lt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
 # Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011, 2012.
@@ -9,18 +9,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2012-02-05 07:37+0000\n"
-"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/language/lt/)\n"
-"Language: lt\n"
+"Last-Translator: Algimantas Margevičius <gymka@archlinux.lt>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/archlinux-pacman/language/lt/)\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"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -46,9 +44,7 @@ msgstr "nepavyko išskleisti %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"%s aplanko leidimai skiriasi\n"
-"failų sistema: %o  paketas: %o\n"
+msgstr "%s aplanko leidimai skiriasi\nfailų sistema: %o  paketas: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -128,13 +124,11 @@ msgstr "nepavyko atverti failo %s: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"%s duomenų bazės nesuderinamumas: pavadinimas neatitinka nurodyto pakete %s\n"
+msgstr "%s duomenų bazės nesuderinamumas: pavadinimas neatitinka nurodyto pakete %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"%s duomenų bazės nesuderinamumas: versija neatitinka nurodytos pakete %s\n"
+msgstr "%s duomenų bazės nesuderinamumas: versija neatitinka nurodytos pakete %s\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
diff --git a/lib/libalpm/po/nb.po b/lib/libalpm/po/nb.po
index f600acec..c9dcb814 100644
--- a/lib/libalpm/po/nb.po
+++ b/lib/libalpm/po/nb.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alexander Rødseth <rodseth@gmail.com>, 2011.
 # Jon Gjengset <jon@thesquareplanet.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-14 16:36+0000\n"
 "Last-Translator: Alexander Rødseth <rodseth@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/"
-"archlinux-pacman/language/nb/)\n"
-"Language: nb\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/archlinux-pacman/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -44,9 +43,7 @@ msgstr "kunne ikke pakke ut %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"mapperettigheter er forskjellige i %s\n"
-"filsystem: %o  pakke: %o\n"
+msgstr "mapperettigheter er forskjellige i %s\nfilsystem: %o  pakke: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -578,6 +575,4 @@ msgstr "mellomlageret %s eksisterer ikke, oppretter...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"kunne ikke finne eller opprette mellomlager for pakker, bruker %s "
-"istedenfor\n"
+msgstr "kunne ikke finne eller opprette mellomlager for pakker, bruker %s istedenfor\n"
diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po
index 36c85ede..994a4505 100644
--- a/lib/libalpm/po/pl.po
+++ b/lib/libalpm/po/pl.po
@@ -1,24 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Bartek Piotrowski <barthalion@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-08 09:10+0000\n"
-"Last-Translator: Bartek Piotrowski <barthalion@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/pl/)\n"
-"Language: pl\n"
+"Last-Translator: Bartek Piotrowski <spam@bpiotrowski.pl>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/archlinux-pacman/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -44,9 +42,7 @@ msgstr "nie udało się rozpakować %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"Różne uprawnienia dla katalogu dla %s\n"
-"system plików: %o pakiet: %o\n"
+msgstr "Różne uprawnienia dla katalogu dla %s\nsystem plików: %o pakiet: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -450,8 +446,7 @@ msgstr "błąd gpgme"
 
 #, c-format
 msgid "error invoking external downloader"
-msgstr ""
-"wystąpił błąd podczas odwoływania się do zewnętrznego programu pobierającego"
+msgstr "wystąpił błąd podczas odwoływania się do zewnętrznego programu pobierającego"
 
 #, c-format
 msgid "unexpected error"
@@ -579,6 +574,4 @@ msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nie można odnaleźć lub stworzyć pamięci podręcznej pakietu, używam %s w "
-"zamian\n"
+msgstr "nie można odnaleźć lub stworzyć pamięci podręcznej pakietu, używam %s w zamian\n"
diff --git a/lib/libalpm/po/pt.po b/lib/libalpm/po/pt.po
index 0c6aa676..943d22d4 100644
--- a/lib/libalpm/po/pt.po
+++ b/lib/libalpm/po/pt.po
@@ -1,23 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Gaspar Santos <omeuviolino@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-12 13:05+0000\n"
 "Last-Translator: Gaspar Santos <omeuviolino@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/archlinux-"
-"pacman/language/pt/)\n"
-"Language: pt\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/archlinux-pacman/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -43,9 +42,7 @@ msgstr "não foi possível extrair %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"permissões do diretório diferem em %s\n"
-"sistema de ficheiros: %o  pacote: %o\n"
+msgstr "permissões do diretório diferem em %s\nsistema de ficheiros: %o  pacote: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -129,8 +126,7 @@ msgstr "%s base de dados está inconsistente: nome no pacote %s não coincide\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"%s base de dados está inconsistente: versão do pacote %s não coincide\n"
+msgstr "%s base de dados está inconsistente: versão do pacote %s não coincide\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -166,8 +162,7 @@ msgstr "não foi possível remover o ficheiro bloqueado %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"não é possível analisar descrição do pacote '%s' da base de dados '%s'\n"
+msgstr "não é possível analisar descrição do pacote '%s' da base de dados '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -199,8 +194,7 @@ msgstr "não foi possível obter informações do sistema de ficheiros\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"não foi possível obter informações do sistema de ficheiros para %s: %s\n"
+msgstr "não foi possível obter informações do sistema de ficheiros para %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
@@ -208,8 +202,7 @@ msgstr "Não foi possível determinar o ponto de montagem para o ficheiro %s\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
-"não foi possível determinar os pontos de montagem do sistema de ficheiros\n"
+msgstr "não foi possível determinar os pontos de montagem do sistema de ficheiros\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
@@ -461,8 +454,7 @@ msgstr "erro inesperado"
 
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"não é possível apresentar na totalidade metadados para o pacote %s-%s\n"
+msgstr "não é possível apresentar na totalidade metadados para o pacote %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -582,6 +574,4 @@ msgstr "cache %s não existe, a criar...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"não é possível encontrar ou criar cache do pacote, em uso %s como "
-"alternativa\n"
+msgstr "não é possível encontrar ou criar cache do pacote, em uso %s como alternativa\n"
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 677a6f1a..4d8633f1 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # ambaratti <ambaratti.listas@gmail.com>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
@@ -11,17 +11,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2012-02-27 22:06+0000\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/language/pt_BR/)\n"
-"Language: pt_BR\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/archlinux-pacman/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -47,9 +46,7 @@ msgstr "não foi possível extrair %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"permissões de diretório diferem em %s\n"
-"sistema de arquivos: %o  pacote: %o\n"
+msgstr "permissões de diretório diferem em %s\nsistema de arquivos: %o  pacote: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -129,13 +126,11 @@ msgstr "não foi possível abrir o arquivo %s: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"base de dados %s está inconsistente: nome não coincidente no pacote %s\n"
+msgstr "base de dados %s está inconsistente: nome não coincidente no pacote %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"%s base de dados está inconsistente: versão não coincidente no pacote %s\n"
+msgstr "%s base de dados está inconsistente: versão não coincidente no pacote %s\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -171,9 +166,7 @@ msgstr "não foi possível remover o arquivo de trava %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"não foi possível analisar arquivo de descrição de pacote '%s' da base de "
-"dados '%s'\n"
+msgstr "não foi possível analisar arquivo de descrição de pacote '%s' da base de dados '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -205,8 +198,7 @@ msgstr "não foi possível obter informações do sistema de arquivos\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"não foi possível obter informações do sistema de arquivos para %s: %s\n"
+msgstr "não foi possível obter informações do sistema de arquivos para %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
@@ -214,8 +206,7 @@ msgstr "não foi possível determinar o ponto de montagem para o arquivo %s\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
-"não foi possível determinar os pontos de montagem do sistema de arquivos\n"
+msgstr "não foi possível determinar os pontos de montagem do sistema de arquivos\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
@@ -227,8 +218,7 @@ msgstr "Partição %s está montada somente para leitura\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Partição %s está cheia: %jd blocos necessários, %jd blocos disponíveis\n"
+msgstr "Partição %s está cheia: %jd blocos necessários, %jd blocos disponíveis\n"
 
 #, c-format
 msgid "disk"
@@ -588,5 +578,4 @@ msgstr "cache %s não existe, criando...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"falha em encontrar ou criar cache do pacote, usando %s em substituição.\n"
+msgstr "falha em encontrar ou criar cache do pacote, usando %s em substituição.\n"
diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po
index 50d741dd..da3168e4 100644
--- a/lib/libalpm/po/ro.po
+++ b/lib/libalpm/po/ro.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # cantabile <cantabile.desu@gmail.com>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
@@ -10,18 +10,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-06 17:25+0000\n"
 "Last-Translator: Mihai Coman <mihai@m1x.ro>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/language/ro/)\n"
-"Language: ro\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/archlinux-pacman/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -47,9 +45,7 @@ msgstr "nu se poate extrage %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"permisiunile directorului diferă la %s\n"
-"pe disc: %o  pachet: %o\n"
+msgstr "permisiunile directorului diferă la %s\npe disc: %o  pachet: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -85,9 +81,7 @@ msgstr "nu s-a putut determina directorul de lucru curent\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr ""
-"nu s-a putut intra în directorul %s (%s)\n"
-"\n"
+msgstr "nu s-a putut intra în directorul %s (%s)\n\n"
 
 #, c-format
 msgid "could not restore working directory (%s)\n"
@@ -131,14 +125,11 @@ msgstr "nu poate fi deschis fișierul %s: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"baza de date %s este inconsistentă: numele nu se potrivește cu pachetul %s\n"
+msgstr "baza de date %s este inconsistentă: numele nu se potrivește cu pachetul %s\n"
 
 #, 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"
+msgstr "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"
@@ -174,9 +165,7 @@ msgstr "nu poate fi eliminat fișierul de blocare %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"nu s-a putut analiza fișierul '%s' de descriere a pachetului  din db '%s'\n"
-"\n"
+msgstr "nu s-a putut analiza fișierul '%s' de descriere a pachetului  din db '%s'\n\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -208,8 +197,7 @@ msgstr "nu s-au putut obține informații despre sistemul de fișiere\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"nu s-au putut obține informații despre sistemul de fișiere pentru %s: %s\n"
+msgstr "nu s-au putut obține informații despre sistemul de fișiere pentru %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
@@ -589,5 +577,4 @@ msgstr "nu există cache %s, se crează...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nu s-a putut găsi sau creea cache pentru pachet; se folosește %s în schimb.\n"
+msgstr "nu s-a putut găsi sau creea cache pentru pachet; se folosește %s în schimb.\n"
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index b99568bc..50ac7fc8 100644
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Ivan Yurasov <vdk@gmx.us>, 2011.
@@ -10,18 +10,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2012-01-17 16:22+0000\n"
 "Last-Translator: partizan <serg.partizan@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/archlinux-pacman/language/ru/)\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"
+"Language: ru\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 "%s-%s is up to date -- skipping\n"
@@ -47,9 +45,7 @@ msgstr "не удалось извлечь %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"права доступа различаются у каталога %s\n"
-"файловая система: %o  пакет: %o\n"
+msgstr "права доступа различаются у каталога %s\nфайловая система: %o  пакет: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -129,13 +125,11 @@ msgstr "не удалось открыть файл %s: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"противоречивая информация в базе данных %s: не совпадает имя пакета %s\n"
+msgstr "противоречивая информация в базе данных %s: не совпадает имя пакета %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"противоречивая информация в базе данных %s: не совпадает версия пакета %s\n"
+msgstr "противоречивая информация в базе данных %s: не совпадает версия пакета %s\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
diff --git a/lib/libalpm/po/sk.po b/lib/libalpm/po/sk.po
index bf51e384..6555d982 100644
--- a/lib/libalpm/po/sk.po
+++ b/lib/libalpm/po/sk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dušan Lago <dusan.lago@gmail.com>, 2011.
 #   <jose1711@gmail.com>, 2011.
@@ -9,17 +9,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-08 19:38+0000\n"
-"Last-Translator: jose1711 <jose1711@gmail.com>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/sk/)\n"
-"Language: sk\n"
+"Last-Translator: Jose Riha <jose1711@gmail.com>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/archlinux-pacman/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -45,9 +44,7 @@ msgstr "nie je možné rozbaliť %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"prístupové práva adresára %s sa nezhodujú\n"
-"súborový systém: %o  balíček: %o\n"
+msgstr "prístupové práva adresára %s sa nezhodujú\nsúborový systém: %o  balíček: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -579,6 +576,4 @@ msgstr "neexistuje cache %s, vytváram...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nie je možné nájsť alebo vytvoriť cache pre balíček,  miesto toho sa používa "
-"%s\n"
+msgstr "nie je možné nájsť alebo vytvoriť cache pre balíček,  miesto toho sa používa %s\n"
diff --git a/lib/libalpm/po/sr.po b/lib/libalpm/po/sr.po
index 1bcb0b9e..218c499f 100644
--- a/lib/libalpm/po/sr.po
+++ b/lib/libalpm/po/sr.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Mladen Pejaković <pejakm@teol.net>, 2013.
 # Slobodan Terzić <githzerai06@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
-"PO-Revision-Date: 2011-10-11 17:15+0000\n"
-"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/sr/)\n"
-"Language: sr\n"
+"PO-Revision-Date: 2013-01-31 22:24+0000\n"
+"Last-Translator: daimonion <pejakm@teol.net>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/archlinux-pacman/language/sr/)\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"
+"Language: sr\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 "%s-%s is up to date -- skipping\n"
@@ -44,9 +43,7 @@ msgstr "не могу да распакујем %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"дозволе фасцикле се разликују за %s\n"
-"систем фајлова: %o пакет: %o\n"
+msgstr "дозволе фасцикле се разликују за %s\nсистем фајлова: %o пакет: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -230,7 +227,7 @@ msgstr "неуспело стварање привременог фајла пр
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "„%s“ је нисправан урл\n"
+msgstr "„%s“ је неисправан урл\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
@@ -562,7 +559,7 @@ msgstr "неуспео позив извршног аргумента (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "неуспешо позивање процеса чекања (%s)\n"
+msgstr "неуспешно позивање процеса чекања (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
@@ -578,4 +575,4 @@ msgstr "не постоји кеш за %s; правим....\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "не могу да нађем или направим кеш пакета, као замену корисим %s\n"
+msgstr "не могу да нађем или направим кеш пакета, као замену користим %s\n"
diff --git a/lib/libalpm/po/sr@latin.po b/lib/libalpm/po/sr@latin.po
index 843bd00d..d264e946 100644
--- a/lib/libalpm/po/sr@latin.po
+++ b/lib/libalpm/po/sr@latin.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Mladen Pejaković <pejakm@teol.net>, 2013.
 # Slobodan Terzić <githzerai06@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
-"PO-Revision-Date: 2011-10-12 15:08+0000\n"
-"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/language/sr@latin/)\n"
-"Language: sr@latin\n"
+"PO-Revision-Date: 2013-01-31 22:24+0000\n"
+"Last-Translator: daimonion <pejakm@teol.net>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/archlinux-pacman/language/sr@latin/)\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"
+"Language: sr@latin\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 "%s-%s is up to date -- skipping\n"
@@ -44,9 +43,7 @@ msgstr "ne mogu da raspakujem %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"dozvole fascikle se razlikuju za %s\n"
-"sistem fajlova: %o paket: %o\n"
+msgstr "dozvole fascikle se razlikuju za %s\nsistem fajlova: %o paket: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -230,7 +227,7 @@ msgstr "neuspelo stvaranje privremenog fajla preuzimanja\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "„%s“ je nispravan url\n"
+msgstr "„%s“ je neispravan url\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
@@ -562,7 +559,7 @@ msgstr "neuspeo poziv izvršnog argumenta (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "neuspešo pozivanje procesa čekanja (%s)\n"
+msgstr "neuspešno pozivanje procesa čekanja (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
@@ -578,4 +575,4 @@ msgstr "ne postoji keš za %s; pravim....\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "ne mogu da nađem ili napravim keš paketa, kao zamenu korisim %s\n"
+msgstr "ne mogu da nađem ili napravim keš paketa, kao zamenu koristim %s\n"
diff --git a/lib/libalpm/po/sv.po b/lib/libalpm/po/sv.po
index 782d3c6b..e24e41da 100644
--- a/lib/libalpm/po/sv.po
+++ b/lib/libalpm/po/sv.po
@@ -1,23 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # , 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-11-15 15:42+0000\n"
 "Last-Translator: Fredrik Halldal <f.halldal@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/sv/)\n"
-"Language: sv\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/archlinux-pacman/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -43,9 +42,7 @@ msgstr "kunde inte extrahera %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"katalogrättigheter skiljer sig på %s\n"
-"filsystem: %o  paket: %o\n"
+msgstr "katalogrättigheter skiljer sig på %s\nfilsystem: %o  paket: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po
index 32174a85..66d587a4 100644
--- a/lib/libalpm/po/tr.po
+++ b/lib/libalpm/po/tr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Atilla Öntaş <tarakbumba@gmail.com>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
@@ -9,17 +9,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-23 09:34+0000\n"
 "Last-Translator: Atilla Öntaş <tarakbumba@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"language/tr/)\n"
-"Language: tr\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/archlinux-pacman/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -45,9 +44,7 @@ msgstr "%s açılamadı (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"%s paketi üzerinde dizin izinleri farklı\n"
-"dosya sistemi: %o paket: %o\n"
+msgstr "%s paketi üzerinde dizin izinleri farklı\ndosya sistemi: %o paket: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -499,8 +496,7 @@ msgstr "%s: %s sürümünden %s sürümüne çevriliyor.\n"
 
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-"%s: yerel depodaki paket (%s) %s deposundaki paketten (%s) daha güncel\n"
+msgstr "%s: yerel depodaki paket (%s) %s deposundaki paketten (%s) daha güncel\n"
 
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
@@ -580,5 +576,4 @@ msgstr "%s önbelleği yok, oluşturuluyor...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"paket önbelleği oluşturulamıyor veya bulunamıyor, yerine %s kullanılıyor\n"
+msgstr "paket önbelleği oluşturulamıyor veya bulunamıyor, yerine %s kullanılıyor\n"
diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po
index 25831719..d8039b10 100644
--- a/lib/libalpm/po/uk.po
+++ b/lib/libalpm/po/uk.po
@@ -1,25 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Yarema aka Knedlyk <yupadmin@gmail.com>, 2011.
+# Yarema aka Knedlyk <yupadmin@gmail.com>, 2011, 2012.
 # Данило Коростіль <ted.korostiled@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
-"PO-Revision-Date: 2011-10-10 20:43+0000\n"
-"Last-Translator: Данило Коростіль <ted.korostiled@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/language/uk/)\n"
-"Language: uk\n"
+"PO-Revision-Date: 2012-07-15 22:23+0000\n"
+"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/archlinux-pacman/language/uk/)\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"
+"Language: uk\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 "%s-%s is up to date -- skipping\n"
@@ -45,9 +43,7 @@ msgstr "неможливо розпакувати %s (%s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"права каталогу відрізняються у\n"
-"файловій системі %s: %o  пакунок: %o\n"
+msgstr "права каталогу відрізняються у\nфайловій системі %s: %o  пакунок: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -423,11 +419,11 @@ msgstr "неможливо забезпечити залежності"
 
 #, c-format
 msgid "conflicting dependencies"
-msgstr "конфлікті залежності"
+msgstr "конфліктні залежності"
 
 #, c-format
 msgid "conflicting files"
-msgstr "конфлікті файли"
+msgstr "конфліктні файли"
 
 #, c-format
 msgid "failed to retrieve some files"
@@ -579,5 +575,4 @@ msgstr "кеш %s не існує, створюється…\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"неможливо знайти або створити кеш пакунків, використовуючи %s натомість\n"
+msgstr "неможливо знайти або створити кеш пакунків, використовуючи %s натомість\n"
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index e2093a6f..629aaa26 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # leonfeng <rainofchaos@gmail.com>, 2011.
@@ -9,17 +9,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-11-15 02:39+0000\n"
 "Last-Translator: 甘 露 <rhythm.gan@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/archlinux-pacman/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -45,9 +44,7 @@ msgstr "无法解压缩 %1$s (%2$s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"目录权限不一致 %1$s\n"
-"文件系统：%2$o  软件包：%3$o\n"
+msgstr "目录权限不一致 %1$s\n文件系统：%2$o  软件包：%3$o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -215,9 +212,7 @@ msgstr "无法测定根分区挂载点 %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
-"分区 %s 为只读\n"
-"\n"
+msgstr "分区 %s 为只读\n\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
diff --git a/lib/libalpm/po/zh_TW.po b/lib/libalpm/po/zh_TW.po
index 059d12c6..09e9bb02 100644
--- a/lib/libalpm/po/zh_TW.po
+++ b/lib/libalpm/po/zh_TW.po
@@ -1,23 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-#   <dlin.tw@gmail.com>, 2011.
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2012.
+#   <dlin.tw@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2012-03-28 18:00-0500\n"
-"PO-Revision-Date: 2011-10-06 03:39+0000\n"
-"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/language/zh_TW/)\n"
-"Language: zh_TW\n"
+"PO-Revision-Date: 2012-08-28 04:30+0000\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/archlinux-pacman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -29,7 +29,7 @@ msgstr "%1$s-%2$s 已經爲最新 -- 重新安裝\n"
 
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
-msgstr "正在降級軟件包 %1$s (%2$s => %3$s)\n"
+msgstr "正在降級軟體包 %1$s (%2$s => %3$s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
@@ -43,9 +43,7 @@ msgstr "無法解壓縮 %1$s (%2$s)\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"目錄權限不一致 %1$s\n"
-"文件系統：%2$o  軟件包：%3$o\n"
+msgstr "目錄權限不一致 %1$s\n文件系統：%2$o  軟體包：%3$o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
@@ -85,7 +83,7 @@ msgstr "無法更改目錄到 %1$s (%2$s)\n"
 
 #, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr ""
+msgstr "無法回存到工作目錄(%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -97,7 +95,7 @@ msgstr "安裝 %s 時出現錯誤\n"
 
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "無法更新數據庫記錄 %1$s-%2$s\n"
+msgstr "無法更新資料庫記錄 %1$s-%2$s\n"
 
 #, c-format
 msgid "could not add entry '%s' in cache\n"
@@ -105,19 +103,19 @@ msgstr "無法在緩存中添加記錄 '%s' \n"
 
 #, c-format
 msgid "removing invalid database: %s\n"
-msgstr "正在刪除無效的數據庫： %s\n"
+msgstr "正在刪除無效的資料庫： %s\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "數據庫記錄 '%s' 名字無效\n"
+msgstr "資料庫記錄 '%s' 名字無效\n"
 
 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "重複的數據庫記錄 '%s'\n"
+msgstr "重複的資料庫記錄 '%s'\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "損壞的數據庫記錄 '%s'\n"
+msgstr "損壞的資料庫記錄 '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
@@ -125,11 +123,11 @@ msgstr "無法打開文件 %1$s: %2$s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr "%1$s 數據庫不一致：名字和軟件包中的 %2$s 不一致\n"
+msgstr "%1$s 資料庫不一致：名字和軟體包中的 %2$s 不一致\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr "%1$s 數據庫不一致：版本和軟件包中的 %2$s 不一致\n"
+msgstr "%1$s 資料庫不一致：版本和軟體包中的 %2$s 不一致\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -137,23 +135,23 @@ msgstr "無法更改目錄到 %1$s：%2$s\n"
 
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "無法解析 %s 中的軟件包描述文件\n"
+msgstr "無法解析 %s 中的軟體包描述文件\n"
 
 #, c-format
 msgid "missing package name in %s\n"
-msgstr "%s 中缺少軟件包名字\n"
+msgstr "%s 中缺少軟體包名字\n"
 
 #, c-format
 msgid "missing package version in %s\n"
-msgstr "%s 中缺少軟件包版本號\n"
+msgstr "%s 中缺少軟體包版本號\n"
 
 #, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "讀取軟件包 %1$s 發生錯誤: %2$s\n"
+msgstr "讀取軟體包 %1$s 發生錯誤: %2$s\n"
 
 #, c-format
 msgid "missing package metadata in %s\n"
-msgstr "%s 中缺少軟件包元數據\n"
+msgstr "%s 中缺少軟體包元資料\n"
 
 #, c-format
 msgid "removing invalid file: %s\n"
@@ -169,7 +167,7 @@ msgstr "無法處理套件描述檔 '%s' 從套件庫 '%s'\\n\n"
 
 #, c-format
 msgid "database path is undefined\n"
-msgstr "數據庫路徑未定義\n"
+msgstr "資料庫路徑未定義\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
@@ -185,7 +183,7 @@ msgstr "%1$s 將在它 %2$s 的依賴關係之前被安裝\n"
 
 #, c-format
 msgid "ignoring package %s-%s\n"
-msgstr "正在忽略軟件包更新 %s-%s\n"
+msgstr "正在忽略軟體包更新 %s-%s\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
@@ -213,13 +211,11 @@ msgstr "無法測定根分區掛載點 %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
-"分區 %s 爲只讀\n"
-"\n"
+msgstr "分區 %s 爲只讀\n\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
+msgstr "磁碟分割區 %s 太滿了: 需要 %jd 磁區，剩餘 %jd 磁區\n"
 
 #, c-format
 msgid "disk"
@@ -283,27 +279,27 @@ msgstr "函數庫已初始化"
 
 #, c-format
 msgid "unable to lock database"
-msgstr "無法鎖定數據庫"
+msgstr "無法鎖定資料庫"
 
 #, c-format
 msgid "could not open database"
-msgstr "無法打開數據庫"
+msgstr "無法打開資料庫"
 
 #, c-format
 msgid "could not create database"
-msgstr "無法創建數據庫"
+msgstr "無法創建資料庫"
 
 #, c-format
 msgid "database not initialized"
-msgstr "數據庫未初始化"
+msgstr "資料庫未初始化"
 
 #, c-format
 msgid "database already registered"
-msgstr "數據庫已登記"
+msgstr "資料庫已登記"
 
 #, c-format
 msgid "could not find database"
-msgstr "無法找到數據庫"
+msgstr "無法找到資料庫"
 
 #, c-format
 msgid "invalid or corrupted database"
@@ -315,15 +311,15 @@ msgstr "資料庫不正確或損毀 (PGP 簽章)"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr "數據庫版本不對"
+msgstr "資料庫版本不對"
 
 #, c-format
 msgid "could not update database"
-msgstr "無法更新數據庫"
+msgstr "無法更新資料庫"
 
 #, c-format
 msgid "could not remove database entry"
-msgstr "無法刪除數據庫記錄"
+msgstr "無法刪除資料庫記錄"
 
 #, c-format
 msgid "invalid url for server"
@@ -331,7 +327,7 @@ msgstr "無效的服務器 url"
 
 #, c-format
 msgid "no servers configured for repository"
-msgstr "軟件庫沒有配置服務器信息"
+msgstr "軟體庫沒有配置服務器信息"
 
 #, c-format
 msgid "transaction already initialized"
@@ -359,7 +355,7 @@ msgstr "操作與處理類型不兼容"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr "未鎖定數據庫即提交了事務處理嘗試"
+msgstr "未鎖定資料庫即提交了事務處理嘗試"
 
 #, c-format
 msgid "could not find or read package"
@@ -371,7 +367,7 @@ msgstr "由於 ignorepkg 指定，操作已取消"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr "無效的或已損壞的軟件包"
+msgstr "無效的或已損壞的軟體包"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
@@ -387,19 +383,19 @@ msgstr "無法打開軟件包文件"
 
 #, c-format
 msgid "cannot remove all files for package"
-msgstr "無法爲軟件包刪除全部文件"
+msgstr "無法爲軟體包刪除全部文件"
 
 #, c-format
 msgid "package filename is not valid"
-msgstr "軟件包文件名無效"
+msgstr "軟體包文件名無效"
 
 #, c-format
 msgid "package architecture is not valid"
-msgstr "無效的軟件包架構"
+msgstr "無效的軟體包架構"
 
 #, c-format
 msgid "could not find repository for target"
-msgstr "無法爲目標找到軟件庫"
+msgstr "無法爲目標找到軟體庫"
 
 #, c-format
 msgid "missing PGP signature"
@@ -459,11 +455,11 @@ msgstr "未預期的錯誤"
 
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
+msgstr "無法完全載入套件的解釋用資料 %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "無法在數據庫中找到 %s -- 跳過\n"
+msgstr "無法在資料庫中找到 %s -- 跳過\n"
 
 #, c-format
 msgid "removing %s from target list\n"
@@ -479,7 +475,7 @@ msgstr "無法移除 %s (%s)\\n\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "無法刪除數據庫記錄 %1$s-%2$s\n"
+msgstr "無法刪除資料庫記錄 %1$s-%2$s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
@@ -487,11 +483,11 @@ msgstr "無法從緩存中刪除記錄 '%s'\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%1$s：忽略軟件包更新（%2$s => %3$s）\n"
+msgstr "%1$s：忽略軟體包更新（%2$s => %3$s）\n"
 
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr "%1$s：正在忽略軟件包經濟（%2$s => %3$s）\n"
+msgstr "%1$s：正在忽略軟體包降級（%2$s => %3$s）\n"
 
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
@@ -503,7 +499,7 @@ msgstr "%1$s：本地（%2$s）比 %3$s 的版本更新 (%4$s)\n"
 
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
-msgstr "正在忽略軟件包更新 (%s-%s => %s-%s)\n"
+msgstr "正在忽略軟體包更新 (%s-%s => %s-%s)\n"
 
 #, c-format
 msgid "cannot replace %s by %s\n"
@@ -511,7 +507,7 @@ msgstr "無法用文件 '%2$s' 替代 %1$s\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "檢測到未解決的軟件包衝突\n"
+msgstr "檢測到未解決的軟體包衝突\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
@@ -539,7 +535,7 @@ msgstr "無法複製臨時文件到 %1$s (%2$s)\n"
 
 #, c-format
 msgid "could not remove %s\n"
-msgstr ""
+msgstr "無法移除 %s\n"
 
 #, c-format
 msgid "could not remove tmpdir %s\n"
@@ -579,4 +575,4 @@ msgstr "沒有 %s 緩存存在，正在創建...\n"
 
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
+msgstr "無法建立套件快取，以 %s 取代\n"