Check in changes for 3.0.5 release (mostly backports)

* Update the mirrorlist
* Fix FS7338- the previous repo-add fix didn't quite do the job, but it
  should be fixed now.
* Small updates to translations files
* Add -mtune=generic to default CFLAGS (req'd by GCC 4.2)

17 files changed, 189 insertions, 160 deletions

diff --git a/NEWS b/NEWS
index 8a43ff93..efe58270 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.0.5         - Add -mtune=generic to default CFLAGS in makepkg.conf
+              - Small updates to translations
+              - repo-add: fix conflicts issue for real this time
+              - Fix issue with libarchive incorrectly setting permissions
+3.0.4         - Updated translations
+              - repo-add: fix issue where conflicts were not put in database
 3.0.3         - Updated translations
               - repo-add: fixed a desc file clobbering issue
 3.0.2         - fix a bug where pre/post_remove scriptlets were not ran
diff --git a/configure.ac b/configure.ac
index 4aec3475..5138ed6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ CFLAGS=""
 
 AC_PREREQ(2.59)
 dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots
-AC_INIT([Pacman package manager], 3.0.4, [pacman-dev@archlinux.org], [pacman])
+AC_INIT([Pacman package manager], 3.0.5, [pacman-dev@archlinux.org], [pacman])
 AC_LANG([C])
 AC_CONFIG_HEADERS(config.h)
 AC_CANONICAL_HOST
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 9ac0ef2d..90623c9d 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -21,8 +21,8 @@ CHOST="@CHOST@"
 #-- Exclusive: will only run on @CARCHFLAGS@
 # -mtune builds exclusively for an architecture
 # -mcpu optimizes for an architecture, but builds for the whole processor family
-CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe"
-CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe"
+CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
+CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 
diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in
index 53fefa67..c9f0da88 100644
--- a/etc/pacman.d/mirrorlist.in
+++ b/etc/pacman.d/mirrorlist.in
@@ -11,6 +11,10 @@ Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@
 Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
 
+# South America
+# - Brazil
+Server = http://archlinux.c3sl.ufpr.br/@@REPO@@/os/@CARCH@
+
 # Europe
 # - Austria
 Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@@REPO@@/os/@CARCH@
@@ -67,6 +71,10 @@ Server = ftp://ftp.linux.org.tr/pub/archlinux/@@REPO@@/os/@CARCH@
 # - Ukraine
 Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@@REPO@@/os/@CARCH@
 
+# Asia
+# - Israel
+Server = http://mirror.isoc.org.il/pub/archlinux/@@REPO@@/os/@CARCH@
+
 # Australia
 Server = ftp://mirror.pacific.net.au/linux/archlinux/@@REPO@@/os/@CARCH@
 
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 90f9a0a7..1f664122 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-04-17 20:26+0200\n"
 "Last-Translator: Pierre Schmitz <pierre@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
@@ -227,59 +227,59 @@ msgstr "Entpacke %s"
 msgid "error: could not extract %s (%s)"
 msgstr "Fehler: Konnte %s nicht entpacken (%s)"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "Hänge Sicherungseintrag für %s an"
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "Fehler traten auf, während %s %s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "Aktualisiere"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "Installiere"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "'%s' wird nicht mehr von %s bereitgestellt (%s => %s)"
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "Aktualisiere '%s' aufgrund einer Bereitstellungsänderung (%s)"
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "Konnte Bereitstellung '%s' von '%s' nicht aktualisieren"
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "Aktualisiere Datenbank"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "Füge Datenbankeintrag '%s' hinzu"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "Führe \"ldconfig -r %s\" aus"
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index e1336c95..fae162cf 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-03-07 21:05+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -222,59 +222,59 @@ msgstr "extracting %s"
 msgid "error: could not extract %s (%s)"
 msgstr "error: could not extract %s (%s)"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "appending backup entry for %s"
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "errors occurred while %s %s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "upgrading"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "installing"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "provision '%s' has been removed from package %s (%s => %s)"
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "updating '%s' due to provision change (%s)"
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "could not update provision '%s' from '%s'"
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "updating database"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "adding database entry '%s'"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "could not update database entry %s-%s"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "could not add entry '%s' in cache"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "running \"ldconfig -r %s\""
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index b5d861b3..11376832 100644
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-04-29 11:12-0300\n"
 "Last-Translator: Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>\n"
 "Language-Team: juan pablo gonzález tognarelli <lord_jotape@yahoo.com.ar>\n"
@@ -228,59 +228,59 @@ msgstr "descomprimiendo %s"
 msgid "error: could not extract %s (%s)"
 msgstr "error: no se pudo descomprimir %s (%s)"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "agregando la entrada de respaldo para %s"
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "ocurrieron errores mientras  %s %s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "actualizando"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "instalando"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "el provisional '%s' ha sido eliminado desde el paquete %s (%s => %s)"
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "actualizando '%s' debido a un cambio de provisiones (%s)"
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "no se pudo actualizar la provisión '%s' desde '%s'"
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "actualizando la base de datos"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "agregando a la base de datos '%s'"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "no se pudo actualizar en la base de datos la entrada %s-%s"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "no se pudo agregar '%s' en la cache"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "ejecutando \"ldconfig -r %s\""
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index a33277c9..4f396b21 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-04-17 12:45+0100\n"
 "Last-Translator: nam <37ii11@altern.org>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
@@ -225,59 +225,59 @@ msgstr "extraction de %s"
 msgid "error: could not extract %s (%s)"
 msgstr "erreur: l'extraction de %s (%s) a échoué"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "ajoute une entrée de sauvegarde pour %s"
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "des erreurs sont survenues pendant %s %s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "mise à jour"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "installation"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "la condition '%s' a été supprimée du paquet %s (%s => %s)"
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "mise à jour de '%s' suite à un changement de contenu (%s)"
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "la mise à jour du contenu '%s' dans '%s' a échoué"
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "mise à jour de la base de données"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "ajout de l'entrée de base de données '%s'"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "la mise à jour l'entrée de base de données %s-%s a échoué"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "l'ajout au cache de l'entrée '%s' a échoué"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "exécution de \"ldconfig -r %s\""
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index 5320b97f..e0468cbf 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-03-14 13:45+0100\n"
 "Last-Translator: Nagy Gabor <ngaba@petra.hos.u-szeged.hu>\n"
 "Language-Team:  <hu@li.org>\n"
@@ -224,59 +224,59 @@ msgstr "a %s kit�m�r�t�se"
 msgid "error: could not extract %s (%s)"
 msgstr "hiba: nem siker�lt kit�m�r�teni: %s (%s)"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "hiba %s k�zben: %s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "friss�t�s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "telep�t�s"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr ""
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "az adatb�zis friss�t�se"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "adatb�zis mez� hozz�ad�sa '%s'"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "sikertelen a '%s-%s' adatb�zis-bejegyz�s friss�t�se"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "sikertelen a '%s' bejegyz�s hozz�ad�sa a gyors�t�t�rhoz"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "az \"ldconfig -r %s\" futtat�sa"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index 3fb1f79f..9f528756 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-04-17 22:00+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
@@ -224,59 +224,59 @@ msgstr "estrazione di %s in corso"
 msgid "error: could not extract %s (%s)"
 msgstr "errore: impossibile estrarre %s (%s)"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "aggiunta in corso della voce di backup per %s"
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "si sono verificati degli errori durante %s %s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "l'aggiornamento"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "l'installazione"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "'%s' è stato rimosso dal pacchetto %s (%s => %s)"
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "aggiornamento in corso di '%s' dovuto ad un cambiamento (%s)"
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "impossibile aggiornare '%s' da '%s'"
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "aggiornamento del database in corso"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "inclusione della voce '%s' nel database"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "impossibile aggiornare la voce %s-%s nel database"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "impossible includere la voce '%s' nella cache"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "esecuzione in corso di \"ldconfig -r %s\""
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index e268671b..fd9b1c99 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -221,59 +221,59 @@ msgstr ""
 msgid "error: could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr ""
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr ""
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr ""
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr ""
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr ""
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr ""
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr ""
diff --git a/lib/libalpm/po/pl_PL.po b/lib/libalpm/po/pl_PL.po
index b1a4bf62..0ea1d982 100644
--- a/lib/libalpm/po/pl_PL.po
+++ b/lib/libalpm/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-04-12 04:23+0200\n"
 "Last-Translator: Mateusz Jędrasik <m.jedrasik@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -225,59 +225,59 @@ msgstr "rozpakowywanie %s"
 msgid "error: could not extract %s (%s)"
 msgstr "błąd: nie udało się rozpakować %s (%s)"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "dodawanie pozycji kopii zapasowej dla %s"
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "wystąpiły błędy podczas %s %s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "aktualizowanie"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "instalowanie"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "zasób '%s' został usunięty z pakietu %s (%s => %s)"
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "aktualizowanie '%s' z powodu zmiany zasobu (%s)"
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "nie udało się zaktualizować zasobu '%s' z '%s'"
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "aktualizowanie bazy danych"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "dodawanie pozycji bazy danych '%s'"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "uruchamianie \"ldconfig -r %s\""
@@ -884,7 +884,7 @@ msgstr "nie udało się znaleźć bądź odczytać pakietu"
 
 #: lib/libalpm/error.c:104
 msgid "invalid or corrupted package"
-msgstr "nieprawidłowy bądź skorumpowany pakiet"
+msgstr "nieprawidłowy bądź uszkodzony pakiet"
 
 #: lib/libalpm/error.c:106
 msgid "cannot open package file"
@@ -912,7 +912,7 @@ msgstr "nieprawidłowa nazwa pakietu"
 
 #: lib/libalpm/error.c:118
 msgid "corrupted package"
-msgstr "skorumpowany pakiet"
+msgstr "uszkodzony pakiet"
 
 #: lib/libalpm/error.c:120
 msgid "no such repository"
@@ -1336,12 +1336,12 @@ msgstr "nie udało się otrzymać sum kontrolnych md5 lub sha1 dla pakietu %s\n"
 #: lib/libalpm/sync.c:894
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
-msgstr "archiwum %s było skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n"
+msgstr "archiwum %s było uszkodzone (błąd sumy kontrolnej MD5 lub SHA1)\n"
 
 #: lib/libalpm/sync.c:896
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-msgstr "archiwum %s jest skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n"
+msgstr "archiwum %s jest uszkodzone (błąd sumy kontrolnej MD5 lub SHA1)\n"
 
 #: lib/libalpm/sync.c:917
 msgid "could not create removal transaction"
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index f865a057..e2754e29 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-03-07 01:18-0300\n"
 "Last-Translator: Douglas Soares de Andrade <dsandrade@gmail.com>\n"
 "Language-Team: Português do Brasil <pt@li.org>\n"
@@ -229,59 +229,59 @@ msgstr "extraindo %s"
 msgid "error: could not extract %s (%s)"
 msgstr "erro: não foi possível descompactar %s (%s)"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "adicionando entrada de backup para %s"
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "erros ocorreram durante %s %s"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "atualizando"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "instalando"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "a provisão '%s' foi removida do pacote %s (%s => %s)"
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "atualizando '%s' devido a uma mudança de provisão (%s)"
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "não foi possível atualizar a provisão '%s' para '%s'"
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "atualizando base de dados"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "adicionando a entrada de base de dados '%s'"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "não foi possível atualizar a entrada na base de dados %s-%s"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "não foi possível adicionar a entrada '%s' ao cache"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "executando \"ldconfig -r %s\""
diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru_RU.po
index 0a227b81..445c120d 100644
--- a/lib/libalpm/po/ru_RU.po
+++ b/lib/libalpm/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-05-07 23:36-0400\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-03-16 02:52+1000\n"
 "Last-Translator:  Vladimir Bayrakovskiy <4rayven@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -223,59 +223,59 @@ msgstr "извлекаю %s"
 msgid "error: could not extract %s (%s)"
 msgstr "ошибка: не могу извлечь %s (%s)"
 
-#: lib/libalpm/add.c:717
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "добавляю запись для отката для %s"
 
-#: lib/libalpm/add.c:749 lib/libalpm/add.c:751
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "во время %s %s произошли ошибки"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "обновляю"
 
-#: lib/libalpm/add.c:750 lib/libalpm/add.c:752
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "устанавливаю"
 
-#: lib/libalpm/add.c:769
+#: lib/libalpm/add.c:771
 #, fuzzy, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "'%s' был удален из пакета %s (%s => %s)"
 
-#: lib/libalpm/add.c:781
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "обновляю '%s' в связи с изменениями в (%s)"
 
-#: lib/libalpm/add.c:785 lib/libalpm/add.c:786
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "не могу обновить '%s' из '%s'"
 
-#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "обновляю базу данных"
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "добавляю в базу данных запись '%s'"
 
-#: lib/libalpm/add.c:803 lib/libalpm/add.c:805
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "не могу обновить в базе данных запись %s-%s"
 
-#: lib/libalpm/add.c:811
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "не могу добавить запись '%s' в кэш"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "запускаю \"ldconfig -r %s\""
diff --git a/scripts/repo-add b/scripts/repo-add
index 45515d1b..642100d0 100755
--- a/scripts/repo-add
+++ b/scripts/repo-add
@@ -117,7 +117,7 @@ db_write_entry()
 			license=*) _licenses="$_licenses $license" ;;
 			replaces=*) _replaces="$_replaces $replaces" ;;
 			provides=*) _provides="$_provides $provides" ;;
