Merge branch 'maint'

lib/libalpm/po/de.po

@@ -465,7 +465,7 @@ msgstr "%s-%s ist aktuell -- Überspringe\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s ist aktuell -- Überspringe\n"
+msgstr "%s-%s ist aktuell -- Reinstalliere\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"

po/LINGUAS

@@ -9,4 +9,5 @@ it
 pl
 pt_BR
 ru
+tr
 zh_CN

po/fr.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: pacman\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-03-03 21:07+0100\n"
+"PO-Revision-Date: 2008-06-05 08:14+0200\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
 "MIME-Version: 1.0\n"
@@ -265,7 +265,7 @@ msgstr "A télécharger         : %6.2f K\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "Taille (compressé)     : %6.2f K\n"
+msgstr "Taille (compressé)    : %6.2f K\n"
 
 #, c-format
 msgid "Installed Size : %6.2f K\n"

scripts/makepkg.sh.in

@@ -1368,7 +1368,7 @@ devel_check
 devel_update
 
 if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
-     -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" ]; then
+     -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" -a "$NOBUILD" = "0" ]; then
 	if [ "$INSTALL" = "1" ]; then
 		warning "$(gettext "A package has already been built, installing existing package...")"
 		install_package