-			conflict=*) _conflicts="$_conflicts $conflicts" ;;
+			conflict=*) _conflicts="$_conflicts $conflict" ;;
 		esac
 	done
 
diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po
index 09990b95..1ac7f934 100644
--- a/src/pacman/po/de.po
+++ b/src/pacman/po/de.po
@@ -364,7 +364,8 @@ msgstr "  -d, --nodeps         Überspringt die Abhängigkeitsprüfung\n"
 #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
-msgstr "  -f, --force          Installation erzwingen, Dateikonflikte überschreiben\n"
+msgstr ""
+"  -f, --force          Installation erzwingen, Dateikonflikte überschreiben\n"
 
 #: src/pacman/pacman.c:106
 #, c-format
@@ -373,12 +374,15 @@ msgstr "Verwendung:  %s {-R --remove} [Optionen] <Paket>\n"
 
 #: src/pacman/pacman.c:108
 #, c-format
-msgid "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade        Entfernt Pakete und alle, die von ihnen abhängen\n"
+msgid ""
+"  -c, --cascade        remove packages and all packages that depend on them\n"
+msgstr ""
+"  -c, --cascade        Entfernt Pakete und alle, die von ihnen abhängen\n"
 
 #: src/pacman/pacman.c:110
 #, c-format
-msgid "  -k, --dbonly         only remove database entry, do not remove files\n"
+msgid ""
+"  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr ""
 "  -k, --dbonly         Nur Datenbankeintrag entfernen, keine Dateien "
 "entfernen\n"
@@ -390,7 +394,8 @@ msgstr "  -n, --nosave         Auch Konfigurationsdateien entfernen\n"
 
 #: src/pacman/pacman.c:112
 #, c-format
-msgid "  -s, --recursive      remove dependencies also (that won't break packages)\n"
+msgid ""
+"  -s, --recursive      remove dependencies also (that won't break packages)\n"
 msgstr ""
 "  -s, --recursive      Auch Abhängigkeiten entfernen (beschädigt keine "
 "Pakete)\n"
@@ -446,7 +451,8 @@ msgstr "  -l, --list           Zeigt den Inhalt des abgefragten Paketes an\n"
 
 #: src/pacman/pacman.c:131
 #, c-format
-msgid "  -m, --foreign        list installed packages not found in sync db(s)\n"
+msgid ""
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
 "  -m, --foreign        Zeigt alle Pakete an, die nicht in den Sync-db(s)\n"
 "                       gefunden wurden\n"
@@ -468,7 +474,8 @@ msgstr ""
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr "  -s, --search <regex> Durchsucht lokal installierte Pakete nach einem Wort\n"
+msgstr ""
+"  -s, --search <regex> Durchsucht lokal installierte Pakete nach einem Wort\n"
 
 #: src/pacman/pacman.c:135
 #, c-format
@@ -497,7 +504,8 @@ msgstr "  -e, --dependsonly    Nur Abhängigkeiten installieren\n"
 #: src/pacman/pacman.c:145
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr "  -l, --list <repo>    Zeigt eine Liste aller Pakete eines Repositoriums an\n"
+msgstr ""
+"  -l, --list <repo>    Zeigt eine Liste aller Pakete eines Repositoriums an\n"
 
 #: src/pacman/pacman.c:146
 #, c-format
@@ -510,8 +518,10 @@ msgstr ""
 
 #: src/pacman/pacman.c:147
 #, c-format
-msgid "  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr "  -s, --search <regex> Durchsucht entfernte Repositorien nach einem Wort\n"
+msgid ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr ""
+"  -s, --search <regex> Durchsucht entfernte Repositorien nach einem Wort\n"
 
 #: src/pacman/pacman.c:148
 #, c-format
@@ -530,7 +540,8 @@ msgstr ""
 
 #: src/pacman/pacman.c:150
 #, c-format
-msgid "  -y, --refresh        download fresh package databases from the server\n"
+msgid ""
+"  -y, --refresh        download fresh package databases from the server\n"
 msgstr "  -y, --refresh        Lädt frische Paketdatenbank vom Server\n"
 
 #: src/pacman/pacman.c:151
@@ -554,20 +565,25 @@ msgstr "      --noconfirm      Niemals nach einer Bestätigung fragen\n"
 
 #: src/pacman/pacman.c:155
 #, c-format
-msgid "      --ask <number>   pre-specify answers for questions (see manpage)\n"
-msgstr "      --ask <Nummer>   Antworten für Fragen vorherbestimmen (Siehe manpage)\n"
+msgid ""
+"      --ask <number>   pre-specify answers for questions (see manpage)\n"
+msgstr ""
+"      --ask <Nummer>   Antworten für Fragen vorherbestimmen (Siehe manpage)\n"
 
 #: src/pacman/pacman.c:156
 #, c-format
-msgid "      --noprogressbar  do not show a progress bar when downloading files\n"
+msgid ""
+"      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""
 "      --noprogressbar  Keine Fortschrittsanzeige anzeigen, wenn Dateien\n"
 "                       heruntergeladen werden\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
-msgid "      --noscriptlet    do not execute the install scriptlet if there is any\n"
-msgstr "      --noscriptlet    Installationskript nicht ausführen, falls vorhanden\n"
+msgid ""
+"      --noscriptlet    do not execute the install scriptlet if there is any\n"
+msgstr ""
+"      --noscriptlet    Installationskript nicht ausführen, falls vorhanden\n"
 
 #: src/pacman/pacman.c:158
 #, c-format
@@ -1066,4 +1082,3 @@ msgstr ""
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Gesamtgröße der installierten Pakete   : %.2f MB\n"
-
diff --git a/src/pacman/po/pl_PL.po b/src/pacman/po/pl_PL.po
index 71c0c232..a8f33c36 100644
--- a/src/pacman/po/pl_PL.po
+++ b/src/pacman/po/pl_PL.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2007-04-28 04:02-0400\n"
 "PO-Revision-Date: 2007-05-08 00:32+0200\n"
-"Last-Translator: Jaroslaw Swierczynski <swiergot@gmail.com>\n"
+"Last-Translator: Mateusz Jędrasik <m.jedrasik@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +48,7 @@ msgstr "gotowe.\n"
 #: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
-msgstr "nie udało się przygotować tranzakcji (%s)\n"
+msgstr "nie udało się przygotować transakcji (%s)\n"
 
 #: src/pacman/add.c:104
 #, c-format
@@ -86,7 +86,7 @@ msgstr ":: %.1f MB wymagane, dostępnych %.1f MB"
 #: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
 #, c-format
 msgid "failed to commit transaction (%s)\n"
-msgstr "nie udało się dokonać tranzakcji (%s)\n"
+msgstr "nie udało się dokonać transakcji (%s)\n"
 
 #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
 #: src/pacman/sync.c:741
@@ -758,7 +758,7 @@ msgstr ":: Usunąć %s z grupy %s? [T/n] "
 #: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529
 #, c-format
 msgid "failed to init transaction (%s)\n"
-msgstr "nie udało się zainicjować tranzakcji (%s)\n"
+msgstr "nie udało się zainicjować transakcji (%s)\n"
 
 #: src/pacman/remove.c:92
 #, c-format
@@ -1039,7 +1039,7 @@ msgstr ""
 #: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
-msgstr ":: Archiwum %s jest skorumpowane. Czy chcesz je usunąć? [T/n] "
+msgstr ":: Archiwum %s jest uszkodzone. Czy chcesz je usunąć? [T/n] "
 
 #: src/pacman/trans.c:326
 msgid "installing"