Merge branch 'maint'

Conflicts:

	lib/libalpm/be_files.c
	lib/libalpm/package.c

29 files changed, 4547 insertions, 4574 deletions

diff --git a/NEWS b/NEWS
index 71f56f5b..451cd519 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.1.2         - updates to proto.install, add ChangeLog.proto (FS#7231)
+              - add 'force' option to packages, and have repo-add respect it
+              - mark gensync and updatesync as deprecated
+              - fix pacman -Qo behavior on symlinks (FS#9473)
+              - fix segfault on a broken symlinks in backup code (FS#9235)
+              - fix chk_fileconflicts brokenness, ensure it reads entire list
+              - minor documentation and message updates
+              - moved some translations to their more generic lang codes
+              - makepkg:
+                - check to ensure we have non-URL sources (FS#9208)
+                - ensure we strip binaries in /opt/ dirs (FS#9342)
+                - check for VCS executable before using (FS#9230)
+                - set sane umask before source extraction (FS#9242, FS#9362)
 3.1.1         - fix versioned provisions handling- use '=' instead of ' ' which
                 differs from original spec but better in long run (FS#9171)
               - rename query --orphans to --unrequired (FS#9144)
diff --git a/TRANSLATORS b/TRANSLATORS
index d9dea891..249665dd 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -12,7 +12,7 @@ your language to the mix.
 
 * indicates the last active translator.
 
-Czech (cs_CZ):
+Czech (cs):
 	* Vojtěch Gondžala <vogo@seznam.cz>
 German (de):
 	* Matthias Gorissen <matthias@archlinux.de>
@@ -30,7 +30,7 @@ Italian (it):
 	* Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
 	Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 	Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>
-Polish (pl_PL):
+Polish (pl):
 	* Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
 	* João Felipe Santos <joao.eel@gmail.com>
@@ -38,6 +38,6 @@ Brazilian Portuguese (pt_BR):
 	Hugo Doria <hugodoria@archlinux-br.org>
 	Lincoln de Sousa <lincoln@archlinux-br.org>
 	Leandro Inácio <leandro@archlinux-br.org>
-Russian (ru_RU):
+Russian (ru):
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
 
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index 9f6f93da..19352d11 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -273,10 +273,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
 	alpm_list_t *ret = NULL;
 	alpm_list_t *pA = filesA, *pB = filesB;
 
-	if(pB == NULL) {
-		return(alpm_list_strdup(pA));
-	}
-
+	/* if both filesA and filesB have entries, do this loop */
 	while(pA && pB) {
 		const char *strA = pA->data;
 		const char *strB = pB->data;
@@ -301,6 +298,15 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
 			}
 	  }
 	}
+	/* ensure we have completely emptied pA */
+	while(pA) {
+		const char *strA = pA->data;
+		/* skip directories */
+		if(strA[strlen(strA)-1] != '/') {
+			ret = alpm_list_add(ret, strdup(strA));
+		}
+		pA = pA->next;
+	}
 
 	return(ret);
 }
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index b66fd85c..98417155 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -162,11 +162,12 @@ const char SYMEXPORT *alpm_pkg_get_filename(pmpkg_t *pkg)
 	ASSERT(handle != NULL, return(NULL));
 	ASSERT(pkg != NULL, return(NULL));
 
+	if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) {
+		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
+	}
+
 	if(pkg->filename == NULL || strlen(pkg->filename) == 0) {
 		/* construct the file name, it's not in the desc file */
-		if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) {
-			_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
-		}
 		char buffer[PATH_MAX];
 		if(pkg->arch && strlen(pkg->arch) > 0) {
 			snprintf(buffer, PATH_MAX, "%s-%s-%s" PKGEXT,
diff --git a/lib/libalpm/po/LINGUAS b/lib/libalpm/po/LINGUAS
index bf816118..955e1fdb 100644
--- a/lib/libalpm/po/LINGUAS
+++ b/lib/libalpm/po/LINGUAS
@@ -1,11 +1,11 @@
 # Set of available languages.
-cs_CZ
+cs
 de
 en_GB
 es
 fr
 hu
 it
-pl_PL
+pl
 pt_BR
-ru_RU
+ru
diff --git a/lib/libalpm/po/cs_CZ.po b/lib/libalpm/po/cs.po
index 850b491e..79931f00 100644
--- a/lib/libalpm/po/cs_CZ.po
+++ b/lib/libalpm/po/cs.po
@@ -1,14 +1,14 @@
-# translation of cs_CZ.po to Čeština
+# translation of cs.po to Čeština
 # Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Vojtěch Gondžala <vogo@seznam.cz>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: cs_CZ\n"
+"Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2008-01-14 23:08-0600\n"
-"PO-Revision-Date: 2008-01-15 21:56+0100\n"
+"PO-Revision-Date: 2008-02-12 09:28+0100\n"
 "Last-Translator: Vojtěch Gondžala <vogo@seznam.cz>\n"
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
 
 #: lib/libalpm/add.c:167
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nemůžete instalovat dva konfliktní balíčky současně\n"
+msgstr "nemůžete instalovat dva konfliktní balíčky společně\n"
 
 #: lib/libalpm/add.c:170
 msgid "replacing packages with -A and -U is not supported yet\n"
@@ -48,7 +48,7 @@ msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"přístupová práva adresáře v %s se liší\n"
+"přístupová práva adresáře %s se neshodují\n"
 "souborový systém: %o  balíček: %o\n"
 
 #: lib/libalpm/add.c:404
@@ -64,12 +64,12 @@ msgstr "rozbalení: nepřepisuji adresář souborem %s\n"
 #: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "%s nelze rozbalit (%s)\n"
+msgstr "nelze rozbalit %s (%s)\n"
 
 #: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "%s nelze přejmenovat (%s)\n"
+msgstr "nelze přejmenovat %s (%s)\n"
 
 #: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
@@ -84,7 +84,7 @@ msgstr "%s uložen jako %s\n"
 #: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "%s nelze nainstalovat jako %s: %s\n"
+msgstr "nelze nainstalovat %s jako %s: %s\n"
 
 #: lib/libalpm/add.c:571
 #, c-format
@@ -94,7 +94,7 @@ msgstr "%s nainstalován jako %s\n"
 #: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "%s rozbaluji jako %s.pacnew\n"
+msgstr "rozbaluji %s jako %s.pacnew\n"
 
 #: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
 msgid "could not get current working directory\n"
@@ -103,12 +103,12 @@ msgstr "nelze určit aktuální pracovní adresář\n"
 #: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "při aktualizaci %s nastal problém\n"
+msgstr "nastal problém při aktualizaci %s\n"
 
 #: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "při instalaci %s nastal problém\n"
+msgstr "nastal problém při instalaci %s\n"
 
 #: lib/libalpm/add.c:797
 #, c-format
@@ -118,7 +118,7 @@ msgstr "nelze aktualizovat záznam databáze %s-%s\n"
 #: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "nelze přidat položku '%s' do keše\n"
+msgstr "nelze přidat položku '%s' do cache\n"
 
 #: lib/libalpm/be_files.c:221
 #, c-format
@@ -163,7 +163,7 @@ msgstr "%s bude nainstalován před %s, na kterém závisí\n"
 #: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nemohu získat \"%s\", závislost \"%s\"\n"
+msgstr "nemohu vyřešit \"%s\", závislost \"%s\"\n"
 
 #: lib/libalpm/error.c:41
 msgid "out of memory!"
@@ -227,11 +227,11 @@ msgstr "nelze aktualizovat databázi"
 
 #: lib/libalpm/error.c:73
 msgid "could not remove database entry"
-msgstr "nelze odstranit položku databáze"
+msgstr "nelze odstranit záznam v databázi"
 
 #: lib/libalpm/error.c:76
 msgid "invalid url for server"
-msgstr "nesprávná URL pro server"
+msgstr "nesprávná url pro server"
 
 #: lib/libalpm/error.c:83
 msgid "could not set parameter"
@@ -311,11 +311,11 @@ msgstr "není žádný takový repositář"
 
 #: lib/libalpm/error.c:126
 msgid "corrupted delta"
-msgstr "poškozený rozdíl"
+msgstr "poškozený delta rozdíl"
 
 #: lib/libalpm/error.c:128
 msgid "delta patch failed"
-msgstr "rozdílový patch selhal"
+msgstr "aplikace delta rozdílu selhala"
 
 #: lib/libalpm/error.c:131
 msgid "group not found"
@@ -355,7 +355,7 @@ msgstr "nesprávný regulární výraz"
 
 #: lib/libalpm/error.c:153
 msgid "connection to remote host failed"
-msgstr "spojení ke vzdálenému hostiteli selhalo"
+msgstr "spojení se vzdáleným hostitelem selhalo"
 
 #: lib/libalpm/error.c:156
 msgid "unexpected error"
@@ -364,12 +364,12 @@ msgstr "neočekávaná chyba"
 #: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "nelze zjistit MD5 kontrolní součet balíčku %s-%s\n"
+msgstr "nelze zjistit md5 kontrolní součet balíčku %s-%s\n"
 
 #: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "MD5 kontrolní součet balíčku %s-%s nesouhlasí\n"
+msgstr "md5 kontrolní součet balíčku %s-%s nesouhlasí\n"
 
 #: lib/libalpm/package.c:844
 #, c-format
@@ -389,7 +389,7 @@ msgstr "nelze získat soubor s popisem balíčku k %s\n"
 #: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "nelze získat soubor s popisem balíčku z %s\n"
+msgstr "nelze zpracovat soubor s popisem balíčku v %s\n"
 
 #: lib/libalpm/package.c:1038
 #, c-format
@@ -429,16 +429,16 @@ msgstr "nelze odstranit záznam databáze %s-%s\n"
 #: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "nelze odstranit položku '%s' z keše\n"
+msgstr "nelze odstranit položku '%s' z cache\n"
 
 #: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr "URL '%s' je chybná, ignoruji\n"
+msgstr "url '%s' je chybná, ignoruji\n"
 
 #: lib/libalpm/server.c:58
 msgid "url scheme not specified, assuming http\n"
-msgstr "schéma URL nedefinováno, předpokládám http\n"
+msgstr "schéma url nedefinováno, předpokládám http\n"
 
 #: lib/libalpm/server.c:239
 msgid "disk"
@@ -447,7 +447,7 @@ msgstr "disk"
 #: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "selhalo získávání souboru '%s' z %s: %s\n"
+msgstr "selhalo získání souboru '%s' z %s: %s\n"
 
 #: lib/libalpm/server.c:273
 msgid "cannot resume download, starting over\n"
@@ -479,7 +479,7 @@ msgstr "spouštím XferCommand: větvení selhalo!\n"
 
 #: lib/libalpm/server.c:443
 msgid "URL does not contain a file for download\n"
-msgstr "URL neobsahuje stahovaný soubor\n"
+msgstr "URL neobsahuje soubor pro stažení\n"
 
 #: lib/libalpm/server.c:456
 #, c-format
@@ -513,7 +513,7 @@ msgstr "%s-%s je aktuální -- přeinstalovávám\n"
 
 #: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
 msgid "unresolvable package conflicts detected\n"
-msgstr "zjištěn nerozlišitelný konflikt balíčků\n"
+msgstr "zjištěn konflikt nerozlišitelných balíčků\n"
 
 #: lib/libalpm/sync.c:611
 #, c-format
@@ -528,7 +528,7 @@ msgstr "příkaz: %s\n"
 #: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "nelze zjistit MD5 kontrolní součet pro soubor %s\n"
+msgstr "nelze získat md5 kontrolní součet pro soubor %s\n"
 
 #: lib/libalpm/sync.c:902
 #, c-format
@@ -579,7 +579,7 @@ msgstr "nelze odstranit zamykací soubor %s\n"
 
 #: lib/libalpm/trans.c:483
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "Nenalezen /bin/sh v rodičovském prostředí, ruším provádění skriptů\n"
+msgstr "V rodičovském prostředí chybí /bin/sh, ruším provádění skriptů\n"
 
 #: lib/libalpm/trans.c:494
 msgid "could not create temp directory\n"
@@ -617,7 +617,7 @@ msgstr "volání waitpid selhalo (%s)\n"
 
 #: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
-msgstr "správné spouštění skriptu selhalo\n"
+msgstr "správné spuštění skriptu selhalo\n"
 
 #: lib/libalpm/trans.c:612
 #, c-format
@@ -637,19 +637,18 @@ msgstr "nelze otevřít %s: %s\n"
 #: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "neexistuje keš %s, vytvářím...\n"
+msgstr "neexistuje cache %s, vytvářím...\n"
 
 #: lib/libalpm/util.c:595
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "nelze vytvořit keš balíčků, používám /tmp\n"
+msgstr "nelze vytvořit cache balíčků, používám /tmp\n"
 
 #: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
-msgstr "MD5: %s nemohl být otevřen\n"
+msgstr "md5: %s nemohl být otevřen\n"
 
 #: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
-msgstr "MD5: %s nemohl být přečten\n"
-
+msgstr "md5: %s nemohl být přečten\n"
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 953c1a98..4a0e31de 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2008-01-14 23:08-0600\n"
-"PO-Revision-Date: 2008-01-17 19:04+0100\n"
+"PO-Revision-Date: 2008-02-15 09:26+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,9 @@ msgstr "In Konflikt stehende Pakete wurden in Ziel-Liste gefunden\n"
 
 #: lib/libalpm/add.c:167
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit installieren\n"
+msgstr ""
+"Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit "
+"installieren\n"
 
 #: lib/libalpm/add.c:170
 msgid "replacing packages with -A and -U is not supported yet\n"
@@ -400,7 +402,7 @@ msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
 #: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
-msgstr "Fehler beim Entpacken der  Paket-Beschreibungsdatei nach %s\n"
+msgstr "Fehler beim Entpacken der Paket-Beschreibungsdatei nach %s\n"
 
 #: lib/libalpm/package.c:1033
 #, c-format
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index 1d3d69fb..c237376c 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -657,12 +657,3 @@ msgstr "md5: l'ouverture de %s a échoué\n"
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: la lecture de %s a échoué\n"
-
-#~ msgid "loading package data for %s : level=%d\n"
-#~ msgstr "chargement des données du paquet %s : niveau=%d\n"
-
-#~ msgid "adding '%s' to package cache for db '%s'\n"
-#~ msgstr "ajout de '%s' au cache de paquets pour la base de données '%s'\n"
-
-#~ msgid "could not remove tempfile %s\n"
-#~ msgstr "la suppression du fichier temporaire %s a échoué\n"
diff --git a/lib/libalpm/po/pl_PL.po b/lib/libalpm/po/pl.po
index 2126d6dd..2126d6dd 100644
--- a/lib/libalpm/po/pl_PL.po
+++ b/lib/libalpm/po/pl.po
diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru.po
index 57add381..57add381 100644
--- a/lib/libalpm/po/ru_RU.po
+++ b/lib/libalpm/po/ru.po
diff --git a/pactest/pmdb.py b/pactest/pmdb.py
index af392000..e0f328ef 100755
--- a/pactest/pmdb.py
+++ b/pactest/pmdb.py
@@ -261,6 +261,7 @@ class pmdb:
             if pkg.reason:
                 data.append(_mksection("REASON", pkg.reason))
         else:
+            data.append(_mksection("FILENAME", pkg.filename()))
             if pkg.replaces:
                 data.append(_mksection("REPLACES", pkg.replaces))
             if pkg.force:
diff --git a/pactest/tests/upgrade011.py b/pactest/tests/upgrade011.py
new file mode 100644
index 00000000..d8ed8734
--- /dev/null
+++ b/pactest/tests/upgrade011.py
@@ -0,0 +1,16 @@
+self.description = "Upgrade a package with a filesystem conflict"
+
+p = pmpkg("dummy", "2.0-1")
+p.files = ["bin/dummy", "usr/share/file"]
+self.addpkg(p)
+
+lp = pmpkg("dummy", "1.0-1")
+lp.files = ["bin/dummy"]
+self.addpkg2db("local", lp)
+
+self.filesystem = ["usr/share/file"]
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=dummy|1.0-1")
diff --git a/pactest/tests/upgrade040.py b/pactest/tests/upgrade040.py
index bc40f337..e17c7176 100644
--- a/pactest/tests/upgrade040.py
+++ b/pactest/tests/upgrade040.py
@@ -27,4 +27,5 @@ for p in p1, p2:
 	self.addrule("PKG_EXIST=%s" % p.name)
 self.addrule("FILE_MODIFIED=bin/dummy")
 self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
 self.addrule("FILE_MODIFIED=usr/share/file")
diff --git a/pactest/tests/upgrade041.py b/pactest/tests/upgrade041.py
index 347c2c4b..20da4f14 100644
--- a/pactest/tests/upgrade041.py
+++ b/pactest/tests/upgrade041.py
@@ -4,7 +4,7 @@ lp1 = pmpkg("dummy")
 lp1.files = ["bin/dummy"]
 
 lp2 = pmpkg("foobar")
-lp2.files = ["bin/foobar"
+lp2.files = ["bin/foobar",
              "usr/share/file"]
 
 for p in lp1, lp2:
@@ -27,4 +27,5 @@ for p in p1, p2:
 	self.addrule("PKG_EXIST=%s" % p.name)
 self.addrule("FILE_MODIFIED=bin/dummy")
 self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
 self.addrule("FILE_MODIFIED=usr/share/file")
diff --git a/pactest/tests/upgrade046.py b/pactest/tests/upgrade046.py
new file mode 100644
index 00000000..60164b72
--- /dev/null
+++ b/pactest/tests/upgrade046.py
@@ -0,0 +1,31 @@
+self.description = "File relocation between two packages (reverse order, --force)"
+
+lp1 = pmpkg("dummy")
+lp1.files = ["bin/dummy"]
+
+lp2 = pmpkg("foobar")
+lp2.files = ["bin/foobar",
+             "usr/share/file"]
+
+for p in lp1, lp2:
+	self.addpkg2db("local", p)
+
+p1 = pmpkg("dummy")
+p1.files = ["bin/dummy",
+            "usr/share/file"]
+
+p2 = pmpkg("foobar")
+p2.files = ["bin/foobar"]
+
+for p in p1, p2:
+	self.addpkg(p)
+
+self.args = "-Uf %s" % " ".join([p.filename() for p in p1, p2])
+
+self.addrule("PACMAN_RETCODE=0")
+for p in p1, p2:
+	self.addrule("PKG_EXIST=%s" % p.name)
+self.addrule("FILE_MODIFIED=bin/dummy")
+self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
+self.addrule("FILE_MODIFIED=usr/share/file")
diff --git a/po/LINGUAS b/po/LINGUAS
index bf816118..955e1fdb 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,11 +1,11 @@
 # Set of available languages.
-cs_CZ
+cs
 de
 en_GB
 es
 fr
 hu
 it
-pl_PL
+pl
 pt_BR
-ru_RU
+ru
diff --git a/po/cs_CZ.po b/po/cs.po
index c6b03fcf..ea047448 100644
--- a/po/cs_CZ.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
-# translation of cs_CZ.po to Čeština
+# translation of cs.po to Čeština
 # Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Vojtěch Gondžala <vogo@seznam.cz>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: cs_CZ\n"
+"Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
-"PO-Revision-Date: 2008-01-18 22:42+0100\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
+"PO-Revision-Date: 2008-02-12 09:49+0100\n"
 "Last-Translator: Vojtěch Gondžala <vogo@seznam.cz>\n"
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "failed to release transaction (%s)\n"
 msgstr "selhalo dokončení transakce (%s)\n"
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "nebyly specifikovány cíle (použijte -h pro nápovědu)\n"
 
@@ -45,43 +45,43 @@ msgstr ""
 msgid "loading package data... "
 msgstr "načítám informace o balíčku... "
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "chyba: selhalo přidání cíle '%s' (%s)"
+msgid "error: '%s': %s\n"
+msgstr "chyba: '%s': %s\n"
 
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr "chyba: selhala příprava transakce (%s)\n"
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: vyžaduje %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: je v konfliktní s %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: konfliktní s %s\n"
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s se nachází v '%s' a '%s'\n"
 
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s již existuje v souborovém systému\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "vyskytla se chyba, žádné balíčky nebyly aktualizovány.\n"
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr "chyba: selhalo provádění transakce (%s)\n"
@@ -138,12 +138,12 @@ msgstr "kontroluji integritu balíčků...\n"
 #: src/pacman/callback.c:216
 #, c-format
 msgid "checking delta integrity...\n"
-msgstr "kontroluji integritu rozdílu...\n"
+msgstr "kontroluji integritu delta rozdílu...\n"
 
 #: src/pacman/callback.c:219
 #, c-format
 msgid "applying deltas...\n"
-msgstr "aplikuji rozdíly...\n"
+msgstr "aplikuji delta rozdíly...\n"
 
 #: src/pacman/callback.c:222
 #, c-format
@@ -170,7 +170,9 @@ msgstr ":: Získávám balíčky z %s...\n"
 msgid ""
 ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
 "n] "
-msgstr ":: %s vyžaduje instalaci %s z IgnorePkg/IgnoreGroup. I přesto instalovat? [A/n] "
+msgstr ""
+":: %s vyžaduje instalaci %s z IgnorePkg/IgnoreGroup. I přesto instalovat? [A/"
+"n] "
 
 #: src/pacman/callback.c:270
 #, c-format
@@ -189,17 +191,13 @@ msgstr ":: Nahradit %s za %s/%s? [A/n] "
 
 #: src/pacman/callback.c:288
 #, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
-msgstr ""
-"Nahrazuji %s za %s/%s\n"
-"."
+msgid "Replacing %s with %s/%s\n"
+msgstr "Nahrazuji %s za %s/%s\n"
 
 #: src/pacman/callback.c:296
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
-msgstr ":: %s je v konfliktní s %s. Odstranit %s? [A/n] "
+msgstr ":: %s je konfliktní s %s. Odstranit %s? [A/n] "
 
 #: src/pacman/callback.c:304
 #, c-format
@@ -229,11 +227,11 @@ msgstr "kontroluji konflikty mezi soubory"
 
 #: src/pacman/package.c:68
 msgid "Explicitly installed"
-msgstr "Výslovně instalován"
+msgstr "Výslovně nainstalován"
 
 #: src/pacman/package.c:71
 msgid "Installed as a dependency for another package"
-msgstr "Instalován jako závislost jiného balíčku"
+msgstr "Nainstalován jako závislost jiného balíčku"
 
 #: src/pacman/package.c:74
 msgid "Unknown"
@@ -379,7 +377,7 @@ msgstr "(žádný)\n"
 #: src/pacman/package.c:243
 #, c-format
 msgid "error: no changelog available for '%s'.\n"
-msgstr "chyba: žádný seznam změn pro '%s' není dostupný.\n"
+msgstr "chyba: není dostupný žádný seznam změn pro '%s'.\n"
 
 #: src/pacman/pacman.c:60
 msgid "options"
@@ -413,7 +411,8 @@ msgstr ""
 #: src/pacman/pacman.c:81 src/pacman/pacman.c:95 src/pacman/pacman.c:117
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr "      --asdeps         nainstaluje balíčky jako nevýslovně instalované\n"
+msgstr ""
+"      --asdeps         nainstaluje balíčky jako nevýslovně instalované\n"
 
 #: src/pacman/pacman.c:82 src/pacman/pacman.c:88 src/pacman/pacman.c:96
 #: src/pacman/pacman.c:119
@@ -424,17 +423,22 @@ msgstr "  -d, --nodeps         přeskočí kontrolu závislostí\n"
 #: src/pacman/pacman.c:83 src/pacman/pacman.c:97 src/pacman/pacman.c:121
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
-msgstr "  -f, --force          vynucená instalace, přepíše konfliktní soubory\n"
+msgstr ""
+"  -f, --force          vynucená instalace, přepíše konfliktní soubory\n"
 
 #: src/pacman/pacman.c:87
 #, c-format
-msgid "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade        odstraní balíčky a všechny, které na nich závisí\n"
+msgid ""
+"  -c, --cascade        remove packages and all packages that depend on them\n"
+msgstr ""
+"  -c, --cascade        odstraní balíčky a všechny, které na nich závisí\n"
 
 #: src/pacman/pacman.c:89
 #, c-format
-msgid "  -k, --dbonly         only remove database entry, do not remove files\n"
-msgstr "  -k, --dbonly         odstraní jen záznam v databázi, neodstraní soubory\n"
+msgid ""
+"  -k, --dbonly         only remove database entry, do not remove files\n"
+msgstr ""
+"  -k, --dbonly         odstraní jen záznam v databázi, neodstraní soubory\n"
 
 #: src/pacman/pacman.c:90
 #, c-format
@@ -443,8 +447,10 @@ msgstr "  -n, --nosave         odstraní také konfigurační soubory\n"
 
 #: src/pacman/pacman.c:91
 #, c-format
-msgid "  -s, --recursive      remove dependencies also (that won't break packages)\n"
-msgstr "  -s, --recursive      odstraní také závislosti (pokud nepoškodí jiné balíčky)\n"
+msgid ""
+"  -s, --recursive      remove dependencies also (that won't break packages)\n"
+msgstr ""
+"  -s, --recursive      odstraní i závislosti (pokud nepoškodí jiné balíčky)\n"
 
 #: src/pacman/pacman.c:101
 #, c-format
@@ -454,7 +460,8 @@ msgstr "  -c, --changelog      zobrazí seznam změn balíčku\n"
 #: src/pacman/pacman.c:102
 #, c-format
 msgid "  -d, --deps           list all packages installed as dependencies\n"
-msgstr "  -d, --deps           seznam všech balíčků instalovaných jako závislosti\n"
+msgstr ""
+"  -d, --deps           seznam všech balíčků instalovaných jako závislosti\n"
 
 #: src/pacman/pacman.c:103
 #, c-format
@@ -468,8 +475,10 @@ msgstr "  -g, --groups         zobrazí všechny balíčky ve skupině\n"
 
 #: src/pacman/pacman.c:105
 #, c-format
-msgid "  -i, --info           view package information (-ii for backup files)\n"
-msgstr "  -i, --info           zobrazí informace o balíčku (-ii zálohované soubory)\n"
+msgid ""
+"  -i, --info           view package information (-ii for backup files)\n"
+msgstr ""
+"  -i, --info           zobrazí informace o balíčku (-ii zálohované soubory)\n"
 
 #: src/pacman/pacman.c:106
 #, c-format
@@ -478,10 +487,10 @@ msgstr "  -l, --list           seznam souborů v balíčku\n"
 
 #: src/pacman/pacman.c:107
 #, 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        seznam nainstalovaných balíčků, které nebyly nalezeny\n"
-"                       v synchronizované databázi\n"
+"  -m, --foreign        seznam nainstalovaných balíčků nalezených databázi\n"
 
 #: src/pacman/pacman.c:108
 #, c-format
@@ -499,20 +508,19 @@ msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search <RegVýr>\n"
+"  -s, --search <regVýr>\n"
 "                       vyhledá nainstalované balíčky odpovídající řetězci\n"
 
 #: src/pacman/pacman.c:111
 #, c-format
 msgid "  -t, --unrequired     list all packages not required by any package\n"
 msgstr ""
-"  -t, --unrequired     seznam všech balíčků, které nejsou vyžadovány\n"
-"                       jiným balíčkem\n"
+"  -t, --unrequired     seznam všech balíčků nevyžadovaných jiným balíčkem\n"
 
 #: src/pacman/pacman.c:112
 #, c-format
 msgid "  -u, --upgrades       list all packages that can be upgraded\n"
-msgstr "  -u, --upgrades       seznam všech balíčků, které mohou být aktualizovány\n"
+msgstr "  -u, --upgrades       seznam všech aktualizovatelných balíčků\n"
 
 #: src/pacman/pacman.c:113
 #, c-format
@@ -524,7 +532,8 @@ msgstr "  -q, --quiet          zobrazit méně informací při dotazu a hledán�
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr "  -c, --clean          odstraní staré balíčky z keše (-cc pro všechny)\n"
+msgstr ""
+"  -c, --clean          odstraní staré balíčky z cache (-cc pro všechny)\n"
 
 #: src/pacman/pacman.c:120
 #, c-format
@@ -539,22 +548,22 @@ msgstr "  -i, --info           zobrazí informace o balíčku\n"
 #: src/pacman/pacman.c:124
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repositář>\n"
-"                       zobrazí seznam balíčků v repositáři\n"
+msgstr "  -l, --list <repo>    zobrazí seznam balíčků v repositáři\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
-msgstr "  -p, --print-uris     vypíše URI požadovaného balíčku a jeho závislostí\n"
+msgstr ""
+"  -p, --print-uris     vypíše URI požadovaného balíčku a jeho závislostí\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
-msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgid ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search <RegVýr>\n"
+"  -s, --search <regVýr>\n"
 "                       vyhledá balíčky v repositářích odpovídající řetězci\n"
 
 #: src/pacman/pacman.c:127
@@ -567,17 +576,22 @@ msgstr "  -u, --sysupgrade     aktualizuje všechny zastaralé balíčky\n"
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr "  -w, --downloadonly   stáhne balíčky, ale nenainstaluje/neaktualizuje je\n"
+msgstr ""
+"  -w, --downloadonly   stáhne balíčky, ale nenainstaluje/neaktualizuje je\n"
 
 #: src/pacman/pacman.c:129
 #, 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        stáhne aktuální databázi balíčků ze serveru\n"
 
 #: src/pacman/pacman.c:130
 #, c-format
-msgid "      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr "      --needed         aktualizuje jen zastaralé nebo nenainstalované balíčky\n"
+msgid ""
+"      --needed         only upgrade outdated or not yet installed packages\n"
+msgstr ""
+"      --needed         aktualizuje jen zastaralé nebo nenainstalované "
+"balíčky\n"
 
 #: src/pacman/pacman.c:131
 #, c-format
@@ -586,7 +600,7 @@ msgid ""
 "once)\n"
 msgstr ""
 "      --ignore <balíček>\n"
-"                        ignoruj aktualizaci balíčku (lze použít vícekrát)\n"
+"                       ignorovat aktualizaci balíčku (lze použít vícekrát)\n"
 
 #: src/pacman/pacman.c:132
 #, c-format
@@ -595,7 +609,7 @@ msgid ""
 "                       ignore a group upgrade (can be used more than once)\n"
 msgstr ""
 "      --ignoregroup <skupina>\n"
-"                       ignoruj aktualizaci skupiny (lze použít vícekrát)\n"
+"                       ignorovat aktualizaci skupiny (lze použít vícekrát)\n"
 
 #: src/pacman/pacman.c:134
 #, c-format
@@ -621,12 +635,14 @@ msgstr "      --noconfirm      neptat se na žádná potvrzení\n"
 
 #: src/pacman/pacman.c:139
 #, 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  nezobrazovat průběh stahování souborů\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
-msgid "      --noscriptlet    do not execute the install scriptlet if one exists\n"
+msgid ""
+"      --noscriptlet    do not execute the install scriptlet if one exists\n"
 msgstr "      --noscriptlet    nespouštět instalační skripty\n"
 
 #: src/pacman/pacman.c:141
@@ -649,7 +665,7 @@ msgstr "  -b, --dbpath <cesta> nastaví umístění databáze\n"
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr ""
 "      --cachedir <adresář>\n"
-"                       nastaví cestu k adresáři s keší\n"
+"                       nastaví cestu k adresáři s cache\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
@@ -657,7 +673,7 @@ msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License\n"
 msgstr ""
-"                       Tento program  může být dále distribuován pod\n"
+"                       Tento program  může být dále šířen pod\n"
 "                       licencí GNU GPL (General Public License)\n"
 
 #: src/pacman/pacman.c:247
@@ -683,7 +699,7 @@ msgstr "'%s' není validní ladící úroveň\n"
 #: src/pacman/pacman.c:396 src/pacman/pacman.c:672
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
-msgstr "problém s přidáním adresáře s keší '%s' (%s)\n"
+msgstr "problém s přidáním adresáře s cache '%s' (%s)\n"
 
 #: src/pacman/pacman.c:482
 msgid "only one operation may be used at a time\n"
@@ -702,12 +718,16 @@ msgstr "konfigurační soubor %s, řádek %d: chybné jméno sekce.\n"
 #: src/pacman/pacman.c:600
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
-msgstr "konfigurační soubor %s, řádek %d: chybná syntaxe konfiguračního souboru, chybí hodnota.\n"
+msgstr ""
+"konfigurační soubor %s, řádek %d: chybná syntaxe konfiguračního souboru, "
+"chybí hodnota.\n"
 
 #: src/pacman/pacman.c:610
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr "konfigurační soubor %s, řádek %d: Všechny direktivy musí náležet nějaké sekci.\n"
+msgstr ""
+"konfigurační soubor %s, řádek %d: Všechny direktivy musí náležet nějaké "
+"sekci.\n"
 
 #: src/pacman/pacman.c:638 src/pacman/pacman.c:692 src/pacman/pacman.c:707
 #, c-format
@@ -721,7 +741,7 @@ msgstr "selhala inicializace knihovny alpm (%s)\n"
 
 #: src/pacman/pacman.c:814
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "nelze provést operaci, vy nejste root.\n"
+msgstr "nelze provést operaci, nejste root.\n"
 
 #: src/pacman/pacman.c:837
 #, c-format
@@ -737,51 +757,51 @@ msgstr "nebyla specifikována operace (použijte -h pro nápovědu)\n"
 msgid "error: no file was specified for --owns\n"
 msgstr "chyba: nebyl určen soubor pro --owns\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "chyba: selhalo čtení souboru '%s': %s\n"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "chyba: nelze určit vlastnictví adresáře\n"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "chyba: nelze určit skutečnou cestu pro '%s': %s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s je vlastněn %s %s\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
 msgstr "chyba: Žádný balíček nevlastní %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "chyba: skupina \"%s\" nenalezena\n"
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
 msgstr "Zjišťuji aktualizace balíčků... \n"
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
 msgstr "žádné aktualizace nebyly nalezeny.\n"
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "nejsou nastaveny žádné použitelné repositáře.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "chyba: balíček \"%s\" nenalezen\n"
@@ -800,17 +820,12 @@ msgstr "    Odstranit celý obsah? [A/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Odstranit %s ze skupiny %s? [A/n] "
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "chyba: selhala příprava transakce (%s)\n"
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "chyba: selhalo přidání cíle '%s' (%s)\n"
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Cíle:"
 
@@ -854,40 +869,40 @@ msgstr "Adresář databáze vyčištěn\n"
 #: src/pacman/sync.c:132 src/pacman/sync.c:179
 #, c-format
 msgid "Cache directory: %s\n"
-msgstr "Adresář s keší: %s\n"
+msgstr "Adresář cache: %s\n"
 
 #: src/pacman/sync.c:133
 msgid "Do you want to remove uninstalled packages from cache? [Y/n] "
-msgstr "Chcete odstranit nenainstalované balíčky z keše? [A/n] "
+msgstr "Chcete odstranit nenainstalované balíčky z cache? [A/n] "
 
 #: src/pacman/sync.c:136
 #, c-format
 msgid "removing old packages from cache... "
-msgstr "odstraňuji staré balíčky z keše... "
+msgstr "odstraňuji staré balíčky z cache... "
 
 #: src/pacman/sync.c:140
 #, c-format
 msgid "error: could not access cache directory\n"
-msgstr "chyba: nelze přistoupit k adresáři s keší\n"
+msgstr "chyba: nelze přistoupit k adresáři s cache\n"
 
 #: src/pacman/sync.c:180
 msgid "Do you want to remove ALL packages from cache? [Y/n] "
-msgstr "Chcete odstranit VŠECHNY balíčky z keše? [A/n] "
+msgstr "Chcete odstranit VŠECHNY balíčky z cache? [A/n] "
 
 #: src/pacman/sync.c:183
 #, c-format
 msgid "removing all packages from cache... "
-msgstr "odstraňuji všechny balíčky z keše... "
+msgstr "odstraňuji všechny balíčky z cache... "
 
 #: src/pacman/sync.c:186
 #, c-format
 msgid "error: could not remove cache directory\n"
-msgstr "chyba: nelze odstranit adresář keše\n"
+msgstr "chyba: nelze odstranit adresář cache\n"
 
 #: src/pacman/sync.c:191
 #, c-format
 msgid "error: could not create new cache directory\n"
-msgstr "chyba: nelze vytvořit nový adresář keše\n"
+msgstr "chyba: nelze vytvořit nový adresář cache\n"
 
 #: src/pacman/sync.c:218
 #, c-format
@@ -941,167 +956,142 @@ msgstr ":: Spouštím aktualizaci systému...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ":: pacman zjistil svoji novější verzi.\n"
+
+#: src/pacman/sync.c:530
 msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
-":: pacman zjistil svoji novější verzi. Je doporučena jeho"
-":: aktualizace použitím 'pacman -S pacman' a poté znovu\n"
-":: spustit aktuální operaci. Pokud chcete pokračovat v této\n"
-":: operaci a neaktualizovat pacmana zvlášť, odpovězte ne.\n"
-
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Zrušit aktuální operaci? [A/n] "
+":: Chcete zrušit současnou operaci a nyní\n"
+":: nainstalovat novou verzi pacmana? [Y/n] "
 
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "chyba: selhalo uveřejnění transakce (%s)\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr "chyba: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "chyba: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ":: skupina %s (včetně ignorovaných balíčků):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Instalovat celý obsah? [A/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Instalovat %s ze skupiny %s? [A/n] "
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, c-format
 msgid "Warning: %s provides %s\n"
 msgstr "Varování: %s poskytuje %s\n"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr "chyba: více balíčků poskytuje %s, vyberte jeden z nich:\n"
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr "chyba: '%s': nenalezen v synchronizované databázi\n"
 
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: konfliktní s %s\n"
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr " lokální databáze je aktuální\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
 msgstr "Zahajuji stahování...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "Pokračovat ve stahování? [A/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
 msgstr "Zahajuji proces aktualizace...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "Pokračovat v instalaci? [A/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr "Zjištěny chyby, žádné balíčky nebyly aktualizovány.\n"
 
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "Nic\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Odstranit:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Celková uvolněná velikost:   %.2f MB\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
-msgstr "Celková velikost stahování:    %.2f MB\n"
+msgstr "Celková velikost stahování:   %.2f MB\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Celková velikost instalace:   %.2f MB\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "A"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
-msgstr "Ano"
-
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr "ladění: %s"
+msgstr "ANO"
 
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr "chyba: %s"
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
 msgstr "varování: %s"
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
 msgstr "funkce: %s"
 
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr "ladění: "
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "chyba: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "varování: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
 msgstr "funkce: "
@@ -1110,17 +1100,26 @@ msgstr "funkce: "
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr "Použití: %s <kořen> <cílový_soubor> [adresář_s_balíčky]"
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+"POZNÁMKA: tento skript je ZAVRŽEN. Bude odstraněn v další hlavní verzi"
+"\\npacmana, proto místo něj používejte repo-add a repo-remove.\\n\\n"
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
 "compresses it to <destfile>.\\n\\n"
 msgstr ""
-"gensync generuje synchronizační databázi ze všech PKGBUILDů\\nz <kořen>. "
-"gensync sestaví databázi do dočasného adresáře\\na ta je zkomprimována do "
-"<cílový_soubor>.\\n\\n"
+"gensync generuje databázi ze všech PKGBUILDů v <kořen>. gensync sestaví"
+"\\ndatabázi do dočasného adresáře, ta je zkomprimována do <cílový_soubor>.\\n"
+"\\n"
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
@@ -1128,7 +1127,7 @@ msgstr ""
 "gensync spočítá kontrolní MD5 součet balíčků ve stejném adresáři jako"
 "\\n<cílový_soubor>, pokud není specifikován [adresář_s_balíčky].\\n\\n"
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1136,64 +1135,64 @@ msgid ""
 "database must reside in the same directory as your\\n      custom packages "
 "(also configured in /etc/pacman.conf)\\n\\n"
 msgstr ""
-"poznámka: jméno <cílový_soubor> je důležité. musí být ve formátu\\n      "
+"poznámka: Jméno <cílový_soubor> je důležité. musí být ve formátu\\n      "
 "{jméno_stromu}.db.tar.gz, kde {jméno_stromu} je jméno vlastního\\n      "
 "repositáře balíčků, shodné s konfigurací v /etc/pacman.conf.\\n      "
-"Generovaná databáze musí být umístěna ve stejném adresáři jako její vlastní"
-"\\n      balíčky (také se nastavuje v /etc/pacman.conf)\\n\\n"
+"Generovaná databáze musí být umístěna ve stejném adresáři jako\\n      její "
+"vlastní balíčky (také se nastavuje v /etc/pacman.conf)\\n\\n"
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr "Příklad:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nToto je "
-"svobodný software; více o podmínkách použití naleznete ve zdrojovém kódu."
-"\\nZe zákona nejsou poskytovány ŽÁDNÉ ZÁRUKY."
+"svobodný software; více o podmínkách použití naleznete\\nve zdrojovém kódu."
+"Ze zákona nejsou poskytovány ŽÁDNÉ ZÁRUKY.\\n"
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr "%s nenalezen. Nelze pokračovat."
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr "neplatný kořenový adresář: %s"
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
-msgstr "gensync: sestavování položek databáze, generování MD5 součtů..."
+msgstr "gensync: sestavuji záznamy databáze, generuji MD5 součty..."
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr "selhalo zpracování %s"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr "nemohu nalézt %s-%s-%s-%s%s - přeskakuji"
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
 msgstr "vytvářím databázi repositáře..."
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr "VAROVÁNÍ:"
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr "CHYBA:"
 
 #: scripts/makepkg.sh.in:142
 msgid "Cleaning up..."
-msgstr "Čištění..."
+msgstr "Čištím..."
 
 #: scripts/makepkg.sh.in:192
 msgid ""
@@ -1207,18 +1206,19 @@ msgstr "Nahraďte 'no' za '!': %s -> %s."
 
 #: scripts/makepkg.sh.in:197
 msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
-msgstr "Volba 'keepdocs' nemusí fungovat jak je zamýšleno. Nahraďte ji volbou 'docs'."
+msgstr ""
+"Volba 'keepdocs' nemusí fungovat jak je zamýšleno. Nahraďte ji volbou 'docs'."
 
 #: scripts/makepkg.sh.in:285
 msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr "Použitý agent neumí zacházet s %s URL. Zkontrolujte %s."
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr "Ruším..."
 
@@ -1244,7 +1244,7 @@ msgstr "Sestavuji chybějící závislosti..."
 
 #: scripts/makepkg.sh.in:353
 msgid "Source root cannot be found - please make sure it is specified in %s."
-msgstr "Kořen zdroje nebyl nalezen - zkontrolujte zda je zadán v %s."
+msgstr "Kořen zdrojů nebyl nalezen - zkontrolujte zda je zadán v %s."
 
 #: scripts/makepkg.sh.in:361
 msgid "Could not find '%s' under %s"
@@ -1276,537 +1276,548 @@ msgstr "%s nalezen v adresáři kde se provádí sestavení"
 
 #: scripts/makepkg.sh.in:462
 msgid "Using cached copy of %s"
-msgstr "Používám kopii %s z keše"
+msgstr "Používám kopii %s z cache"
+
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr "%s nebyl nalezen v adresáři, kde se provádí sestavení, a není ani URL."
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
 msgstr "Stahuji %s..."
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr "Selhání při stahování %s"
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr "Generuji kontrolní součty zdrojových souborů..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Zadán chybný algoritmus '%s' pro kontrolu integrity."
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr "Nemohu nalézt program '%s'."
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
 msgstr "Nelze nalézt zdrojový soubor %s pro výpočet kontrolního součtu."
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr "Zadán chybný algoritmus '%s' pro kontrolu integrity"
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr "Kontroluji zdrojové soubory pomocí %s..."
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr "NENALEZEN"
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr "V pořádku"
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr "SELHALO"
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr "Jeden nebo více souborů neprošlo kontrolou validity!"
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
-msgstr "Kontrola integrity (%s) nenalezena nebo není kompletní."
+msgstr "Kontrolní součty (%s) nenalezeny nebo nejsou kompletní."
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr "Rozbaluji zdrojové soubory..."
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr "Nenalezen zdrojový soubor %s pro rozbalení."
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr "Selhalo rozbalení %s"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr "Startuji build()..."
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr "Sestavení selhalo."
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr "Uklízím instalaci..."
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr "Odstraňuji info/doc soubory..."
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr "Komprimuji man stránky..."
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "Odstraňuji ladící informace z binárních souborů a knihoven..."
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr "Odstraňuji libtool .la soubory..."
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr "Odstraňuji prázdné adresáře..."
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr "Nenalezen pkg/ adresář."
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr "Vytvářím balíček..."
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr "Vytvářím .PKGINFO soubor..."
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr "Prosím přidejte informace o licenci do vašeho %s!"
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Například pro GPL software: license=('GPL')."
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr "Přidávám instalační skripty..."
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr "Přidávám seznam změn balíčku..."
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
-msgstr "Zabaluji balíček..."
+msgstr "Komprimuji balíček..."
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr "Selhalo vytvoření balíčku."
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr "Nemohu nalézt příkaz xdelta! Je xdelta nainstalován?"
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
-msgstr "Vytvářím rozdílovou verzi z %s..."
+msgstr "Vytvářím delta verzi z %s..."
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
-msgstr "Znovu vytvářím celý archív z rozdílu pro kontrolu MD5 podpisů"
+msgstr "Znovu vytvářím celý archív z delta rozdílu pro kontrolu MD5 podpisů"
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
-msgstr "POZNÁMKA: tento rozdíl může být distribuován JEN s tímto archívem"
+msgstr "POZNÁMKA: tento delta rozdíl může být šířen JEN s tímto archívem"
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
-msgstr "Nemohu vygenerovat balíček z tohoto rozdílu."
+msgstr "Nemohu vytvořit balíček z tohoto delta rozdílu."
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
-msgstr "Nebylo možné vytvořit rozdíl."
+msgstr "Nebylo možné vytvořit delta rozdíl."
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr "Žádná předchozí verze nebyla nalezena, přeskakuji xdelta."
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr "Vytvářím zdrojový balíček..."
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr "Přidávám %s..."
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
-msgstr "instalační skript %s nebyl nalezen."
+msgstr "Instalační skript %s nebyl nalezen."
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr "Komprimuji zdrojový balíček..."
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr "Selhalo vytváření zdrojového balíčku."
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr "Určuji poslední darcs revizi..."
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr "Určuji poslední cvs revizi..."
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr "Určuji poslední git revizi..."
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr "Určuji poslední svn revizi..."
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr "Určuji poslední bzr revizi..."
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr "Určuji poslední hg revizi..."
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr "Nalezena verze: %s"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
 msgstr "Použití: %s [volby]"
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr "Volby:"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr "  -A, --ignorearch Ignoruje nekompletní pole arch v %s"
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr "  -b, --builddeps  Sestaví chybějící závislosti ze zdrojových souborů"
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
-msgstr "  -c, --clean      Pročistí pracovní soubory po sestavení"
+msgstr "  -c, --clean      Odstraní pracovní soubory po sestavení"
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
-msgstr "  -C, --cleancache Pročistí zdrojové soubory z keše"
+msgstr "  -C, --cleancache Odstraní zdrojové soubory v cache"
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     Přeskočí všechny kontroly závislostí"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
-msgstr "  -e, --noextract  Nerozbalovat zdrojové soubory (použije se existující src/ adresář)"
+msgstr ""
+"  -e, --noextract  Nerozbalovat zdrojové soubory (použít existující src/)"
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      Přepsat existující balíček"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Vygeneruje kontrolní součty zdrojových souborů"
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       Vypíše tuto nápovědu"
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
-msgstr "  -i, --install    Nainstaluje balíček po úspěšném sestavení"
+msgstr "  -i, --install    Po úspěšném sestavení nainstaluje balíček"
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Zaznamenat proces sestavení balíčku"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Zakáže barevný výstup zpráv"
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Pouze stáhne a rozbalí soubory"
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr "  -p <buildscript> Použije alternativní build skript (namísto '%s')"
 
-#: scripts/makepkg.sh.in:1072
-msgid "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr "  -r, --rmdeps     Odstraní nainstalované závislosti po úspěšném sestavení"
+#: scripts/makepkg.sh.in:1088
+msgid ""
+"  -r, --rmdeps     Remove installed dependencies after a successful build"
+msgstr ""
+"  -r, --rmdeps     Po úspěšném sestavení odstraní nainstalované závislosti"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr "  -R, --repackage  Znovu zabalí obsah pkg/ bez sestavování"
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
-msgstr "  -s, --syncdeps   Nainstaluje chybějící závislosti pomocí pacman"
+msgstr "  -s, --syncdeps   Nainstaluje chybějící závislosti pomocí pacmana"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
-msgstr "      --asroot     Umožňuje spustit makepkg pod právy uživatele root"
+msgstr "      --asroot     Umožňuje spustit makepkg s právy uživatele root"
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
-msgstr "      --holdver    Zabrání automatickému zvýšení verze u vyvíjených PKGBUILDů"
+msgstr ""
+"      --holdver    Zabrání automatickému zvýšení verze u vývojových PKGBUILDů"
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
-msgstr "      --source     Nesestavovat balíček, vygenerovat jen zdrojový archiv"
+msgstr ""
+"      --source     Nesestavovat balíček, vygenerovat jen zdrojový archiv"
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr "Tyto volby se předají pacmanovi:"
 
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1098
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
 msgstr "      --noconfirm      Nedotazovat se na potvrzení"
 
-#: scripts/makepkg.sh.in:1083
-msgid "      --noprogressbar  Do not show a progress bar when downloading files"
+#: scripts/makepkg.sh.in:1099
+msgid ""
+"      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "      --noprogressbar  Nezobrazovat průběh stahování souborů"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "Když není zadáno -p, makepkg bude hledat '%s'"
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr "%s nebyl nalezen."
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr "Sudo je nyní používáno jako výchozí. Volba --usesudo je zavržena!"
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
-msgstr "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
+msgstr "\\0--holdver a --forcever nemohou být specifikovány najednou"
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr "Odstraňuji VŠECHNY soubory z %s."
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr "    Jste si jistý, že víte co děláte? [A/n] "
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr "Problém s odstraněním souborů, možná nemáte správná oprávnění v %s"
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
-msgstr "Keš zdrojových souborů vyčištěna."
+msgstr "Cache zdrojových souborů vyčištěna."
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr "Žádné soubory nebyly odstraněny."
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr "V makepkg.conf musí být specifikováno umístění zdrojových souborů."
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
-msgstr "Dodatek: prosím spusťte makepkg -C mino váš adresář s keší."
+msgstr "Dodatek: spusťte makepkg -C mino váš adresář s cache."
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr "Není definován BUILDSCRIPT! Zjistěte, zda máte aktuální %s."
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr "Spouštění makepkg jako root je ŠPATNÝ nápad a může způsobit"
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr "trvalé a katastrofální poškození vašeho systému. Pokud"
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr "jej chcete spustit jako root, použijte volbu --asroot."
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr "Volba --asroot je určena jen pro uživatele root."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr "Prosím spusťte makepkg znovu bez volby --asroot."
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr "Nainstalujte si fakeroot, pokud chcete používat volbu 'fakeroot'"
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr "v poli BUILDENV v %s."
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr "Spuštění makepkg jako neprivilegovaný uživatel může mít za následek"
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
-"vlastnění souborů v balíčku někým jiným než rootem. Používejte fakeroot "
-"prostředí"
+"vlastnění souborů v balíčku někým jiným než rootem. Používejte fakeroot"
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
-msgstr "přidáním 'fakeroot' do BUILDENV pole v makepkg.conf."
+msgstr "prostředí, přidáním 'fakeroot' do BUILDENV pole v makepkg.conf."
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr "Nepoužívejte volbu '-F'. Tato volba je použitelná jen pro makepkg."
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr "Nemohu nalézt příkaz sudo! Je sudo nainstalován?"
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
-msgstr "Chybějící závislosti nelze nainstalovat nebo odstranit pod běžným uživatelem"
+msgstr ""
+"Chybějící závislosti nelze nainstalovat nebo odstranit pod běžným uživatelem"
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
-msgstr "bez sudo; nainstalujte a nastavte sudo pro automatické zjišťování závislostí."
+msgstr ""
+"bez sudo. Nainstalujte a nastavte sudo pro automatické zjišťování závislostí."
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr "%s neexistuje."
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
-msgstr "%s nemůže být prázdná."
+msgstr "%s nemůže být prázdné."
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s nemůže obsahovat pomlčky."
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s není dostupný pro architekturu '%s'."
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
-msgstr "Poznámka:  mnoho balíčků možná potřebuje přidat řádek do svého %s,"
+msgstr "Poznámka: mnoho balíčků možná potřebuje přidat řádek do svého %s,"
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
-msgstr "může vypadat takto: arch=('%s')."
+msgstr "který vypadá takto: arch=('%s')."
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Instalační skript (%s) neexistuje."
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr "Balíček je již sestaven, instaluji existující balíček..."
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "Balíček je již sestaven. (použijte -f pro přepsání)"
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
-msgstr "Přeskakuji sestavování."
+msgstr "Přeskakuji sestavovení."
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr "Opouštím prostředí fakeroot."
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr "Vytvářím balíček: %s"
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr "Spouštím makepkg jako root..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr "Zdrojový balíček vytvořen: %s"
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr "Přeskakuji kontrolu závislostí."
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr "Kontroluji závislosti potřebné pro běh..."
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr "Kontroluji závislosti potřebné pro sestavení..."
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr "Nemohu vyřešit všechny závislosti."
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
 msgstr "pacman nebyl nalezen v PATH, přeskakuji kontrolu závislostí."
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr "Přeskakuji hledání zdrojů        -- používám existující src/ strom"
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr "Přeskakuji kontrolu integrity    -- používám existující src/ strom"
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr "Přeskakuji rozbalování zdrojů    -- používám existující src/ strom"
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "Zdrojový adresář je prázdný, není co sestavovat!"
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr "Adresář s balíčkem je prázdný, není nic k opětovnému zabalení!"
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr "Zdroje jsou připraveny."
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr "Odstraňuji existující pkg/ adresář..."
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr "Vstupuji do fakeroot prostředí..."
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr "Dokončeno vytváření: %s"
 
@@ -1819,8 +1830,8 @@ msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
 msgstr ""
-"pacman-optimize je malý hack, který pomáhá zlepšit výkon pacmana\\npři čtení a "
-"zápisu do jeho databáze na bázi souborového systému.\\n\\n"
+"pacman-optimize je malý hack, který pomáhá zlepšit výkon pacmana\\npři čtení "
+"a zápisu do jeho databáze na bázi souborového systému.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:46
 msgid ""
@@ -1891,7 +1902,7 @@ msgstr "Umisťuji novou databázi na místo..."
 
 #: scripts/pacman-optimize.sh.in:156
 msgid "Finished. Your pacman database has been optimized."
-msgstr "Dokončeno. Vaše databáze pacmana byla optimalizována."
+msgstr "Dokončeno. Databáze pacmana byla optimalizována."
 
 #: scripts/pacman-optimize.sh.in:157
 msgid "For full benefits of pacman-optimize, run 'sync' now."
@@ -1906,8 +1917,8 @@ msgid ""
 "repo-add will update a package database by reading a package file."
 "\\nMultiple packages to add can be specified on the command line.\\n\\n"
 msgstr ""
-"repo-add aktualizuje databázi balíčků pomocí čtení souboru balíčku."
-"\\nNa příkazové řádce může být uvedeno více balíčků pro přidání.\\n\\n"
+"repo-add aktualizuje databázi balíčků pomocí čtení souboru balíčku.\\nNa "
+"příkazové řádce může být uvedeno více balíčků pro přidání.\\n\\n"
 
 #: scripts/repo-add.sh.in:61
 msgid ""
@@ -1915,8 +1926,8 @@ msgid ""
 "\\ntells pacman to skip its internal version number checking and update"
 "\\nthe package regardless.\\n\\n"
 msgstr ""
-"Přepínač --force přidává záznam 'vynucení' do aktualizované databáze,\\nten "
-"znamená, že pacman přeskakuje svoji interní kontrolu verze a\\na za všech "
+"Přepínač --force přidává záznam 'force' do aktualizované databáze,\\nten "
+"znamená, že pacman přeskakuje svoji interní kontrolu verze a za\\nvšech "
 "okolností aktualizuje balíček.\\n\\n"
 
 #: scripts/repo-add.sh.in:65
@@ -1930,14 +1941,14 @@ msgid ""
 "the extent permitted by law.\\n"
 msgstr ""
 "Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nToto je "
-"svobodný software; více o podmínkách použití naleznete ve zdrojovém kódu."
-"\\nZe zákona nejsou poskytovány ŽÁDNÉ ZÁRUKY."
+"svobodný software; více o podmínkách použití naleznete\\nve zdrojovém kódu."
+"Ze zákona nejsou poskytovány ŽÁDNÉ ZÁRUKY.\\n"
 
 #: scripts/repo-add.sh.in:174
 msgid "Invalid package file '%s'."
 msgstr "Neplatný soubor balíčku '%s'."
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr "Odstraňuji existující balíček '%s'..."
 
@@ -1959,25 +1970,25 @@ msgstr "Vytvářím 'deltas' záznam databáze..."
 
 #: scripts/repo-add.sh.in:237
 msgid "Added delta '%s'"
-msgstr "Přidávám rozdíl '%s'"
+msgstr "Přidávám delta rozdíl '%s'"
 
 #: scripts/repo-add.sh.in:239
 msgid "Could not add delta '%s'"
-msgstr "Nemohu přidat rozdíl '%s'"
+msgstr "Nemohu přidat delta rozdíl '%s'"
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr "%s nenalezen. Nemohu pokračovat."
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr "Nemohu vytvořit dočasný adresář pro sestavení databáze."
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Soubor repositáře '%s' není vhodná databáze pacmana."
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr "Rozbaluji databázi do dočasného umístění..."
 
@@ -1997,67 +2008,71 @@ msgstr "Balíček '%s' nenalezen."
 msgid "Creating updated database file %s"
 msgstr "Vytvářím aktualizovaný soubor databáze %s"
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr "Žádná komprese."
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr "Nebyl změněn žádný balíček, není co dělat."
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
 msgstr "repo-remove %s\\n\\n"
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
 msgstr "použití: %s <cesta-k-databázi> <jménoBalíčku> ...\\n\\n"
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
 "\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
 "repo-remove aktualizuje databázi balíčků odstraňováním balíčků podle jména"
-"\\nuvedeného na příkazové řádce z dané databáze. Na příkazové řádce může"
-"\\nbýt uvedeno více balíčků pro odebrání.\\n\\n"
+"\\nuvedeného na příkazové řádce z dané databáze. Na příkazové řádce může být"
+"\\nuvedeno více balíčků pro odebrání.\\n\\n"
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "Příklad:  repo-remove /cesta/k/repo.db.tar.gz kernel26"
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
 msgstr "Vyhledávám balíček '%s'..."
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr "Balíček odpovídající '%s' nenalezen."
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr "Vytvářím aktualizovaný soubor databáze '%s'..."
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr "Všechny balíčky budou odstraněny z databáze. Mažu '%s'."
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr "Použití: %s <akce> <cílový_soubor> <volba> [adresář_balíčků]"
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
 "then compresses it to <destfile>.\\n\\n"
 msgstr ""
-"updatesync aktualizuje a synchronizuje databáze čtením PKGBUILDu a\\núpravou "
-"cílového souboru. updatesync aktualizuje databázi v dočasném\\nadresáři a "
-"pak ji komprimuje do <cílový_soubor>.\\n\\n"
+"updatesync aktualizuje a synchronizuje databáze čtením PKGBUILDu a úpravou"
+"\\ncílového souboru. updatesync aktualizuje databázi v dočasném adresáři."
+"\\nPak ji komprimuje do <cílový_soubor>.\\n\\n"
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
 msgstr "Jsou dva typy akcí:\\n\\n"
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
@@ -2065,13 +2080,14 @@ msgstr ""
 "upd - Aktualizuje záznamy balíčků nebo je vytváří, pokud neexistují.\\n      "
 "Jako volby bere PKGBUILDy balíčků.\\n"
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
-msgstr "del - Odstraňuje záznamy balíčků z databáze. Jako volby bere jejich jména.\\n"
+msgstr ""
+"del - Odstraňuje záznamy balíčků z databáze. Jako volby bere jejich jména.\\n"
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
@@ -2079,25 +2095,24 @@ msgstr ""
 "updatesync počítá MD5 součty balíčků ve stejném adresáři, ve jako je"
 "\\n<cílový_soubor>, pokud není nastaven jiný [adresář_balíčků].\\n\\n"
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr "Příklad:  updatesync upd /home/moje_balíčky/vlastní.db.tar.gz PKGBUILD"
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nToto je svobodný "
-"software; více o podmínkách použití naleznete ve zdrojovém kódu.\\nZe zákona "
+"software; více o podmínkách použití naleznete\\nve zdrojovém kódu.Ze zákona "
 "nejsou poskytovány ŽÁDNÉ ZÁRUKY.\\n"
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr "%s nenalezen"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr "nemohu nalézt %s-%s-%s-%s%s - ruším"
-
diff --git a/po/de.po b/po/de.po
index 4b667075..4a299e10 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
-"PO-Revision-Date: 2008-01-17 19:27+0100\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
+"PO-Revision-Date: 2008-02-15 09:11+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -20,28 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.4\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/pacman/add.c:40
-#: src/pacman/remove.c:42
+#: src/pacman/add.c:40 src/pacman/remove.c:42
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "Konnte den Vorgang (%s) nicht freigeben\n"
 
-#: src/pacman/add.c:77
-#: src/pacman/query.c:363
-#: src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "Keine Ziel-Dateien spezifiziert (benutzen Sie -h für Hilfe)\n"
 
-#: src/pacman/add.c:104
-#: src/pacman/sync.c:510
+#: src/pacman/add.c:104 src/pacman/sync.c:510
 #, c-format
 msgid "error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: src/pacman/add.c:107
-#: src/pacman/remove.c:98
-#: src/pacman/sync.c:484
+#: src/pacman/add.c:107 src/pacman/remove.c:98 src/pacman/sync.c:484
 #, c-format
 msgid ""
 "  if you're sure a package manager is not already\n"
@@ -50,57 +44,48 @@ msgstr ""
 "  Wenn Sie sicher sind, dass nicht bereits ein Paketmanager\n"
 "  gestartet ist, können Sie %s entfernen\n"
 
-#: src/pacman/add.c:114
-#: src/pacman/remove.c:106
+#: src/pacman/add.c:114 src/pacman/remove.c:106
 #, c-format
 msgid "loading package data... "
 msgstr "Lade Paketdaten ... "
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "Fehler: Konnte Ziel-Datei '%s' nicht hinzufügen (%s)"
+msgid "error: '%s': %s\n"
+msgstr "Fehler: '%s': %s\n"
 
-#: src/pacman/add.c:124
-#: src/pacman/remove.c:118
-#: src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/pacman/add.c:129
-#: src/pacman/remove.c:122
-#: src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr "Fehler: Konnte Vorgang (%s) nicht vorbereiten\n"
 
-#: src/pacman/add.c:141
-#: src/pacman/remove.c:130
-#: src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: benötigt %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: steht im Konflikt mit %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: steht im Konflikt mit %s\n"
 
-#: src/pacman/add.c:158
-#: src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s existiert in '%s' und '%s'\n"
 
-#: src/pacman/add.c:164
-#: src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s existiert im Dateisystem\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -109,9 +94,7 @@ msgstr ""
 "\n"
 "Fehler aufgetreten, keine Pakete wurden aktualisiert.\n"
 
-#: src/pacman/add.c:183
-#: src/pacman/remove.c:168
-#: src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr "Fehler: Konnte den Vorgang (%s) nicht durchführen\n"
@@ -188,8 +171,12 @@ msgstr ":: Empfange Pakete von %s...\n"
 
 #: src/pacman/callback.c:265
 #, c-format
-msgid ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
-msgstr ":: %s erfordert die Installation von %s aus IgnorePkg/IgnoreGroup. Trotzdem installieren? [J/n] "
+msgid ""
+":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
+"n] "
+msgstr ""
+":: %s erfordert die Installation von %s aus IgnorePkg/IgnoreGroup. Trotzdem "
+"installieren? [J/n] "
 
 #: src/pacman/callback.c:270
 #, c-format
@@ -208,11 +195,9 @@ msgstr ":: %s durch %s/%s ersetzen? [J/n] "
 
 #: src/pacman/callback.c:288
 #, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
-msgstr "Ersetze %s durch %s/%s\n"
-"."
+msgid "Replacing %s with %s/%s\n"
+msgstr ""
+"Ersetze %s durch %s/%s\n"
 
 #: src/pacman/callback.c:296
 #, c-format
@@ -428,37 +413,39 @@ msgstr ""
 "\n"
 "Benutzen Sie '%s --help' mit anderen Optionen für mehr Informationen\n"
 
-#: src/pacman/pacman.c:81
-#: src/pacman/pacman.c:95
-#: src/pacman/pacman.c:117
+#: src/pacman/pacman.c:81 src/pacman/pacman.c:95 src/pacman/pacman.c:117
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr "      --asdeps         Installiert Pakete als nicht-ausdrücklich installiert\n"
+msgstr ""
+"      --asdeps         Installiert Pakete als nicht-ausdrücklich "
+"installiert\n"
 
-#: src/pacman/pacman.c:82
-#: src/pacman/pacman.c:88
-#: src/pacman/pacman.c:96
+#: src/pacman/pacman.c:82 src/pacman/pacman.c:88 src/pacman/pacman.c:96
 #: src/pacman/pacman.c:119
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps         Überspringt die Abhängigkeitsprüfung\n"
 
-#: src/pacman/pacman.c:83
-#: src/pacman/pacman.c:97
-#: src/pacman/pacman.c:121
+#: src/pacman/pacman.c:83 src/pacman/pacman.c:97 src/pacman/pacman.c:121
 #, 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:87
 #, 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:89
 #, c-format
-msgid "  -k, --dbonly         only remove database entry, do not remove files\n"
-msgstr "  -k, --dbonly         Nur Datenbankeintrag entfernen, keine Dateien entfernen\n"
+msgid ""
+"  -k, --dbonly         only remove database entry, do not remove files\n"
+msgstr ""
+"  -k, --dbonly         Nur Datenbankeintrag entfernen, keine Dateien "
+"entfernen\n"
 
 #: src/pacman/pacman.c:90
 #, c-format
@@ -467,8 +454,11 @@ msgstr "  -n, --nosave         Auch Konfigurationsdateien entfernen\n"
 
 #: src/pacman/pacman.c:91
 #, c-format
-msgid "  -s, --recursive      remove dependencies also (that won't break packages)\n"
-msgstr "  -s, --recursive      Auch Abhängigkeiten entfernen (beschädigt keine Pakete)\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"
 
 #: src/pacman/pacman.c:101
 #, c-format
@@ -478,23 +468,29 @@ msgstr "  -c, --changelog      Das Änderungsprotokoll des Paketes anzeigen\n"
 #: src/pacman/pacman.c:102
 #, c-format
 msgid "  -d, --deps           list all packages installed as dependencies\n"
-msgstr "  -d, --deps           Zeigt alle Pakete an, die als Abhängigkeiten installiert wurden\n"
+msgstr ""
+"  -d, --deps           Zeigt alle Pakete an, die als Abhängigkeiten "
+"installiert wurden\n"
 
 #: src/pacman/pacman.c:103
 #, c-format
 msgid "  -e, --explicit       list all packages explicitly installed\n"
-msgstr "  -e, --explicit       Zeigt alle Pakete an, die ausdrücklich installiert wurden\n"
+msgstr ""
+"  -e, --explicit       Zeigt alle Pakete an, die ausdrücklich installiert "
+"wurden\n"
 
-#: src/pacman/pacman.c:104
-#: src/pacman/pacman.c:122
+#: src/pacman/pacman.c:104 src/pacman/pacman.c:122
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
 msgstr "  -g, --groups         Zeigt alle Mitglieder einer Paket-Gruppe an\n"
 
 #: src/pacman/pacman.c:105
 #, c-format
-msgid "  -i, --info           view package information (-ii for backup files)\n"
-msgstr "  -i, --info           Zeigt Paketinformationen an (-ii für Sicherungs-Dateien)\n"
+msgid ""
+"  -i, --info           view package information (-ii for backup files)\n"
+msgstr ""
+"  -i, --info           Zeigt Paketinformationen an (-ii für Sicherungs-"
+"Dateien)\n"
 
 #: src/pacman/pacman.c:106
 #, c-format
@@ -503,7 +499,8 @@ msgstr "  -l, --list           Zeigt den Inhalt des abgefragten Paketes an\n"
 
 #: src/pacman/pacman.c:107
 #, 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"
@@ -516,17 +513,23 @@ msgstr "  -o, --owns <Datei>   Fragt das Paket ab, das <Datei> enthält\n"
 #: src/pacman/pacman.c:109
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr "  -p, --file <Paket>   Fragt eine Paketdatei anstatt der Datenbank ab\n"
+msgstr ""
+"  -p, --file <Paket>   Fragt eine Paketdatei anstatt der Datenbank ab\n"
 
 #: src/pacman/pacman.c:110
 #, c-format
-msgid "  -s, --search <regex> search locally-installed packages for matching strings\n"
-msgstr "  -s, --search <regex> Durchsucht lokal installierte Pakete nach einem Wort\n"
+msgid ""
+"  -s, --search <regex> search locally-installed packages for matching "
+"strings\n"
+msgstr ""
+"  -s, --search <regex> Durchsucht lokal installierte Pakete nach einem Wort\n"
 
 #: src/pacman/pacman.c:111
 #, c-format
 msgid "  -t, --unrequired     list all packages not required by any package\n"
-msgstr "  -t, --unrequired     Zeigt alle Pakete an, die nicht von anderen benötigt werden\n"
+msgstr ""
+"  -t, --unrequired     Zeigt alle Pakete an, die nicht von anderen benötigt "
+"werden\n"
 
 #: src/pacman/pacman.c:112
 #, c-format
@@ -536,12 +539,17 @@ msgstr "  -u, --upgrades       Zeigt alle aktualisierbaren Pakete an\n"
 #: src/pacman/pacman.c:113
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr "  -q, --quiet          zeigt weniger Information bei Abfragen und Suche an \n"
+msgstr ""
+"  -q, --quiet          zeigt weniger Information bei Abfragen und Suche an \n"
 
 #: src/pacman/pacman.c:118
 #, c-format
-msgid "  -c, --clean          remove old packages from cache directory (-cc for all)\n"
-msgstr "  -c, --clean          Entfernt alte Pakete aus dem Paketpuffer(-cc für alle)\n"
+msgid ""
+"  -c, --clean          remove old packages from cache directory (-cc for "
+"all)\n"
+msgstr ""
+"  -c, --clean          Entfernt alte Pakete aus dem Paketpuffer(-cc für "
+"alle)\n"
 
 #: src/pacman/pacman.c:120
 #, c-format
@@ -556,19 +564,24 @@ msgstr "  -i, --info           Zeigt Paketinformationen an\n"
 #: src/pacman/pacman.c:124
 #, 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:125
 #, c-format
-msgid "  -p, --print-uris     print out URIs for given packages and their dependencies\n"
+msgid ""
+"  -p, --print-uris     print out URIs for given packages and their "
+"dependencies\n"
 msgstr ""
 "  -p, --print-uris     URIs der angegebenen Pakete und deren Abhängigkeiten\n"
 "                       ausgeben\n"
 
 #: src/pacman/pacman.c:126
 #, 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:127
 #, c-format
@@ -577,25 +590,36 @@ msgstr "  -u, --sysupgrade     Aktualisiert alle veralteten Pakete\n"
 
 #: src/pacman/pacman.c:128
 #, c-format
-msgid "  -w, --downloadonly   download packages but do not install/upgrade anything\n"
+msgid ""
+"  -w, --downloadonly   download packages but do not install/upgrade "
+"anything\n"
 msgstr ""
-"  -w, --downloadonly   Lädt Pakete herunter, ohne etwas zu installieren oder\n"
+"  -w, --downloadonly   Lädt Pakete herunter, ohne etwas zu installieren "
+"oder\n"
 "                       aktualisieren\n"
 
 #: src/pacman/pacman.c:129
 #, 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 Paketdatenbanken vom Server\n"
 
 #: src/pacman/pacman.c:130
 #, c-format
-msgid "      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr "      --needed         aktualisiere nur veraltete oder noch nicht installierte Pakete\n"
+msgid ""
+"      --needed         only upgrade outdated or not yet installed packages\n"
+msgstr ""
+"      --needed         aktualisiere nur veraltete oder noch nicht "
+"installierte Pakete\n"
 
 #: src/pacman/pacman.c:131
 #, c-format
-msgid "      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"
-msgstr "      --ignore <pkg>   Ignoriert ein neues Paket (kann mehrfach genutzt werden)\n"
+msgid ""
+"      --ignore <pkg>   ignore a package upgrade (can be used more than "
+"once)\n"
+msgstr ""
+"      --ignore <pkg>   Ignoriert ein neues Paket (kann mehrfach genutzt "
+"werden)\n"
 
 #: src/pacman/pacman.c:132
 #, c-format
@@ -603,13 +627,15 @@ msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
 msgstr ""
-"      --ignore <grp>\n"
-"                       Ignoriert Upgrade einer Gruppe (kann mehrfach genutzt werden)\n"
+"      --ignoregroup <grp>\n"
+"                       Ignoriert Upgrade einer Gruppe (kann mehrfach genutzt "
+"werden)\n"
 
 #: src/pacman/pacman.c:134
 #, c-format
 msgid "  -q  --quiet          show less information for query and search\n"
-msgstr "  -q, --quiet         Zeigt weniger Information bei Abfragen und Suche an\n"
+msgstr ""
+"  -q, --quiet         Zeigt weniger Information bei Abfragen und Suche an\n"
 
 #: src/pacman/pacman.c:136
 #, c-format
@@ -628,15 +654,18 @@ msgstr "      --noconfirm      Niemals nach einer Bestätigung fragen\n"
 
 #: src/pacman/pacman.c:139
 #, 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:140
 #, c-format
-msgid "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr "      --noscriptlet    Installationsskript nicht ausführen, falls vorhanden\n"
+msgid ""
+"      --noscriptlet    do not execute the install scriptlet if one exists\n"
+msgstr ""
+"      --noscriptlet    Installationsskript nicht ausführen, falls vorhanden\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
@@ -646,7 +675,9 @@ msgstr "  -v, --verbose        Sei gesprächig\n"
 #: src/pacman/pacman.c:142
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr "  -r, --root <Pfad>    Setzt ein alternatives Wurzelverzeichnis zur Installation\n"
+msgstr ""
+"  -r, --root <Pfad>    Setzt ein alternatives Wurzelverzeichnis zur "
+"Installation\n"
 
 #: src/pacman/pacman.c:143
 #, c-format
@@ -656,7 +687,8 @@ msgstr "  -b, --dbpath <Pfad>  Setzt einen anderen Ort für die Datenbank\n"
 #: src/pacman/pacman.c:144
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr "  --cachedir <Verzeichnis>  Setzt einen anderen Ort für den Paketpuffer\n"
+msgstr ""
+"  --cachedir <Verzeichnis>  Setzt einen anderen Ort für den Paketpuffer\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
@@ -687,8 +719,7 @@ msgstr "Problem beim Setzen der Log-Datei '%s' (%s)\n"
 msgid "'%s' is not a valid debug level\n"
 msgstr "'%s' ist kein gültiger Debug-Level\n"
 
-#: src/pacman/pacman.c:396
-#: src/pacman/pacman.c:672
+#: src/pacman/pacman.c:396 src/pacman/pacman.c:672
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
 msgstr "Problem beim Hinzufügen des Puffer-Verzeichnisses '%s' (%s)\n"
@@ -710,19 +741,22 @@ msgstr "Konfigurations-Datei %s, Zeile %d: Schlechter Sektions-Name.\n"
 #: src/pacman/pacman.c:600
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
-msgstr "Konfigurations-Datei %s, Zeile %d: Syntax-Fehler in der Datei - fehlender Schlüssel.\n"
+msgstr ""
+"Konfigurations-Datei %s, Zeile %d: Syntax-Fehler in der Datei - fehlender "
+"Schlüssel.\n"
 
 #: src/pacman/pacman.c:610
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr "Konfigurations-Datei %s, Zeile %d: Alle Direktiven müssen zu einer Sektion gehören.\n"
+msgstr ""
+"Konfigurations-Datei %s, Zeile %d: Alle Direktiven müssen zu einer Sektion "
+"gehören.\n"
 
-#: src/pacman/pacman.c:638
-#: src/pacman/pacman.c:692
-#: src/pacman/pacman.c:707
+#: src/pacman/pacman.c:638 src/pacman/pacman.c:692 src/pacman/pacman.c:707
 #, c-format
 msgid "config file %s, line %d: directive '%s' not recognized.\n"
-msgstr "Konfigurations-Datei %s, Zeile %d: Direktive '%s' wurde nicht erkannt.\n"
+msgstr ""
+"Konfigurations-Datei %s, Zeile %d: Direktive '%s' wurde nicht erkannt.\n"
 
 #: src/pacman/pacman.c:777
 #, c-format
@@ -747,52 +781,51 @@ msgstr "Keine Operation angegeben (benutzen Sie -h für Hilfe)\n"
 msgid "error: no file was specified for --owns\n"
 msgstr "Fehler: Es wurde keine Datei für --owns angegeben\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "Fehler: Konnte Datei '%s' nicht lesen: %s\n"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "Fehler: Konnte den Besitzer eines Verzeichnisses nicht ermitteln\n"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "Konnte den wahren Pfad für '%s' nicht ermitteln: %s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s ist in %s %s enthalten\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
 msgstr "Fehler: Kein Paket besitzt %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "Fehler: Gruppe \"%s\" wurde nicht gefunden\n"
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
 msgstr "Suche nach aktualisierbaren Paketen...\n"
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
 msgstr "Keine Aktualisierungen gefunden.\n"
 
-#: src/pacman/query.c:353
-#: src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "Keine brauchbaren Paket-Repositorien konfiguriert.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "Fehler: Paket \"%s\" nicht gefunden\n"
@@ -811,20 +844,12 @@ msgstr "    Gesamten Inhalt entfernen? [J/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: %s aus Gruppe %s entfernen? [J/n] "
 
-#: src/pacman/remove.c:95
-#: src/pacman/sync.c:481
-#: src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "Fehler: Konnte den Vorgang (%s) nicht starten\n"
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "Fehler: Konnte das Ziel '%s' nicht hinzufügen (%s)\n"
-
-#: src/pacman/remove.c:155
-#: src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Pakete:"
 
@@ -865,8 +890,7 @@ msgstr "Möchten Sie ungenutzte Repositorien entfernen? [J/n] "
 msgid "Database directory cleaned up\n"
 msgstr "Datenbank-Verzeichnis wurde aufgeräumt\n"
 
-#: src/pacman/sync.c:132
-#: src/pacman/sync.c:179
+#: src/pacman/sync.c:132 src/pacman/sync.c:179
 #, c-format
 msgid "Cache directory: %s\n"
 msgstr "Puffer-Verzeichnis: %s\n"
@@ -956,170 +980,142 @@ msgstr ":: Starte komplette Systemaktualisierung...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ":: pacman hat eine neuere Version von sich selbst gefunden.\n"
+
+#: src/pacman/sync.c:530
 msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
-":: Pacman hat eine neuere Version von sich selbst gefunden.\n"
-":: Es wird empfohlen, zunächst Pacman mit 'pacman -S pacman'\n"
-":: zu aktualisieren, und den laufenden Vorgang zu wiederholen.\n"
-":: Wenn Sie den laufenden Vorgang fortsetzen und Pacman\n"
-":: nicht seperat aktualisieren möchten, antworten Sie Nein.\n"
+":: Möchtest du die momentan Handlung abbrechen\n"
+":: und die neue pacman Version installieren? [Y/n]"
 
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Laufenden Vorgang beenden? [J/n]"
-
-#: src/pacman/sync.c:536
-#: src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "Fehler: Konnte den Vorgang (%s) nicht freigeben\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr "Fehler: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "Fehler: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ":: Gruppe %s (einschließlich ignorierter Pakete):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Gesamten Inhalt installieren? [J/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: %s aus Gruppe %s installieren? [J/n] "
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, c-format
 msgid "Warning: %s provides %s\n"
 msgstr "Warnung: %s stellt %s bereit\n"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr "Fehler: Mehrere Pakete stellen %s, bitte bestimmen Sie eins :\n"
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr "Fehler: '%s': nicht in Sync-DB gefunden\n"
 
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: steht im Konflikt mit %s\n"
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr " Lokale Datenbank ist aktuell\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
 msgstr "Beginne Download...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "Download fortsetzen? [J/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
 msgstr "Beginne Aktualisierungsprozess...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "Installation fortsetzen? [J/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr "Fehler sind aufgetreten, keine Pakete wurden aktualisiert.\n"
 
-#: src/pacman/util.c:354
-#: src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "Nichts\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Entfernen:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Gesamtgröße der zu entfernenden Pakete: %.2f MB\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
 msgstr "Gesamtgröße der heruntergeladenen Pakete: %.2f MB\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Gesamtgröße der installierten Pakete: %.2f MB\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "J"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "JA"
 
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr "Fehlersuche: %s"
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr "Fehler: %s"
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
 msgstr "Warnung: %s"
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
 msgstr "Funktion: %s"
 
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr "Fehlersuche:"
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "Fehler: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
 msgstr "Funktion:"
@@ -1128,100 +1124,94 @@ msgstr "Funktion:"
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr "Verwendung: %s <root> <destfile> [Paket_Verzeichnis]"
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
 msgid ""
-"gensync will generate a sync database by reading all PKGBUILD files\\n"
-"from <root>. gensync builds the database in a temporary directory\\n"
-"and then compresses it to <destfile>.\\n"
-"\\n"
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
 msgstr ""
-"gensync wird eine Synchronisations-Datenbank erstellen, indem es alle\\n"
-"PKGBUILD-Dateien aus <root> ausliest. gensync erstellt die Datenbank in\\n"
-"einem temporären Verzeichnis und komprimiert sie dann nach <Ziel-Datei>.\\n"
-"\\n"
+"ANMERKUNG: Dieses Skript ist VERALTET.\\nEs wird in einer zukünftigen pacman "
+"Version entfernt.\\nBitte benutze anstelle: repo-add und repo-remove.\\n\\n"
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:36
 msgid ""
-"gensync will calculate md5sums of packages in the same directory as\\n"
-"<destfile>, unless an alternate [package_directory] is specified.\\n"
-"\\n"
+"gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
+"<root>. gensync builds the database in a temporary directory\\nand then "
+"compresses it to <destfile>.\\n\\n"
 msgstr ""
-"gensync errechnet die Md5-Summen von Paketen im gleichen Verzeichnis\\n"
-"wie <destfile>, wenn kein anderes [Paket_Verzeichnis] spezifiziert ist.\\n"
-"\\n"
+"gensync wird eine Synchronisations-Datenbank erstellen, indem es alle"
+"\\nPKGBUILD-Dateien aus <root> ausliest. gensync erstellt die Datenbank in"
+"\\neinem temporären Verzeichnis und komprimiert sie dann nach <Ziel-Datei>."
+"\\n\\n"
 
 #: scripts/gensync.sh.in:40
 msgid ""
-"note: The <destfile> name is important. It must be of the form\\n"
-"      {treename}.db.tar.gz where {treename} is the name of the custom\\n"
-"      package repository you configured in /etc/pacman.conf. The\\n"
-"      generated database must reside in the same directory as your\\n"
-"      custom packages (also configured in /etc/pacman.conf)\\n"
-"\\n"
-msgstr ""
-"Anmerkung: Der <destfile> Name ist wichtig. Er muß die Form\\n"
-"      {treename}.db.tar.gz haben, wobei {treename} der Name des\\n"
-"      Paket-Repos ist, der /etc/pacman.conf konfiguriert wurde. Die\\n"
-"      erstellte DB muß gleichen Verzeichnis liegen wie Ihre selbst-\\n"
-"      erstellten Pakete (ebenfalls in /etc/pacman.conf konfiguriert)\\n"
-"\\n"
-
-#: scripts/gensync.sh.in:46
+"gensync will calculate md5sums of packages in the same directory as"
+"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
+msgstr ""
+"gensync errechnet die Md5-Summen von Paketen im gleichen Verzeichnis\\nwie "
+"<destfile>, wenn kein anderes [Paket_Verzeichnis] spezifiziert ist.\\n\\n"
+
+#: scripts/gensync.sh.in:43
+msgid ""
+"note: The <destfile> name is important. It must be of the form\\n      "
+"{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
+"package repository you configured in /etc/pacman.conf. The\\n      generated "
+"database must reside in the same directory as your\\n      custom packages "
+"(also configured in /etc/pacman.conf)\\n\\n"
+msgstr ""
+"Anmerkung: Der <destfile> Name ist wichtig. Er muß die Form\\n      "
+"{treename}.db.tar.gz haben, wobei {treename} der Name des\\n      Paket-"
+"Repos ist, der /etc/pacman.conf konfiguriert wurde. Die\\n      erstellte DB "
+"muß gleichen Verzeichnis liegen wie Ihre selbst-\\n      erstellten Pakete "
+"(ebenfalls in /etc/pacman.conf konfiguriert)\\n\\n"
+
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr "Beispiel: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 
-#: scripts/gensync.sh.in:51
-#: scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57
-#: scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
-"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\n"
-"Dies ist freie Software, siehe Quellcode für Kopierbedingungen.\\n"
-"Es gibt KEINERLEI GARANTIE, soweit das Gesetz dies erlaubt.\\n"
-
-#: scripts/gensync.sh.in:99
-#: scripts/updatesync.sh.in:98
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
+msgstr ""
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDies ist "
+"freie Software, siehe Quellcode für Kopierbedingungen.\\nEs gibt KEINERLEI "
+"GARANTIE, soweit das Gesetz dies erlaubt.\\n"
+
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr "%s nicht gefunden. Kann nicht fortfahren."
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr "Ungültiges Root-Verzeichnis: %s"
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
 msgstr "gensync: Erstelle Datenbank-Einträge, berechne MD5-Summen ..."
 
-#: scripts/gensync.sh.in:128
-#: scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr "Konnte %s nicht lesen"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr "Konnte %s-%s-%s-%s nicht finden %s - überspringe"
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
 msgstr "Erstelle Repo-Datenbank... "
 
-#: scripts/makepkg.sh.in:100
-#: scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46
-#: scripts/repo-remove.sh.in:43
+#: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr "WARNUNG:"
 
-#: scripts/makepkg.sh.in:109
-#: scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51
-#: scripts/repo-remove.sh.in:48
+#: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr "FEHLER:"
 
@@ -1230,8 +1220,12 @@ msgid "Cleaning up..."
 msgstr "Räume auf... "
 
 #: scripts/makepkg.sh.in:192
-msgid "Options beginning with 'no' will be deprecated in the next version of makepkg!"
-msgstr "Optionen, die mit 'no' beginnen, werden in der nächstenen Version von makepkg abgeschafft!"
+msgid ""
+"Options beginning with 'no' will be deprecated in the next version of "
+"makepkg!"
+msgstr ""
+"Optionen, die mit 'no' beginnen, werden in der nächstenen Version von "
+"makepkg abgeschafft!"
 
 #: scripts/makepkg.sh.in:193
 msgid "Please replace 'no' with '!': %s -> %s."
@@ -1239,24 +1233,21 @@ msgstr "Bitte ersetzen Sie 'no' durch '!': %s -> %s."
 
 #: scripts/makepkg.sh.in:197
 msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
-msgstr "Die Option 'keepdocs' wird vielleicht nicht wie vorgesehen funktionieren. Bitte durch 'docs' ersetzen."
+msgstr ""
+"Die Option 'keepdocs' wird vielleicht nicht wie vorgesehen funktionieren. "
+"Bitte durch 'docs' ersetzen."
 
 #: scripts/makepkg.sh.in:285
 msgid "There is no agent set up to handle %s URLs. Check %s."
-msgstr "Es ist kein Agent eingerichtet, der %s URLs bearbeiten kann. Prüfen Sie %s."
-
-#: scripts/makepkg.sh.in:286
-#: scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448
-#: scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522
-#: scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638
-#: scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775
-#: scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421
-#: scripts/makepkg.sh.in:1425
+msgstr ""
+"Es ist kein Agent eingerichtet, der %s URLs bearbeiten kann. Prüfen Sie %s."
+
+#: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr "Breche ab ..."
 
@@ -1282,7 +1273,9 @@ msgstr "Baue fehlende Abhängigkeiten... "
 
 #: scripts/makepkg.sh.in:353
 msgid "Source root cannot be found - please make sure it is specified in %s."
-msgstr "Quelle root kann nicht gefunden werden - Stellen Sie sicher, dass sie in %s spezifiert ist."
+msgstr ""
+"Quelle root kann nicht gefunden werden - Stellen Sie sicher, dass sie in %s "
+"spezifiert ist."
 
 #: scripts/makepkg.sh.in:361
 msgid "Could not find '%s' under %s"
@@ -1316,539 +1309,574 @@ msgstr "%s im Build-Verzeichnis gefunden"
 msgid "Using cached copy of %s"
 msgstr "Benutze gespeicherte Kopie von %s"
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr "%s wurde nicht im build Verzeichnis gefunden und ist keine URL."
+
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
 msgstr "Lade %s herunter... "
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr "Fehler beim Download von %s"
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr "Erstelle Prüfsummen für Quell-Dateien..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Ungültiger Integritäts-Algorithmus '%s' spezifiziert."
 
-#: scripts/makepkg.sh.in:500
-#: scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr "Kann das Programm '%s' nicht finden."
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
-msgstr "Konnte die Quell-Datei %s nicht finden, um eine Prüfsumme zu erstellen."
+msgstr ""
+"Konnte die Quell-Datei %s nicht finden, um eine Prüfsumme zu erstellen."
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr "Ungültiger Integritäts-Algorithmus '%s' spezifiziert"
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr "Überprüfe Gültigkeit der Quell-Dateien mit %s..."
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr "NICHT GEFUNDEN"
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr "Durchgelaufen"
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr "FEHLGESCHLAGEN"
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr "Eine oder mehrere Dateien überstanden nicht die Gültigkeits-Prüfung!"
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr "Integritäts-Prüfungen (%s) fehlen oder sind unvollständig."
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr "Entpacke Quellen..."
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr "Konnte die Quell-Datei %s zum Entpacken nicht finden."
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr "Konnte %s nicht entpacken"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr "Beginne build()..."
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr "Build fehlgeschlagen."
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr "Säubere Installation..."
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr "Entferne info/doc-Dateien... "
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr "Komprimiere Man-Pages..."
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "Entferne Debugging-Symbole aus Binär-Dateien und Bibliotheken..."
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr "Entferne libtool .la Dateien..."
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr "Entferne leere Verzeichnisse... "
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr "Fehlendes pkg/-Verzeichnis."
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr "Erstelle Paket ... "
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
-msgstr "Erstelle PKGINFO Datei..."
+msgstr "Erstelle .PKGINFO-Datei..."
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr "Bitte fügen Sie eine Lizenz-Zeile zu Ihrer %s hinzu!"
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Beispiel für Software unter der GPL: license=('GPL')."
 
-#: scripts/makepkg.sh.in:846
-#: scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr "Füge Installations-Skript hinzu..."
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr "Füge Änderungsprotokoll des Pakets hinzu ..."
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
 msgstr "Komprimiere Paket ... "
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr "Konnte Paket-Datei nicht erstellen."
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr "Konnte die xdelta-Binär-Datei nicht finden. Ist xdelta installiert?"
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr "Erstelle Delta aus Version %s..."
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr "Erstelle neuen Tarball aus dem Delta, damit Md5-Signaturen passen"
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr "ANMERKUNG: Das Delta sollte NUR mit diesem Tarball ausgeliefert werden"
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr "Konnte kein Paket aus dem Delta erstellen."
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr "Delta konnte nicht erstellt werden."
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr "Keine vorherige Version gefunden, überspringe Xdelta."
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr "Erstelle Quell-Paket..."
 
-#: scripts/makepkg.sh.in:937
-#: scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr "Füge %s hinzu ... "
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
 msgstr "Installations-Skript %s nicht gefunden."
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr "Komprimiere Quell-Paket..."
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr "Konnte Quell-Paket nicht erstellen."
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr "Bestimme letzte Darcs-Revision..."
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr "Bestimme letzte CVS-Revision..."
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr "Bestimme letzte git-Revision..."
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr "Bestimme letzte SVN-Revision..."
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr "Bestimme letzte bzr-Revision..."
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr "Bestimme letzte hg-Revision..."
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr "Gefundene Version: %s"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
 msgstr "Verwendung: %s [Optionen]"
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr "Optionen:"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr "  -A, --ignorearch Ignoriere unvollständiges Arch-Feld in %s"
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr "  -b, --builddeps  Baue fehlende Abhängigkeiten aus den Quellen"
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Säubere Arbeitsverzeichnisse nach dem Build"
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache Säubere Quell-Dateien aus dem Puffer"
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps         Überspringt alle Abhängigkeitsprüfungen"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
-msgstr "  -e, --noextract  Entpacke keine Quell-Dateien (verwende bestehendes src/ Verzeichnis)"
+msgstr ""
+"  -e, --noextract  Entpacke keine Quell-Dateien (verwende bestehendes src/ "
+"Verzeichnis)"
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force          Existierendes Paket überschreiben"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Erstelle Integritäts-Prüfung für Quell-Dateien"
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       Diese Hilfe"
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Installiere Paket nach erfolgreichem Build"
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Erstelle Log-Datei beim Bauen des Paketes"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Farbige Ausgabe-Mitteilungen abschalten"
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Dateien nur herunterladen und auspacken"
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
-msgstr "  -p <buildscript> Ein alternatives Build-Skript (statt '%s') verwenden"
+msgstr ""
+"  -p <buildscript> Ein alternatives Build-Skript (statt '%s') verwenden"
 
-#: scripts/makepkg.sh.in:1072
-msgid "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr "  -r, --rmdeps     Entferne installierte Abhängigkeiten nach erfolgreichem Build"
+#: scripts/makepkg.sh.in:1088
+msgid ""
+"  -r, --rmdeps     Remove installed dependencies after a successful build"
+msgstr ""
+"  -r, --rmdeps     Entferne installierte Abhängigkeiten nach erfolgreichem "
+"Build"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr "  -R, --repackage  Packe den Inhalt von pkg/ neu, ohne etwas zu bauen"
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Installiere fehlende Abhängigkeiten mit Pacman"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Lässt makepkg als Root-Nutzer laufen"
 
-#: scripts/makepkg.sh.in:1077
-msgid "      --holdver    Prevent automatic version bumping for development PKGBUILDs"
-msgstr "      --holdver    Verhindert, dass die Auto-Version sich mit dev-PKGBUILDS beisst"
+#: scripts/makepkg.sh.in:1093
+msgid ""
+"      --holdver    Prevent automatic version bumping for development "
+"PKGBUILDs"
+msgstr ""
+"      --holdver    Verhindert, dass die Auto-Version sich mit dev-PKGBUILDS "
+"beisst"
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr "      --source     Baue kein Paket, erstelle nur Quell-Tarball"
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr "Diese Optionen können an pacman weitergegeben werden:"
 
-#: scripts/makepkg.sh.in:1082
-msgid "      --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr "      --noconfirm      Niemals nach einer Bestätigung fragen, wenn Abhängigkeiten aufgelöst werden"
+#: scripts/makepkg.sh.in:1098
+msgid ""
+"      --noconfirm      Do not ask for confirmation when resolving "
+"dependencies"
+msgstr ""
+"      --noconfirm      Niemals nach einer Bestätigung fragen, wenn "
+"Abhängigkeiten aufgelöst werden"
 
-#: scripts/makepkg.sh.in:1083
-msgid "      --noprogressbar  Do not show a progress bar when downloading files"
-msgstr "      --noprogressbar  Keine Fortschrittsanzeige anzeigen, wenn Dateien heruntergeladen werden"
+#: scripts/makepkg.sh.in:1099
+msgid ""
+"      --noprogressbar  Do not show a progress bar when downloading files"
+msgstr ""
+"      --noprogressbar  Keine Fortschrittsanzeige anzeigen, wenn Dateien "
+"heruntergeladen werden"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "Wenn -p nicht spezifiziert ist, wird makepkg nach '%s' suchen"
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr "%s nicht gefunden."
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
-msgstr "Sudo wird nun als Standard verwendet. Die Option --usesudo ist veraltet!"
+msgstr ""
+"Sudo wird nun als Standard verwendet. Die Option --usesudo ist veraltet!"
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
-msgstr "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
+msgstr ""
+"\\0--holdver und --forcever können nicht beide gleichzeitig benutzt werden"
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr "Räume ALLE Dateien aus %s."
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr "    Sind Sie sicher, dass Sie dies tun möchten? [J/n]"
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
-msgstr "Problem beim Entfernen von Dateien; vielleicht haben Sie nicht die nötigen Berechtigungen für %s"
+msgstr ""
+"Problem beim Entfernen von Dateien; vielleicht haben Sie nicht die nötigen "
+"Berechtigungen für %s"
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr "Quell-Puffer gesäubert."
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr "Keine Dateien wurden entfernt."
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr "Der Zielpfad der Quelle muss in makepkg.conf definiert werden."
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
-msgstr "Zusätzlich lassen Sie bitte makepkg -C außerhalb ihres Puffer-Verzeichnisses laufen."
+msgstr ""
+"Zusätzlich lassen Sie bitte makepkg -C außerhalb ihres Puffer-Verzeichnisses "
+"laufen."
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
-msgstr "BUILDSCRIPT ist nicht definiert! Stellen Sie sicher, dass %s aktualisiert wurde."
+msgstr ""
+"BUILDSCRIPT ist nicht definiert! Stellen Sie sicher, dass %s aktualisiert "
+"wurde."
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr "Makepkg als Root laufen zu lassen, ist eine SCHLECHTE"
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr "Idee, die dauerhaften Schaden auf Ihrem System anrichten kann."
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr "Möchten Sie dies als Root tun, benutzen Sie bitte die Option --asroot."
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr "Die Option --asroot ist nur für den Root-Benutzer gedacht."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr "Bitte starten Sie makepkg erneut, jedoch ohne --asroot."
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
-msgstr "Fakeroot muss installiert werden, bevor Sie die 'fakeroot'-Option nutzen können."
+msgstr ""
+"Fakeroot muss installiert werden, bevor Sie die 'fakeroot'-Option nutzen "
+"können."
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr "in der BUILDENV Sektion in %s. "
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
-msgstr "Läßt man makepkg als normaler Nutzer laufen, werden die gepackten Dateien"
+msgstr ""
+"Läßt man makepkg als normaler Nutzer laufen, werden die gepackten Dateien"
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr "nicht Root gehören. Nutzen Sie die fakeroot-Umgebung, indem Sie"
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr "'fakeroot' in der BUILDENV-Sektion von makepkg.conf angeben."
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
-msgstr "Benutzen Sie nicht die Option '-F'. Diese Option ist nur für die Verwendung durch makepkg gedacht."
+msgstr ""
+"Benutzen Sie nicht die Option '-F'. Diese Option ist nur für die Verwendung "
+"durch makepkg gedacht."
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr "Konnte die sudo-Binärdatei nicht finden! Ist sudo installiert?"
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
-msgstr "Fehlende Abhängigkeiten können nicht als normaler Benutzer installiert oder entfernt werden"
+msgstr ""
+"Fehlende Abhängigkeiten können nicht als normaler Benutzer installiert oder "
+"entfernt werden"
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
-msgstr "ohne sudo: Installieren und konfigurieren Sie sudo, um Abhängigkeiten automatisch aufzulösen."
+msgstr ""
+"ohne sudo: Installieren und konfigurieren Sie sudo, um Abhängigkeiten "
+"automatisch aufzulösen."
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr "%s existiert nicht."
 
-#: scripts/makepkg.sh.in:1285
-#: scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
 msgstr "%s darf nicht leer sein."
 
-#: scripts/makepkg.sh.in:1297
-#: scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s darf keine Bindestriche enthalten."
 
-#: scripts/makepkg.sh.in:1311
-#: scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s steht für die '%s'-Architektur nicht zur Verfügung."
 
-#: scripts/makepkg.sh.in:1312
-#: scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
-msgstr "Beachten Sie, dass bei vielen Paketen eine Zeile zu %s hinzugefügt werden muss."
+msgstr ""
+"Beachten Sie, dass bei vielen Paketen eine Zeile zu %s hinzugefügt werden "
+"muss."
 
-#: scripts/makepkg.sh.in:1313
-#: scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr "so wie arch=('%s')"
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Installations-Skript (%s) existiert nicht."
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr "Es wurde bereits ein Paket gebaut, installiere existierendes Paket..."
 
-#: scripts/makepkg.sh.in:1341
-#: scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "Es wurde bereits ein Paket gebaut. (Benutzen Sie -f zum überschreiben)"
 
-#: scripts/makepkg.sh.in:1350
-#: scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr "Überspringe Build."
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr "Verlasse fakeroot-Umgebung."
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr "Erstelle Paket: %s"
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr "Lasse makepkg als Root laufen..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr "Quell-Paket erstellt: %s"
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr "Überspringe Abhängigkeits-Prüfungen."
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr "Prüfe Laufzeit-Abhängigkeiten... "
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr "Prüfe Buildtime-Abhängigkeiten... "
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr "Konnte nicht alle Abhängigkeiten auflösen."
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
-msgstr "pacman wurde nicht in PATH gefunden; überspringe Abhängigkeits-Prüfungen."
+msgstr ""
+"pacman wurde nicht in PATH gefunden; überspringe Abhängigkeits-Prüfungen."
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
-msgstr "Überspringe Abholen der Quellen        -- verwende bestehenden src/ Baum"
+msgstr ""
+"Überspringe Abholen der Quellen        -- verwende bestehenden src/ Baum"
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
-msgstr "Überspringe Integritäts-Prüfung der Quellen -- verwende bestehenden src/ Baum"
+msgstr ""
+"Überspringe Integritäts-Prüfung der Quellen -- verwende bestehenden src/ Baum"
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
-msgstr "Überspringe Entpacken der Quellen       -- verwende bestehenden src/ Baum"
+msgstr ""
+"Überspringe Entpacken der Quellen       -- verwende bestehenden src/ Baum"
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "Das Quell-Verzeichnis ist leer, es kann nichts gebaut werden!"
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr "Das Paket-Verzeichnis ist leer, es kann nichts neu gepackt werden!"
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr "Quellen sind fertig."
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr "Entferne existierendes pkg/ Verzeichnis ..."
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr "Betrete fakeroot-Umgebung ..."
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr "Beendete make: %s"
 
@@ -1858,29 +1886,28 @@ msgstr "Verwendung: %s [pacman_db_root]"
 
 #: scripts/pacman-optimize.sh.in:43
 msgid ""
-"pacman-optimize is a little hack that should improve the performance\\n"
-"of pacman when reading/writing to its filesystem-based database.\\n"
-"\\n"
+"pacman-optimize is a little hack that should improve the performance\\nof "
+"pacman when reading/writing to its filesystem-based database.\\n\\n"
 msgstr ""
-"pacman-optimize ist ein kleines Skript, das die Performanz von Pacman\\n"
-"verbessert, wenn die Dateisystem-basierte Datenbank gelesen/beschrieben wird.\\n"
-"\\n"
+"pacman-optimize ist ein kleines Skript, das die Performanz von Pacman"
+"\\nverbessert, wenn die Dateisystem-basierte Datenbank gelesen/beschrieben "
+"wird.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:46
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\n"
-"there is a tendency for these files to become fragmented over time.\\n"
-"This script attempts to relocate these small files into one\\n"
-"continuous location on your hard drive. The result is that the hard\\n"
-"drive should be able to read them faster, since the hard drive head\\n"
-"does not have to move around the disk as much.\\n"
-msgstr ""
-"Da Pacman viele kleine Dateien verwendet, um Pakete zu verfolgen,\\n"
-"tendieren diese Dateien im Laufe der Zeit dazu, zu fragmentieren.\\n"
-"Dieses Skript versucht, diese kleinen Dateien an einem Ort auf Ihrer\\n"
-"Festplatte zu versammeln. Als Ergebnis kann die Festplatte sie\\n"
-"schneller auslesen, da der Kopf der Festplatte nicht so viel umher-\\n"
-"wandern muss.\\n"
+"Because pacman uses many small files to keep track of packages,\\nthere is a "
+"tendency for these files to become fragmented over time.\\nThis script "
+"attempts to relocate these small files into one\\ncontinuous location on "
+"your hard drive. The result is that the hard\\ndrive should be able to read "
+"them faster, since the hard drive head\\ndoes not have to move around the "
+"disk as much.\\n"
+msgstr ""
+"Da Pacman viele kleine Dateien verwendet, um Pakete zu verfolgen,"
+"\\ntendieren diese Dateien im Laufe der Zeit dazu, zu fragmentieren."
+"\\nDieses Skript versucht, diese kleinen Dateien an einem Ort auf Ihrer"
+"\\nFestplatte zu versammeln. Als Ergebnis kann die Festplatte sie"
+"\\nschneller auslesen, da der Kopf der Festplatte nicht so viel umher-"
+"\\nwandern muss.\\n"
 
 #: scripts/pacman-optimize.sh.in:89
 msgid "diff tool was not found, please install diffutils."
@@ -1888,7 +1915,8 @@ msgstr "Diff-Werkzeug nicht gefunden, bitte diffutils installieren."
 
 #: scripts/pacman-optimize.sh.in:94
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr "Pacman Sperr-Datei gefunden. Kann nicht arbeiten, während Pacman läuft."
+msgstr ""
+"Pacman Sperr-Datei gefunden. Kann nicht arbeiten, während Pacman läuft."
 
 #: scripts/pacman-optimize.sh.in:98
 msgid "%s does not exist or is not a directory."
@@ -1896,11 +1924,14 @@ msgstr "%s existiert nicht oder ist kein Verzeichnis"
 
 #: scripts/pacman-optimize.sh.in:102
 msgid "You must have correct permissions to optimize the database."
-msgstr "Sie müssen über die nötigen Rechte verfügen, um die Datenbank zu optimieren."
+msgstr ""
+"Sie müssen über die nötigen Rechte verfügen, um die Datenbank zu optimieren."
 
 #: scripts/pacman-optimize.sh.in:106
 msgid "ERROR: Can not create temp directory for database building."
-msgstr "FEHLER: Konnte kein temporäres Verzeichnis für den Aufbau der Datenbank erstellen."
+msgstr ""
+"FEHLER: Konnte kein temporäres Verzeichnis für den Aufbau der Datenbank "
+"erstellen."
 
 #: scripts/pacman-optimize.sh.in:112
 msgid "MD5sum'ing the old database..."
@@ -1940,36 +1971,31 @@ msgstr "Fertig. Ihre Pacman-Datenbank wurde optimiert."
 
 #: scripts/pacman-optimize.sh.in:157
 msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr "Für alle Vorteile von pacman-optimize, führen Sie nun ein 'sync' durch."
+msgstr ""
+"Für alle Vorteile von pacman-optimize, führen Sie nun ein 'sync' durch."
 
 #: scripts/repo-add.sh.in:57
-msgid ""
-"Usage: %s <path-to-db> [--force] <package> ...\\n"
-"\\n"
-msgstr ""
-"Verwendung: %s <Pfad-zur-DB> [--force] <Paket> ...\\n"
-"\\n"
+msgid "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
+msgstr "Verwendung: %s <Pfad-zur-DB> [--force] <Paket> ...\\n\\n"
 
 #: scripts/repo-add.sh.in:58
 msgid ""
-"repo-add will update a package database by reading a package file.\\n"
-"Multiple packages to add can be specified on the command line.\\n"
-"\\n"
+"repo-add will update a package database by reading a package file."
+"\\nMultiple packages to add can be specified on the command line.\\n\\n"
 msgstr ""
-"repo-add wird eine Paket-DB aktualisieren, indem es eine Paket-Datei liest.\\n"
-"Mehrere Pakete zum Hinzufügen können über Kommandozeile spezifiziert werden.\\n"
-"\\n"
+"repo-add wird eine Paket-DB aktualisieren, indem es eine Paket-Datei liest."
+"\\nMehrere Pakete zum Hinzufügen können über Kommandozeile spezifiziert "
+"werden.\\n\\n"
 
 #: scripts/repo-add.sh.in:61
 msgid ""
-"The --force flag will add a 'force' entry to the sync database, which\\n"
-"tells pacman to skip its internal version number checking and update\\n"
-"the package regardless.\\n"
-"\\n"
+"The --force flag will add a 'force' entry to the sync database, which"
+"\\ntells pacman to skip its internal version number checking and update"
+"\\nthe package regardless.\\n\\n"
 msgstr ""
-"Das -- force Flag wird einen 'force'-Eintrag zur Sync-DB hinzufügen,\\n"
-"der Pacman anweist, die interne Prüfung der Versions-Nummer zu\\n"
-"überspringen und ohne Rücksicht darauf zu aktualisieren.\\n"
+"Das -- force Flag wird einen 'force'-Eintrag zur Sync-DB hinzufügen,\\nder "
+"Pacman anweist, die interne Prüfung der Versions-Nummer zu\\nüberspringen "
+"und ohne Rücksicht darauf zu aktualisieren.\\n"
 
 #: scripts/repo-add.sh.in:65
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
@@ -1977,22 +2003,19 @@ msgstr "Beispiel: repo-add /Pfad/zum/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 
 #: scripts/repo-add.sh.in:70
 msgid ""
-"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
 msgstr ""
-"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n"
-"\\n"
-"Dies ist freie Software, siehe Quellcode für Kopierbedingungen.\\n"
-"Es gibt KEINERLEI GARANTIE, soweit das Gesetz dies erlaubt.\\n"
+"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nDies ist freie "
+"Software, siehe Quellcode für Kopierbedingungen.\\nEs gibt KEINERLEI "
+"GARANTIE, soweit das Gesetz dies erlaubt.\\n"
 
 #: scripts/repo-add.sh.in:174
 msgid "Invalid package file '%s'."
 msgstr "Ungültige Paket-Datei '%s'."
 
-#: scripts/repo-add.sh.in:183
-#: scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr "Entferne existierendes Paket '%s'..."
 
@@ -2020,23 +2043,19 @@ msgstr "Habe Delta '%s' hinzugefügt"
 msgid "Could not add delta '%s'"
 msgstr "Konnte Delta '%s' nicht hinzufügen"
 
-#: scripts/repo-add.sh.in:277
-#: scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr "%s nicht gefunden. Kann nicht fortfahren."
 
-#: scripts/repo-add.sh.in:287
-#: scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr "Kann kein temporäres Verzeichnis zum Aufbau der Datenbank erstellen."
 
-#: scripts/repo-add.sh.in:298
-#: scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Repositorien-Datei '%s' ist keine korrekte pacman-Datenbank."
 
-#: scripts/repo-add.sh.in:301
-#: scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr "Entpacke Datenbasis an einen temporären Ort..."
 
@@ -2056,130 +2075,126 @@ msgstr "Paket '%s' wurde nicht gefunden."
 msgid "Creating updated database file %s"
 msgstr "Erstelle aktualisierte Datenbank-Datei %s"
 
-#: scripts/repo-add.sh.in:333
-#: scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr "Kein Komprimierungs-Satz."
 
-#: scripts/repo-add.sh.in:341
-#: scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr "Keine Pakete modifiziert, ich kann nichts machen."
 
+#: scripts/repo-remove.sh.in:52
+msgid "repo-remove %s\\n\\n"
+msgstr "repo-remove %s\\n\\n"
+
 #: scripts/repo-remove.sh.in:53
-msgid ""
-"repo-remove %s\\n"
-"\\n"
-msgstr ""
-"repo-remove %s\\n"
-"\\n"
+msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
+msgstr "Verwendung: %s <Pfad-zur-Datenbank> <Paketname> ...\\n\\n"
 
 #: scripts/repo-remove.sh.in:54
 msgid ""
-"usage: %s <path-to-db> <packagename> ...\\n"
-"\\n"
-msgstr ""
-"Verwendung: %s <Pfad-zur-Datenbank> <Paketname> ...\\n"
-"\\n"
-
-#: scripts/repo-remove.sh.in:55
-msgid ""
-"repo-remove will update a package database by removing the package name\\n"
-"specified on the command line from the given repo database. Multiple\\n"
-"packages to remove can be specified on the command line.\\n"
-"\\n"
+"repo-remove will update a package database by removing the package name"
+"\\nspecified on the command line from the given repo database. Multiple"
+"\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
-"repo-add wird eine Paket-DB aktualisieren, indem es den auf der Kommando-\\n"
-"zeile der jeweiligen Repo-DB angegebenen Paket-Namen entfernt. Mehrere\\n"
-"Pakete zum Entfernen können auf der Kommandozeile angegeben werden.\\n"
-"\\n"
+"repo-remove wird eine Paket-DB aktualisieren, indem es den auf der Kommando-"
+"\\nzeile der jeweiligen Repo-DB angegebenen Paket-Namen entfernt. Mehrere"
+"\\nPakete zum Entfernen können auf der Kommandozeile angegeben werden.\\n\\n"
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "Beispiel: repo-remove /Pfad/zum/Repo.db.tar.gz kernel26"
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
 msgstr "Suche nach Paket '%s'..."
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr "Paket, das '%s' entspricht wurde nicht gefunden."
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr "Erstelle aktualisierte Datenbank-Datei '%s'..."
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr "Alle Pakete wurden von der Datenbank entfernt. Lösche '%s'."
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr "Verwendung: %s <Vorgang> <destfile> <Option> [Paket_Verzeichnis]"
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
-"updatesync will update a sync database by reading a PKGBUILD and\\n"
-"modifying the destfile. updatesync updates the database in a temporary\\n"
-"directory and then compresses it to <destfile>.\\n"
-"\\n"
+"updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
+"the destfile. updatesync updates the database in a temporary\\ndirectory and "
+"then compresses it to <destfile>.\\n\\n"
 msgstr ""
-"updatesync wird die Sync-DB aktualisieren, indem es ein PKGBUILD liest\\n"
-"und die Zieldatei modfiziert. updatesync aktualisiert die DB in einem\\n"
-"temp-Verzeichnis und komprimiert sie dann nach <destfile>.\\n"
-"\\n"
+"updatesync wird die Sync-DB aktualisieren, indem es ein PKGBUILD liest\\nund "
+"die Zieldatei modfiziert. updatesync aktualisiert die DB in einem\\ntemp-"
+"Verzeichnis und komprimiert sie dann nach <destfile>.\\n\\n"
 
-#: scripts/updatesync.sh.in:38
-msgid ""
-"There are two types of actions:\\n"
-"\\n"
-msgstr ""
-"Es gibt zwei Arten von Vorgängen:\\n"
-"\\n"
+#: scripts/updatesync.sh.in:41
+msgid "There are two types of actions:\\n\\n"
+msgstr "Es gibt zwei Arten von Vorgängen:\\n\\n"
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
-"upd - Will update a package's entry or create it if it doesn't exist.\\n"
-"      It takes the package's PKGBUILD as an option.\\n"
+"upd - Will update a package's entry or create it if it doesn't exist."
+"\\n      It takes the package's PKGBUILD as an option.\\n"
 msgstr ""
-"upd - Erstellt oder aktualisiert den Eintrag für ein Paket.\\n"
-"      Verwendet das PKGBUILD des Paketes als Option.\\n"
+"upd - Erstellt oder aktualisiert den Eintrag für ein Paket.\\n      "
+"Verwendet das PKGBUILD des Paketes als Option.\\n"
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
-"del - Will remove a package's entry from the db. It takes the package's\\n"
-"      name as an option.\\n"
+"del - Will remove a package's entry from the db. It takes the package's"
+"\\n      name as an option.\\n"
 msgstr ""
-"del - Entfernt den Eintrag für ein Paket aus der Datenbank.\\n"
-"      Verwendet den Namen des Paketes als Option.\\n"
+"del - Entfernt den Eintrag für ein Paket aus der Datenbank.\\n      "
+"Verwendet den Namen des Paketes als Option.\\n"
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
-"updatesync will calculate md5sums of packages in the same directory as\\n"
-"<destfile>, unless an alternate [package_directory] is specified.\\n"
-"\\n"
+"updatesync will calculate md5sums of packages in the same directory as"
+"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
-"updatesync wird die MD5-Summen der Pakete im gleichen Verzeichnis wie\\n"
-"<destfile> errechnen, wenn kein anderes [Paket_Verzeichnis] angegeben ist.\\n"
-"\\n"
+"updatesync wird die MD5-Summen der Pakete im gleichen Verzeichnis wie"
+"\\n<destfile> errechnen, wenn kein anderes [Paket_Verzeichnis] angegeben ist."
+"\\n\\n"
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr "Beispiel:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
-"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
 msgstr ""
-"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n"
-"\\n"
-"Dies ist freie Software, siehe Quellcode für Kopierbedingungen.\\n"
-"Es gibt KEINERLEI GARANTIE, soweit das Gesetz dies erlaubt.\\n"
+"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nDies ist freie "
+"Software, siehe Quellcode für Kopierbedingungen.\\nEs gibt KEINERLEI "
+"GARANTIE, soweit das Gesetz dies erlaubt.\\n"
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr "Konnte %s-%s-%s-%s nicht finden %s - Breche ab"
+
+#~ msgid "error: failed to add target '%s' (%s)"
+#~ msgstr "Fehler: Konnte Ziel-Datei '%s' nicht hinzufügen (%s)"
+
+#~ msgid ":: %s: conflicts with %s"
+#~ msgstr ":: %s: steht im Konflikt mit %s"
+
+#~ msgid "error: failed to add target '%s' (%s)\n"
+#~ msgstr "Fehler: Konnte das Ziel '%s' nicht hinzufügen (%s)\n"
+
+#~ msgid ":: Cancel current operation? [Y/n] "
+#~ msgstr ":: Laufenden Vorgang beenden? [J/n]"
+
diff --git a/po/en_GB.po b/po/en_GB.po
index b4a2f3c9..b2ce994e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
-"PO-Revision-Date: 2008-01-16 10:39+1000\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
+"PO-Revision-Date: 2008-02-11 17:42+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,28 +16,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/pacman/add.c:40
-#: src/pacman/remove.c:42
+#: src/pacman/add.c:40 src/pacman/remove.c:42
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "failed to release transaction (%s)\n"
 
-#: src/pacman/add.c:77
-#: src/pacman/query.c:363
-#: src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "no targets specified (use -h for help)\n"
 
-#: src/pacman/add.c:104
-#: src/pacman/sync.c:510
+#: src/pacman/add.c:104 src/pacman/sync.c:510
 #, c-format
 msgid "error: %s\n"
 msgstr "error: %s\n"
 
-#: src/pacman/add.c:107
-#: src/pacman/remove.c:98
-#: src/pacman/sync.c:484
+#: src/pacman/add.c:107 src/pacman/remove.c:98 src/pacman/sync.c:484
 #, c-format
 msgid ""
 "  if you're sure a package manager is not already\n"
@@ -46,57 +40,48 @@ msgstr ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s.\n"
 
-#: src/pacman/add.c:114
-#: src/pacman/remove.c:106
+#: src/pacman/add.c:114 src/pacman/remove.c:106
 #, c-format
 msgid "loading package data... "
 msgstr "loading package data... "
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "error: failed to add target '%s' (%s)"
+msgid "error: '%s': %s\n"
+msgstr "error: '%s': %s\n"
 
-#: src/pacman/add.c:124
-#: src/pacman/remove.c:118
-#: src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "done.\n"
 
-#: src/pacman/add.c:129
-#: src/pacman/remove.c:122
-#: src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr "error: failed to prepare transaction (%s)\n"
 
-#: src/pacman/add.c:141
-#: src/pacman/remove.c:130
-#: src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: requires %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: conflicts with %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: conflicts with %s\n"
 
-#: src/pacman/add.c:158
-#: src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s exists in both '%s' and '%s'\n"
 
-#: src/pacman/add.c:164
-#: src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s exists in filesystem\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -105,9 +90,7 @@ msgstr ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
 
-#: src/pacman/add.c:183
-#: src/pacman/remove.c:168
-#: src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr "error: failed to commit transaction (%s)\n"
@@ -184,8 +167,12 @@ msgstr ":: Retrieving packages from %s...\n"
 
 #: src/pacman/callback.c:265
 #, c-format
-msgid ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
-msgstr ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
+msgid ""
+":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
+"n] "
+msgstr ""
+":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
+"n] "
 
 #: src/pacman/callback.c:270
 #, c-format
@@ -204,12 +191,8 @@ msgstr ":: Replace %s with %s/%s? [Y/n] "
 
 #: src/pacman/callback.c:288
 #, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
-msgstr ""
-"Replacing %s with %s/%s\n"
-"."
+msgid "Replacing %s with %s/%s\n"
+msgstr "Replacing %s with %s/%s\n"
 
 #: src/pacman/callback.c:296
 #, c-format
@@ -425,37 +408,35 @@ msgstr ""
 "\n"
 "use '%s --help' with other options for more syntax\n"
 
-#: src/pacman/pacman.c:81
-#: src/pacman/pacman.c:95
-#: src/pacman/pacman.c:117
+#: src/pacman/pacman.c:81 src/pacman/pacman.c:95 src/pacman/pacman.c:117
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
 msgstr "      --asdeps         install packages as non-explicitly installed\n"
 
-#: src/pacman/pacman.c:82
-#: src/pacman/pacman.c:88
-#: src/pacman/pacman.c:96
+#: src/pacman/pacman.c:82 src/pacman/pacman.c:88 src/pacman/pacman.c:96
 #: src/pacman/pacman.c:119
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps         skip dependency checks\n"
 
-#: src/pacman/pacman.c:83
-#: src/pacman/pacman.c:97
-#: src/pacman/pacman.c:121
+#: src/pacman/pacman.c:83 src/pacman/pacman.c:97 src/pacman/pacman.c:121
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr "  -f, --force          force install, overwrite conflicting files\n"
 
 #: src/pacman/pacman.c:87
 #, c-format
-msgid "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade        remove packages and all packages that depend on them\n"
+msgid ""
+"  -c, --cascade        remove packages and all packages that depend on them\n"
+msgstr ""
+"  -c, --cascade        remove packages and all packages that depend on them\n"
 
 #: src/pacman/pacman.c:89
 #, c-format
-msgid "  -k, --dbonly         only remove database entry, do not remove files\n"
-msgstr "  -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         only remove database entry, do not remove files\n"
 
 #: src/pacman/pacman.c:90
 #, c-format
@@ -464,8 +445,10 @@ msgstr "  -n, --nosave         remove configuration files as well\n"
 
 #: src/pacman/pacman.c:91
 #, c-format
-msgid "  -s, --recursive      remove dependencies also (that won't break packages)\n"
-msgstr "  -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      remove dependencies also (that won't break packages)\n"
 
 #: src/pacman/pacman.c:101
 #, c-format
@@ -482,16 +465,17 @@ msgstr "  -d, --deps           list all packages installed as dependencies\n"
 msgid "  -e, --explicit       list all packages explicitly installed\n"
 msgstr "  -e, --explicit       list all packages explicitly installed\n"
 
-#: src/pacman/pacman.c:104
-#: src/pacman/pacman.c:122
+#: src/pacman/pacman.c:104 src/pacman/pacman.c:122
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
 msgstr "  -g, --groups         view all members of a package group\n"
 
 #: src/pacman/pacman.c:105
 #, c-format
-msgid "  -i, --info           view package information (-ii for backup files)\n"
-msgstr "  -i, --info           view package information (-ii for backup files)\n"
+msgid ""
+"  -i, --info           view package information (-ii for backup files)\n"
+msgstr ""
+"  -i, --info           view package information (-ii for backup files)\n"
 
 #: src/pacman/pacman.c:106
 #, c-format
@@ -500,7 +484,8 @@ msgstr "  -l, --list           list the contents of the queried package\n"
 
 #: src/pacman/pacman.c:107
 #, 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        list installed packages not found in sync db(s)\n"
 "(s)\n"
@@ -517,8 +502,12 @@ msgstr "  -p, --file <package> query a package file instead of the database\n"
 
 #: src/pacman/pacman.c:110
 #, c-format
-msgid "  -s, --search <regex> search locally-installed packages for matching strings\n"
-msgstr "  -s, --search <regex> search locally-installed packages for matching strings\n"
+msgid ""
+"  -s, --search <regex> search locally-installed packages for matching "
+"strings\n"
+msgstr ""
+"  -s, --search <regex> search locally-installed packages for matching "
+"strings\n"
 
 #: src/pacman/pacman.c:111
 #, c-format
@@ -537,8 +526,12 @@ msgstr "  -q, --quiet          show less information for query and search\n"
 
 #: src/pacman/pacman.c:118
 #, c-format
-msgid "  -c, --clean          remove old packages from cache directory (-cc for all)\n"
-msgstr "  -c, --clean          remove old packages from cache directory (-cc for all)\n"
+msgid ""
+"  -c, --clean          remove old packages from cache directory (-cc for "
+"all)\n"
+msgstr ""
+"  -c, --clean          remove old packages from cache directory (-cc for "
+"all)\n"
 
 #: src/pacman/pacman.c:120
 #, c-format
@@ -557,13 +550,19 @@ msgstr "  -l, --list <repo>    view a list of packages in a repo\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
-msgid "  -p, --print-uris     print out URIs for given packages and their dependencies\n"
-msgstr "  -p, --print-uris     print out URIs for given packages and their dependencies\n"
+msgid ""
+"  -p, --print-uris     print out URIs for given packages and their "
+"dependencies\n"
+msgstr ""
+"  -p, --print-uris     print out URIs for given packages and their "
+"dependencies\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
-msgid "  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr "  -s, --search <regex> search remote repositories for matching strings\n"
+msgid ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
 
 #: src/pacman/pacman.c:127
 #, c-format
@@ -572,23 +571,35 @@ msgstr "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 
 #: src/pacman/pacman.c:128
 #, c-format
-msgid "  -w, --downloadonly   download packages but do not install/upgrade anything\n"
-msgstr "  -w, --downloadonly   download packages but do not install/upgrade anything\n"
+msgid ""
+"  -w, --downloadonly   download packages but do not install/upgrade "
+"anything\n"
+msgstr ""
+"  -w, --downloadonly   download packages but do not install/upgrade "
+"anything\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
-msgid "  -y, --refresh        download fresh package databases from the server\n"
-msgstr "  -y, --refresh        download fresh package databases from the server\n"
+msgid ""
+"  -y, --refresh        download fresh package databases from the server\n"
+msgstr ""
+"  -y, --refresh        download fresh package databases from the server\n"
 
 #: src/pacman/pacman.c:130
 #, c-format
-msgid "      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr "      --needed         only upgrade outdated or not yet installed packages\n"
+msgid ""
+"      --needed         only upgrade outdated or not yet installed packages\n"
+msgstr ""
+"      --needed         only upgrade outdated or not yet installed packages\n"
 
 #: src/pacman/pacman.c:131
 #, c-format
-msgid "      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"
-msgstr "      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"
+msgid ""
+"      --ignore <pkg>   ignore a package upgrade (can be used more than "
+"once)\n"
+msgstr ""
+"      --ignore <pkg>   ignore a package upgrade (can be used more than "
+"once)\n"
 
 #: src/pacman/pacman.c:132
 #, c-format
@@ -621,13 +632,17 @@ msgstr "      --noconfirm      do not ask for any confirmation\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
-msgid "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr "      --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  do not show a progress bar when downloading files\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
-msgid "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr "      --noscriptlet    do not execute the install scriptlet if one exists\n"
+msgid ""
+"      --noscriptlet    do not execute the install scriptlet if one exists\n"
+msgstr ""
+"      --noscriptlet    do not execute the install scriptlet if one exists\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
@@ -678,8 +693,7 @@ msgstr "problem setting logfile '%s' (%s)\n"
 msgid "'%s' is not a valid debug level\n"
 msgstr "'%s' is not a valid debug level\n"
 
-#: src/pacman/pacman.c:396
-#: src/pacman/pacman.c:672
+#: src/pacman/pacman.c:396 src/pacman/pacman.c:672
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
 msgstr "problem adding cachedir '%s' (%s)\n"
@@ -708,9 +722,7 @@ msgstr "config file %s, line %d: syntax error in config file- missing key.\n"
 msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr "config file %s, line %d: All directives must belong to a section.\n"
 
-#: src/pacman/pacman.c:638
-#: src/pacman/pacman.c:692
-#: src/pacman/pacman.c:707
+#: src/pacman/pacman.c:638 src/pacman/pacman.c:692 src/pacman/pacman.c:707
 #, c-format
 msgid "config file %s, line %d: directive '%s' not recognized.\n"
 msgstr "config file %s, line %d: directive '%s' not recognised.\n"
@@ -738,52 +750,51 @@ msgstr "no operation specified (use -h for help)\n"
 msgid "error: no file was specified for --owns\n"
 msgstr "error: no file was specified for --owns\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "error: failed to read file '%s': %s\n"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "error: cannot determine ownership of a directory\n"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "error: cannot determine real path for '%s': %s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s is owned by %s %s\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
 msgstr "error: No package owns %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "error: group \"%s\" was not found\n"
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
 msgstr "Checking for package upgrades... \n"
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
 msgstr "no upgrades found.\n"
 
-#: src/pacman/query.c:353
-#: src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "no usable package repositories configured.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "error: package \"%s\" not found\n"
@@ -802,20 +813,12 @@ msgstr "    Remove whole content? [Y/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Remove %s from group %s? [Y/n] "
 
-#: src/pacman/remove.c:95
-#: src/pacman/sync.c:481
-#: src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "error: failed to init transaction (%s)\n"
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "error: failed to add target '%s' (%s)\n"
-
-#: src/pacman/remove.c:155
-#: src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Targets:"
 
@@ -856,8 +859,7 @@ msgstr "Do you want to remove unused repositories? [Y/n] "
 msgid "Database directory cleaned up\n"
 msgstr "Database directory cleaned up\n"
 
-#: src/pacman/sync.c:132
-#: src/pacman/sync.c:179
+#: src/pacman/sync.c:132 src/pacman/sync.c:179
 #, c-format
 msgid "Cache directory: %s\n"
 msgstr "Cache directory: %s\n"
@@ -947,170 +949,142 @@ msgstr ":: Starting full system upgrade...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ":: pacman has detected a newer version of itself.\n"
+
+#: src/pacman/sync.c:530
 msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
-
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Cancel current operation? [Y/n] "
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 
-#: src/pacman/sync.c:536
-#: src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "error: failed to release transaction (%s)\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr "error: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "error: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ":: group %s (including ignored packages):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Install whole content? [Y/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Install %s from group %s? [Y/n] "
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, c-format
 msgid "Warning: %s provides %s\n"
 msgstr "Warning: %s provides %s\n"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr "error: several packages provide %s, please specify one :\n"
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr "error: '%s': not found in sync db\n"
 
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: conflicts with %s\n"
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr " local database is up to date\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
 msgstr "Beginning download...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "Proceed with download? [Y/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
 msgstr "Beginning upgrade process...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "Proceed with installation? [Y/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr "Errors occurred, no packages were upgraded.\n"
 
-#: src/pacman/util.c:354
-#: src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "None\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Remove:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Total Removed Size:   %.2f MB\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
 msgstr "Total Download Size:    %.2f MB\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Total Installed Size:   %.2f MB\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "Y"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "YES"
 
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr "debug: %s"
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr "error: %s"
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
 msgstr "warning: %s"
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
 msgstr "function: %s"
 
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr "debug: "
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "warning: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
 msgstr "function: "
@@ -1119,100 +1093,93 @@ msgstr "function: "
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr "Usage: %s <root> <destfile> [package_directory]"
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
 msgid ""
-"gensync will generate a sync database by reading all PKGBUILD files\\n"
-"from <root>. gensync builds the database in a temporary directory\\n"
-"and then compresses it to <destfile>.\\n"
-"\\n"
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
 msgstr ""
-"gensync will generate a sync database by reading all PKGBUILD files\\n"
-"from <root>. gensync builds the database in a temporary directory\\n"
-"and then compresses it to <destfile>.\\n"
-"\\n"
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:36
 msgid ""
-"gensync will calculate md5sums of packages in the same directory as\\n"
-"<destfile>, unless an alternate [package_directory] is specified.\\n"
-"\\n"
+"gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
+"<root>. gensync builds the database in a temporary directory\\nand then "
+"compresses it to <destfile>.\\n\\n"
 msgstr ""
-"gensync will calculate md5sums of packages in the same directory as\\n"
-"<destfile>, unless an alternate [package_directory] is specified.\\n"
-"\\n"
+"gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
+"<root>. gensync builds the database in a temporary directory\\nand then "
+"compresses it to <destfile>.\\n\\n"
 
 #: scripts/gensync.sh.in:40
 msgid ""
-"note: The <destfile> name is important. It must be of the form\\n"
-"      {treename}.db.tar.gz where {treename} is the name of the custom\\n"
-"      package repository you configured in /etc/pacman.conf. The\\n"
-"      generated database must reside in the same directory as your\\n"
-"      custom packages (also configured in /etc/pacman.conf)\\n"
-"\\n"
+"gensync will calculate md5sums of packages in the same directory as"
+"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
+msgstr ""
+"gensync will calculate md5sums of packages in the same directory as"
+"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
+
+#: scripts/gensync.sh.in:43
+msgid ""
+"note: The <destfile> name is important. It must be of the form\\n      "
+"{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
+"package repository you configured in /etc/pacman.conf. The\\n      generated "
+"database must reside in the same directory as your\\n      custom packages "
+"(also configured in /etc/pacman.conf)\\n\\n"
 msgstr ""
-"note: The <destfile> name is important. It must be of the form\\n"
-"      {treename}.db.tar.gz where {treename} is the name of the custom\\n"
-"      package repository you configured in /etc/pacman.conf. The\\n"
-"      generated database must reside in the same directory as your\\n"
-"      custom packages (also configured in /etc/pacman.conf)\\n"
-"\\n"
-
-#: scripts/gensync.sh.in:46
+"note: The <destfile> name is important. It must be of the form\\n      "
+"{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
+"package repository you configured in /etc/pacman.conf. The\\n      generated "
+"database must reside in the same directory as your\\n      custom packages "
+"(also configured in /etc/pacman.conf)\\n\\n"
+
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 
-#: scripts/gensync.sh.in:51
-#: scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57
-#: scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
-"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
 msgstr ""
-"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
 
-#: scripts/gensync.sh.in:99
-#: scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr "%s not found. Can not continue."
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr "invalid root dir: %s"
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
 msgstr "gensync: building database entries, generating md5sums..."
 
-#: scripts/gensync.sh.in:128
-#: scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr "failed to parse %s"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr "could not find %s-%s-%s-%s%s - skipping"
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
 msgstr "creating repo DB..."
 
-#: scripts/makepkg.sh.in:100
-#: scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46
-#: scripts/repo-remove.sh.in:43
+#: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr "WARNING:"
 
-#: scripts/makepkg.sh.in:109
-#: scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51
-#: scripts/repo-remove.sh.in:48
+#: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr "ERROR:"
 
@@ -1221,8 +1188,12 @@ msgid "Cleaning up..."
 msgstr "Cleaning up..."
 
 #: scripts/makepkg.sh.in:192
-msgid "Options beginning with 'no' will be deprecated in the next version of makepkg!"
-msgstr "Options beginning with 'no' will be deprecated in the next version of makepkg!"
+msgid ""
+"Options beginning with 'no' will be deprecated in the next version of "
+"makepkg!"
+msgstr ""
+"Options beginning with 'no' will be deprecated in the next version of "
+"makepkg!"
 
 #: scripts/makepkg.sh.in:193
 msgid "Please replace 'no' with '!': %s -> %s."
@@ -1230,24 +1201,19 @@ msgstr "Please replace 'no' with '!': %s -> %s."
 
 #: scripts/makepkg.sh.in:197
 msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
-msgstr "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
+msgstr ""
+"Option 'keepdocs' may not work as intended. Please replace with 'docs'."
 
 #: scripts/makepkg.sh.in:285
 msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr "There is no agent set up to handle %s URLs. Check %s."
 
-#: scripts/makepkg.sh.in:286
-#: scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448
-#: scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522
-#: scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638
-#: scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775
-#: scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421
-#: scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr "Aborting..."
 
@@ -1307,539 +1273,546 @@ msgstr "Found %s in build dir"
 msgid "Using cached copy of %s"
 msgstr "Using cached copy of %s"
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr "%s was not found in the build directory and is not a URL."
+
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
 msgstr "Downloading %s..."
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr "Failure while downloading %s"
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr "Generating checksums for source files..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Invalid integrity algorithm '%s' specified."
 
-#: scripts/makepkg.sh.in:500
-#: scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr "Cannot find the '%s' program."
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
 msgstr "Unable to find source file %s to generate checksum."
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr "Invalid integrity algorithm '%s' specified"
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr "Validating source files with %s..."
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr "NOT FOUND"
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr "Passed"
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr "FAILED"
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr "One or more files did not pass the validity check!"
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr "Integrity checks (%s) are missing or incomplete."
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr "Extracting Sources..."
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr "Unable to find source file %s for extraction."
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr "Failed to extract %s"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr "Starting build()..."
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr "Build Failed."
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr "Tidying install..."
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr "Removing info/doc files..."
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr "Compressing man pages..."
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "Stripping debugging symbols from binaries and libraries..."
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr "Removing libtool .la files..."
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr "Removing empty directories..."
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr "Missing pkg/ directory."
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr "Creating package..."
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr "Generating .PKGINFO file..."
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr "Please add a license line to your %s!"
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Example for GPL'ed software: license=('GPL')."
 
-#: scripts/makepkg.sh.in:846
-#: scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr "Adding install script..."
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr "Adding package changelog..."
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
 msgstr "Compressing package..."
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr "Failed to create package file."
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr "Cannot find the xdelta binary! Is xdelta installed?"
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr "Making delta from version %s..."
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr "Recreating package tarball from delta to match md5 signatures"
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr "NOTE: the delta should ONLY be distributed with this tarball"
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr "Could not generate the package from the delta."
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr "Delta was not able to be created."
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr "No previous version found, skipping xdelta."
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr "Creating source package..."
 
-#: scripts/makepkg.sh.in:937
-#: scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr "Adding %s..."
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
 msgstr "Install script %s not found."
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr "Compressing source package..."
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr "Failed to create source package file."
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr "Determining latest darcs revision..."
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr "Determining latest cvs revision..."
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr "Determining latest git revision..."
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr "Determining latest svn revision..."
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr "Determining latest bzr revision..."
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr "Determining latest hg revision..."
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr "Version found: %s"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
 msgstr "Usage: %s [options]"
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr "Options:"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr "  -A, --ignorearch Ignore incomplete arch field in %s"
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr "  -b, --builddeps  Build missing dependencies from source"
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Clean up work files after build"
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache Clean up source files from the cache"
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     Skip all dependency checks"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      Overwrite existing package"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Generate integrity checks for source files"
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       This help"
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Install package after successful build"
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Log package build process"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Disable colourised output messages"
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Download and extract files only"
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr "  -p <buildscript> Use an alternate build script (instead of '%s')"
 
-#: scripts/makepkg.sh.in:1072
-msgid "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr "  -r, --rmdeps     Remove installed dependencies after a successful build"
+#: scripts/makepkg.sh.in:1088
+msgid ""
+"  -r, --rmdeps     Remove installed dependencies after a successful build"
+msgstr ""
+"  -r, --rmdeps     Remove installed dependencies after a successful build"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr "  -R, --repackage  Repackage contents of pkg/ without building"
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Install missing dependencies with pacman"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Allow makepkg to run as root user"
 
-#: scripts/makepkg.sh.in:1077
-msgid "      --holdver    Prevent automatic version bumping for development PKGBUILDs"
-msgstr "      --holdver    Prevent automatic version bumping for development PKGBUILDs"
+#: scripts/makepkg.sh.in:1093
+msgid ""
+"      --holdver    Prevent automatic version bumping for development "
+"PKGBUILDs"
+msgstr ""
+"      --holdver    Prevent automatic version bumping for development "
+"PKGBUILDs"
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
-msgstr "      --source     Do not build package; generate a source-only tarball"
+msgstr ""
+"      --source     Do not build package; generate a source-only tarball"
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr "These options can be passed to pacman:"
 
-#: scripts/makepkg.sh.in:1082
-msgid "      --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr "      --noconfirm      Do not ask for confirmation when resolving dependencies"
+#: scripts/makepkg.sh.in:1098
+msgid ""
+"      --noconfirm      Do not ask for confirmation when resolving "
+"dependencies"
+msgstr ""
+"      --noconfirm      Do not ask for confirmation when resolving "
+"dependencies"
 
-#: scripts/makepkg.sh.in:1083
-msgid "      --noprogressbar  Do not show a progress bar when downloading files"
-msgstr "      --noprogressbar  Do not show a progress bar when downloading files"
+#: scripts/makepkg.sh.in:1099
+msgid ""
+"      --noprogressbar  Do not show a progress bar when downloading files"
+msgstr ""
+"      --noprogressbar  Do not show a progress bar when downloading files"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "If -p is not specified, makepkg will look for '%s'"
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr "%s not found."
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr "Sudo is used by default now. The --usesudo option is deprecated!"
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
-msgstr "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
+msgstr "\\0--holdver and --forcever cannot both be specified"
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr "Cleaning up ALL files from %s."
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr "    Are you sure you wish to do this? [Y/n] "
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr "Problem removing files; you may not have correct permissions in %s"
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr "Source cache cleaned."
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr "No files have been removed."
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr "Source destination must be defined in makepkg.conf."
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr "In addition, please run makepkg -C outside of your cache directory."
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr "BUILDSCRIPT is undefined! Ensure you have updated %s."
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr "Running makepkg as root is a BAD idea and can cause"
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr "permanent, catastrophic damage to your system. If you"
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr "wish to run as root, please use the --asroot option."
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr "The --asroot option is meant for the root user only."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr "Please rerun makepkg without the --asroot flag."
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr "Fakeroot must be installed if using the 'fakeroot' option"
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr "in the BUILDENV array in %s."
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr "Running makepkg as an unprivileged user will result in non-root"
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr "ownership of the packaged files. Try using the fakeroot environment by"
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr "Do not use the '-F' option. This option is only for use by makepkg."
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr "Cannot find the sudo binary! Is sudo installed?"
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr "Missing dependencies cannot be installed or removed as a normal user"
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr "without sudo; install and configure sudo to auto-resolve dependencies."
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr "%s does not exist."
 
-#: scripts/makepkg.sh.in:1285
-#: scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
 msgstr "%s is not allowed to be empty."
 
-#: scripts/makepkg.sh.in:1297
-#: scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s is not allowed to contain hyphens."
 
-#: scripts/makepkg.sh.in:1311
-#: scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s is not available for the '%s' architecture."
 
-#: scripts/makepkg.sh.in:1312
-#: scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
 msgstr "Note that many packages may need a line added to their %s"
 
-#: scripts/makepkg.sh.in:1313
-#: scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr "such as arch=('%s')."
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Install scriptlet (%s) does not exist."
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr "A package has already been built, installing existing package..."
 
-#: scripts/makepkg.sh.in:1341
-#: scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "A package has already been built. (use -f to overwrite)"
 
-#: scripts/makepkg.sh.in:1350
-#: scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr "Skipping build."
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr "Leaving fakeroot environment."
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr "Making package: %s"
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr "Running makepkg as root..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr "Source package created: %s"
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr "Skipping dependency checks."
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr "Checking Runtime Dependencies..."
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr "Checking Buildtime Dependencies..."
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr "Could not resolve all dependencies."
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
 msgstr "pacman was not found in PATH; skipping dependency checks."
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr "Skipping source retrieval        -- using existing src/ tree"
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr "Skipping source integrity checks -- using existing src/ tree"
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr "Skipping source extraction       -- using existing src/ tree"
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "The source directory is empty, there is nothing to build!"
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr "The package directory is empty, there is nothing to repackage!"
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr "Sources are ready."
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr "Removing existing pkg/ directory..."
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr "Entering fakeroot environment..."
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr "Finished making: %s"
 
@@ -1849,29 +1822,27 @@ msgstr "Usage: %s [pacman_db_root]"
 
 #: scripts/pacman-optimize.sh.in:43
 msgid ""
-"pacman-optimize is a little hack that should improve the performance\\n"
-"of pacman when reading/writing to its filesystem-based database.\\n"
-"\\n"
+"pacman-optimize is a little hack that should improve the performance\\nof "
+"pacman when reading/writing to its filesystem-based database.\\n\\n"
 msgstr ""
-"pacman-optimize is a little hack that should improve the performance\\n"
-"of pacman when reading/writing to its filesystem-based database.\\n"
-"\\n"
+"pacman-optimize is a little hack that should improve the performance\\nof "
+"pacman when reading/writing to its filesystem-based database.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:46
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\n"
-"there is a tendency for these files to become fragmented over time.\\n"
-"This script attempts to relocate these small files into one\\n"
-"continuous location on your hard drive. The result is that the hard\\n"
-"drive should be able to read them faster, since the hard drive head\\n"
-"does not have to move around the disk as much.\\n"
+"Because pacman uses many small files to keep track of packages,\\nthere is a "
+"tendency for these files to become fragmented over time.\\nThis script "
+"attempts to relocate these small files into one\\ncontinuous location on "
+"your hard drive. The result is that the hard\\ndrive should be able to read "
+"them faster, since the hard drive head\\ndoes not have to move around the "
+"disk as much.\\n"
 msgstr ""
-"Because pacman uses many small files to keep track of packages,\\n"
-"there is a tendency for these files to become fragmented over time.\\n"
-"This script attempts to relocate these small files into one\\n"
-"continuous location on your hard drive. The result is that the hard\\n"
-"drive should be able to read them faster, since the hard drive head\\n"
-"does not have to move around the disk as much.\\n"
+"Because pacman uses many small files to keep track of packages,\\nthere is a "
+"tendency for these files to become fragmented over time.\\nThis script "
+"attempts to relocate these small files into one\\ncontinuous location on "
+"your hard drive. The result is that the hard\\ndrive should be able to read "
+"them faster, since the hard drive head\\ndoes not have to move around the "
+"disk as much.\\n"
 
 #: scripts/pacman-optimize.sh.in:89
 msgid "diff tool was not found, please install diffutils."
@@ -1934,34 +1905,26 @@ msgid "For full benefits of pacman-optimize, run 'sync' now."
 msgstr "For full benefits of pacman-optimize, run 'sync' now."
 
 #: scripts/repo-add.sh.in:57
-msgid ""
-"Usage: %s <path-to-db> [--force] <package> ...\\n"
-"\\n"
-msgstr ""
-"Usage: %s <path-to-db> [--force] <package> ...\\n"
-"\\n"
+msgid "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
+msgstr "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
 
 #: scripts/repo-add.sh.in:58
 msgid ""
-"repo-add will update a package database by reading a package file.\\n"
-"Multiple packages to add can be specified on the command line.\\n"
-"\\n"
+"repo-add will update a package database by reading a package file."
+"\\nMultiple packages to add can be specified on the command line.\\n\\n"
 msgstr ""
-"repo-add will update a package database by reading a package file.\\n"
-"Multiple packages to add can be specified on the command line.\\n"
-"\\n"
+"repo-add will update a package database by reading a package file."
+"\\nMultiple packages to add can be specified on the command line.\\n\\n"
 
 #: scripts/repo-add.sh.in:61
 msgid ""
-"The --force flag will add a 'force' entry to the sync database, which\\n"
-"tells pacman to skip its internal version number checking and update\\n"
-"the package regardless.\\n"
-"\\n"
+"The --force flag will add a 'force' entry to the sync database, which"
+"\\ntells pacman to skip its internal version number checking and update"
+"\\nthe package regardless.\\n\\n"
 msgstr ""
-"The --force flag will add a 'force' entry to the sync database, which\\n"
-"tells pacman to skip its internal version number checking and update\\n"
-"the package regardless.\\n"
-"\\n"
+"The --force flag will add a 'force' entry to the sync database, which"
+"\\ntells pacman to skip its internal version number checking and update"
+"\\nthe package regardless.\\n\\n"
 
 #: scripts/repo-add.sh.in:65
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
@@ -1969,22 +1932,19 @@ msgstr "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 
 #: scripts/repo-add.sh.in:70
 msgid ""
-"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
 msgstr ""
-"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
 
 #: scripts/repo-add.sh.in:174
 msgid "Invalid package file '%s'."
 msgstr "Invalid package file '%s'."
 
-#: scripts/repo-add.sh.in:183
-#: scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr "Removing existing package '%s'..."
 
@@ -2012,23 +1972,19 @@ msgstr "Added delta '%s'"
 msgid "Could not add delta '%s'"
 msgstr "Could not add delta '%s'"
 
-#: scripts/repo-add.sh.in:277
-#: scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr "%s not found. Cannot continue."
 
-#: scripts/repo-add.sh.in:287
-#: scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr "Cannot create temp directory for database building."
 
-#: scripts/repo-add.sh.in:298
-#: scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Repository file '%s' is not a proper pacman database."
 
-#: scripts/repo-add.sh.in:301
-#: scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr "Extracting database to a temporary location..."
 
@@ -2048,131 +2004,146 @@ msgstr "Package '%s' not found."
 msgid "Creating updated database file %s"
 msgstr "Creating updated database file %s"
 
-#: scripts/repo-add.sh.in:333
-#: scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr "No compression set."
 
-#: scripts/repo-add.sh.in:341
-#: scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr "No packages modified, nothing to do."
 
+#: scripts/repo-remove.sh.in:52
+msgid "repo-remove %s\\n\\n"
+msgstr "repo-remove %s\\n\\n"
+
 #: scripts/repo-remove.sh.in:53
-msgid ""
-"repo-remove %s\\n"
-"\\n"
-msgstr ""
-"repo-remove %s\\n"
-"\\n"
+msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
+msgstr "usage: %s <path-to-db> <packagename> ...\\n\\n"
 
 #: scripts/repo-remove.sh.in:54
 msgid ""
-"usage: %s <path-to-db> <packagename> ...\\n"
-"\\n"
-msgstr ""
-"usage: %s <path-to-db> <packagename> ...\\n"
-"\\n"
-
-#: scripts/repo-remove.sh.in:55
-msgid ""
-"repo-remove will update a package database by removing the package name\\n"
-"specified on the command line from the given repo database. Multiple\\n"
-"packages to remove can be specified on the command line.\\n"
-"\\n"
+"repo-remove will update a package database by removing the package name"
+"\\nspecified on the command line from the given repo database. Multiple"
+"\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
-"repo-remove will update a package database by removing the package name\\n"
-"specified on the command line from the given repo database. Multiple\\n"
-"packages to remove can be specified on the command line.\\n"
-"\\n"
+"repo-remove will update a package database by removing the package name"
+"\\nspecified on the command line from the given repo database. Multiple"
+"\\npackages to remove can be specified on the command line.\\n\\n"
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
 msgstr "Searching for package '%s'..."
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr "Package matching '%s' not found."
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr "Creating updated database file '%s'..."
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr "All packages have been removed from the database. Deleting '%s'."
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr "Usage: %s <action> <destfile> <option> [package_directory]"
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
-"updatesync will update a sync database by reading a PKGBUILD and\\n"
-"modifying the destfile. updatesync updates the database in a temporary\\n"
-"directory and then compresses it to <destfile>.\\n"
-"\\n"
+"updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
+"the destfile. updatesync updates the database in a temporary\\ndirectory and "
+"then compresses it to <destfile>.\\n\\n"
 msgstr ""
-"updatesync will update a sync database by reading a PKGBUILD and\\n"
-"modifying the destfile. updatesync updates the database in a temporary\\n"
-"directory and then compresses it to <destfile>.\\n"
-"\\n"
+"updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
+"the destfile. updatesync updates the database in a temporary\\ndirectory and "
+"then compresses it to <destfile>.\\n\\n"
 
-#: scripts/updatesync.sh.in:38
-msgid ""
-"There are two types of actions:\\n"
-"\\n"
-msgstr ""
-"There are two types of actions:\\n"
-"\\n"
+#: scripts/updatesync.sh.in:41
+msgid "There are two types of actions:\\n\\n"
+msgstr "There are two types of actions:\\n\\n"
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
-"upd - Will update a package's entry or create it if it doesn't exist.\\n"
-"      It takes the package's PKGBUILD as an option.\\n"
+"upd - Will update a package's entry or create it if it doesn't exist."
+"\\n      It takes the package's PKGBUILD as an option.\\n"
 msgstr ""
-"upd - Will update a package's entry or create it if it doesn't exist.\\n"
-"      It takes the package's PKGBUILD as an option.\\n"
+"upd - Will update a package's entry or create it if it doesn't exist."
+"\\n      It takes the package's PKGBUILD as an option.\\n"
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
-"del - Will remove a package's entry from the db. It takes the package's\\n"
-"      name as an option.\\n"
+"del - Will remove a package's entry from the db. It takes the package's"
+"\\n      name as an option.\\n"
 msgstr ""
-"del - Will remove a package's entry from the db. It takes the package's\\n"
-"      name as an option.\\n"
+"del - Will remove a package's entry from the db. It takes the package's"
+"\\n      name as an option.\\n"
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
-"updatesync will calculate md5sums of packages in the same directory as\\n"
-"<destfile>, unless an alternate [package_directory] is specified.\\n"
-"\\n"
+"updatesync will calculate md5sums of packages in the same directory as"
+"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
-"updatesync will calculate md5sums of packages in the same directory as\\n"
-"<destfile>, unless an alternate [package_directory] is specified.\\n"
-"\\n"
+"updatesync will calculate md5sums of packages in the same directory as"
+"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
-"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
 msgstr ""
-"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
+"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
+"the extent permitted by law.\\n"
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr "%s not found"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr "could not find %s-%s-%s-%s%s - aborting"
 
+#~ msgid "error: failed to add target '%s' (%s)"
+#~ msgstr "error: failed to add target '%s' (%s)"
+
+#~ msgid ":: %s: conflicts with %s"
+#~ msgstr ":: %s: conflicts with %s"
+
+#~ msgid "error: failed to add target '%s' (%s)\n"
+#~ msgstr "error: failed to add target '%s' (%s)\n"
+
+#~ msgid ""
+#~ ":: pacman has detected a newer version of itself.\n"
+#~ ":: It is recommended that you upgrade pacman by itself\n"
+#~ ":: using 'pacman -S pacman', and then rerun the current\n"
+#~ ":: operation. If you wish to continue the operation and\n"
+#~ ":: not upgrade pacman separately, answer no.\n"
+#~ msgstr ""
+#~ ":: pacman has detected a newer version of itself.\n"
+#~ ":: It is recommended that you upgrade pacman by itself\n"
+#~ ":: using 'pacman -S pacman', and then rerun the current\n"
+#~ ":: operation. If you wish to continue the operation and\n"
+#~ ":: not upgrade pacman separately, answer no.\n"
+
+#~ msgid ":: Cancel current operation? [Y/n] "
+#~ msgstr ":: Cancel current operation? [Y/n] "
+
+#~ msgid "debug: %s"
+#~ msgstr "debug: %s"
+
+#~ msgid "debug: "
+#~ msgstr "debug: "
+
+#~ msgid "--"
+#~ msgstr "--"
diff --git a/po/es.po b/po/es.po
index c7cadbde..d379c38d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
 "PO-Revision-Date: 2008-01-16 16:10-0300\n"
 "Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
 "Language-Team:  <es@li.org>\n"
@@ -26,8 +26,8 @@ msgstr ""
 msgid "failed to release transaction (%s)\n"
 msgstr "fallo al lanzar la operación (%s)\n"
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "no se especificaron objetivos (use -h para ayuda)\n"
 
@@ -50,43 +50,43 @@ msgstr ""
 msgid "loading package data... "
 msgstr "Cargando datos del paquete..."
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "error: fallo al procesar '%s' (%s)"
+msgid "error: '%s': %s\n"
+msgstr "error: '%s': %s\n"
 
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr "error: fallo al preparar operación (%s)\n"
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: necesita %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: posee conflictos con %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: posee conflictos con %s\n"
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s existe en '%s' y '%s'\n"
 
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s existe en el sistema de archivos\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -95,7 +95,7 @@ msgstr ""
 "\n"
 "ocurrieron errores, no fueron actualizados los paquetes\n"
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr "error: no se pudo iniciar la operación (%s)\n"
@@ -195,10 +195,8 @@ msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: ¿Reemplazar %s con %s/%s? [Y/n] "
 
 #: src/pacman/callback.c:288
-#, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
+#, fuzzy, c-format
+msgid "Replacing %s with %s/%s\n"
 msgstr ""
 "Reemplazando %s con %s/%s\n"
 "."
@@ -439,14 +437,16 @@ msgstr ""
 
 #: src/pacman/pacman.c:87
 #, c-format
-msgid "  -c, --cascade        remove packages and all packages that depend on them\n"
+msgid ""
+"  -c, --cascade        remove packages and all packages that depend on them\n"
 msgstr ""
 "  -c, --cascade        quita paquetes, junto a todos los que dependan de "
 "estos\n"
 
 #: src/pacman/pacman.c:89
 #, 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         sólo quita la referencia en la base de datos. No "
 "elimina archivos\n"
@@ -458,7 +458,8 @@ msgstr "  -n, --nosave         quita también los archivos de  configuración\n"
 
 #: src/pacman/pacman.c:91
 #, 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      quita también las dependencias (que no quiebren a "
 "otros paquetes)\n"
@@ -478,16 +479,19 @@ msgstr ""
 #: src/pacman/pacman.c:103
 #, c-format
 msgid "  -e, --explicit       list all packages explicitly installed\n"
-msgstr "  -e, --explicit       lista todos los paquetes instalados explicitamente\n"
+msgstr ""
+"  -e, --explicit       lista todos los paquetes instalados explicitamente\n"
 
 #: src/pacman/pacman.c:104 src/pacman/pacman.c:122
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr "  -g, --groups         muestra todos los elementos del grupo de paquetes \n"
+msgstr ""
+"  -g, --groups         muestra todos los elementos del grupo de paquetes \n"
 
 #: src/pacman/pacman.c:105
 #, c-format
-msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgid ""
+"  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
 "  -i, --info           ver la información del paquete (-ii para archivos de "
 "respaldo)\n"
@@ -501,7 +505,8 @@ msgstr ""
 
 #: src/pacman/pacman.c:107
 #, 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        lista paquetes instalados no encontrados en las "
 "listas de paquetes\n"
@@ -585,7 +590,8 @@ msgstr ""
 
 #: src/pacman/pacman.c:126
 #, c-format
-msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgid ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 "  -s, --search <busca> busca en los repositorios remotos por coincidencias "
 "de la cadena especificada.\n"
@@ -593,7 +599,8 @@ msgstr ""
 #: src/pacman/pacman.c:127
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
-msgstr "  -u, --sysupgrade     actualiza todos los paquetes que no están al día\n"
+msgstr ""
+"  -u, --sysupgrade     actualiza todos los paquetes que no están al día\n"
 
 #: src/pacman/pacman.c:128
 #, c-format
@@ -606,14 +613,16 @@ msgstr ""
 
 #: src/pacman/pacman.c:129
 #, 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        descarga bases de datos actualizadas desde el "
 "servidor\n"
 
 #: src/pacman/pacman.c:130
 #, c-format
-msgid "      --needed         only upgrade outdated or not yet installed packages\n"
+msgid ""
+"      --needed         only upgrade outdated or not yet installed packages\n"
 msgstr ""
 "      --needed         solo actualiza paquetes antiguos o los que no\n"
 "                            están instalados\n"
@@ -661,15 +670,18 @@ msgstr "      --noconfirm      no solicita confirmación alguna\n"
 
 #: src/pacman/pacman.c:139
 #, 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  no muestra la barra de progreso cuando descarga "
 "archivos\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
-msgid "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr "      --noscriptlet    no ejecuta el script de instalación si existe alguno\n"
+msgid ""
+"      --noscriptlet    do not execute the install scriptlet if one exists\n"
+msgstr ""
+"      --noscriptlet    no ejecuta el script de instalación si existe alguno\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
@@ -761,7 +773,8 @@ msgstr ""
 #: src/pacman/pacman.c:638 src/pacman/pacman.c:692 src/pacman/pacman.c:707
 #, c-format
 msgid "config file %s, line %d: directive '%s' not recognized.\n"
-msgstr "archivo de configuración %s, linea %d: directiva '%s' no es reconocida.\n"
+msgstr ""
+"archivo de configuración %s, linea %d: directiva '%s' no es reconocida.\n"
 
 #: src/pacman/pacman.c:777
 #, c-format
@@ -786,51 +799,51 @@ msgstr "no se especificó una operación (utilice -h para ayuda)\n"
 msgid "error: no file was specified for --owns\n"
 msgstr "error: no se indicó un archivo para --owns\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "error: no se pudo leer el archivo  '%s': %s\n"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "error: no se pudo determinar el propietario de un directorio\n"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "error: no se pudo determinar la ruta verdadera para '%s': %s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s es propiedad de %s %s\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
 msgstr "error: Ningún paquete posee %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "error: el grupo \"%s\" no fue encontrado\n"
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
 msgstr "Verificando existencia de actualizaciones de paquetes...\n"
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
 msgstr "no se encontraron actualizaciones\n"
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "no se encontraron repositorios útiles configurados.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "error: el paquete  \"%s\" no fue encontrado\n"
@@ -849,17 +862,12 @@ msgstr "    ¿Quitar todo el contenido? [Y/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: ¿Quitar %s del grupo %s? [Y/n] "
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "error: no se pudo iniciar la operación (%s)\n"
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "error: fallo al procesar '%s' (%s)\n"
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Se procesará:"
 
@@ -990,168 +998,140 @@ msgstr ":: iniciando actualización completa del sistema...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
-msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+msgid ":: pacman has detected a newer version of itself.\n"
 msgstr ""
-":: Se ha encontrado una nueva versión de pacman.\n"
-":: Se recomienda actualizar pacman\n"
-":: usando 'pacman -S pacman', y ejecute nuevamente la\n"
-":: operación. Si desea continuar con la operación y\n"
-":: no actualizar pacman de forma separada, responda no.\n"
 
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Cancelar la operación actual? [Y/n] "
+#: src/pacman/sync.c:530
+msgid ""
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
+msgstr ""
 
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "fallo al liberar la operación (%s)\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr "error: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "error: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ":: grupo %s (incluyendo los paquetes ignorados):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: ¿Instalar el todo el contenido? [Y/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: ¿Instalar %s del grupo %s? [Y/n] "
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, c-format
 msgid "Warning: %s provides %s\n"
 msgstr "Advertencia: %s: provee %s\n"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr "error: varios paquetes proveen %s, por favor especifique uno :\n"
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr "error: '%s': no encontrado en la lista de paquetes\n"
 
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: posee conflictos con %s\n"
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr "la base de datos local está actualizada\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
 msgstr "Empezando la descarga...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "¿Continuar con la descarga? [Y/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
 msgstr "Empezando proceso de actualización...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "¿Continuar con la instalación? [Y/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr "Ocurrieron errores, no se actualizaron paquetes\n"
 
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "Nada\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Se quitará:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Tamaño total eliminado:   %.2f MB\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
 msgstr "Tamaño total de descarga:   %.2f MB\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Tamaño total instalado:   %.2f MB\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "Y"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "YES"
 
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr "debug: %s"
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr "error: %s"
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
 msgstr "precaución: %s"
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
 msgstr "función: %s"
 
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr "debug: "
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
 msgstr "función: "
@@ -1160,7 +1140,14 @@ msgstr "función: "
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr "Uso: %s <root> <destfile> [directorio_del_paquete]"
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
@@ -1170,7 +1157,7 @@ msgstr ""
 "gensync  crea la base de datos en un directorio temporal\\ny entonces la "
 "comprime a <destfile>.\\n\\n"
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
@@ -1179,7 +1166,7 @@ msgstr ""
 "\\n<destfile>, a menos que un directorio alternativo [package_directory] sea "
 "especificado \\n\\n"
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1193,12 +1180,12 @@ msgstr ""
 "debe estar en el mismo directorio que tus paquetes(también configurado en /"
 "etc/pacman.conf)\\n\\n"
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr "Ejemplo:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -1208,37 +1195,37 @@ msgstr ""
 "Software libre; Ver el código fuente para condiciones de copia.\\nNO HAY "
 "GARANTÍA, hasta los límites permitidos por la ley.\\n"
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr "%s no se encuentra. No se puede continuar."
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr "directorio raíz invalido: %s"
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
 msgstr "gensync: contruyendo base de datos, generando hash md5..."
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr "fallo al analizar %s"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr "no se pudo encontrar %s-%s-%s-%s %s - saltando"
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
 msgstr "creando la BD del repositorio..."
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr "PRECAUCIÓN:"
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr "ERROR:"
 
@@ -1269,11 +1256,11 @@ msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr "No hay nada configurado para las URLs %s. Comprueba %s."
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr "Abortando..."
 
@@ -1333,298 +1320,303 @@ msgstr "Encontrado %s en el directorio de compilación"
 msgid "Using cached copy of %s"
 msgstr "usando copia cacheada de %s"
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr ""
+
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
 msgstr "Descargando %s... "
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr "Fallo mientras se descargaba %s"
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr "Generando la verificación para los archivos fuentes"
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Algoritmo de integridad '%s' invalido"
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr "No se pudo encontrar el programa '%s'."
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
 msgstr "No se pudo encontrar el archivo fuente '%s' para generar el ckecksum."
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr "Algoritmo de integridad inválido '%s' especificado"
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr "Validando el archivo fuente con %s..."
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr "NO ENCONTRADO"
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr "Pasado"
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr "FALLO"
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr "¡Uno o más archivos no pasaron el test de integridad!"
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr "Faltan los test de integridad (%s) o están incompletos"
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr "Descomprimiendo fuentes..."
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr "Incapaz de abrir el archivo fuente %s para extraerlo."
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr "Fallo al extraer %s"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr "comenzando build()..."
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr "Fallo build()"
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr "Limpiando la instalación..."
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr "Quitando los archivos info/doc..."
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr "Comprimiendo las paginas man..."
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "Quitando símbolos de debug de los bianrios y librerías..."
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr "eliminando archivos .la..."
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr "Quitando directorios vacios... "
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr "Falta directorio pkg/"
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr "Creando el paquete..."
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr "Generando el archivo .PKGINFO..."
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr "Por favor agregar la linea de licencia a %s!"
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Ejemplo de software con licencia GPL: license=('GPL')."
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr "Agregando el script de instalación..."
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr "Agregando el registro de cambios del paquete..."
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
 msgstr "Comprimiendo el paquete..."
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr "Fallo al crear el paquete."
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr "¡No se pudo encontrar el binario xdelta! ¿está xdelta instalado?"
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr "Creando delta de la versión %s..."
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr "Creando tarball del paquete de delta para encajar las firmas md5"
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr "NOTA: la delta sólo debería distribuirse con este tarball"
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr "No se pudo general el paquete desde la delta."
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr "Delta no pudo ser creada."
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr "No se encontraron versiones anteriores, saltando xdelta."
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr "Creando paquete fuente..."
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr "Agregando %s... "
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
 msgstr "Script de instalación: %s no encontrado."
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr "Comprimiendo el paquete fuente..."
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr "Fallo al crear paquete fuente."
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr "Determinando última revisión de darcs..."
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr "Determinando última revisión de cvs..."
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr "Determinando última revisión de git..."
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr "Determinando última revisión de svn..."
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr "Determinando última revisión de bzr..."
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr "Determinando última revisión de hg..."
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr "Versión encontrada: %s"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
 msgstr "Uso: %s [opciones]"
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr "Opciones:"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr "  -A, --ignorearch Ignorar campo arch incompleto en %s"
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr "  -b, --builddeps Compilar las dependencias desde las fuentes"
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Limpiar archivos tras la compilación"
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache Limpiar las fuentes de la cache"
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     salta la verificación de dependencias"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr "  -e, --noextract No extraer las fuentes (usar el directorio src/)"
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force          Sobreescribe el paquete existente"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Generar test de integridad para las fuentes"
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       Esta ayuda"
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Instalar el paquete tras una compilación exitosa"
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Registra el proceso de construcción"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Deshabilitar los colores en la salida"
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Sólo descargar y extraer"
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr "  -p <buildscript> Usar un script alternativo (en vez de '%s')"
 
-#: scripts/makepkg.sh.in:1072
-msgid "  -r, --rmdeps     Remove installed dependencies after a successful build"
+#: scripts/makepkg.sh.in:1088
+msgid ""
+"  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr ""
 "  -r, --rmdeps     Elimina las dependencias instaladas tras una creación "
 "exitosa."
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr "  -R, --repackage  Volver a crear el paquete sin recompilar"
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Instala las dependencias faltantes con pacman"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Permitir a makepkg ser ejecutado como root"
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
@@ -1632,15 +1624,16 @@ msgstr ""
 "      --holdver    Previene el choque automático de versiones para los "
 "PKGBUILD de desarrollo"
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
-msgstr "      --source     No construir el paquete, crear un tarball com sólo fuentes"
+msgstr ""
+"      --source     No construir el paquete, crear un tarball com sólo fuentes"
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr "Estas opciones pueden ser pasadas a pacman:"
 
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1098
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
@@ -1648,230 +1641,233 @@ msgstr ""
 "      --noconfirm      no solicita confirmación alguna cuado se encuentra "
 "resolviendo dependencias"
 
-#: scripts/makepkg.sh.in:1083
-msgid "      --noprogressbar  Do not show a progress bar when downloading files"
+#: scripts/makepkg.sh.in:1099
+msgid ""
+"      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr ""
 "      --noprogressbar  No muestra la barra de progreso cuando descarga "
 "archivos"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "Si no se especifica -p, makepkg buscará '%s'"
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr "el paquete %s no fue encontrado."
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr "Sudo se usa ahora por defecto. ¡La opción --usesudo está obsoleta!"
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
-msgstr "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
+msgstr ""
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr "Limpiando TODOS los archivos de %s."
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr "    ¿Seguro que quieres hacer esto? [Y/n]"
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
 "Problemas eliminando archivos; puede que no tengas los permisos correctos en "
 "%s"
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr "La cache de las fuentes limpiada."
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr "No se eliminaron archivos."
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr "La destinación de las fuentes debe ser definido en makepkg.conf."
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr "Adicionalmente, por favor, ejecuta makepkg -C fuera de tu cache."
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr "¡BUILDSCRIPT está sin definir! Asegurate de que hayas actualizado %s."
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr "Ejecutar makepkg como root es una MALA idea y puede causar"
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr "Daño catastrófico permanente a tu sistema. Si tú"
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr "quieres ejecutarlo como root, por favor, usa la opción --asroot."
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr "La opción --asroot está pensada sólo para el usuario root."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr "Por favor, ejecuta makepkg sin la opción --asroot."
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr "Fakeroot debe ser instalado si se usa la opción 'fakeroot'"
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr "en la línea BUILDENV en %s."
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
-msgstr "Ejecutar makepkg como un usuario sin privilegios resultará en unos paquetes"
+msgstr ""
+"Ejecutar makepkg como un usuario sin privilegios resultará en unos paquetes"
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr "no pertenecientes a root. Prueba usando fakeroot "
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr "añadiendo 'fakeroot' en la línea BUILDENV en makepkg.conf."
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr "No usar la opción '-F'. Esta opción es sólo para makepkg."
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr "¡No se pudo encontrar sudo! ¿Está sudo instalado?"
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
 "Las dependencias faltantes no se pueden instalar o eliminar siendo un "
 "usuario normal"
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr "sin sudo; instala y configura sudo para que resuelva dependencias"
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr "%s no existe."
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
 msgstr "%s no es permitido que esté vacío."
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s no está permitido que tenga guiones."
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s no esta disponible para la arquitectura '%s'."
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
 msgstr "Advierte que muchos paquetes pueden necesitar añadir una línea a su %s"
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr "como por ejemplo arch=('%s')."
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
 msgstr "El script de instalación (%s) no existe."
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr "El paquete ya ha sido compilado, instalando el paquete preexistente..."
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "Un paquete ya ha sido compilado. /usa -f para sobreescribir)"
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr "Saltando compilación"
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr "Saliendo de fakeroot"
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr "Creando el paquete: %s"
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr "Ejecutando makepkg como root..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr "Pauqete fuente creado: %s"
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr "Saltando la verificación de dependencias... "
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr "Comprobando Dependencias en tiempo de ejecución... "
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr "comprobando dependencias en tiempo de compilación... "
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr "No se pudieron resolver todas las dependencias... "
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
-msgstr "no se encontró pacman en el PATH; saltando la comprobación de dependencias."
+msgstr ""
+"no se encontró pacman en el PATH; saltando la comprobación de dependencias."
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr "Saltando obtención de fuentes        -- usando src/tree existente"
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr "saltando test de integridad -- usando src/tree existente"
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr "Saltando extracción de las fuentes       -- usando src/tree existente"
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "El directorio de las fuentes esta vacío, ¡nada que compilar!"
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr "El directorio del paquete esta vacío, ¡nada que empaquetar!"
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr "Las fuentes están listas"
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr "Eliminando directorio pkg/ existente..."
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr "entrando a fakeroot..."
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr "Terminado haciendo: %s"
 
@@ -1923,7 +1919,8 @@ msgstr "Debes tener los permisos correctos para optimizar la base de datos."
 
 #: scripts/pacman-optimize.sh.in:106
 msgid "ERROR: Can not create temp directory for database building."
-msgstr "ERROR: No se pudo crear directorio temporal para crear la base de datos."
+msgstr ""
+"ERROR: No se pudo crear directorio temporal para crear la base de datos."
 
 #: scripts/pacman-optimize.sh.in:112
 msgid "MD5sum'ing the old database..."
@@ -1963,7 +1960,8 @@ msgstr "Terminado, Tu base de datos pacman ha sido optimizada."
 
 #: scripts/pacman-optimize.sh.in:157
 msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr "Para beneficiarse completamente de pacman-optimize ejecuta 'sync' ahora."
+msgstr ""
+"Para beneficiarse completamente de pacman-optimize ejecuta 'sync' ahora."
 
 #: scripts/repo-add.sh.in:57
 msgid "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
@@ -2006,7 +2004,7 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Paquete inalido '%s'."
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr "Quitando el paquete existente %s..."
 
@@ -2034,19 +2032,19 @@ msgstr "Añadida delta '%s'"
 msgid "Could not add delta '%s'"
 msgstr "No se pudo añadir delta '%s'"
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr "%s no encontrado. No se puede continuar."
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr "No se puede crear directorio temp para la base de datos."
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "El archivo '%s' no es una base de datos pacman válida."
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr "Extrallendo base de datos a un sitio temporal..."
 
@@ -2066,23 +2064,23 @@ msgstr "El paquete '%s' no fue encontrado."
 msgid "Creating updated database file %s"
 msgstr "Creado base de datos actualizada %s"
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr "Sin compresión"
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr "No se modificaron paquetes, nada que hacer."
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
 msgstr "repo-remove %s\\n\\n"
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
 msgstr "uso: %s <path-to-db> <packagename> ...\\n\\n"
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
@@ -2092,27 +2090,31 @@ msgstr ""
 "\\nespecificado en la linea de comandos. Varios paquetes\\n pueden "
 "eliminarse especificandolo en la línea de comandos.\\n\\n"
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "Ejemplo: repo-remove /path/al/repo.db.tar.gz kernel26"
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
 msgstr "Buscando el paquete '%s'..."
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr "No fueron encontrados paquetes que coincidan con '%s'."
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr "Creando base de datos actualizada '%s'..."
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr ""
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr "Uso: %s <action> <destfile> <option> [package_directory]"
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
@@ -2122,11 +2124,11 @@ msgstr ""
 "el destfile. updatesync actualiza la base de datos en un directorio temporal"
 "\\n y entonces lo comprime en <destfile>.\\n\\n"
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
 msgstr "Hay dos tipos de acciones:\\n\\n"
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
@@ -2134,7 +2136,7 @@ msgstr ""
 "upd - Actualizará la entrada de un paquete o la creará si no existe.\\n      "
 "tome el PKGBUILD del paquete como una opción.\\n"
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
@@ -2142,7 +2144,7 @@ msgstr ""
 "del - Eliminará la entrada del paquete de la base de datos. toma el\\nnombre "
 "del paquete como una opción.\\n"
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
@@ -2150,11 +2152,11 @@ msgstr ""
 "updatesync calculara el md5 de los paquetes en el mismo directorio que"
 "\\n<destifle>, a menos que [package_directory] esté especificado.\\n\\n"
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr "Ejemplo:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -2164,11 +2166,44 @@ msgstr ""
 "libre; ver las fuentes para información de copia.\\nNO HAY GARANTÍA hasta el "
 "límite permitido por la ley.\\n"
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr "%s no fue encontrado"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr "No se pudo encontrar %s-%s-%s-%s%s - abortando"
 
+#~ msgid "error: failed to add target '%s' (%s)"
+#~ msgstr "error: fallo al procesar '%s' (%s)"
+
+#~ msgid ":: %s: conflicts with %s"
+#~ msgstr ":: %s: posee conflictos con %s"
+
+#~ msgid "error: failed to add target '%s' (%s)\n"
+#~ msgstr "error: fallo al procesar '%s' (%s)\n"
+
+#~ msgid ""
+#~ ":: pacman has detected a newer version of itself.\n"
+#~ ":: It is recommended that you upgrade pacman by itself\n"
+#~ ":: using 'pacman -S pacman', and then rerun the current\n"
+#~ ":: operation. If you wish to continue the operation and\n"
+#~ ":: not upgrade pacman separately, answer no.\n"
+#~ msgstr ""
+#~ ":: Se ha encontrado una nueva versión de pacman.\n"
+#~ ":: Se recomienda actualizar pacman\n"
+#~ ":: usando 'pacman -S pacman', y ejecute nuevamente la\n"
+#~ ":: operación. Si desea continuar con la operación y\n"
+#~ ":: no actualizar pacman de forma separada, responda no.\n"
+
+#~ msgid ":: Cancel current operation? [Y/n] "
+#~ msgstr ":: Cancelar la operación actual? [Y/n] "
+
+#~ msgid "debug: %s"
+#~ msgstr "debug: %s"
+
+#~ msgid "debug: "
+#~ msgstr "debug: "
+
+#~ msgid "--"
+#~ msgstr "--"
diff --git a/po/fr.po b/po/fr.po
index c2e99cd0..d6a8be53 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pacman\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
 "PO-Revision-Date: 2007-12-20 23:26+0100\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
@@ -24,8 +24,8 @@ msgstr ""
 msgid "failed to release transaction (%s)\n"
 msgstr "la libération de la transaction a échoué (%s)\n"
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "aucune cible spécifiée (utiliser -h pour obtenir de l'aide)\n"
 
@@ -48,45 +48,45 @@ msgstr ""
 msgid "loading package data... "
 msgstr "Chargement des données du paquet... "
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "erreur: l'ajout de la cible '%s' a échoué (%s)"
+msgid "error: '%s': %s\n"
+msgstr "erreur: '%s': %s\n"
 
 # "fait" est incompréhensible
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr "erreur: la préparation de la transaction a échoué (%s)\n"
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: requiert %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: est en conflit avec %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: est en conflit avec %s\n"
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s est présent à la fois dans '%s' et '%s'\n"
 
 # id.
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s est déjà présent dans le système de fichiers\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -95,7 +95,7 @@ msgstr ""
 "\n"
 "Des erreurs se sont produites, aucun paquet n'a été mis à jour.\n"
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr "erreur: la validation de la transaction a échoué (%s)\n"
@@ -202,11 +202,8 @@ msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: Remplacer %s par %s/%s? [O/n] "
 
 #: src/pacman/callback.c:288
-#, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
-msgstr "Remplace %s par %s/%s\n."
+msgid "Replacing %s with %s/%s\n"
+msgstr "Remplace %s par %s/%s\n"
 
 # pour être cohérent
 #: src/pacman/callback.c:296
@@ -811,52 +808,52 @@ msgstr "aucune opération spécifiée (utiliser -h pour obtenir de l'aide)\n"
 msgid "error: no file was specified for --owns\n"
 msgstr "erreur: aucun fichier spécifié pour --owns\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "erreur: échec de lecture du fichier '%s': %s\n"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "erreur: ne peut déterminer le propriétaire d'un répertoire\n"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "erreur: ne peut déterminer le vrai chemin pour '%s': %s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s appartient à %s %s\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
 msgstr "erreur: aucun paquet ne contient %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "erreur: le groupe \"%s\" n'a pas été trouvé\n"
 
 # le sens est plus clair
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
 msgstr "Vérification des mises à jour disponibles...\n"
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
 msgstr "pas de mises à jour trouvées.\n"
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "aucun dépôt de paquets utilisable n'a été défini.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "erreur: paquet '%s' introuvable\n"
@@ -876,17 +873,12 @@ msgstr "    Supprimer tout le contenu? [O/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Supprimer %s du groupe %s? [O/n] "
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "erreur: l'initialisation de la transaction a échoué (%s)\n"
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "erreur: l'ajout de la cible '%s' a échoué (%s)\n"
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Cibles:"
 
@@ -1019,169 +1011,143 @@ msgstr ":: Début de la mise à jour complète du système...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ":: Une nouvelle version de pacman est disponible.\n"
+
+#: src/pacman/sync.c:530
 msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
-":: une nouvelle version de pacman est disponible.\n"
-":: Il est recommandé de d'abord mettre à jour pacman\n"
-":: avec 'pacman -S pacman', et de relancer ensuite l'opération\n"
-":: courante. Si vous souhaitez continuer l'opération et ne pas\n"
-":: mettre a jouer pacman séparément, répondez non.\n"
-
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Annuler l'opération courante? [O/n] "
+":: Voulez-vous annuler l'opération courante et\n"
+":: installer la nouvelle version de pacman maintenant? [O/n] "
 
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "erreur: la libération de la transaction a échoué (%s)\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr "erreur: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "erreur: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ":: groupe %s (inclut les paquets ignorés):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Installer tout le contenu? [O/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Installer %s du groupe %s? [O/n] "
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, c-format
 msgid "Warning: %s provides %s\n"
 msgstr "Attention: %s fournit %s\n"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr "erreur: %s est fourni par plusieurs paquets, spécifiez-en-un svp :\n"
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr "erreur: '%s': non trouvé dans les dépôts\n"
 
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: est en conflit avec %s\n"
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr "La base de données locale est à jour.\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
 msgstr "Début du téléchargement...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "Procéder au téléchargement? [O/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
 msgstr "Début du processus de mise à jour...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "Procéder à l'installation? [O/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr "Des erreurs se sont produites, aucun paquet n'a été mis à jour.\n"
 
 # bon, on peut discuter là dessus; mais pacman -Qi avec tous ses "aucun" est vraiment trop laid... je le préfère comme ça
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "--\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Suppression:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Taille totale des paquets (suppression):   %.2f Mo\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
 msgstr "Taille totale des paquets (téléchargement):   %.2f Mo\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Taille totale des paquets (installation):   %.2f Mo\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "O"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "OUI"
 
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr "Débogage: %s"
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr "Erreur: %s"
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
 msgstr "Avertissement: %s"
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
 msgstr "Fonction: %s"
 
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr "Débogage:"
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "Erreur: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "Avertissement: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
 msgstr "Fonction:"
@@ -1190,7 +1156,16 @@ msgstr "Fonction:"
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr "Utilisation: %s <root> <destfile> [package_directory]"
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+"NOTE: ce script est OBSOLETE. Il sera supprimé dans la prochaine version"
+"\\nmajeure de pacman, donc utiliser repo-add et repo-remove à la place svp.\\n\\n"
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
@@ -1200,7 +1175,7 @@ msgstr ""
 "\\n<root>. gensync construit la base de donnée dans un répertoire temporaire"
 "\\net le compression ensuite vers <destfile>.\\n\\n"
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
@@ -1208,7 +1183,7 @@ msgstr ""
 "gensync va calculer les md5sums des paquets dans le même répertoire que"
 "\\n<destfile>, sauf si un [package_directory] alternatif est spécifié.\\n\\n"
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1222,12 +1197,12 @@ msgstr ""
 "générée doit se trouver dans le même répertoire que les paquets\\n      "
 "(aussi configuré dans /etc/pacman.conf)\\n\\n"
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr "Exemple:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -1237,37 +1212,37 @@ msgstr ""
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr "%s introuvable. Ne peut pas continuer."
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr "répertoire racine invalide: %s"
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
 msgstr "gensync: construction de la base de données, calcul des md5sums..."
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr "la lecture de %s a échoué"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr "%s-%s-%s-%s%s introuvable - ignore"
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
 msgstr "Création des dépôts... "
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr "ATTENTION:"
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr "ERREUR:"
 
@@ -1298,11 +1273,11 @@ msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr "Il n'y a aucun agent configuré pour les URLs %s. Vérifiez %s."
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr "Abandon..."
 
@@ -1366,565 +1341,571 @@ msgstr "%s trouvé dans le répertoire de compilation"
 msgid "Using cached copy of %s"
 msgstr "Utilisation de la copie de %s du cache."
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr "%s n'a pas été trouvé dans le répertoire de travail et n'est pas une URL."
+
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
 msgstr "Téléchargement de %s... "
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr "Erreur lors du téléchargement de %s"
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr "Calcul des sommes de contrôle..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "L'algorithme d'intégrité '%s' spécifié est invalide."
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr "Le programme '%s' est introuvable."
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
 msgstr ""
 "Impossible de trouver le fichier source %s pour générer les sommes de "
 "contrôle."
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr "L'algorithme d'intégrité '%s' spécifié est invalide."
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr "Validation des fichiers sources avec %s..."
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr "INTROUVABLE"
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr "Réussite"
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr "ECHEC"
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr "Un ou plusieurs fichiers sont invalides!"
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr "Les sommes de contrôle (%s) sont manquantes ou incomplètes."
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr "Extraction des sources..."
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr "Impossible de trouver le fichier source %s pour l'extraction."
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr "L'extraction de %s a échoué"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr "Début de la compilation..."
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr "La compilation a échoué."
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr "Finition de l'installation..."
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr "Suppression de la documentation..."
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr "Compression des man pages..."
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr ""
 "Strip des symboles de débogage dans les binaires et les bibliothèques..."
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr "Suppression des fichiers libtool .la..."
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr "Suppression des répertoires vides... "
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr "Le répertoire pkg/ est manquant."
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr "Création du paquet... "
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr "Génération du fichier .PKGINFO..."
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr "Ajouter une ligne license à votre %s SVP!"
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Exemple pour les logiciels GPL: license=('GPL')."
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr "Ajout du scriptlet d'installation..."
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr "Ajout du ChangeLog... "
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
 msgstr "Compression du paquet... "
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr "Echec à la création du paquet."
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr "Le programme xdelta est introuvable! Vérifiez qu'il est bien installé."
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr "Création du delta à partir de la version %s..."
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr ""
 "Recréation du paquet à partir des deltas pour obtenir la même somme de "
 "contrôle."
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr "NOTE: le delta devrait être distribué SEULEMENT avec cette archive."
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr "Impossible de générer le paquet à partir des deltas."
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr "Impossible de créer les deltas."
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr "Aucune version précédente n'a été trouvée, passe xdelta."
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr "Création du paquet source..."
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr "Ajoute %s..."
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
 msgstr "Script d'installation %s introuvable."
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr "Compression du paquet source... "
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr "Impossible de créer le paquet source."
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr "Détermination de la dernière révision darcs..."
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr "Détermination de la dernière révision cvs..."
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr "Détermination de la dernière révision git..."
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr "Détermination de la dernière révision svn..."
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr "Détermination de la dernière révision bzr..."
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr "Détermination de la dernière révision hg..."
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr "Version trouvée        : %s"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
 msgstr "Utilisation: %s [options]"
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr "Options:"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr "  -A, --ignorearch Ignore une entrée arch incomplète dans %s"
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr ""
 "  -b, --builddeps  Compilation des dépendances manquantes à partir des "
 "sources"
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Nettoyage des fichiers après compilation"
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache Nettoie les fichiers sources dans le cache"
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     ne vérifie pas les dépendances"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
 "  -e, --noextract  Ne pas extraire les fichiers sources (utilise le "
 "répertoire existant src/)"
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      écrase le paquet existant"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr ""
 "  -g, --geninteg   Génération des sommes de contrôle à partir des fichiers "
 "sources"
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       Cette aide"
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Installe le paquet après une compilation réussie"
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Log la compilation du paquet"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Ne pas colorer les messages de sortie"
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Seulement téléchargement et extraction des fichiers"
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr "  -p <buildscript> Utilise un script alternatif (à la place de '%s')"
 
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1088
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr ""
 "  -r, --rmdeps     Supprime les dépendances installées après une compilation "
 "réussie"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr ""
 "  -R, --repackage  Recréation du paquet à partir de pkg/ sans recompiler"
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Installe les dépendances manquantes avec pacman"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Autorise makepkg à s'exécuter en root"
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
-msgstr "      --holdver    Empêche la mise à jour automatique de la version pour les PKGBUILDs de développement."
+msgstr ""
+"      --holdver    Empêche la mise à jour automatique de la version pour les "
+"PKGBUILDs de développement."
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr ""
 "      --source     Ne compile pas le paquet; génère une archive avec juste "
 "les sources"
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr "Ces options peuvent être passées à pacman:"
 
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1098
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
 msgstr "      --noconfirm          ne demande aucune confirmation"
 
-#: scripts/makepkg.sh.in:1083
+#: scripts/makepkg.sh.in:1099
 msgid ""
 "      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr ""
 "      --noprogressbar      n'affiche pas la barre de progression pendant le "
 "téléchargement"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "Si -p n'est pas spécifié, makepkg regardera seulement '%s'"
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr "%s introuvable."
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr ""
 "Sudo est utilisé par défaut maintenant. L'option --usesudo est obsolète!"
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
-msgstr "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
+msgstr "\\0--holdver et --forcever sont incompatibles"
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr "Nettoyage de TOUS les fichiers dans %s."
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr "    Êtes-vous sur de vouloir faire celà? [Y/n] "
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
 "Problème à la suppression des fichiers; vous n'avez peut-être pas les "
 "permissions correctes dans %s"
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr "Le cache des sources est nettoyé."
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr "Aucun fichier n'a été supprimé."
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr "La destination source doit être défini dans makepkg.conf."
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr "De plus, utilisez makepkg -C en dehors du répertoire de cache."
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr "BUILDSCRIPT n'est pas défini! Vérifiez que vous avez mis à jour %s."
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr "Lancer makepkg en root est une MAUVAISE idée et peut causer"
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr "des dommages permanents et catastrophiques à votre système. Si vous"
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr "souhaitez le lancer en root, utilisez l'option --asroot."
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr "L'option --asroot ne concerne que l'utilisateur root."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr "Relancez makepkg avec l'option --asroot SVP."
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr "Fakeroot doit être installé si l'option 'fakeroot' est utilisé."
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr "dans le tableau BUILDENV dans %s."
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr ""
 "Lancer makepkg avec un utilisateur non privilégié aura pour conséquence la"
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
 "non-appartenance à root des fichiers. Essayez d'utiliser l'environnement "
 "fakeroot en"
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr "plaçant 'fakeroot' dans le tableau BUILDENV dans makepkg.conf."
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr ""
 "N'utilisez pas l'option '-F'. Cette option est uniquement pour makepkg."
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr "Sudo introuvable! Est-il installé?"
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
 "Les dépendances manquantes ne peuvent pas être installés ou désinstallés par "
 "un utilisateur normal"
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr ""
 "sans sudo; installez et configurez sudo pour que les dépendances soient "
 "résolus automatiquement."
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr "%s n'existe pas."
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
 msgstr "%s ne peut pas être vide."
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s ne peut pas contenir des tirets."
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s n'est pas disponible pour l'architecture '%s'."
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
 msgstr "Notez que beaucoup de paquets peuvent avoir besoin d'une ligne dans %s"
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr "comme arch=('%s')."
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Le scriptlet d'installation (%s) n'a pas été trouvé."
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr "Un paquet a déjà été compilé, installation du paquet existant..."
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "Un paquet a déjà été compilé. (utilisez -f pour l'écraser)"
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr "Passe la compilation."
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr "Quitte l'environnement fakeroot."
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr "Création du paquet %s"
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr "Lancement de makepkg en root..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr "Paquet source créé: %s"
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr "Passe la vérification des dépendances."
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr "Vérification des dépendances..."
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr "Vérification des dépendances pour la compilation..."
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr "Échec de résolution des dépendances."
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
 msgstr ""
 "pacman n'a pas été trouvé dans PATH; passe la vérification des dépendances."
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr "Passe la récupération des sources -- utilise l'arbre src/ existant"
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr "Passe la vérification des sources -- utilise l'arbre src/ existant"
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr "Passe l'extraction des sources -- utilise l'arbre src/ existant"
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "Le répertoire source est vide, il n'y a rien à compiler!"
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr "Le répertoire du paquet est vide, il n'y a rien à repaqueter!"
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr "Les sources sont prêtes."
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr "Suppression du répertoire pkg/ existant..."
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr "Entre dans l'environnement fakeroot..."
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr "Création finie: %s"
 
@@ -2063,7 +2044,7 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Le paquet '%s' est invalide."
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr "Suppression du paquet '%s'..."
 
@@ -2091,21 +2072,21 @@ msgstr "Ajout du delta '%s'"
 msgid "Could not add delta '%s'"
 msgstr "n'a pas pu ajouter le delta '%s'"
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr "%s introuvable. Ne peut pas continuer."
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr ""
 "Ne peut pas créer le répertoire temporaire pour construire la base de "
 "données."
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Le fichier de dépôt '%s' n'est pas un dépôt pacman valide."
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr "Extraction de la base de données vers un répertoire temporaire..."
 
@@ -2125,23 +2106,23 @@ msgstr "le paquet '%s' n'a pas été trouvé."
 msgid "Creating updated database file %s"
 msgstr "Création du nouveau dépôt %s"
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr "Aucune compression spécifiée."
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr "Aucun paquets modifiés, il n'y a rien à faire."
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
 msgstr "repo-remove %s\\n\\n"
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
 msgstr "utilisation: %s <path-to-db> <packagename> ...\\n\\n"
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
@@ -2151,27 +2132,33 @@ msgstr ""
 "ligne de commande pour un dépôt donné. Plusieurs\\npaquets à supprimer "
 "peuvent être spécifiés.\\n\\n"
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "Exemple:  repo-remove /path/to/repo.db.tar.gz kernel26"
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
 msgstr "Recherche le paquet '%s'..."
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr "le paquet '%s' n'a pas été trouvé."
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr "Création du nouveau dépôt '%s'..."
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr ""
+"Tous les paquets ont été supprimés de la base de données. "
+"Suppression de '%s'."
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr "Utilisation: %s <action> <destfile> <option> [package_directory]"
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
@@ -2181,11 +2168,11 @@ msgstr ""
 "destfile. updatesync met à jour la base de données dans un\\nrépertoire "
 "temporaire, et le compresse ensuite dans <destfile>.\\n\\n"
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
 msgstr "Il y a deux types d'actions:\\n\\n"
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
@@ -2193,7 +2180,7 @@ msgstr ""
 "upd - Met à jour l'entrée d'un paquet, ou la crée si elle n'existe pas."
 "\\n      Prend le PKGBUILD du paquet en argument.\\n"
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
@@ -2201,7 +2188,7 @@ msgstr ""
 "del - Supprime l'entrée d'un paquet dans la base de donnée.\\n      Prend le "
 "nom du paquet en argument.\\n"
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
@@ -2210,11 +2197,11 @@ msgstr ""
 "\\n<destfile>, sauf si un répertoire alternatif [package_directory] est "
 "spécifié.\\n\\n"
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr "Exemple:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -2224,13 +2211,10 @@ msgstr ""
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr "%s introuvable"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr "%s-%s-%s-%s%s introuvable - abandon"
-
-#~ msgid "Installing package with pacman -U..."
-#~ msgstr "Installation du paquet avec pacman -U... "
diff --git a/po/hu.po b/po/hu.po
index 5898ea25..07a56688 100644
--- a/po/hu.po
+++ b/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: 2008-01-14 23:03-0600\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
 "PO-Revision-Date: 2006-09-03 13:52+0200\n"
 "Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,12 +19,13 @@ msgstr ""
 #: src/pacman/add.c:40 src/pacman/remove.c:42
 #, c-format
 msgid "failed to release transaction (%s)\n"
-msgstr "nem siker�lt lez�rni a tranzakci�t (%s)\n"
+msgstr "nem siker�lt lez�rni a tranzakci�t (%s)\n"
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
-msgstr "nincs megadva egyetlen c�l sem (haszn�lja a '-h'-t seg�ts�g�rt)\n"
+msgstr ""
+"nincs megadva egyetlen c�l sem (haszn�lja a '-h'-t seg�ts�g�rt)\n"
 
 #: src/pacman/add.c:104 src/pacman/sync.c:510
 #, c-format
@@ -37,118 +38,118 @@ msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s.\n"
 msgstr ""
-"  ha biztos benne, hogy nem fut m�sik csomagkezel�, akkor\n"
-"  elt�vol�thatja a %s f�jlt.\n"
+"  ha biztos benne, hogy nem fut m�sik csomagkezel�, akkor\n"
+"  elt�vol�thatja a %s f�jlt.\n"
 
 #: src/pacman/add.c:114 src/pacman/remove.c:106
 #, c-format
 msgid "loading package data... "
-msgstr "csomag adatainak bet�lt�se... "
+msgstr "csomag adatainak bet�lt�se... "
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "hiba: nem siker�lt a(z) '%s' c�lt hozz�adni (%s)"
+msgid "error: '%s': %s\n"
+msgstr "hiba: '%s': %s\n"
 
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
-msgstr "k�sz.\n"
+msgstr "k�sz.\n"
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
-msgstr "hiba: nem siker�lt el�k�sz�teni a tranzakci�t (%s)\n"
+msgstr "hiba: nem siker�lt el�k�sz�teni a tranzakci�t (%s)\n"
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
-msgstr ":: %s: ig�nyli a k�vetkez�t: %s\n"
+msgstr ":: %s: ig�nyli a k�vetkez�t: %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: �tk�zik a k�vetkez�vel: %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: �tk�zik a k�vetkez�vel: %s\n"
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
-msgstr "%s l�tezik ebben: '%s' �s ebben: '%s'\n"
+msgstr "%s l�tezik ebben: '%s' �s ebben: '%s'\n"
 
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
-msgstr "%s: %s l�tezik a f�jlrendszerben\n"
+msgstr "%s: %s l�tezik a f�jlrendszerben\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
 msgstr ""
 "\n"
-"hib�k l�ptek fel, nem friss�lt csomag.\n"
+"hib�k l�ptek fel, nem friss�lt csomag.\n"
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
-msgstr "hiba: nem siker�lt v�grehajtani a tranzakci�t (%s)\n"
+msgstr "hiba: nem siker�lt v�grehajtani a tranzakci�t (%s)\n"
 
 #: src/pacman/callback.c:165
 #, c-format
 msgid "checking dependencies...\n"
-msgstr "f�gg�s�gek vizsg�lata...\n"
+msgstr "f�gg�s�gek vizsg�lata...\n"
 
 #: src/pacman/callback.c:169
 #, c-format
 msgid "checking for file conflicts...\n"
-msgstr "f�jl�tk�z�sek vizsg�lata...\n"
+msgstr "f�jl�tk�z�sek vizsg�lata...\n"
 
 #: src/pacman/callback.c:173
 #, c-format
 msgid "resolving dependencies...\n"
-msgstr "f�gg�s�gek felold�sa...\n"
+msgstr "f�gg�s�gek felold�sa...\n"
 
 #: src/pacman/callback.c:176
 #, c-format
 msgid "looking for inter-conflicts...\n"
-msgstr "bels� �tk�z�sek keres�se...\n"
+msgstr "bels� �tk�z�sek keres�se...\n"
 
 #: src/pacman/callback.c:180
 #, c-format
 msgid "installing %s...\n"
-msgstr "%s telep�t�se...\n"
+msgstr "%s telep�t�se...\n"
 
 #: src/pacman/callback.c:191
 #, c-format
 msgid "removing %s...\n"
-msgstr "%s elt�vol�t�sa...\n"
+msgstr "%s elt�vol�t�sa...\n"
 
 #: src/pacman/callback.c:202
 #, c-format
 msgid "upgrading %s...\n"
-msgstr "%s friss�t�se...\n"
+msgstr "%s friss�t�se...\n"
 
 #: src/pacman/callback.c:213
 #, c-format
 msgid "checking package integrity...\n"
-msgstr "csomagok integrit�s�nak ellen�rz�se...\n"
+msgstr "csomagok integrit�s�nak ellen�rz�se...\n"
 
 #: src/pacman/callback.c:216
 #, c-format
 msgid "checking delta integrity...\n"
-msgstr "delt�k integrit�s�nak ellen�rz�se...\n"
+msgstr "delt�k integrit�s�nak ellen�rz�se...\n"
 
 #: src/pacman/callback.c:219
 #, c-format
 msgid "applying deltas...\n"
-msgstr "delt�k alkalmaz�sa...\n"
+msgstr "delt�k alkalmaz�sa...\n"
 
 #: src/pacman/callback.c:222
 #, c-format
 msgid "generating %s with %s... "
-msgstr "%s l�trehoz�sa %s seg�ts�g�vel... "
+msgstr "%s l�trehoz�sa %s seg�ts�g�vel... "
 
 #: src/pacman/callback.c:225
 #, c-format
@@ -163,7 +164,7 @@ msgstr "sikertelen.\n"
 #: src/pacman/callback.c:237
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: Csomagok let�lt�se a(z) %s rep�b�l...\n"
+msgstr ":: Csomagok let�lt�se a(z) %s rep�b�l...\n"
 
 #: src/pacman/callback.c:265
 #, c-format
@@ -171,71 +172,68 @@ msgid ""
 ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
 "n] "
 msgstr ""
-":: %s ig�nyli %s telep�t�s�t az IgnorePkg/IgnoreGroup-b�l. M�gis telep�ti? "
-"[I/n] "
+":: %s ig�nyli %s telep�t�s�t az IgnorePkg/IgnoreGroup-b�l. M�gis "
+"telep�ti? [I/n] "
 
 #: src/pacman/callback.c:270
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
-msgstr ":: %s az IgnorePkg/IgnoreGroup r�sze. M�gis telep�ti? [I/n] "
+msgstr ":: %s az IgnorePkg/IgnoreGroup r�sze. M�gis telep�ti? [I/n] "
 
 #: src/pacman/callback.c:276
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-msgstr ":: %s HoldPkgnak lett jel�lve. Biztosan elt�vol�tja? [I/n] "
+msgstr ":: %s HoldPkgnak lett jel�lve. Biztosan elt�vol�tja? [I/n] "
 
 #: src/pacman/callback.c:282
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
-msgstr ":: Lecser�li %s-t erre: %s/%s? [I/n] "
+msgstr ":: Lecser�li %s-t erre: %s/%s? [I/n] "
 
 #: src/pacman/callback.c:288
 #, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
-msgstr ""
-"%s lecser�l�se erre: %s/%s\n"
-"."
+msgid "Replacing %s with %s/%s\n"
+msgstr "%s lecser�l�se erre: %s/%s\n"
 
 #: src/pacman/callback.c:296
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
-msgstr ":: %s �tk�zik a k�vetkez�vel: %s. Elt�vol�tja a %s-t? [I/n] "
+msgstr ""
+":: %s �tk�zik a k�vetkez�vel: %s. Elt�vol�tja a %s-t? [I/n] "
 
 #: src/pacman/callback.c:304
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
-msgstr ":: %s-%s: a helyi verzi� �jabb. M�gis friss�ti? [I/n] "
+msgstr ":: %s-%s: a helyi verzi� �jabb. M�gis friss�ti? [I/n] "
 
 #: src/pacman/callback.c:314
 #, c-format
 msgid ":: File %s is corrupted. Do you want to delete it? [Y/n] "
-msgstr ":: A %s f�jl s�r�lt. K�v�nja t�r�lni? [I/n] "
+msgstr ":: A %s f�jl s�r�lt. K�v�nja t�r�lni? [I/n] "
 
 #: src/pacman/callback.c:364
 msgid "installing"
-msgstr "telep�t�s:"
+msgstr "telep�t�s:"
 
 #: src/pacman/callback.c:367
 msgid "upgrading"
-msgstr "friss�t�s:"
+msgstr "friss�t�s:"
 
 #: src/pacman/callback.c:370
 msgid "removing"
-msgstr "elt�vol�t�s:"
+msgstr "elt�vol�t�s:"
 
 #: src/pacman/callback.c:373
 msgid "checking for file conflicts"
-msgstr "f�jl�tk�z�sek vizsg�lata"
+msgstr "f�jl�tk�z�sek vizsg�lata"
 
 #: src/pacman/package.c:68
 msgid "Explicitly installed"
-msgstr "K�zzel telep�tve"
+msgstr "K�zzel telep�tve"
 
 #: src/pacman/package.c:71
 msgid "Installed as a dependency for another package"
-msgstr "Egy m�sik csomag f�gg�s�gek�nt lett telep�tve"
+msgstr "Egy m�sik csomag f�gg�s�gek�nt lett telep�tve"
 
 #: src/pacman/package.c:74
 msgid "Unknown"
@@ -243,19 +241,19 @@ msgstr "Ismeretlen"
 
 #: src/pacman/package.c:89
 msgid "Description    : "
-msgstr "Le�r�s          : "
+msgstr "Le�r�s          : "
 
 #: src/pacman/package.c:93
 msgid "Filename       :"
-msgstr "F�jln�v         :"
+msgstr "F�jln�v         :"
 
 #: src/pacman/package.c:95
 msgid "Name           :"
-msgstr "N�v             :"
+msgstr "N�v             :"
 
 #: src/pacman/package.c:96
 msgid "Version        :"
-msgstr "Verzi�          :"
+msgstr "Verzi�          :"
 
 #: src/pacman/package.c:97
 msgid "URL            :"
@@ -271,66 +269,66 @@ msgstr "Csoportok       :"
 
 #: src/pacman/package.c:100
 msgid "Provides       :"
-msgstr "Szolg�ltatja    :"
+msgstr "Szolg�ltatja    :"
 
 #: src/pacman/package.c:101
 msgid "Depends On     :"
-msgstr "F�gg            :"
+msgstr "F�gg            :"
 
 #: src/pacman/package.c:102
 msgid "Optional Deps  :"
-msgstr "Opcion�lis f�gg.:"
+msgstr "Opcion�lis f�gg.:"
 
 #: src/pacman/package.c:105
 msgid "Required By    :"
-msgstr "Ig�nyli         :"
+msgstr "Ig�nyli         :"
 
 #: src/pacman/package.c:108
 msgid "Conflicts With :"
-msgstr "�tk�zik         :"
+msgstr "�tk�zik         :"
 
 #: src/pacman/package.c:109
 msgid "Replaces       :"
-msgstr "Lecser�li       :"
+msgstr "Lecser�li       :"
 
 #: src/pacman/package.c:111
 #, c-format
 msgid "Download Size  : %6.2f K\n"
-msgstr "Let�ltend� m�ret: %6.2f K\n"
+msgstr "Let�ltend� m�ret: %6.2f K\n"
 
 #: src/pacman/package.c:115
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "T�m�r�tett m�ret: %6.2f K\n"
+msgstr "T�m�r�tett m�ret: %6.2f K\n"
 
 #: src/pacman/package.c:119
 #, c-format
 msgid "Installed Size : %6.2f K\n"
-msgstr "Telep�tett m�ret: %6.2f K\n"
+msgstr "Telep�tett m�ret: %6.2f K\n"
 
 #: src/pacman/package.c:121
 msgid "Packager       :"
-msgstr "Csomagol�       :"
+msgstr "Csomagol�       :"
 
 #: src/pacman/package.c:122
 msgid "Architecture   :"
-msgstr "Architekt�ra    :"
+msgstr "Architekt�ra    :"
 
 #: src/pacman/package.c:123
 msgid "Build Date     :"
-msgstr "Ford�t�s ideje  :"
+msgstr "Ford�t�s ideje  :"
 
 #: src/pacman/package.c:125
 msgid "Install Date   :"
-msgstr "Telep�t�s ideje :"
+msgstr "Telep�t�s ideje :"
 
 #: src/pacman/package.c:126
 msgid "Install Reason :"
-msgstr "Telep�t�s oka   :"
+msgstr "Telep�t�s oka   :"
 
 #: src/pacman/package.c:129
 msgid "Install Script :"
-msgstr "Telep�t� szkript:"
+msgstr "Telep�t� szkript:"
 
 #: src/pacman/package.c:130
 msgid "Yes"
@@ -346,32 +344,33 @@ msgstr "MD5 Sum         :"
 
 #: src/pacman/package.c:159
 msgid "Repository     :"
-msgstr "Rep�            :"
+msgstr "Rep�            :"
 
 #: src/pacman/package.c:169
 #, c-format
 msgid "Backup Files:\n"
-msgstr "Backup f�jlok:\n"
+msgstr "Backup f�jlok:\n"
 
 #: src/pacman/package.c:189
 #, c-format
 msgid "error: could not calculate checksums for %s\n"
-msgstr "hiba: nem siker�lt a(z) %s ellen�rz� �sszeg�nek sz�m�t�sa\n"
+msgstr ""
+"hiba: nem siker�lt a(z) %s ellen�rz� �sszeg�nek sz�m�t�sa\n"
 
 #: src/pacman/package.c:197
 #, c-format
 msgid "MODIFIED\t%s\n"
-msgstr "M�DOS�TVA\t%s\n"
+msgstr "M�DOS�TVA\t%s\n"
 
 #: src/pacman/package.c:199
 #, c-format
 msgid "Not Modified\t%s\n"
-msgstr "Nem m�dos�tva\t%s\n"
+msgstr "Nem m�dos�tva\t%s\n"
 
 #: src/pacman/package.c:203
 #, c-format
 msgid "MISSING\t\t%s\n"
-msgstr "HI�NYZIK\t\t%s\n"
+msgstr "HI�NYZIK\t\t%s\n"
 
 #: src/pacman/package.c:209
 #, c-format
@@ -381,15 +380,16 @@ msgstr "(nincs)\n"
 #: src/pacman/package.c:243
 #, c-format
 msgid "error: no changelog available for '%s'.\n"
-msgstr "hiba: nem �ll rendelkez�sre v�ltoz�si napl� a(z) '%s' csomaghoz.\n"
+msgstr ""
+"hiba: nem �ll rendelkez�sre v�ltoz�si napl� a(z) '%s' csomaghoz.\n"
 
 #: src/pacman/pacman.c:60
 msgid "options"
-msgstr "opci�k"
+msgstr "opci�k"
 
 #: src/pacman/pacman.c:61
 msgid "file"
-msgstr "f�jl"
+msgstr "f�jl"
 
 #: src/pacman/pacman.c:62
 msgid "package"
@@ -397,11 +397,11 @@ msgstr "csomag"
 
 #: src/pacman/pacman.c:63
 msgid "usage"
-msgstr "haszn�lat"
+msgstr "haszn�lat"
 
 #: src/pacman/pacman.c:64
 msgid "operation"
-msgstr "m�velet"
+msgstr "m�velet"
 
 #: src/pacman/pacman.c:76
 #, c-format
@@ -410,131 +410,145 @@ msgid ""
 "use '%s --help' with other options for more syntax\n"
 msgstr ""
 "\n"
-"haszn�lja a '%s --help'-et m�s opci�kkal tov�bbi szintaxishoz\n"
+"haszn�lja a '%s --help'-et m�s opci�kkal tov�bbi szintaxishoz\n"
 
 #: src/pacman/pacman.c:81 src/pacman/pacman.c:95 src/pacman/pacman.c:117
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr "      --asdeps         a csomagok f�gg�s�gk�nt val� telep�t�se\n"
+msgstr ""
+"      --asdeps         a csomagok f�gg�s�gk�nt val� "
+"telep�t�se\n"
 
 #: src/pacman/pacman.c:82 src/pacman/pacman.c:88 src/pacman/pacman.c:96
 #: src/pacman/pacman.c:119
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         f�gg�s�gi ellen�rz�sek kihagy�sa\n"
+msgstr "  -d, --nodeps         f�gg�s�gi ellen�rz�sek kihagy�sa\n"
 
 #: src/pacman/pacman.c:83 src/pacman/pacman.c:97 src/pacman/pacman.c:121
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr ""
-"  -f, --force          a telep�t�s er�ltet�se, �tk�z� f�jlok fel�l�r�sa\n"
+"  -f, --force          a telep�t�s er�ltet�se, �tk�z� f�jlok "
+"fel�l�r�sa\n"
 
 #: src/pacman/pacman.c:87
 #, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
 msgstr ""
-"  -c, --cascade        a csomagok �s az �ket ig�nyl� csomagok elt�vol�t�sa\n"
+"  -c, --cascade        a csomagok �s az �ket ig�nyl� csomagok "
+"elt�vol�t�sa\n"
 
 #: src/pacman/pacman.c:89
 #, c-format
 msgid ""
 "  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr ""
-"  -k, --dbonly         csak az adatb�zis-bejegyz�st t�r�lje, a f�jlokat ne\n"
+"  -k, --dbonly         csak az adatb�zis-bejegyz�st t�r�lje, a "
+"f�jlokat ne\n"
 
 #: src/pacman/pacman.c:90
 #, c-format
 msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         a be�ll�t�si f�jlokat is t�r�lje\n"
+msgstr "  -n, --nosave         a be�ll�t�si f�jlokat is t�r�lje\n"
 
 #: src/pacman/pacman.c:91
 #, c-format
 msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
 msgstr ""
-"  -s, --recursive      a f�gg�s�geket is t�vol�tsa el (melyekn�l ez "
-"biztons�gos)\n"
+"  -s, --recursive      a f�gg�s�geket is t�vol�tsa el (melyekn�l "
+"ez biztons�gos)\n"
 
 #: src/pacman/pacman.c:101
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
-msgstr "  -c, --changelog      egy csomag v�ltoz�si napl�j�nak megtekint�se\n"
+msgstr ""
+"  -c, --changelog      egy csomag v�ltoz�si napl�j�nak "
+"megtekint�se\n"
 
 #: src/pacman/pacman.c:102
 #, c-format
 msgid "  -d, --deps           list all packages installed as dependencies\n"
 msgstr ""
-"  -d, --deps           az �sszes f�gg�s�gk�nt telep�tett csomag list�z�sa\n"
+"  -d, --deps           az �sszes f�gg�s�gk�nt telep�tett csomag "
+"list�z�sa\n"
 
 #: src/pacman/pacman.c:103
 #, c-format
 msgid "  -e, --explicit       list all packages explicitly installed\n"
-msgstr "  -e, --explicit       az �sszes k�zzel telep�tett csomag list�z�sa\n"
+msgstr ""
+"  -e, --explicit       az �sszes k�zzel telep�tett csomag "
+"list�z�sa\n"
 
 #: src/pacman/pacman.c:104 src/pacman/pacman.c:122
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr "  -g, --groups         egy csoport �sszes tagj�nak megtekint�se\n"
+msgstr ""
+"  -g, --groups         egy csoport �sszes tagj�nak megtekint�se\n"
 
 #: src/pacman/pacman.c:105
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
-"  -i, --info           csomaginform�ci�k megtekint�se (-ii: backup f�jlok "
-"is)\n"
+"  -i, --info           csomaginform�ci�k megtekint�se (-ii: backup "
+"f�jlok is)\n"
 
 #: src/pacman/pacman.c:106
 #, c-format
 msgid "  -l, --list           list the contents of the queried package\n"
-msgstr "  -l, --list           a lek�rdezett csomag tartalm�nak list�z�sa\n"
+msgstr ""
+"  -l, --list           a lek�rdezett csomag tartalm�nak list�z�sa\n"
 
 #: src/pacman/pacman.c:107
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
-"  -m, --foreign        a t�voli rep�kban nem tal�lt telep�tett csomagok "
-"list�ja\n"
+"  -m, --foreign        a t�voli rep�kban nem tal�lt telep�tett "
+"csomagok list�ja\n"
 
 #: src/pacman/pacman.c:108
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr "  -o, --owns <f�jl>    a <f�jl>-t tartalmaz� csomag lek�rdez�se\n"
+msgstr ""
+"  -o, --owns <f�jl>    a <f�jl>-t tartalmaz� csomag lek�rdez�se\n"
 
 #: src/pacman/pacman.c:109
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
-"  -p, --file <csomag>  a <csomag> csomagf�jl lek�rdez�se az adatb�zis "
-"helyett\n"
+"  -p, --file <csomag>  a <csomag> csomagf�jl lek�rdez�se az "
+"adatb�zis helyett\n"
 
 #: src/pacman/pacman.c:110
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr "  -s, --search <regex> keres�s a telep�tett csomagok k�z�tt\n"
+msgstr "  -s, --search <regex> keres�s a telep�tett csomagok k�z�tt\n"
 
 #: src/pacman/pacman.c:111
 #, c-format
 msgid "  -t, --unrequired     list all packages not required by any package\n"
 msgstr ""
-"  -t, --unrequired     azon csomagok list�z�sa, melyeket nem ig�nyel m�s "
-"csomag\n"
+"  -t, --unrequired     azon csomagok list�z�sa, melyeket nem ig�nyel "
+"m�s csomag\n"
 
 #: src/pacman/pacman.c:112
 #, c-format
 msgid "  -u, --upgrades       list all packages that can be upgraded\n"
-msgstr "  -u, --upgrades       az �sszes friss�thet� csomag list�z�sa\n"
+msgstr ""
+"  -u, --upgrades       az �sszes friss�thet� csomag list�z�sa\n"
 
 #: src/pacman/pacman.c:113
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
 msgstr ""
-"  -q, --quiet          kevesebb inform�ci� mutat�sa lek�rdez�sn�l �s "
-"keres�sn�l\n"
+"  -q, --quiet          kevesebb inform�ci� mutat�sa "
+"lek�rdez�sn�l �s keres�sn�l\n"
 
 #: src/pacman/pacman.c:118
 #, c-format
@@ -542,23 +556,24 @@ msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
 msgstr ""
-"  -c, --clean          a r�gi csomagok t�rl�se a gyors�t�t�rk�nyvt�rb�l\n"
-"                       (haszn�lja a '-cc'-t az �sszeshez)\n"
+"  -c, --clean          a r�gi csomagok t�rl�se a "
+"gyors�t�t�rk�nyvt�rb�l\n"
+"                       (haszn�lja a '-cc'-t az �sszeshez)\n"
 
 #: src/pacman/pacman.c:120
 #, c-format
 msgid "  -e, --dependsonly    install dependencies only\n"
-msgstr "  -e, --dependsonly    csak a f�gg�s�gek telep�t�se\n"
+msgstr "  -e, --dependsonly    csak a f�gg�s�gek telep�t�se\n"
 
 #: src/pacman/pacman.c:123
 #, c-format
 msgid "  -i, --info           view package information\n"
-msgstr "  -i, --info           csomaginform�ci�k megtekint�se\n"
+msgstr "  -i, --info           csomaginform�ci�k megtekint�se\n"
 
 #: src/pacman/pacman.c:124
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr "  -l, --list <rep�>    egy rep� csomagjainak list�z�sa\n"
+msgstr "  -l, --list <rep�>    egy rep� csomagjainak list�z�sa\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
@@ -566,38 +581,42 @@ msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
 msgstr ""
-"  -p, --print-uris     list�zza a megadott csomagok �s f�gg�s�geik URI-jait\n"
+"  -p, --print-uris     list�zza a megadott csomagok �s f�gg�s�geik "
+"URI-jait\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
 msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr "  -s, --search <regex> keres�s a t�voli csomagadatb�zisokban\n"
+msgstr "  -s, --search <regex> keres�s a t�voli csomagadatb�zisokban\n"
 
 #: src/pacman/pacman.c:127
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
-msgstr "  -u, --sysupgrade     az �sszes elavult csomag friss�t�se\n"
+msgstr "  -u, --sysupgrade     az �sszes elavult csomag friss�t�se\n"
 
 #: src/pacman/pacman.c:128
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr "  -w, --downloadonly   csak let�lt�s, de semmit nem telep�t/friss�t\n"
+msgstr ""
+"  -w, --downloadonly   csak let�lt�s, de semmit nem telep�t/friss�t\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
-msgstr "  -y, --refresh        friss csomagadatb�zis let�lt�se a szerverr�l\n"
+msgstr ""
+"  -y, --refresh        friss csomagadatb�zis let�lt�se a szerverr�l\n"
 
 #: src/pacman/pacman.c:130
 #, c-format
 msgid ""
 "      --needed         only upgrade outdated or not yet installed packages\n"
 msgstr ""
-"      --needed         csak az elavult vagy hi�nyz� csomagok \"friss�t�se\"\n"
+"      --needed         csak az elavult vagy hi�nyz� csomagok "
+"\"friss�t�se\"\n"
 
 #: src/pacman/pacman.c:131
 #, c-format
@@ -605,7 +624,8 @@ msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
-"      --ignore <csom.> csomagfriss�t�s mell�z�se (t�bbsz�r is haszn�lhat�)\n"
+"      --ignore <csom.> csomagfriss�t�s mell�z�se (t�bbsz�r is "
+"haszn�lhat�)\n"
 
 #: src/pacman/pacman.c:132
 #, c-format
@@ -614,36 +634,40 @@ msgid ""
 "                       ignore a group upgrade (can be used more than once)\n"
 msgstr ""
 "      --ignoregroup <csoport>\n"
-"                       csoportfriss�t�s mell�z�se (t�bbsz�r is haszn�lhat�)\n"
+"                       csoportfriss�t�s mell�z�se (t�bbsz�r is "
+"haszn�lhat�)\n"
 
 #: src/pacman/pacman.c:134
 #, c-format
 msgid "  -q  --quiet          show less information for query and search\n"
 msgstr ""
-"  -q, --quiet          kevesebb inform�ci� mutat�sa lek�rdez�sn�l �s "
-"keres�sn�l\n"
+"  -q, --quiet          kevesebb inform�ci� mutat�sa "
+"lek�rdez�sn�l �s keres�sn�l\n"
 
 #: src/pacman/pacman.c:136
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr "      --config <�tv.>  alternat�v konfigur�ci�s f�jl be�ll�t�sa\n"
+msgstr ""
+"      --config <�tv.>  alternat�v konfigur�ci�s f�jl "
+"be�ll�t�sa\n"
 
 #: src/pacman/pacman.c:137
 #, c-format
 msgid "      --logfile <path> set an alternate log file\n"
-msgstr "      --logfile <�tv.> alternat�v logf�jl be�ll�t�sa\n"
+msgstr "      --logfile <�tv.> alternat�v logf�jl be�ll�t�sa\n"
 
 #: src/pacman/pacman.c:138
 #, c-format
 msgid "      --noconfirm      do not ask for any confirmation\n"
-msgstr "      --noconfirm      ne k�rjen soha meger�s�t�st\n"
+msgstr "      --noconfirm      ne k�rjen soha meger�s�t�st\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""
-"      --noprogressbar  ne mutasson folyamats�vot a f�jlok let�lt�se k�zben\n"
+"      --noprogressbar  ne mutasson folyamats�vot a f�jlok let�lt�se "
+"k�zben\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -655,24 +679,28 @@ msgstr ""
 #: src/pacman/pacman.c:141
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
-msgstr "  -v, --verbose        legyen b�besz�d�\n"
+msgstr "  -v, --verbose        legyen b�besz�d�\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
-"  -r, --root <�tvonal> alternat�v telep�t�si gy�k�rk�nyvt�r be�ll�t�sa\n"
+"  -r, --root <�tvonal> alternat�v telep�t�si gy�k�rk�nyvt�r "
+"be�ll�t�sa\n"
 
 #: src/pacman/pacman.c:143
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr "  -b, --dbpath <�tv.>  alternat�v adatb�zisk�nyvt�r be�ll�t�sa\n"
+msgstr ""
+"  -b, --dbpath <�tv.>  alternat�v adatb�zisk�nyvt�r "
+"be�ll�t�sa\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr ""
-"      --cachedir <kvt> alternat�v csomaggyors�t�t�r-k�nyvt�r be�ll�t�sa\n"
+"      --cachedir <kvt> alternat�v csomaggyors�t�t�r-k�nyvt�r "
+"be�ll�t�sa\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
@@ -680,137 +708,151 @@ msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License\n"
 msgstr ""
-"                       Ezt a programot b�rki a General Public License-ben\n"
-"                       foglaltak alapj�n szabadon terjesztheti\n"
+"                       Ezt a programot b�rki a General Public License-ben\n"
+"                       foglaltak alapj�n szabadon terjesztheti\n"
 
 #: src/pacman/pacman.c:247
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr ""
-"hiba t�rt�nt a(z) '%s' telep�t�si gy�k�rk�nyvt�r be�ll�t�sa sor�n (%s)\n"
+"hiba t�rt�nt a(z) '%s' telep�t�si gy�k�rk�nyvt�r "
+"be�ll�t�sa sor�n (%s)\n"
 
 #: src/pacman/pacman.c:264
 #, c-format
 msgid "problem setting dbpath '%s' (%s)\n"
-msgstr "hiba t�rt�nt a(z) '%s' adatb�zisk�nyvt�r be�ll�t�sa sor�n (%s)\n"
+msgstr ""
+"hiba t�rt�nt a(z) '%s' adatb�zisk�nyvt�r be�ll�t�sa sor�n "
+"(%s)\n"
 
 #: src/pacman/pacman.c:272
 #, c-format
 msgid "problem setting logfile '%s' (%s)\n"
-msgstr "hiba t�rt�nt a(z) '%s' napl�f�jl be�ll�t�sa sor�n (%s)\n"
+msgstr ""
+"hiba t�rt�nt a(z) '%s' napl�f�jl be�ll�t�sa sor�n (%s)\n"
 
 #: src/pacman/pacman.c:382
 #, c-format
 msgid "'%s' is not a valid debug level\n"
-msgstr "a(z) '%s' nem �rv�nyes hibakeres�si szint\n"
+msgstr "a(z) '%s' nem �rv�nyes hibakeres�si szint\n"
 
 #: src/pacman/pacman.c:396 src/pacman/pacman.c:672
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
-msgstr "hiba t�rt�nt a(z) '%s' gyors�t�t�r-k�nyvt�r hozz�ad�sa sor�n (%s)\n"
+msgstr ""
+"hiba t�rt�nt a(z) '%s' gyors�t�t�r-k�nyvt�r hozz�ad�sa "
+"sor�n (%s)\n"
 
 #: src/pacman/pacman.c:482
 msgid "only one operation may be used at a time\n"
-msgstr "csak egy m�velet hajthat� v�gre egyszerre\n"
+msgstr "csak egy m�velet hajthat� v�gre egyszerre\n"
 
 #: src/pacman/pacman.c:542
 #, c-format
 msgid "config file %s could not be read.\n"
-msgstr "a %s konfigur�ci�s f�jl nem olvashat�.\n"
+msgstr "a %s konfigur�ci�s f�jl nem olvashat�.\n"
 
 #: src/pacman/pacman.c:578
 #, c-format
 msgid "config file %s, line %d: bad section name.\n"
-msgstr "%s konfigur�ci�s f�jl, %d. sor: hib�s szekci�n�v.\n"
+msgstr "%s konfigur�ci�s f�jl, %d. sor: hib�s szekci�n�v.\n"
 
 #: src/pacman/pacman.c:600
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
-msgstr "%s konfigur�ci�s f�jl, %d. sor: szintaktikai hiba- hi�nyz� kulcs.\n"
+msgstr ""
+"%s konfigur�ci�s f�jl, %d. sor: szintaktikai hiba- hi�nyz� kulcs.\n"
 
 #: src/pacman/pacman.c:610
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr ""
-"%s konfigur�ci�s f�jl, %d. sor: Minden direkt�v�nak egy szekci�hoz "
-"kell tartoznia.\n"
+"%s konfigur�ci�s f�jl, %d. sor: Minden direkt�v�nak egy "
+"szekci�hoz kell tartoznia.\n"
 
 #: src/pacman/pacman.c:638 src/pacman/pacman.c:692 src/pacman/pacman.c:707
 #, c-format
 msgid "config file %s, line %d: directive '%s' not recognized.\n"
-msgstr "%s konfigur�ci�s f�jl, %d. sor: a '%s' direkt�va nem �rtelmezhet�.\n"
+msgstr ""
+"%s konfigur�ci�s f�jl, %d. sor: a '%s' direkt�va nem "
+"�rtelmezhet�.\n"
 
 #: src/pacman/pacman.c:777
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
-msgstr "nem siker�lt inicializ�lni az alpm k�nyvt�rat (%s)\n"
+msgstr "nem siker�lt inicializ�lni az alpm k�nyvt�rat (%s)\n"
 
 #: src/pacman/pacman.c:814
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "ez a m�velet csak rendszergazdak�nt hajthat� v�gre.\n"
+msgstr "ez a m�velet csak rendszergazdak�nt hajthat� v�gre.\n"
 
 #: src/pacman/pacman.c:837
 #, c-format
 msgid "could not register 'local' database (%s)\n"
-msgstr "nem siker�lt regisztr�lni a 'local' adatb�zist (%s)\n"
+msgstr "nem siker�lt regisztr�lni a 'local' adatb�zist (%s)\n"
 
 #: src/pacman/pacman.c:863
 msgid "no operation specified (use -h for help)\n"
-msgstr "nincs megadva egyetlen m�velet sem (haszn�lja a '-h'-t seg�ts�g�rt)\n"
+msgstr ""
+"nincs megadva egyetlen m�velet sem (haszn�lja a '-h'-t "
+"seg�ts�g�rt)\n"
 
 #: src/pacman/query.c:65
 #, c-format
 msgid "error: no file was specified for --owns\n"
-msgstr "hiba: nincs megadva f�jl a --owns sz�m�ra\n"
+msgstr "hiba: nincs megadva f�jl a --owns sz�m�ra\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
-msgstr "hiba: nem siker�lt olvasni a '%s' f�jlt: %s\n"
+msgstr "hiba: nem siker�lt olvasni a '%s' f�jlt: %s\n"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
-msgstr "hiba: k�nyvt�r tulajdonos-csomagj�t nem lehet meg�llap�tani\n"
+msgstr ""
+"hiba: k�nyvt�r tulajdonos-csomagj�t nem lehet meg�llap�tani\n"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
-msgstr "hiba: nem �llap�that� meg a val�di �tvonal a(z) '%s' sz�m�ra: %s\n"
+msgstr ""
+"hiba: nem �llap�that� meg a val�di �tvonal a(z) '%s' sz�m�ra: %"
+"s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
-msgstr "a %s f�jlt a %s %s tartalmazza\n"
+msgstr "a %s f�jlt a %s %s tartalmazza\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
-msgstr "hiba: Egyik csomag sem tartalmazza a k�vetkez�t: %s\n"
+msgstr "hiba: Egyik csomag sem tartalmazza a k�vetkez�t: %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
-msgstr "hiba: a(z) \"%s\" csoport nem tal�lhat�\n"
+msgstr "hiba: a(z) \"%s\" csoport nem tal�lhat�\n"
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
-msgstr "Friss�t�sek keres�se... \n"
+msgstr "Friss�t�sek keres�se... \n"
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
-msgstr "nem tal�ltam friss�t�st.\n"
+msgstr "nem tal�ltam friss�t�st.\n"
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
-msgstr "egyetlen haszn�lhat� csomagrep� sincs be�ll�tva.\n"
+msgstr "egyetlen haszn�lhat� csomagrep� sincs be�ll�tva.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
-msgstr "hiba: a(z) \"%s\" csomag nem tal�lhat�\n"
+msgstr "hiba: a(z) \"%s\" csomag nem tal�lhat�\n"
 
 #: src/pacman/remove.c:76
 #, c-format
@@ -819,26 +861,21 @@ msgstr ":: %s csoport:\n"
 
 #: src/pacman/remove.c:78
 msgid "    Remove whole content? [Y/n] "
-msgstr "    Elt�vol�tja a teljes tartalmat? [I/n] "
+msgstr "    Elt�vol�tja a teljes tartalmat? [I/n] "
 
 #: src/pacman/remove.c:82
 #, c-format
 msgid ":: Remove %s from group %s? [Y/n] "
-msgstr ":: Elt�vol�tja %s-t a(z) %s csoportb�l? [I/n] "
+msgstr ":: Elt�vol�tja %s-t a(z) %s csoportb�l? [I/n] "
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
-msgstr "hiba: nem siker�lt inicializ�lni a tranzakci�t (%s)\n"
+msgstr "hiba: nem siker�lt inicializ�lni a tranzakci�t (%s)\n"
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "hiba: nem siker�lt a(z) '%s' c�lt hozz�adni (%s)\n"
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
-msgstr "C�lok:"
+msgstr "C�lok:"
 
 #: src/pacman/remove.c:158
 msgid ""
@@ -846,311 +883,299 @@ msgid ""
 "Do you want to remove these packages? [Y/n] "
 msgstr ""
 "\n"
-"El k�v�nja t�vol�tani ezeket a csomagokat? [I/n] "
+"El k�v�nja t�vol�tani ezeket a csomagokat? [I/n] "
 
 #: src/pacman/sync.c:52
 #, c-format
 msgid "error: could not access database directory\n"
-msgstr "hiba: nem siker�lt el�rni az adatb�zisk�nyvt�rt\n"
+msgstr "hiba: nem siker�lt el�rni az adatb�zisk�nyvt�rt\n"
 
 #: src/pacman/sync.c:84
 #, c-format
 msgid "Do you want to remove %s? [Y/n] "
-msgstr "El k�v�nja t�vol�tani %s-t? [I/n] "
+msgstr "El k�v�nja t�vol�tani %s-t? [I/n] "
 
 #: src/pacman/sync.c:89
 #, c-format
 msgid "error: could not remove repository directory\n"
-msgstr "hiba: nem siker�lt t�r�lni a rep� k�nyvt�r�t\n"
+msgstr "hiba: nem siker�lt t�r�lni a rep� k�nyvt�r�t\n"
 
 #: src/pacman/sync.c:102
 #, c-format
 msgid "Database directory: %s\n"
-msgstr "Adatb�zisk�nyvt�r: %s\n"
+msgstr "Adatb�zisk�nyvt�r: %s\n"
 
 #: src/pacman/sync.c:103
 msgid "Do you want to remove unused repositories? [Y/n] "
-msgstr "El k�v�nja t�vol�tani a nem haszn�lt rep�kat? [I/n] "
+msgstr "El k�v�nja t�vol�tani a nem haszn�lt rep�kat? [I/n] "
 
 #: src/pacman/sync.c:114
 #, c-format
 msgid "Database directory cleaned up\n"
-msgstr "Adatb�zisk�nyvt�r kitakar�tva\n"
+msgstr "Adatb�zisk�nyvt�r kitakar�tva\n"
 
 #: src/pacman/sync.c:132 src/pacman/sync.c:179
 #, c-format
 msgid "Cache directory: %s\n"
-msgstr "Gyors�t�t�r k�nyvt�r: %s\n"
+msgstr "Gyors�t�t�r k�nyvt�r: %s\n"
 
 #: src/pacman/sync.c:133
 msgid "Do you want to remove uninstalled packages from cache? [Y/n] "
-msgstr "K�v�nja t�r�lni az elt�vol�tott csomagokat a gyors�t�t�rb�l? [I/n] "
+msgstr ""
+"K�v�nja t�r�lni az elt�vol�tott csomagokat a "
+"gyors�t�t�rb�l? [I/n] "
 
 #: src/pacman/sync.c:136
 #, c-format
 msgid "removing old packages from cache... "
-msgstr "a r�gi csomagok t�rl�se a gyors�t�t�rb�l... "
+msgstr "a r�gi csomagok t�rl�se a gyors�t�t�rb�l... "
 
 #: src/pacman/sync.c:140
 #, c-format
 msgid "error: could not access cache directory\n"
-msgstr "hiba: nem siker�lt el�rni a gyors�t�t�r k�nyvt�r�t\n"
+msgstr "hiba: nem siker�lt el�rni a gyors�t�t�r k�nyvt�r�t\n"
 
 #: src/pacman/sync.c:180
 msgid "Do you want to remove ALL packages from cache? [Y/n] "
-msgstr "T�r�lni k�v�nja az �SSZES csomagot a gyors�t�t�rb�l? [I/n] "
+msgstr ""
+"T�r�lni k�v�nja az �SSZES csomagot a gyors�t�t�rb�l? [I/n] "
 
 #: src/pacman/sync.c:183
 #, c-format
 msgid "removing all packages from cache... "
-msgstr "az �sszes csomag t�rl�se a gyors�t�t�rb�l... "
+msgstr "az �sszes csomag t�rl�se a gyors�t�t�rb�l... "
 
 #: src/pacman/sync.c:186
 #, c-format
 msgid "error: could not remove cache directory\n"
-msgstr "hiba: nem siker�lt t�r�lni a gyors�t�t�r k�nyvt�r�t\n"
+msgstr ""
+"hiba: nem siker�lt t�r�lni a gyors�t�t�r k�nyvt�r�t\n"
 
 #: src/pacman/sync.c:191
 #, c-format
 msgid "error: could not create new cache directory\n"
-msgstr "hiba: nem siker�lt l�trehozni az �j gyors�t�t�r k�nyvt�r�t\n"
+msgstr ""
+"hiba: nem siker�lt l�trehozni az �j gyors�t�t�r "
+"k�nyvt�r�t\n"
 
 #: src/pacman/sync.c:218
 #, c-format
 msgid "error: failed to synchronize %s: %s\n"
-msgstr "hiba: nem siker�lt a(z) %s szinkroniz�l�sa: %s\n"
+msgstr "hiba: nem siker�lt a(z) %s szinkroniz�l�sa: %s\n"
 
 #: src/pacman/sync.c:221
 #, c-format
 msgid "error: failed to update %s (%s)\n"
-msgstr "hiba: nem siker�lt a(z) %s friss�t�se (%s)\n"
+msgstr "hiba: nem siker�lt a(z) %s friss�t�se (%s)\n"
 
 #: src/pacman/sync.c:225
 #, c-format
 msgid " %s is up to date\n"
-msgstr " a(z) %s naprak�sz\n"
+msgstr " a(z) %s naprak�sz\n"
 
 #: src/pacman/sync.c:368
 #, c-format
 msgid "error: repository '%s' does not exist\n"
-msgstr "hiba: a(z) '%s' rep� nem l�tezik\n"
+msgstr "hiba: a(z) '%s' rep� nem l�tezik\n"
 
 #: src/pacman/sync.c:383
 #, c-format
 msgid "error: package '%s' was not found in repository '%s'\n"
-msgstr "hiba: a(z) '%s' csomag nem tal�lhat� a(z) '%s' rep�ban\n"
+msgstr "hiba: a(z) '%s' csomag nem tal�lhat� a(z) '%s' rep�ban\n"
 
 #: src/pacman/sync.c:403
 #, c-format
 msgid "error: package '%s' was not found\n"
-msgstr "hiba: a(z) '%s' csomag nem tal�lhat�\n"
+msgstr "hiba: a(z) '%s' csomag nem tal�lhat�\n"
 
 #: src/pacman/sync.c:440
 #, c-format
 msgid "error: repository \"%s\" was not found.\n"
-msgstr "hiba: a(z) \"%s\" rep� nem tal�lhat�.\n"
+msgstr "hiba: a(z) \"%s\" rep� nem tal�lhat�.\n"
 
 #: src/pacman/sync.c:492
 #, c-format
 msgid ":: Synchronizing package databases...\n"
-msgstr ":: A csomagadatb�zisok szinkroniz�l�sa...\n"
+msgstr ":: A csomagadatb�zisok szinkroniz�l�sa...\n"
 
 #: src/pacman/sync.c:495
 #, c-format
 msgid "error: failed to synchronize any databases\n"
-msgstr "hiba: nem siker�lt szinkroniz�lni valamelyik adatb�zist\n"
+msgstr "hiba: nem siker�lt szinkroniz�lni valamelyik adatb�zist\n"
 
 #: src/pacman/sync.c:507
 #, c-format
 msgid ":: Starting full system upgrade...\n"
-msgstr ":: Teljes rendszerfriss�t�s ind�t�sa...\n"
+msgstr ":: Teljes rendszerfriss�t�s ind�t�sa...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ":: A pacman egy �jabb verz�ja �ll rendelkez�sre.\n"
+
+#: src/pacman/sync.c:530
 msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
-":: A pacman egy �jabb verz�ja �ll rendelkez�sre.\n"
-":: Aj�nlott, hogy el�sz�r mag�t a pacmant friss�tse\n"
-":: a 'pacman -S pacman' paranccsal, majd adja ki �jra\n"
-":: a jelenlegi parancsot. Ha m�gis folytatni szeretn�,\n"
-":: �s nem friss�ti k�l�n a pacmant, v�laszoljon nemmel.\n"
-
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Megszak�tja a jelenlegi m�veletet? [I/n] "
+":: Megszak�tja a jelenlegi jelenlegi m�veletet\n"
+":: �s telep�ti az �j pacman verzi�t most? [I/n] "
 
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
-msgstr "hiba: nem siker�lt lez�rni a tranzakci�t (%s)\n"
+msgstr "hiba: nem siker�lt lez�rni a tranzakci�t (%s)\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr "hiba: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "hiba: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
-msgstr ":: %s csoport (mell�z�tt csomagok is):\n"
+msgstr ":: %s csoport (mell�z�tt csomagok is):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
-msgstr ":: A teljes tartalom telep�t�se? [I/n] "
+msgstr ":: A teljes tartalom telep�t�se? [I/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
-msgstr ":: Telep�ti %s-t a(z) %s csoportb�l? [I/n] "
+msgstr ":: Telep�ti %s-t a(z) %s csoportb�l? [I/n] "
 
-#: src/pacman/sync.c:620
-#,  c-format
+#: src/pacman/sync.c:617
+#, c-format
 msgid "Warning: %s provides %s\n"
-msgstr "Figyelmeztet�s: %s szolg�ltatja a k�vetkez�t: %s\n"
+msgstr "Figyelmeztet�s: %s szolg�ltatja a k�vetkez�t: %s\n"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
-msgstr "hiba: t�bb csomag is szolg�ltatja %s-t, k�rem v�lasszon egyet:\n"
+msgstr ""
+"hiba: t�bb csomag is szolg�ltatja %s-t, k�rem v�lasszon egyet:\n"
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
-msgstr "hiba: '%s': nem tal�lhat� a t�voli adatb�zisban\n"
-
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: �tk�zik a k�vetkez�vel: %s\n"
+msgstr "hiba: '%s': nem tal�lhat� a t�voli adatb�zisban\n"
 
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
-msgstr " a helyi adatb�zis naprak�sz\n"
+msgstr " a helyi adatb�zis naprak�sz\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
-msgstr "A let�lt�s megkezd�se...\n"
+msgstr "A let�lt�s megkezd�se...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
-msgstr "Kezd�dhet a let�lt�s? [I/n] "
+msgstr "Kezd�dhet a let�lt�s? [I/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
-msgstr "A friss�t�si folyamat megkezd�se...\n"
+msgstr "A friss�t�si folyamat megkezd�se...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
-msgstr "Kezd�dhet a telep�t�s? [I/n] "
+msgstr "Kezd�dhet a telep�t�s? [I/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
-msgstr "Hib�k l�ptek fel, nem friss�lt csomag.\n"
+msgstr "Hib�k l�ptek fel, nem friss�lt csomag.\n"
 
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "Nincs\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
-msgstr "Elt�vol�t�s:"
+msgstr "Elt�vol�t�s:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
-msgstr "Teljes elt�vol�tott m�ret:   %.2f MB\n"
+msgstr "Teljes elt�vol�tott m�ret:   %.2f MB\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
-msgstr "Teljes let�ltend� m�ret:   %.2f MB\n"
+msgstr "Teljes let�ltend� m�ret:   %.2f MB\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
-msgstr "Teljes telep�tett m�ret:   %.2f MB\n"
+msgstr "Teljes telep�tett m�ret:   %.2f MB\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "I"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "IGEN"
 
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr "hibakeres�s: %s"
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr "hiba: %s"
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
-msgstr "figyelmeztet�s: %s"
+msgstr "figyelmeztet�s: %s"
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
-msgstr "f�ggv�ny: %s"
-
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr "hibakeres�s: "
+msgstr "f�ggv�ny: %s"
 
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "hiba: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
-msgstr "figyelmeztet�s: "
+msgstr "figyelmeztet�s: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
-msgstr "f�ggv�ny: "
+msgstr "f�ggv�ny: "
 
 #: scripts/gensync.sh.in:32
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr ""
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
 "compresses it to <destfile>.\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1159,49 +1184,49 @@ msgid ""
 "(also configured in /etc/pacman.conf)\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr ""
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr ""
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr ""
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
 msgstr ""
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr ""
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr ""
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
 msgstr ""
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr ""
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr "HIBA:"
 
@@ -1228,11 +1253,11 @@ msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr ""
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr ""
 
@@ -1292,535 +1317,539 @@ msgstr ""
 msgid "Using cached copy of %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr ""
+
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr ""
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr ""
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
 msgstr ""
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr ""
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr ""
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr ""
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr ""
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr ""
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr ""
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr ""
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr ""
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr ""
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr ""
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr ""
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr ""
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr ""
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr ""
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr ""
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr ""
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
 msgstr ""
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr ""
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1088
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1098
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1083
+#: scripts/makepkg.sh.in:1099
 msgid ""
 "      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr ""
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr ""
 
@@ -1936,7 +1965,7 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr ""
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr ""
 
@@ -1964,19 +1993,19 @@ msgstr ""
 msgid "Could not add delta '%s'"
 msgstr ""
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr ""
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr ""
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr ""
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr ""
 
@@ -1996,93 +2025,97 @@ msgstr ""
 msgid "Creating updated database file %s"
 msgstr ""
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr ""
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr ""
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
 "\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
 msgstr ""
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr ""
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr ""
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr ""
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr ""
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
 "then compresses it to <destfile>.\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr ""
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr ""
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 534a644d..a1ecc81d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # Italian translations for Pacman package manager package.
 # Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
-# Giovanni 'voidnull' Scafora <linuxmania@gmail.com>, 2007.
+# Giovanni 'voidnull' Scafora <linuxmania@gmail.com>, 2007, 2008
 # Alessio 'mOLOk' Bolognino <themolok@gmail.com>, 2007.
 # Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>, 2007.
 #
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
-"PO-Revision-Date: 2008-01-15 18:00+0100\n"
+"POT-Creation-Date: 2008-02-11 15:30-0600\n"
+"PO-Revision-Date: 2008-02-11 16:00+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "failed to release transaction (%s)\n"
 msgstr "impossibile annullare l'operazione richiesta (%s)\n"
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "nessun pacchetto specificato (usare -h per un aiuto)\n"
 
@@ -47,43 +47,43 @@ msgstr ""
 msgid "loading package data... "
 msgstr "caricamento dei dati in corso... "
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "errore: impossibile aggiungere il pacchetto '%s' (%s)"
+msgid "error: '%s': %s\n"
+msgstr "errore: '%s': %s\n"
 
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr "errore: preparazione non riuscita (%s)\n"
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: richiede %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: va in conflitto con %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: va in conflitto con %s\n"
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s è già presente in '%s' e in '%s'\n"
 
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s è già presente nel filesystem\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -92,7 +92,7 @@ msgstr ""
 "\n"
 "si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n"
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr "errore: impossibile eseguire l'operazione richiesta (%s)\n"
@@ -193,12 +193,8 @@ msgstr ":: Sostituire %s con %s/%s? [S/n] "
 
 #: src/pacman/callback.c:288
 #, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
-msgstr ""
-"Sostituzione di %s con %s/%s in corso\n"
-"."
+msgid "Replacing %s with %s/%s\n"
+msgstr "Sostituzione di %s con %s/%s in corso\n"
 
 #: src/pacman/callback.c:296
 #, c-format
@@ -439,7 +435,7 @@ msgstr ""
 #, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade        rimuove i pacchetti con tutte le dipendenze\n"
+msgstr "  -c, --cascade        rimuove i pacchetti e tutti quelli che dipendono da essi\n"
 
 #: src/pacman/pacman.c:89
 #, c-format
@@ -777,51 +773,51 @@ msgstr "nessuna operazione specificata (usare -h per un aiuto)\n"
 msgid "error: no file was specified for --owns\n"
 msgstr "errore: non è stato specificato alcun file per --owns\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "errore: impossibile leggere il file '%s': %s\n"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "errore: impossibile determinare il proprietario di una directory\n"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "errore: impossibile determinare la posizione reale di '%s': %s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s è contenuto in %s %s\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
 msgstr "errore: nessun pacchetto contiene %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "errore: il gruppo \"%s\" non è stato trovato\n"
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
 msgstr "Controllo degli aggiornamenti dei pacchetti in corso... \n"
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
 msgstr "non ci sono aggiornamenti.\n"
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "non è stato configurato nessun repository di pacchetti valido.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "errore: il pacchetto \"%s\" non è stato trovato\n"
@@ -840,17 +836,12 @@ msgstr "    Rimuovere l'intero contenuto? [S/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Rimuovere %s dal gruppo %s? [S/n] "
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "errore: inizializzazione non riuscita (%s)\n"
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "errore: impossibile aggiungere il pacchetto '%s' (%s)\n"
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Pacchetti:"
 
@@ -981,169 +972,143 @@ msgstr ":: Aggiornamento del sistema in corso...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ":: è disponibile una nuova versione di pacman.\n"
+
+#: src/pacman/sync.c:530
 msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
-":: è disponibile una nuova versione di pacman.\n"
-":: Si consiglia di aggiornare pacman\n"
-":: usando 'pacman -S pacman' e poi riavviare l'attuale\n"
-":: operazione. Se si desidera continuare l'operazione e\n"
-":: non aggiornare pacman separatamente, rispondere no.\n"
+":: Si desidera annullare l'operazione corrente\n"
+":: ed installare adesso la nuova versione di pacman? [S/n] "
 
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Annullare l'operazione corrente? [S/n] "
-
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "errore: impossibile annullare l'operazione richiesta (%s)\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr "errore: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "errore: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ":: gruppo %s (include i pacchetti ignorati):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Installare l'intero contenuto? [S/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Installare %s dal gruppo %s? [S/n] "
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, c-format
 msgid "Warning: %s provides %s\n"
 msgstr "Attenzione: %s: fornisce %s\n"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr "errore: diversi pacchetti forniscono %s, specificarne uno :\n"
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr "errore: '%s' non è stato trovato nel database\n"
 
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: va in conflitto con %s\n"
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr " Il database locale è aggiornato\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
 msgstr "Download in corso...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "Procedere con il download? [S/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
 msgstr "Aggiornamento in corso...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "Procedere con l'installazione? [S/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr ""
 "Si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n"
 
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "Nessuno\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Rimuovere:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Dimensione totale dei pacchetti rimossi:   %.2f MB\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
 msgstr "Dimensione totale dei pacchetti scaricati:    %.2f MB\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Dimensione totale dei pacchetti installati:   %.2f MB\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "S"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "SI"
 
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr "debug: %s"
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr "errore: %s"
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
 msgstr "attenzione: %s"
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
 msgstr "funzione: %s"
 
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr "debug: "
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "errore: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "attenzione: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
 msgstr "funzione: "
@@ -1152,7 +1117,16 @@ msgstr "funzione: "
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr "Uso: %s <root> <destfile> [directory_pacchetto]"
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+"NOTA: questo script è DEPRECATO. Esso sarà rimosso nel prossimo"
+"\\nrilascio di pacman, quindi usate repo-add e repo-remove.\\n\\n"
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
@@ -1162,7 +1136,7 @@ msgstr ""
 "gensync crea il database in una directory temporanea\\ne quindi lo comprime "
 "in <destfile>.\\n\\n"
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
@@ -1171,7 +1145,7 @@ msgstr ""
 "\\ncome ad esempio <destfile>, se non sarà specificata una "
 "[directory_pacchetto]\\nalternativa.\\n\\n"
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1185,12 +1159,12 @@ msgstr ""
 "risiedere nella stessa directory come i vostri\\n      pacchetti personali "
 "(configurato anche in /etc/pacman.conf)\\n\\n"
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr "Esempio:  gensync /var/abs/local /home/mypkg/custom.db.tar.gz"
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -1200,38 +1174,38 @@ msgstr ""
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr "%s non è stato trovato. Impossibile continuare."
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr "Directory radice non valida: %s"
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
 msgstr ""
 "gensync: creazione del database, generazione della somma MD5 in corso..."
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr "impossibile analizzare %s"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr "impossibile trovare %s-%s-%s-%s%s - ignorato"
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
 msgstr "creazione del database del repo in corso..."
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr "ATTENZIONE:"
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr "ERRORE:"
 
@@ -1263,11 +1237,11 @@ msgstr ""
 "Non sono stati impostati agenti per gestire gli URL di %s. Controllare %s."
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr "L'operazione sta per essere interrotta..."
 
@@ -1329,300 +1303,303 @@ msgstr "Trovato %s nella directory di compilazione"
 msgid "Using cached copy of %s"
 msgstr "Sarà utilizzata la copia di %s contenuta nella cache"
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr "impossibile trovare %s nella directory e non è un URL."
+
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
 msgstr "Scaricamento di %s in corso..."
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr "Impossibile scaricare %s"
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr "Generazione dei checksum dei sorgenti in corso..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "L'algoritmo dell'integrità di '%s' specificato non è valido."
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr "Impossibile trovare il programma '%s'."
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
-msgstr ""
-"Impossibile trovare il file sorgente di %s per generare il checksum."
+msgstr "Impossibile trovare il file sorgente di %s per generare il checksum."
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr "L'algoritmo dell'integrità di '%s' specificato non è valido"
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr "Validazione dei file sorgenti con %s in corso..."
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr "NON TROVATO"
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr "Verificato"
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr "NON RIUSCITO"
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr "Uno o più file non hanno superato il controllo di validità!"
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr "I controlli dell'integrità (%s) mancano o sono incompleti."
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr "Estrazione dei sorgenti in corso..."
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr "Impossibile trovare i sorgenti di %s per estrarli."
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr "Impossibile estrarre %s"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr "Avvio di build() in corso..."
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr "Compilazione interrotta."
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr "Rimozione dei dati superflui in corso..."
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr "Rimozione dei file info/doc in corso..."
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr "Compressione delle pagine man in corso..."
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "Rimozione dei simboli di debug dai binari e dalle librerie in corso..."
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr "Rimozione dei file di libtool .la in corso..."
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr "Rimozione delle directory vuote in corso..."
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr "Manca la directory pkg/."
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr "Creazione del pacchetto in corso..."
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr "Generazione del file .PKGINFO in corso..."
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr "Si prega di aggiungere il campo license al vostro %s!"
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Esempio di software GPL: license=('GPL')."
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr "Aggiunta dello script install in corso..."
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr "Aggiunta del changelog del pacchetto in corso..."
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
 msgstr "Compressione del pacchetto in corso..."
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr "Impossibile creare il pacchetto."
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr "Impossibile trovare il binario di xdelta! xdelta è installato?"
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr "Creazione di delta dalla versione %s in corso..."
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr "Ricreazione del pacchetto dal delta che corrisponda alla firma md5"
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr "NOTA: il delta dovrebbe essere distribuito SOLO con questo archivio"
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr "Impossibile generare il pacchetto dal delta."
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr "Impossibile creare il delta."
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr "Impossibile trovare una versione precedente, delta ignorato."
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr "Creazione del pacchetto in corso..."
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr "Aggiunta di %s in corso..."
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
 msgstr "Impossibile trovare lo script %s."
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr "Compressione del pacchetto in corso..."
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr "Impossibile creare il pacchetto."
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr "Determinazione dell'ultima revisione darcs in corso..."
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr "Determinazione dell'ultima revisione cvs in corso..."
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr "Determinazione dell'ultima revisione git in corso..."
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr "Determinazione dell'ultima revisione svn in corso..."
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr "Determinazione dell'ultima revisione bzr in corso..."
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr "Determinazione dell'ultima revisione hg in corso..."
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr "Versione trovata: %s"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
 msgstr "uso:  %s [opzioni]"
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr "Opzioni:"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr "  -A, --ignorearch Ignora il campo incompleto arch in %s"
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr "  -b, --builddeps  Compilazione delle dipendenze mancanti dai sorgenti"
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Ripulisce i sorgenti dopo la compilazione"
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache Elimina i sorgenti dalla cache"
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     Ignora i controlli tutte sulle dipendenze"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr "  -e, --noextract  Non estrae i sorgenti (usa l'esistente dir src/)"
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      Sovrascrive i pacchetti esistenti"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Genera i controlli dell'integrità dei sorgenti"
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       Visualizza questo help"
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Installa il pacchetto dopo la compilazione"
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Mostra il log della compilazione"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Disabilita l'output dei messaggi colorati"
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Scarica ed estrae solo i file"
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr ""
 "  -p <buildscript> Usa uno script di build alternativo (invece di '%s')"
 
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1088
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr ""
 "  -r, --rmdeps     Rimuove le dipendenze installate dopo la compilazione"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr "  -R, --repackage  Ricrea il pacchetto in pkg/ senza compilarlo"
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Installa le dipendenze mancanti con pacman"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Consente a makepkg di avviarsi da root"
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
@@ -1630,15 +1607,15 @@ msgstr ""
 "      --holdver    Previene l'incremento automatico della versione per i "
 "PKGBUILD di sviluppo"
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr "      --source     Non compila il pacchetto, genera solo un archivio"
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr "Queste opzioni possono essere passate a pacman:"
 
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1098
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
@@ -1646,7 +1623,7 @@ msgstr ""
 "      --noconfirm      Non chiede alcuna conferma durante la risoluzione\n"
 "                       delle dipendenze"
 
-#: scripts/makepkg.sh.in:1083
+#: scripts/makepkg.sh.in:1099
 msgid ""
 "      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr ""
@@ -1654,239 +1631,239 @@ msgstr ""
 "download\n"
 "                       dei file"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "Se -p non è stato specificato, makepkg utilizzerà '%s'"
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr "Impossibile trovare %s."
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr "Adesso sudo è usato di default. L'opzione --usesudo è deprecata!"
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
-msgstr "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
+msgstr "\\0--holdver e --forcever non possono essere specificate contemporaneamente"
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr "Pulizia di TUTTI i file da %s in corso."
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr "    Siete proprio sicuri di volerlo fare? [S/n] "
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
 "Si è verificato un problema durante la rimozione dei file; forse non si "
 "dispone dei permessi necessari in %s"
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr "La cache del sorgente è stata pulita."
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr "Non è stato rimosso nessun file."
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr "La destinazione del sorgente deve essere definita in makepkg.conf."
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr ""
 "Inoltre, si prega di avviare makepkg -C all'esterno della vostra directory "
 "di cache."
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr "BUILDSCRIPT non è definito! Assicurarsi di aver aggiornato %s."
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr "Avviare makepkg da root è una CATTIVA idea e può causare"
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr "danni permanenti e catastrofici al vostro sistema. Se"
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr "volete avviarlo da root, usate l'opzione --asroot."
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr "L'opzione --asroot è riservata solo all'utente root."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr "Si prega di riavviare makepkg senza il flag --asroot."
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr "Per usare l'opzione 'fakeroot' nell'array BUILDENV in %s"
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr "è indispensabile installare fakeroot."
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr "Avviando makepkg con un utente senza privilegi i file risulteranno"
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
 "di proprietà del pacchettizzatore. Provare usando l'ambiente di fakeroot"
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr "posizionando 'fakeroot' nell'array BUILDENV in makepkg.conf."
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr "Non usare l'opzione '-F'. Questa opzione si usa solo con makepkg."
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr "Impossibile trovare il binario di sudo! sudo è installato?"
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
 "Le dipendenze mancanti non possono essere installate o rimosse da utente "
 "normale"
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr ""
 "senza sudo; installare e configurare sudo per risolvere automaticamente le "
 "dipendenze."
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr "%s non esiste."
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
 msgstr "%s non può essere vuoto."
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s non può contenere dei trattini."
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s non è disponibile per l'architettura '%s'."
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
 msgstr ""
 "Notare che molti pacchetti possono aver bisogno di una linea aggiunta al "
 "loro %s"
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr "come ad esempio arch=('%s')."
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Lo script install (%s) non esiste."
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr ""
 "Già è stato creato un pacchetto, installazione del pacchetto esistente in "
 "corso..."
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "Già è stato creato un pacchetto. (usare -f per sovrascrivere)"
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr "Compilazione ignorata."
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr "Uscita dall'ambiente di fakeroot."
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr "Creazione del pacchetto: %s"
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr "Avvio di makepkg da root in corso..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr "Il pacchetto è stato creato: %s"
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr "Controllo delle dipendenze ignorato."
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr "Controllo delle dipendenze per l'esecuzione in corso..."
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr "Controllo delle dipendenze per la compilazione in corso..."
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr "Impossibile risolvere tutte le dipendenze."
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
 msgstr ""
 "pacman non è stato trovato nel PATH; controllo delle dipendenze ignorato."
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
 "Recupero dei sorgenti ignorato        -- utilizzo la directory esistente src/"
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
 "Controllo dell'integrità dei sorgenti ignorato -- utilizzo la directory "
 "esistente src/"
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr ""
 "Estrazione dei sorgenti ignorata       -- utilizzo la directory esistente "
 "src/"
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "La directory dei sorgenti è vuota, non c'è nulla da compilare!"
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr "La directory del pacchetto è vuota, non c'è nulla ripacchettizzare!"
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr "I sorgenti sono pronti."
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr "Rimozione dell'esistente directory pkg/ in corso..."
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr "Entrata nell'ambiente di fakeroot in corso..."
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr "Compilazione terminata: %s"
 
@@ -2026,7 +2003,7 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Il file '%s' del pacchetto non è valido."
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr "Rimozione del pacchetto esistente '%s' in corso..."
 
@@ -2054,19 +2031,19 @@ msgstr "Aggiunto il delta '%s'"
 msgid "Could not add delta '%s'"
 msgstr "Impossibile aggiungere delta '%s'"
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr "%s non è stato trovato. Impossibile continuare."
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr "Impossibile creare la directory temp per creare il database."
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Il file di repository '%s' non è un valido database di pacman."
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr "Estrazione del database in una locazione temporanea in corso..."
 
@@ -2086,23 +2063,23 @@ msgstr "Impossibile trovare il pacchetto '%s'"
 msgid "Creating updated database file %s"
 msgstr "Creazione di un database aggiornato di %s"
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr "Non è stata impostata nessuna compressione."
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr "Non è stato modificato alcun pacchetto."
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
 msgstr "repo-remove %s\\n\\n"
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
 msgstr "uso: %s <path-al-db> <nomepacchetto> ...\\n\\n"
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
@@ -2113,27 +2090,31 @@ msgstr ""
 "\\nrimozione di pacchetti multipli può essere specificata dalla linea di "
 "comando.\\n\\n"
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "Esempio:  repo-remove /path/to/repo.db.tar.gz kernel26"
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
 msgstr "Ricerca del pacchetto '%s' in corso..."
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr "Non è stato trovato nessun pacchetto corrispondente a '%s'."
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr "Creazione del database aggiornato '%s' in corso..."
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr "Tutti i pacchetti sono stati rimossi dal database. Rimozione di '%s' in corso."
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr "Uso: %s <azione> <destfile> <opzione> [directory_pacchetto]"
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
@@ -2143,11 +2124,11 @@ msgstr ""
 "\\ndestfile. updatesync aggiorna il database in una directory temporanea e"
 "\\nquindi lo comprime in <destfile>.\\n\\n"
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
 msgstr "Esistono due tipi di azioni:\\n\\n"
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
@@ -2155,7 +2136,7 @@ msgstr ""
 "upd - Aggiornerà una voce dei pacchetti o la creerà se non esiste.\\n      "
 "Esso prende il PKGBUILD del pacchetto come un'opzione.\\n"
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
@@ -2163,7 +2144,7 @@ msgstr ""
 "del - Rimuoverà una voce del pacchetto dal database. Esso prende il\\n      "
 "nome del pacchetto come un'opzione.\\n"
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
@@ -2172,11 +2153,11 @@ msgstr ""
 "\\n<destfile>, se non sarà specificata una [directory_package] alternativa."
 "\\n\\n"
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr "Esempio:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -2186,14 +2167,48 @@ msgstr ""
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr "%s non è stato trovato"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr "impossibile trovare %s-%s-%s-%s%s - operazione interrotta"
 
+#~ msgid "error: failed to add target '%s' (%s)"
+#~ msgstr "errore: impossibile aggiungere il pacchetto '%s' (%s)"
+
+#~ msgid ":: %s: conflicts with %s"
+#~ msgstr ":: %s: va in conflitto con %s"
+
+#~ msgid "error: failed to add target '%s' (%s)\n"
+#~ msgstr "errore: impossibile aggiungere il pacchetto '%s' (%s)\n"
+
+#~ msgid ""
+#~ ":: pacman has detected a newer version of itself.\n"
+#~ ":: It is recommended that you upgrade pacman by itself\n"
+#~ ":: using 'pacman -S pacman', and then rerun the current\n"
+#~ ":: operation. If you wish to continue the operation and\n"
+#~ ":: not upgrade pacman separately, answer no.\n"
+#~ msgstr ""
+#~ ":: è disponibile una nuova versione di pacman.\n"
+#~ ":: Si consiglia di aggiornare pacman\n"
+#~ ":: usando 'pacman -S pacman' e poi riavviare l'attuale\n"
+#~ ":: operazione. Se si desidera continuare l'operazione e\n"
+#~ ":: non aggiornare pacman separatamente, rispondere no.\n"
+
+#~ msgid ":: Cancel current operation? [Y/n] "
+#~ msgstr ":: Annullare l'operazione corrente? [S/n] "
+
+#~ msgid "debug: %s"
+#~ msgstr "debug: %s"
+
+#~ msgid "debug: "
+#~ msgstr "debug: "
+
+#~ msgid "--"
+#~ msgstr "--"
+
 #~ msgid "failed to parse parse %s"
 #~ msgstr "impossibile analizzare %s"
 
diff --git a/po/pacman.pot b/po/pacman.pot
index 1a06bfb0..5c473e53 100644
--- a/po/pacman.pot
+++ b/po/pacman.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: 2008-01-14 23:03-0600\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\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"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "failed to release transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr ""
 
@@ -43,50 +43,50 @@ msgstr ""
 msgid "loading package data... "
 msgstr ""
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
+msgid "error: '%s': %s\n"
 msgstr ""
 
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ""
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
+msgid ":: %s: conflicts with %s\n"
 msgstr ""
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr ""
 
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr ""
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
 msgstr ""
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr ""
@@ -185,9 +185,7 @@ msgstr ""
 
 #: src/pacman/callback.c:288
 #, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
+msgid "Replacing %s with %s/%s\n"
 msgstr ""
 
 #: src/pacman/callback.c:296
@@ -719,51 +717,51 @@ msgstr ""
 msgid "error: no file was specified for --owns\n"
 msgstr ""
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr ""
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr ""
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr ""
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr ""
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
 msgstr ""
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr ""
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
 msgstr ""
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
 msgstr ""
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr ""
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr ""
@@ -782,17 +780,12 @@ msgstr ""
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ""
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr ""
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr ""
 
@@ -921,163 +914,140 @@ msgstr ""
 
 #: src/pacman/sync.c:529
 #, c-format
-msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+msgid ":: pacman has detected a newer version of itself.\n"
 msgstr ""
 
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
+#: src/pacman/sync.c:530
+msgid ""
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr ""
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr ""
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ""
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, c-format
 msgid "Warning: %s provides %s\n"
 msgstr ""
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr ""
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr ""
 
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ""
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr ""
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
 msgstr ""
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
 msgstr ""
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr ""
 
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr ""
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr ""
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr ""
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
 msgstr ""
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr ""
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr ""
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr ""
 
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr ""
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr ""
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
 msgstr ""
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
 msgstr ""
 
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr ""
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr ""
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
 msgstr ""
@@ -1086,20 +1056,27 @@ msgstr ""
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr ""
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
 "compresses it to <destfile>.\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1108,49 +1085,49 @@ msgid ""
 "(also configured in /etc/pacman.conf)\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr ""
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr ""
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr ""
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
 msgstr ""
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr ""
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr ""
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
 msgstr ""
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr ""
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr ""
 
@@ -1177,11 +1154,11 @@ msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr ""
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr ""
 
@@ -1241,535 +1218,539 @@ msgstr ""
 msgid "Using cached copy of %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr ""
+
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr ""
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr ""
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
 msgstr ""
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr ""
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr ""
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr ""
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr ""
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr ""
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr ""
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr ""
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr ""
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr ""
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr ""
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr ""
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr ""
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr ""
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr ""
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr ""
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr ""
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
 msgstr ""
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr ""
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1088
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1098
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1083
+#: scripts/makepkg.sh.in:1099
 msgid ""
 "      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr ""
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr ""
 
@@ -1885,7 +1866,7 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr ""
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr ""
 
@@ -1913,19 +1894,19 @@ msgstr ""
 msgid "Could not add delta '%s'"
 msgstr ""
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr ""
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr ""
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr ""
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr ""
 
@@ -1945,93 +1926,97 @@ msgstr ""
 msgid "Creating updated database file %s"
 msgstr ""
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr ""
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr ""
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
 "\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
 msgstr ""
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr ""
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr ""
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr ""
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr ""
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
 "then compresses it to <destfile>.\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr ""
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr ""
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr ""
diff --git a/po/pl_PL.po b/po/pl.po
index 34ce0676..1e450981 100644
--- a/po/pl_PL.po
+++ b/po/pl.po
@@ -1,45 +1,48 @@
+# translation of pl.po to Polski
 # Polish translations for Pacman package manager package
 # Polskie tłumaczenia dla pakietu Pacman package manager.
 # Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
-# Mateusz Jędrasik <m.jedrasik@gmail.com>, 2007.
 #
+# Mateusz Jędrasik <m.jedrasik@gmail.com>, 2007.
+# Jaroslaw Swierczynski <swiergot@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: Pacman package manager 3.1.0\n"
+"Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
-"PO-Revision-Date: 2008-01-13 01:19+0200\n"
-"Last-Translator: Mateusz Jędrasik <m.jedrasik@gmail.com>\n"
-"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
+"PO-Revision-Date: 2008-02-15 22:11+0100\n"
+"Last-Translator: Jaroslaw Swierczynski <swiergot@gmail.com>\n"
+"Language-Team: Polski <pl@li.org>\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"
+"X-Generator: KBabel 1.11.4\n"
 
 #: src/pacman/add.c:40 src/pacman/remove.c:42
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "nie udało się wyswobodzić transakcji (%s)\n"
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "nie podano żadnych celów (użyj -h aby otrzymać pomoc)\n"
 
 #: src/pacman/add.c:104 src/pacman/sync.c:510
-#, fuzzy, c-format
+#, c-format
 msgid "error: %s\n"
-msgstr "błąd:  %s\n"
+msgstr "błąd: %s\n"
 
 #: src/pacman/add.c:107 src/pacman/remove.c:98 src/pacman/sync.c:484
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s.\n"
 msgstr ""
-"  jeśli jesteś pewien że menedżer pakietów nie jest\n"
+"  jeśli jesteś pewien, że menedżer pakietów nie jest\n"
 "  już uruchomiony, możesz usunąć %s.\n"
 
 #: src/pacman/add.c:114 src/pacman/remove.c:106
@@ -47,43 +50,43 @@ msgstr ""
 msgid "loading package data... "
 msgstr "ładowanie informacji o pakietach... "
 
-#: src/pacman/add.c:118
-#, fuzzy, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "nie udało się dodać celu '%s' (%s)"
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
+#, c-format
+msgid "error: '%s': %s\n"
+msgstr "błąd: '%s': %s\n"
 
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
-#, fuzzy, c-format
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
+#, c-format
 msgid "error: failed to prepare transaction (%s)\n"
-msgstr "nie udało się przygotować transakcji (%s)\n"
+msgstr "błąd: nie udało się przygotować transakcji (%s)\n"
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
-#, fuzzy, c-format
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
+#, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: wymaga %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: konfliktuje z %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: konfliktuje z %s\n"
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s znajduje się w '%s' i w '%s'\n"
 
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s znajduje się w systemie plików\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -92,55 +95,55 @@ msgstr ""
 "\n"
 "wystąpiły błędy, nie zaktualizowano żadnych pakietów.\n"
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
-#, fuzzy, c-format
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
+#, c-format
 msgid "error: failed to commit transaction (%s)\n"
-msgstr "nie udało się dokonać transakcji (%s)\n"
+msgstr "błąd: nie udało się dokonać transakcji (%s)\n"
 
 #: src/pacman/callback.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "checking dependencies...\n"
 msgstr "sprawdzanie zależności...\n"
 
 #: src/pacman/callback.c:169
-#, fuzzy, c-format
+#, c-format
 msgid "checking for file conflicts...\n"
 msgstr "sprawdzanie konfliktów w systemie plików...\n"
 
 #: src/pacman/callback.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "resolving dependencies...\n"
 msgstr "rozwiązywanie zależności...\n"
 
 #: src/pacman/callback.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "looking for inter-conflicts...\n"
 msgstr "szukanie konfliktów międzypakietowych...\n"
 
 #: src/pacman/callback.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "installing %s...\n"
 msgstr "instalowanie %s...\n"
 
 #: src/pacman/callback.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "removing %s...\n"
 msgstr "usuwanie %s...\n"
 
 #: src/pacman/callback.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "upgrading %s...\n"
 msgstr "aktualizowanie %s...\n"
 
 #: src/pacman/callback.c:213
-#, fuzzy, c-format
+#, c-format
 msgid "checking package integrity...\n"
 msgstr "sprawdzanie spójności pakietów...\n"
 
 #: src/pacman/callback.c:216
-#, fuzzy, c-format
+#, c-format
 msgid "checking delta integrity...\n"
-msgstr "sprawdzanie spójności pakietów...\n"
+msgstr "sprawdzanie spójności archiwów przyrostowych...\n"
 
 #: src/pacman/callback.c:219
 #, c-format
@@ -148,7 +151,7 @@ msgid "applying deltas...\n"
 msgstr "aplikowanie delt...\n"
 
 #: src/pacman/callback.c:222
-#, fuzzy, c-format
+#, c-format
 msgid "generating %s with %s... "
 msgstr "aktualizowanie %s przez %s... "
 
@@ -168,7 +171,7 @@ msgid ":: Retrieving packages from %s...\n"
 msgstr ":: Pobieranie pakietów z %s...\n"
 
 #: src/pacman/callback.c:265
-#, fuzzy, c-format
+#, c-format
 msgid ""
 ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
 "n] "
@@ -176,7 +179,7 @@ msgstr ""
 ":: %s wymaga %s z IgnorePkg/IgnoreGroup. Zainstalować mimo tego? [T/n] "
 
 #: src/pacman/callback.c:270
-#, fuzzy, c-format
+#, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
 msgstr ":: %s jest w IgnorePkg/IgnoreGroup. Zainstalować mimo tego? [T/n] "
 
@@ -192,10 +195,10 @@ msgstr ":: Zastąpić %s przez %s/%s? [T/n] "
 
 #: src/pacman/callback.c:288
 #, fuzzy, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
+msgid "Replacing %s with %s/%s\n"
+msgstr ""
+"Zastępuję %s przez %s/%s\n"
 "."
-msgstr ":: Zastąpić %s przez %s/%s? [T/n] "
 
 #: src/pacman/callback.c:296
 #, c-format
@@ -208,7 +211,7 @@ msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: lokalna wersja jest nowsza. Aktualizować pomimo tego? [T/n] "
 
 #: src/pacman/callback.c:314
-#, fuzzy, c-format
+#, c-format
 msgid ":: File %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: Plik %s jest uszkodzony. Czy chcesz go usunąć? [T/n] "
 
@@ -245,27 +248,22 @@ msgid "Description    : "
 msgstr "Opis           : "
 
 #: src/pacman/package.c:93
-#, fuzzy
 msgid "Filename       :"
 msgstr "Nazwa pliku    :"
 
 #: src/pacman/package.c:95
-#, fuzzy
 msgid "Name           :"
 msgstr "Nazwa          :"
 
 #: src/pacman/package.c:96
-#, fuzzy
 msgid "Version        :"
 msgstr "Wersja         :"
 
 #: src/pacman/package.c:97
-#, fuzzy
 msgid "URL            :"
 msgstr "URL            :"
 
 #: src/pacman/package.c:98
-#, fuzzy
 msgid "Licenses       :"
 msgstr "Licencja       :"
 
@@ -300,12 +298,12 @@ msgstr "Zastępuje      :"
 #: src/pacman/package.c:111
 #, c-format
 msgid "Download Size  : %6.2f K\n"
-msgstr "Ilość danych do pobrania  : %6.2f K\n"
+msgstr "Ilość danych do pobrania: %6.2f K\n"
 
 #: src/pacman/package.c:115
-#, fuzzy, c-format
+#, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "Rozmiar po instalacji : %6.2f K\n"
+msgstr "Rozmiar skompresowany: %6.2f K\n"
 
 #: src/pacman/package.c:119
 #, c-format
@@ -313,32 +311,26 @@ msgid "Installed Size : %6.2f K\n"
 msgstr "Rozmiar po instalacji : %6.2f K\n"
 
 #: src/pacman/package.c:121
-#, fuzzy
 msgid "Packager       :"
 msgstr "Pakujący       :"
 
 #: src/pacman/package.c:122
-#, fuzzy
 msgid "Architecture   :"
 msgstr "Architektura   :"
 
 #: src/pacman/package.c:123
-#, fuzzy
 msgid "Build Date     :"
 msgstr "Data budowy    :"
 
 #: src/pacman/package.c:125
-#, fuzzy
 msgid "Install Date   :"
 msgstr "Data instalacji :"
 
 #: src/pacman/package.c:126
-#, fuzzy
 msgid "Install Reason :"
-msgstr "Powód ku instalacji :"
+msgstr "Powód instalacji :"
 
 #: src/pacman/package.c:129
-#, fuzzy
 msgid "Install Script :"
 msgstr "Skrypt instalacyjny :"
 
@@ -351,12 +343,10 @@ msgid "No"
 msgstr "Nie"
 
 #: src/pacman/package.c:135
-#, fuzzy
 msgid "MD5 Sum        :"
 msgstr "Suma MD5       :"
 
 #: src/pacman/package.c:159
-#, fuzzy
 msgid "Repository     :"
 msgstr "Repozytorium   :"
 
@@ -366,7 +356,7 @@ msgid "Backup Files:\n"
 msgstr "Pliki kopii zapasowej:\n"
 
 #: src/pacman/package.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "error: could not calculate checksums for %s\n"
 msgstr "błąd kalkulowania sum kontrolnych dla %s\n"
 
@@ -391,17 +381,15 @@ msgid "(none)\n"
 msgstr "(żadnych)\n"
 
 #: src/pacman/package.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "error: no changelog available for '%s'.\n"
-msgstr "Brak dostępnego changelog'a dla '%s'.\n"
+msgstr "błąd: brak dostępnego changelog'a dla '%s'.\n"
 
 #: src/pacman/pacman.c:60
-#, fuzzy
 msgid "options"
 msgstr "opcje"
 
 #: src/pacman/pacman.c:61
-#, fuzzy
 msgid "file"
 msgstr "plik"
 
@@ -414,7 +402,6 @@ msgid "usage"
 msgstr "sposób użycia"
 
 #: src/pacman/pacman.c:64
-#, fuzzy
 msgid "operation"
 msgstr "operacja"
 
@@ -428,11 +415,10 @@ msgstr ""
 "użyj '%s --help' z innymi opcjami dla dalszych składni\n"
 
 #: src/pacman/pacman.c:81 src/pacman/pacman.c:95 src/pacman/pacman.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
 msgstr ""
-"      --asdeps       instaluje pakiety jako nie-zależności (na życzenie)\n"
-" "
+"      --asdeps       instaluje pakiety jako zależności (nie na życzenie)\n"
 
 #: src/pacman/pacman.c:82 src/pacman/pacman.c:88 src/pacman/pacman.c:96
 #: src/pacman/pacman.c:119
@@ -480,18 +466,17 @@ msgid "  -c, --changelog      view the changelog of a package\n"
 msgstr "  -c, --changelog      wyświetla changelog dla pakietu\n"
 
 #: src/pacman/pacman.c:102
-#, fuzzy, c-format
+#, c-format
 msgid "  -d, --deps           list all packages installed as dependencies\n"
 msgstr ""
-"  -d, --deps           wylistowywuje wszystkie pakiety zainstalowane jako "
+"  -d, --deps           pokaż wszystkie pakiety zainstalowane jako "
 "zależności\n"
 
 #: src/pacman/pacman.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "  -e, --explicit       list all packages explicitly installed\n"
 msgstr ""
-"  -e, --explicit       wylistowywuje wszystkie pakiety zainstalowane na "
-"życzenie"
+"  -e, --explicit       pokaż wszystkie pakiety zainstalowane na życzenie\n"
 
 #: src/pacman/pacman.c:104 src/pacman/pacman.c:122
 #, c-format
@@ -499,7 +484,7 @@ msgid "  -g, --groups         view all members of a package group\n"
 msgstr "  -g, --groups         wyświetla zawartość grupy pakietów\n"
 
 #: src/pacman/pacman.c:105
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
@@ -539,11 +524,11 @@ msgstr ""
 "pasujących ciągów\n"
 
 #: src/pacman/pacman.c:111
-#, fuzzy, c-format
+#, c-format
 msgid "  -t, --unrequired     list all packages not required by any package\n"
 msgstr ""
-"  -t, --orphans        wylistowywuje wszystkie pakiety nie wymagane przez "
-"żaden pakiet\n"
+"  -t, --orphans        pokaż wszystkie pakiety nie wymagane przez żaden "
+"pakiet\n"
 
 #: src/pacman/pacman.c:112
 #, c-format
@@ -636,12 +621,13 @@ msgstr ""
 "więcej niż raz)\n"
 
 #: src/pacman/pacman.c:132
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
 msgstr ""
-"      --ignoregroup <grp>   ignoruje uaktualnienie grupy (może zostać użyte "
+"      --ignoregroup <grp>\n"
+"                       ignoruje uaktualnienie grupy (może zostać użyte "
 "więcej niż raz)\n"
 
 #: src/pacman/pacman.c:134
@@ -656,9 +642,9 @@ msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <path>  ustawia alternatywny plik konfiguracji\n"
 
 #: src/pacman/pacman.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "      --logfile <path> set an alternate log file\n"
-msgstr "      --logconfig <path>  ustawia alternatywny plik logu\n"
+msgstr "      --logfile <path> ustawia alternatywny plik dziennika\n"
 
 #: src/pacman/pacman.c:138
 #, c-format
@@ -674,12 +660,11 @@ msgstr ""
 "      --noprogressbar  wyłącza pasek postępu podczas pobierania plików\n"
 
 #: src/pacman/pacman.c:140
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
 msgstr ""
-"      --noscriptlet    nie wykonuje skryptu instalacyjnego jeśli takowy "
-"istnieje\n"
+"      --noscriptlet    nie wykonuje skryptu instalacyjnego jeśli istnieje\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
@@ -704,7 +689,7 @@ msgstr ""
 "podręcznej (cache) pakietów\n"
 
 #: src/pacman/pacman.c:157
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License\n"
@@ -728,14 +713,14 @@ msgid "problem setting logfile '%s' (%s)\n"
 msgstr "problem ustawiania logfile '%s' (%s)\n"
 
 #: src/pacman/pacman.c:382
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid debug level\n"
-msgstr "'%s' nie jest ważnym poziomem debug'owania\n"
+msgstr "'%s' nie jest ważnym poziomem odpluskwiania\n"
 
 #: src/pacman/pacman.c:396 src/pacman/pacman.c:672
-#, fuzzy, c-format
+#, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
-msgstr "problem dodawania cachedir '%s' (%s)\n"
+msgstr "problem z dodaniem cachedir '%s' (%s)\n"
 
 #: src/pacman/pacman.c:482
 msgid "only one operation may be used at a time\n"
@@ -758,10 +743,9 @@ msgstr ""
 "plik konfigu %s, linia %d: błąd składni w pliku konfigu- brak klucza.\n"
 
 #: src/pacman/pacman.c:610
-#, fuzzy, c-format
+#, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"plik konfigu %s, linia %d: dyrektywa 'Include' musi być częścią sekcji.\n"
+msgstr "plik %s, linia %d: Wszystkie dyrektywy muszą należeć do sekcji.\n"
 
 #: src/pacman/pacman.c:638 src/pacman/pacman.c:692 src/pacman/pacman.c:707
 #, c-format
@@ -787,56 +771,56 @@ msgid "no operation specified (use -h for help)\n"
 msgstr "nie podano żadnej operacji (użyj -h aby otrzymać pomoc)\n"
 
 #: src/pacman/query.c:65
-#, fuzzy, c-format
+#, c-format
 msgid "error: no file was specified for --owns\n"
 msgstr "błąd: nie podano pliku dla --owns\n"
 
-#: src/pacman/query.c:78
-#, fuzzy, c-format
+#: src/pacman/query.c:79
+#, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "błąd: nie udało się odczytać pliku '%s': %s\n"
 
-#: src/pacman/query.c:85
-#, fuzzy, c-format
+#: src/pacman/query.c:86
+#, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "błąd: nie można ustalić właściciela katalogu\n"
 
-#: src/pacman/query.c:93
-#, fuzzy, c-format
+#: src/pacman/query.c:97
+#, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
-msgstr "błąd: nie można ustalić pełnej ścieżki dla '%s': %s"
+msgstr "błąd: nie można ustalić pełnej ścieżki dla '%s': %s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s jest własnością %s %s\n"
 
-#: src/pacman/query.c:123
-#, fuzzy, c-format
+#: src/pacman/query.c:130
+#, c-format
 msgid "error: No package owns %s\n"
 msgstr "błąd: Żaden pakiet nie jest właścicielem %s\n"
 
-#: src/pacman/query.c:219
-#, fuzzy, c-format
+#: src/pacman/query.c:226
+#, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "błąd: grupa \"%s\" nie została znaleziona\n"
 
-#: src/pacman/query.c:230
-#, fuzzy, c-format
+#: src/pacman/query.c:237
+#, c-format
 msgid "Checking for package upgrades... \n"
-msgstr "Sprawdzanie możliwych aktualizacji...\n"
+msgstr "Sprawdzanie dostępnych aktualizacji...\n"
 
-#: src/pacman/query.c:241
-#, fuzzy, c-format
+#: src/pacman/query.c:248
+#, c-format
 msgid "no upgrades found.\n"
 msgstr "nie znaleziono aktualizacji.\n"
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "nie skonfigurowano używalnych repozytoriów.\n"
 
-#: src/pacman/query.c:397
-#, fuzzy, c-format
+#: src/pacman/query.c:404
+#, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "błąd: pakiet \"%s\" nie został odnaleziony\n"
 
@@ -854,17 +838,12 @@ msgstr "    Usunąć całą zawartość [T/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Usunąć %s z grupy %s? [T/n] "
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
-#, fuzzy, c-format
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
+#, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "błąd: nie udało się zainicjować transakcji (%s)\n"
 
-#: src/pacman/remove.c:111
-#, fuzzy, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "błąd: nie udało się dodać celu '%s' (%s)\n"
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Celuje: "
 
@@ -877,17 +856,17 @@ msgstr ""
 "Czy chcesz usunąć te pakiety? [T/n] "
 
 #: src/pacman/sync.c:52
-#, fuzzy, c-format
+#, c-format
 msgid "error: could not access database directory\n"
 msgstr "błąd: brak dostępu do katalogu bazy danych\n"
 
 #: src/pacman/sync.c:84
-#, fuzzy, c-format
+#, c-format
 msgid "Do you want to remove %s? [Y/n] "
 msgstr "Czy chcesz usunąć %s? [T/n] "
 
 #: src/pacman/sync.c:89
-#, fuzzy, c-format
+#, c-format
 msgid "error: could not remove repository directory\n"
 msgstr "błąd: nie udało się usunąć katalogu repozytorium\n"
 
@@ -897,7 +876,6 @@ msgid "Database directory: %s\n"
 msgstr "Katalog bazy danych: %s\n"
 
 #: src/pacman/sync.c:103
-#, fuzzy
 msgid "Do you want to remove unused repositories? [Y/n] "
 msgstr "Czy chcesz usunąć nieużywane repozytoria? [T/n] "
 
@@ -907,14 +885,13 @@ msgid "Database directory cleaned up\n"
 msgstr "Katalog bazy danych wyczyszczony\n"
 
 #: src/pacman/sync.c:132 src/pacman/sync.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "Cache directory: %s\n"
 msgstr "Katalog pamięci podręcznej : %s\n"
 
 #: src/pacman/sync.c:133
-#, fuzzy
 msgid "Do you want to remove uninstalled packages from cache? [Y/n] "
-msgstr "Czy chcesz usunąć wszystkie pakiety z pamięci podręcznej? [T/n] "
+msgstr "Czy chcesz usunąć odinstalowane pakiety z pamięci podręcznej? [T/n] "
 
 #: src/pacman/sync.c:136
 #, c-format
@@ -922,12 +899,11 @@ msgid "removing old packages from cache... "
 msgstr "usuwanie starych pakietów z pamięci podręcznej... "
 
 #: src/pacman/sync.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "error: could not access cache directory\n"
 msgstr "błąd: brak dostępu do katalogu pamięci podręcznej\n"
 
 #: src/pacman/sync.c:180
-#, fuzzy
 msgid "Do you want to remove ALL packages from cache? [Y/n] "
 msgstr "Czy chcesz usunąć WSZYSTKIE pakiety z pamięci podręcznej? [T/n] "
 
@@ -937,22 +913,22 @@ msgid "removing all packages from cache... "
 msgstr "usuwanie wszystkich pakietów z pamięci podręcznej... "
 
 #: src/pacman/sync.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "error: could not remove cache directory\n"
 msgstr "błąd: nie udało się usunąć katalogu pamięci podręcznej\n"
 
 #: src/pacman/sync.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "error: could not create new cache directory\n"
 msgstr "błąd: nie udało się utworzyć nowego katalogu pamięci podręcznej\n"
 
 #: src/pacman/sync.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "error: failed to synchronize %s: %s\n"
 msgstr "błąd: nie udało się zsynchronizować %s: %s\n"
 
 #: src/pacman/sync.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "error: failed to update %s (%s)\n"
 msgstr "błąd: nie udało się zaktualizować %s (%s)\n"
 
@@ -962,22 +938,22 @@ msgid " %s is up to date\n"
 msgstr " %s jest już w najnowszej wersji\n"
 
 #: src/pacman/sync.c:368
-#, fuzzy, c-format
+#, c-format
 msgid "error: repository '%s' does not exist\n"
 msgstr "błąd: repozytorium '%s' nie istnieje\n"
 
 #: src/pacman/sync.c:383
-#, fuzzy, c-format
+#, c-format
 msgid "error: package '%s' was not found in repository '%s'\n"
 msgstr "błąd: pakiet '%s' nie został odnaleziony w repozytorium '%s'\n"
 
 #: src/pacman/sync.c:403
-#, fuzzy, c-format
+#, c-format
 msgid "error: package '%s' was not found\n"
 msgstr "błąd: pakiet '%s' nie został odnaleziony\n"
 
 #: src/pacman/sync.c:440
-#, fuzzy, c-format
+#, c-format
 msgid "error: repository \"%s\" was not found.\n"
 msgstr "błąd: repozytorium \"%s\" nie zostało znalezione.\n"
 
@@ -987,9 +963,9 @@ msgid ":: Synchronizing package databases...\n"
 msgstr ":: Synchronizowanie baz danych z pakietami...\n"
 
 #: src/pacman/sync.c:495
-#, fuzzy, c-format
+#, c-format
 msgid "error: failed to synchronize any databases\n"
-msgstr "błąd: nie udało się zsynchronizować żadnych baz danych\n"
+msgstr "błąd: nie udało się zsynchronizować żadnej bazy danych\n"
 
 #: src/pacman/sync.c:507
 #, c-format
@@ -998,190 +974,175 @@ msgstr ":: Rozpoczynanie pełnej aktualizacji systemu...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ""
+
+#: src/pacman/sync.c:530
 msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
-msgstr ""
-":: pacman rozpoznał nowszą wersję samego siebie.\n"
-":: Zalecane jest zaktualizować samego pacman'a używając\n"
-":: komendy 'pacman -S pacman', po czym uruchomić jeszcze\n"
-":: raz obecną operację. Jeśli wolisz kontynuować,\n"
-":: nie aktualizując pacman'a oddzielnie, wybierz 'nie'\n"
-
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Anulować obecną operację? [T/n] "
-
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
-#, fuzzy, c-format
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
+msgstr ""
+
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
+#, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "error: nie udało się wyswobodzić transakcji (%s)\n"
 
-#: src/pacman/sync.c:548
-#, fuzzy, c-format
+#: src/pacman/sync.c:545
+#, c-format
 msgid "error: pacman: %s\n"
 msgstr "błąd: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, fuzzy, c-format
-msgid "error: '%s': %s\n"
-msgstr "błąd: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ":: grupa %s (włączająć ignorowane pakiety):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Zainstalować całą zawartość? [T/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Zainstalować %s z grupy %s? [T/n] "
 
-#: src/pacman/sync.c:620
-#, fuzzy, c-format
+#: src/pacman/sync.c:617
+#, c-format
 msgid "Warning: %s provides %s\n"
-msgstr ":: %s: wymaga %s\n"
+msgstr "Uwaga: %s: dostarcza %s\n"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
-msgstr ""
+msgstr "błąd: więcej niż jeden pakiet dostarcza %s, podaj jeden:\n"
 
-#: src/pacman/sync.c:635
-#, fuzzy, c-format
+#: src/pacman/sync.c:632
+#, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr "błąd: '%s': nie znaleziono w bazie danych synchronizacji\n"
 
-#: src/pacman/sync.c:663
-#, fuzzy, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: konfliktuje z %s\n"
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr " lokalna baza pakietów jest już w najnowszej wersji\n"
 
-#: src/pacman/sync.c:689
-#, fuzzy, c-format
+#: src/pacman/sync.c:686
+#, c-format
 msgid "Beginning download...\n"
 msgstr "Rozpoczynanie pobierania...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "Kontynuować pobieranie? [T/n] "
 
-#: src/pacman/sync.c:696
-#, fuzzy, c-format
+#: src/pacman/sync.c:693
+#, c-format
 msgid "Beginning upgrade process...\n"
 msgstr "Rozpoczynanie procesu aktualizacji...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "Kontynuować instalację? [T/n] "
 
-#: src/pacman/sync.c:740
-#, fuzzy, c-format
+#: src/pacman/sync.c:737
+#, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
-msgstr "wystąpiły błędy, nie zaktualizowano żadnych pakietów.\n"
+msgstr "Wystąpiły błędy, nie zaktualizowano żadnego pakietu.\n"
 
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "Żadnych\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Usunąć:"
 
-#: src/pacman/util.c:456
-#, fuzzy, c-format
+#: src/pacman/util.c:484
+#, c-format
 msgid "Total Removed Size:   %.2f MB\n"
-msgstr "Całkowity rozmiar usunięć:   %.2f MB\n"
+msgstr "Całkowity rozmiar do usunięcia: %.2f MB\n"
 
-#: src/pacman/util.c:463
-#, fuzzy, c-format
+#: src/pacman/util.c:491
+#, c-format
 msgid "Total Download Size:    %.2f MB\n"
-msgstr "Całkowity rozmiar pobrania:   %.2f MB\n"
+msgstr "Całkowity rozmiar do pobrania: %.2f MB\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Całkowity rozmiar po instalacji:   %.2f MB\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "T"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "TAK"
 
-#: src/pacman/util.c:543
-#, fuzzy, c-format
-msgid "debug: %s"
-msgstr "debug: %s"
-
-#: src/pacman/util.c:546
-#, fuzzy, c-format
+#: src/pacman/util.c:574
+#, c-format
 msgid "error: %s"
 msgstr "błąd: %s"
 
-#: src/pacman/util.c:549
-#, fuzzy, c-format
+#: src/pacman/util.c:577
+#, c-format
 msgid "warning: %s"
 msgstr "ostrzeżenie: %s"
 
-#: src/pacman/util.c:552
-#, fuzzy, c-format
+#: src/pacman/util.c:580
+#, c-format
 msgid "function: %s"
 msgstr "funkcja: %s"
 
-#: src/pacman/util.c:590
-#, fuzzy, c-format
-msgid "debug: "
-msgstr "debug: "
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "błąd:  "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "ostrzeżenie: "
 
-#: src/pacman/util.c:601
-#, fuzzy, c-format
+#: src/pacman/util.c:629
+#, c-format
 msgid "function: "
-msgstr "funkcja"
+msgstr "funkcja: "
 
 #: scripts/gensync.sh.in:32
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr "Sposób użycia: %s <root> <destfile> [katalog_pakietu]"
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
 "compresses it to <destfile>.\\n\\n"
 msgstr ""
+"gensync stworzy bazę danych sync czytając wszystkie pliki PKGBUILD\\n z "
+"<root>. gensync buduje bazę danych w katalogu tymczasowym\\n a później "
+"kompresuje ją do <destfile>.\\n\\n"
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
+"gensync przekalkuluje sumy md5 pakietów znajdujących się w tym samym"
+"\\nkatalogu co <destfile>, chyba że alternatywne [package_directory]\\njest "
+"podane.\\n\\n"
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1189,724 +1150,708 @@ msgid ""
 "database must reside in the same directory as your\\n      custom packages "
 "(also configured in /etc/pacman.conf)\\n\\n"
 msgstr ""
+"uwaga: Nazwa <destfile> jest ważna. Musi mieć postać\\n      {treename}.db."
+"tar.gz gdzie {treename} jest nazwą repozytorium pakietów,\\n      które "
+"skonfigurowałeś w /etc/pacman.conf. Wygenerowana\\n      baza musi znajdować "
+"się w tym samym katalogu co pakiety\\n      (również skonfigurowanym w /etc/"
+"pacman.conf)\\n\\n"
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
-msgstr ""
+msgstr "Przykład: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nTo jest wolne "
+"oprogramowanie; warunki dystrybucji znajdziesz w źródłach.\\nBRAK GWARANCJI, "
+"na ile pozwala prawo.\\n"
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
-msgstr ""
+msgstr "Nie znaleziono %s. Nie można kontynuować."
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
-msgstr ""
+msgstr "niepoprawny katalog główny: %s"
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
-msgstr ""
+msgstr "gensync: budowanie rekordów bazy, generowanie sum kontrolnych..."
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
-#, fuzzy
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
-msgstr "nie udało się przeczytać pliku konfiguracji (%s)\n"
+msgstr "nie udało się przetworzyć %s"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
-msgstr ""
+msgstr "nie znaleziono %s-%s-%s-%s.%s - pomijam"
 
-#: scripts/gensync.sh.in:149
-#, fuzzy
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
-msgstr "czyszczenie... "
+msgstr "tworzę bazę repozytorium..."
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
-msgstr ""
+msgstr "UWAGA:"
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
-msgstr ""
+msgstr "BŁĄD:"
 
 #: scripts/makepkg.sh.in:142
-#, fuzzy
 msgid "Cleaning up..."
-msgstr "czyszczenie... "
+msgstr "Sprzątam..."
 
 #: scripts/makepkg.sh.in:192
 msgid ""
 "Options beginning with 'no' will be deprecated in the next version of "
 "makepkg!"
 msgstr ""
+"Opcje zaczynające się od 'no' nie będą wspierane w następnej wersji makepkg!"
 
 #: scripts/makepkg.sh.in:193
 msgid "Please replace 'no' with '!': %s -> %s."
-msgstr ""
+msgstr "Zastąp 'no' przez '!': %s -> %s."
 
 #: scripts/makepkg.sh.in:197
 msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
-msgstr ""
+msgstr "Opcja 'keepdocs' może nie działać poprawnie. Zastąp ją przez 'docs'."
 
 #: scripts/makepkg.sh.in:285
 msgid "There is no agent set up to handle %s URLs. Check %s."
-msgstr ""
+msgstr "Brak agenta do obslugi URL-i %s. Sprawdź %s."
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
-msgstr ""
+msgstr "Przerywam..."
 
 #: scripts/makepkg.sh.in:294
 msgid "The download program %s is not installed."
-msgstr ""
+msgstr "Program do pobierania %s nie jest zainstalowany."
 
 #: scripts/makepkg.sh.in:310
 msgid "Pacman returned a fatal error (%i): %s"
-msgstr ""
+msgstr "Pacman zwrócił błąd krytyczny (%i): %s"
 
 #: scripts/makepkg.sh.in:334
-#, fuzzy
 msgid "Installing missing dependencies..."
-msgstr "rozwiązywanie zależności... "
+msgstr "Instaluję brakujące zależności..."
 
 #: scripts/makepkg.sh.in:344
 msgid "Pacman failed to install missing dependencies."
-msgstr ""
+msgstr "Pacman nie zdołał zainstalować brakujących zależności."
 
 #: scripts/makepkg.sh.in:348
-#, fuzzy
 msgid "Building missing dependencies..."
-msgstr "rozwiązywanie zależności... "
+msgstr "Buduję brakujące zależności..."
 
 #: scripts/makepkg.sh.in:353
 msgid "Source root cannot be found - please make sure it is specified in %s."
-msgstr ""
+msgstr "Nie znaleziono katalogu źródeł - upewnij się, że jest podany w %s."
 
 #: scripts/makepkg.sh.in:361
 msgid "Could not find '%s' under %s"
-msgstr ""
+msgstr "Nie znaleziono '%s' w %s"
 
 #: scripts/makepkg.sh.in:378
-#, fuzzy
 msgid "Failed to build '%s'"
-msgstr "nie udało się odczytać pliku '%s': %s"
+msgstr "Nie udało się zbudować '%s'"
 
 #: scripts/makepkg.sh.in:411
 msgid "Failed to install all missing dependencies."
-msgstr ""
+msgstr "Nie udało się zainstalować wszystkich brakujących zależności."
 
 #: scripts/makepkg.sh.in:414
-#, fuzzy
 msgid "Missing Dependencies:"
-msgstr "rozwiązywanie zależności... "
+msgstr "Brakujące zależności:"
 
 #: scripts/makepkg.sh.in:444
-#, fuzzy
 msgid "Retrieving Sources..."
-msgstr ":: Pobieranie pakietów z %s...\n"
+msgstr "Pobieranie źródeł..."
 
 #: scripts/makepkg.sh.in:447
 msgid "You do not have write permission to store downloads in %s."
-msgstr ""
+msgstr "Nie masz prawa zapisu do umieszczania plików w %s."
 
 #: scripts/makepkg.sh.in:458
 msgid "Found %s in build dir"
-msgstr ""
+msgstr "Znaleziono %s w katalogu budowania"
 
 #: scripts/makepkg.sh.in:462
 msgid "Using cached copy of %s"
+msgstr "Używam zachowanej kopii %s"
+
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
 msgstr ""
 
-#: scripts/makepkg.sh.in:470
-#, fuzzy
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
-msgstr "aktualizowanie %s... "
+msgstr "Pobieram %s... "
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
-msgstr ""
+msgstr "Błąd podczas pobierania %s"
 
-#: scripts/makepkg.sh.in:486
-#, fuzzy
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
-msgstr "błąd kalkulowania sum kontrolnych dla %s\n"
+msgstr "Generuję sumy kontrolne dla plików źródłwych..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
-msgstr ""
+msgstr "Algorytm sprawdzania spójności '%s' jest niepoprawny."
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
-msgstr ""
+msgstr "Nie znaleziono programu '%s'."
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
-msgstr ""
+msgstr "Brak pliku źródeł %s do generacji sumy kontrolnej."
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
-msgstr ""
+msgstr "Algorytm sprawdzania spójności '%s' jest niepoprawny"
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
-msgstr ""
+msgstr "Sprawdzam pliki źródłowe przy użyciu %s..."
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
-msgstr ""
+msgstr "NIE ZNALEZIONO"
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
-msgstr ""
+msgstr "Zgadza się"
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
-msgstr ""
+msgstr "NIE ZGADZA SIĘ"
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
-msgstr ""
+msgstr "Przynajmniej jeden plik nie jest poprawny!"
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
-msgstr ""
+msgstr "Sumy kontrolne (%s) nieobecne lub niekompletne."
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
-msgstr ""
+msgstr "Rozpakowuję źródła..."
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
-msgstr ""
+msgstr "Nie znaleziono pliku źródeł %s do rozpakowania."
 
-#: scripts/makepkg.sh.in:637
-#, fuzzy
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
-msgstr "nie udało się przygotować transakcji (%s)\n"
+msgstr "Nie udało się rozpakować %s"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
-msgstr ""
+msgstr "Uruchamiam build()..."
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
-msgstr ""
+msgstr "Budowanie nie powiodło się."
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
-msgstr ""
+msgstr "Sprzątam..."
 
-#: scripts/makepkg.sh.in:711
-#, fuzzy
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
-msgstr "rozwiązywanie zależności... "
+msgstr "Usuwam pliki dokumentacji..."
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
-msgstr ""
+msgstr "Kompresuję strony manuala..."
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
-msgstr ""
+msgstr "Usuwam symbole odpluskwiania z binariów i bibliotek..."
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
-msgstr ""
+msgstr "Usuwam pliki libtoola .la..."
 
-#: scripts/makepkg.sh.in:767
-#, fuzzy
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
-msgstr "rozwiązywanie zależności... "
+msgstr "Usuwam puste katalogi..."
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
-msgstr ""
+msgstr "Brakujący katalog pkg."
 
-#: scripts/makepkg.sh.in:780
-#, fuzzy
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
-msgstr "ładowanie informacji o pakietach... "
+msgstr "Tworzę pakiet..."
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
-msgstr ""
+msgstr "Generuję plik .PKGINFO..."
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
-msgstr ""
+msgstr "Dodaj pole z licencją do %s!"
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
-msgstr ""
+msgstr "Przykład dla programu na GPL: license=('GPL')."
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
-msgstr ""
+msgstr "Dodaję skrypt instalacyjny..."
 
-#: scripts/makepkg.sh.in:853
-#, fuzzy
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
-msgstr "ładowanie informacji o pakietach... "
+msgstr "Dodaję dziennik zmian pakietu..."
 
-#: scripts/makepkg.sh.in:859
-#, fuzzy
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
-msgstr "ładowanie informacji o pakietach... "
+msgstr "Kompresuję pakiet..."
 
-#: scripts/makepkg.sh.in:864
-#, fuzzy
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
-msgstr "nie udało się załadować pakietu '%s' (%s)\n"
+msgstr "Nie udało się utworzyć pliku pakietu."
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
-msgstr ""
+msgstr "Nie znaleziono programu xdelta! Czy jest zainstalowany?"
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
-msgstr ""
+msgstr "Tworzę pakiet przyrostowy od wersji %s..."
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
-msgstr ""
+msgstr "Odtwarzam pakiet z archiwum przyrostowego w celu sprawdzenia spójności"
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr ""
+"UWAGA: pakiet przyrostowy powinien być rozprowadzany TYLKO z tym archiwum"
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
-msgstr ""
+msgstr "Nie udało się stworzyć pakietu z archiwum przyrostowego."
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
-msgstr ""
+msgstr "Nie udało się stworzyć archiwum przyrostowego."
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr ""
+"Nie znaleziono żadnej z poprzednich wersji, pomijam archiwum przyrostowe."
 
-#: scripts/makepkg.sh.in:935
-#, fuzzy
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
-msgstr "Sprawdzanie możliwych aktualizacji..."
+msgstr "Tworzę pakiet źródłowy..."
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
-#, fuzzy
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
-msgstr "aktualizowanie %s... "
+msgstr "Dodaję %s..."
 
-#: scripts/makepkg.sh.in:944
-#, fuzzy
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
-msgstr "Skrypt instalacyjny : %s\n"
+msgstr "Nie znaleziono skryptu instalacyjnego %s."
 
-#: scripts/makepkg.sh.in:964
-#, fuzzy
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
-msgstr "Sprawdzanie możliwych aktualizacji..."
+msgstr "Kompresuję pakiet źródłowy..."
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
-msgstr ""
+msgstr "Nie udało się stworzyć pakietu źródłowego."
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
-msgstr ""
+msgstr "Sprawdzam ostatnią rewizję repozytorium darcs..."
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
-msgstr ""
+msgstr "Sprawdzam ostatnią rewizję repozytorium cvs..."
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
-msgstr ""
+msgstr "Sprawdzam ostatnią rewizje repozytorium git..."
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
-msgstr ""
+msgstr "Sprawdzam ostatnią rewizję repozytorium svn..."
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
-msgstr ""
+msgstr "Sprawdzam ostatnią rewizję repozytorium bzr..."
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
-msgstr ""
+msgstr "Sprawdzam ostatnią rewizję repozytorium hg..."
 
-#: scripts/makepkg.sh.in:1024
-#, fuzzy
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
-msgstr "Wersja        : %s\n"
+msgstr "Wersja        : %s"
 
-#: scripts/makepkg.sh.in:1055
-#, fuzzy
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
-msgstr "składnia:  %s {-A --add} [options] <file>\n"
+msgstr "Użycie: %s [opcje]"
 
-#: scripts/makepkg.sh.in:1057
-#, fuzzy
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
-msgstr "opcje:\n"
+msgstr "Opcje:"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
-msgstr ""
+msgstr "  -A, --ignorearch Ignoruj niekompletne pole arch w %s"
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
-msgstr ""
+msgstr "  -b, --builddeps  Zbuduj brakujące zależności ze źródeł"
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
-msgstr ""
+msgstr "  -c, --clean      Usuń plik robocze po wszystkim"
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
-msgstr ""
+msgstr "  -C, --cleancache Usuń pliki źródłowe z pamięci podręcznej"
 
-#: scripts/makepkg.sh.in:1062
-#, fuzzy
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
-msgstr "  -d, --nodeps         pomija sprawdzanie zależności\n"
+msgstr "  -d, --nodeps     Pomija sprawdzanie zależności"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
+"  -e, --noextract  Nie rozpakowuj źródeł (użyj istniejącego katalogu src/)"
 
-#: scripts/makepkg.sh.in:1064
-#, fuzzy
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
-msgstr ""
-"  -f, --force          wymusza instalację, nadpisując konfliktujące pliki\n"
+msgstr "  -f, --force      Nadpisuje istniejące pakiety"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
+msgstr "  -g, --geninteg   Wygeneruj symy kontrolne dla źródeł"
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
-msgstr ""
+msgstr "  -h, --help       Niniejsza pomoc"
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
-msgstr ""
+msgstr "  -i, --install     Zainstaluj pakiet po udanej budowie"
 
-#: scripts/makepkg.sh.in:1068
-#, fuzzy
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
-msgstr "  -i, --info           wyświetla informację o pakiecie\n"
+msgstr "  -L, --log        Stwórz dziennik budowy pakietu"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
-msgstr ""
+msgstr "  -m, --nocolor    Wyłącz kolorowe komunikaty"
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
-msgstr ""
+msgstr "  -o, --nobuild    Tylko pobierz i rozpakuj pliki"
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
-msgstr ""
+msgstr "  -p <buildscript> Użyj alternatywnego skryptu budowy (zamiast '%s')"
 
-#: scripts/makepkg.sh.in:1072
-#, fuzzy
+#: scripts/makepkg.sh.in:1088
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr "  -e, --dependsonly    instaluje tylko zależności\n"
+msgstr "  -r, --rmdeps     Usuń zainstalowane zależności po udanym budowaniu"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
-msgstr ""
+msgstr "  -R, --repackage  Przepakuj zawartość pkg/ bez budowania"
 
-#: scripts/makepkg.sh.in:1075
-#, fuzzy
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
-msgstr "  -e, --dependsonly    instaluje tylko zależności\n"
+msgstr "  -s, --syncdeps   Zainstaluj brakujące zależności pacmanem"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
-msgstr ""
+msgstr "      --asroot     Pozwól makepkg pracować jako root"
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr ""
+"      --holdver    Zapobiega autopodnoszeniu wersji dla rozwojowych "
+"PKGBUILDów"
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr ""
+"      --source     Nie buduj pakietu; tylko wygeneruj archiwum źródłowe"
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
-msgstr ""
+msgstr "Poniższe opcje mogą być przekazane do pacmana:"
 
-#: scripts/makepkg.sh.in:1082
-#, fuzzy
+#: scripts/makepkg.sh.in:1098
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
 msgstr ""
-"      --noconfirm      nie pyta o potwierdzenie ze strony użytkownika\n"
+"      --noconfirm      Nie pyta o potwierdzenie przy rozwiązywaniu zależności"
 
-#: scripts/makepkg.sh.in:1083
-#, fuzzy
+#: scripts/makepkg.sh.in:1099
 msgid ""
 "      --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"      --noprogressbar  wyłącza pasek postępu podczas pobierania plików\n"
+msgstr "      --noprogressbar  Wyłącza pasek postępu podczas pobierania plików"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
-msgstr ""
+msgstr "Jeżeli nie użytko -p, makepkg będzie szukać '%s'"
 
-#: scripts/makepkg.sh.in:1107
-#, fuzzy
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
-msgstr "pakiet \"%s\" nie został odnaleziony\n"
+msgstr "%s nie znaleziony."
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
-msgstr ""
+msgstr "Sudo jest teraz używane domyślnie. Opcja --usesudo jest przestarzała!"
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
-msgstr ""
+msgstr "Usuwam WSZYSTKIE pliki z %s."
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr ""
+msgstr "    Czy jesteś pewien, że chcesz to zrobić? [T/n] "
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
-msgstr ""
+msgstr "Problem z usuwaniem plików; możliwy brak uprawnień w %s"
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
-msgstr ""
+msgstr "Pamięć podręczna źródeł wyczyszczona."
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
-msgstr ""
+msgstr "Nie usunięto żadnych plików."
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
-msgstr ""
+msgstr "Docelowy katalog źródeł musi być podany w makepkg.conf."
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
-msgstr ""
+msgstr "Dodatkowo uruchom makepkg -C poza katalogiem pamięci podręcznej."
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
-msgstr ""
+msgstr "Skrypt budujący niezdefiniowany! Sprawdź czy poprawiłeś %s."
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
-msgstr ""
+msgstr "Uruchamianie makepkg jako root to ZŁY pomysł i może spowodować"
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
-msgstr ""
+msgstr "trwałe, katastrofalne uszkodzenia systemu. Jeżeli"
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
-msgstr ""
+msgstr "naprawdę chcesz to zrobić, użyj opcji --asroot."
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
-msgstr ""
+msgstr "Opcja --asroot jest przeznaczona tylko dla użytkownika root."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
-msgstr ""
+msgstr "Uruchom makepkg ponownie bez opcji --asroot."
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
-msgstr ""
+msgstr "Fakeroot musi być zainstalowany jeżeli używasz opcji 'fakeroot'"
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
-msgstr ""
+msgstr "w tablicy BUILDENV w %s."
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
-msgstr ""
+msgstr "Wynikiem uruchamienia makepkg jako zwykły użytkownik będą"
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
+"pliki, których właścicielem nie jest root. Spróbuj użyć środowiska fakeroot"
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
-msgstr ""
+msgstr "dodając 'fakeroot' do tablicy BUILDENV w makepkg.conf."
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr ""
+"Nie używaj opcji '-F'. Jest ona przeznaczona tylko do użytku przez makepkg."
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
-msgstr ""
+msgstr "Nie znaleziono programu sudo! Czy jest zainstalowany?"
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
+"Brakujące zależności nie mogą być dodane lub usunięte jako zwykły użytkownik"
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr ""
+"bez sudo; zainstaluj i ustaw sudo aby automatycznie rozwiązywać zależności."
 
-#: scripts/makepkg.sh.in:1270
-#, fuzzy
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
-msgstr "repozytorium '%s' nie istnieje\n"
+msgstr "%s nie istnieje."
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
-#, fuzzy
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
-msgstr "'%s' nie jest ważną ścieżką db (bazy danych)\n"
+msgstr "%s nie może być pusty."
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
-msgstr ""
+msgstr "%s nie może zawierać myślnika."
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
-msgstr ""
+msgstr "%s nie jest dostępny dla architektury '%s'."
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
-msgstr ""
+msgstr "Dużo pakietów może potrzebować w %s pola"
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
-msgstr ""
+msgstr "podobnego do arch=('%s')."
 
-#: scripts/makepkg.sh.in:1323
-#, fuzzy
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
-msgstr "repozytorium '%s' nie istnieje\n"
+msgstr "Skrypt instalacyjny (%s) nie istnieje."
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
-msgstr ""
+msgstr "Pakiet został już zbudowany, instaluję istniejący pakiet..."
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
-msgstr ""
+msgstr "Pakiet został już zbudowany. (użyj -f aby obejść)"
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
-msgstr ""
+msgstr "Pomijam budowanie."
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
-msgstr ""
+msgstr "Opuszczam środowisko fakeroot."
 
-#: scripts/makepkg.sh.in:1362
-#, fuzzy
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
-msgstr "ładowanie informacji o pakietach... "
+msgstr "Tworzę pakiet: %s"
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
-msgstr ""
+msgstr "Uruchamiam makepkg jako root..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
-msgstr ""
+msgstr "Utworzono pakiet źródłowy: %s"
 
-#: scripts/makepkg.sh.in:1383
-#, fuzzy
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
-msgstr "sprawdzanie zależności... "
+msgstr "Pomijam sprawdzanie zależności."
 
-#: scripts/makepkg.sh.in:1390
-#, fuzzy
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
-msgstr "sprawdzanie zależności... "
+msgstr "Sprawdzanie zależności dla uruchomienia..."
 
-#: scripts/makepkg.sh.in:1393
-#, fuzzy
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
-msgstr "sprawdzanie zależności... "
+msgstr "Sprawdzanie zależności dla zbudowania..."
 
-#: scripts/makepkg.sh.in:1397
-#, fuzzy
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
-msgstr "rozwiązywanie zależności... "
+msgstr "Nie udało się rozwiązać wszystkich zależności."
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
-msgstr ""
+msgstr "pacman nie został znaleziono w PATH; pomijam sprawdzanie zależności."
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
-msgstr ""
+msgstr "Pomijam pobieranie źródeł        -- używam istniejącego drzewa src/"
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
-msgstr ""
+msgstr "Pomijam test sum kontrolnych     -- używam istniejącego drzewa src/"
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
-msgstr ""
+msgstr "Pomijam rozpakowanie źródeł       -- używam istniejącego drzewa src/"
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
-msgstr ""
+msgstr "Katalog źródeł jest pusty, nie mam czego budować!"
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
-msgstr ""
+msgstr "Katalog pakietu jest pusty, nie mam czego przepakować!"
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
-msgstr ""
+msgstr "Źródła są gotowe."
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
-msgstr ""
+msgstr "Usuwam istniejący katalog pkg/..."
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
-msgstr ""
+msgstr "Wchodzę do środowiska fakeroot..."
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
-msgstr ""
+msgstr "Skończyłem tworzenie: %s"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid "Usage: %s [pacman_db_root]"
-msgstr ""
+msgstr "Użycie: %s [pacman_db_root]"
 
 #: scripts/pacman-optimize.sh.in:43
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
 msgstr ""
+"pacman-optimize jest małym narzędziem, które powinno polepszyć wydajność"
+"\\npacmana podczas odczytu/zapisu do bazy danych opartej na systemie plików."
+"\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:46
 msgid ""
@@ -1917,79 +1862,84 @@ msgid ""
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
 msgstr ""
+"Ponieważ pacman używa wielu małych plików aby śledzić pakiety pliki te mają"
+"\\ntendencję do fragmentacji w miarę upływu czasu. Ten skrypt próbuje "
+"przenieść\\nje w jedno ciągłe miejsce na dysku. W rezultacie dysk twardy "
+"powinien czytać\\nje szybciej, ponieważ jego głowica nie musi się często "
+"przemieszczać\\n"
 
 #: scripts/pacman-optimize.sh.in:89
 msgid "diff tool was not found, please install diffutils."
-msgstr ""
+msgstr "Nie znaleziono programu diff, zainstaluj diffutils."
 
 #: scripts/pacman-optimize.sh.in:94
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr ""
+"Znaleziono plik blokady pacmana. Nie można kontynuować gdy pacman działa."
 
 #: scripts/pacman-optimize.sh.in:98
-#, fuzzy
 msgid "%s does not exist or is not a directory."
-msgstr "'%s' nie jest ważnym katalogiem pamięci podręcznej\n"
+msgstr "%s nie istnieje lub nie jest katalogiem."
 
 #: scripts/pacman-optimize.sh.in:102
 msgid "You must have correct permissions to optimize the database."
-msgstr ""
+msgstr "Musisz mieć odpowiednie uprawnienia aby optymalizować bazę."
 
 #: scripts/pacman-optimize.sh.in:106
 msgid "ERROR: Can not create temp directory for database building."
-msgstr ""
+msgstr "BŁĄD: Nie można utworzyć katalogu tymczasowego do zbudowania bazy."
 
 #: scripts/pacman-optimize.sh.in:112
 msgid "MD5sum'ing the old database..."
-msgstr ""
+msgstr "Generuję sumę kontrolną starej bazy..."
 
 #: scripts/pacman-optimize.sh.in:116
-#, fuzzy
 msgid "Tar'ing up %s..."
-msgstr "czyszczenie... "
+msgstr "Tworzę archiwum tar z %s..."
 
 #: scripts/pacman-optimize.sh.in:121
 msgid "Tar'ing up %s failed."
-msgstr ""
+msgstr "Stworzenie archiwum tar z %s nie udało się."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Making and MD5sum'ing the new db..."
-msgstr ""
+msgstr "Tworzę nową bazę i generuję jej sumę kontrolną..."
 
 #: scripts/pacman-optimize.sh.in:130
 msgid "Untar'ing %s failed."
-msgstr ""
+msgstr "Nie udało się rozpakować archiwum tar z %s."
 
 #: scripts/pacman-optimize.sh.in:136
-#, fuzzy
 msgid "Checking integrity..."
-msgstr "sprawdzanie spójności pakietów... "
+msgstr "Sprawdzanie spójności pakietów... "
 
 #: scripts/pacman-optimize.sh.in:142
 msgid "Integrity check FAILED, reverting to old database."
-msgstr ""
+msgstr "Test spójności NIE POWIÓDŁ się, powracam do starej bazy."
 
 #: scripts/pacman-optimize.sh.in:147
 msgid "Putting the new database in place..."
-msgstr ""
+msgstr "Umieszczam nową bazę w odpowiednim miejscu..."
 
 #: scripts/pacman-optimize.sh.in:156
 msgid "Finished. Your pacman database has been optimized."
-msgstr ""
+msgstr "Zakończono. Baza pacmana została zoptymalizowana."
 
 #: scripts/pacman-optimize.sh.in:157
 msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr ""
+msgstr "Aby w pełni skorzystać z optymalizacji, uruchom teraz 'sync'."
 
 #: scripts/repo-add.sh.in:57
 msgid "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
-msgstr ""
+msgstr "Użycie: %s <ścieżka-do-bazy> [--force] <pakiet> ...\\n\\n"
 
 #: scripts/repo-add.sh.in:58
 msgid ""
 "repo-add will update a package database by reading a package file."
 "\\nMultiple packages to add can be specified on the command line.\\n\\n"
 msgstr ""
+"repo-add aktualizuje bazę pakietów czytająć plik z pakietem.\\nW linii "
+"poleceń można podać wiele pakietów do dodania\\n\\n"
 
 #: scripts/repo-add.sh.in:61
 msgid ""
@@ -1997,10 +1947,12 @@ msgid ""
 "\\ntells pacman to skip its internal version number checking and update"
 "\\nthe package regardless.\\n\\n"
 msgstr ""
+"Opcja --force doda pole 'force' do bazy, co sprawi, że pacman opuści"
+"\\nsprawdzanie numerów wersji i zaktualizuje pakiet bezwarunkowo.\\n\\n"
 
 #: scripts/repo-add.sh.in:65
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
-msgstr ""
+msgstr "Przykład: repo-add /ścieżka/do/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 
 #: scripts/repo-add.sh.in:70
 msgid ""
@@ -2008,311 +1960,191 @@ msgid ""
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
+"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nTo jest wolne "
+"oprogramowanie; warunki dystrybucji znajdziesz w źródłach\\nBRAK GWARANCJI, "
+"na ile pozwala prawo.\\n"
 
 #: scripts/repo-add.sh.in:174
 msgid "Invalid package file '%s'."
-msgstr ""
+msgstr "Błędny plik pakietu '%s'."
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
-#, fuzzy
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
-msgstr ":: Pobieranie pakietów z %s...\n"
+msgstr "Usuwam istniejący pakiet '%s'..."
 
 #: scripts/repo-add.sh.in:193
 msgid "Creating 'desc' db entry..."
-msgstr ""
+msgstr "Tworzę pole 'desc' w bazie..."
 
 #: scripts/repo-add.sh.in:203
 msgid "Computing md5 checksums..."
-msgstr ""
+msgstr "Obliczam sumy kontrolne..."
 
 #: scripts/repo-add.sh.in:215
-#, fuzzy
 msgid "Creating 'depends' db entry..."
-msgstr "rozwiązywanie zależności... "
+msgstr "Tworzę pole 'depends' w bazie..."
 
 #: scripts/repo-add.sh.in:231
 msgid "Creating 'deltas' db entry..."
-msgstr ""
+msgstr "Tworzę pole 'deltas' w bazie..."
 
 #: scripts/repo-add.sh.in:237
 msgid "Added delta '%s'"
-msgstr ""
+msgstr "Dodano archiwum przyrostowe '%s'"
 
 #: scripts/repo-add.sh.in:239
 msgid "Could not add delta '%s'"
-msgstr ""
+msgstr "Nie udało się dodać archiwum przyrostowego '%s'"
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
-msgstr ""
+msgstr "Nie znaleziono %s. Nie można kontynuować."
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
-msgstr ""
+msgstr "Nie udało się utworzyć katalogu tymczasowego do zbudowania bazy."
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr ""
+msgstr "Plik repozytorium '%s' nie jest poprawną bazą pacmana."
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
-msgstr ""
+msgstr "Rozpakowuję bazę do tymczasowej lokalizacji..."
 
 #: scripts/repo-add.sh.in:307
 msgid "'%s' is not a package file, skipping"
-msgstr ""
+msgstr "'%s' nie jest plikiem pakietu, pomijam"
 
 #: scripts/repo-add.sh.in:309
-#, fuzzy
 msgid "Adding package '%s'"
-msgstr "ładowanie informacji o pakietach... "
+msgstr "Dodaję pakiet '%s'"
 
 #: scripts/repo-add.sh.in:316
-#, fuzzy
 msgid "Package '%s' not found."
-msgstr "pakiet '%s' nie został odnaleziony\n"
+msgstr "Pakiet '%s' nie został odnaleziony."
 
 #: scripts/repo-add.sh.in:323
 msgid "Creating updated database file %s"
-msgstr ""
+msgstr "Tworzę uaktualniony plik bazy %s"
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
-msgstr ""
+msgstr "Nie wybrano żadnej kompresji."
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
-msgstr ""
+msgstr "Nie zmodyfikowano żadnego pakietu, nie ma nic do zrobienia."
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
-msgstr ""
+msgstr "repo-remove %s\\n\\n"
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
-msgstr ""
+msgstr "użycie: %s <ścieżka-do-bazy> <nazwapakietu> ...\\n\\n"
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
 "\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
+"repo-remove uaktualni bazę pakietów usuwając pakiet o nazwie podanej w linii"
+"\\npoleceń. Wiele pakietów może być podanych w linii poleceń.\\n\\n"
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-msgstr ""
+msgstr "Przykład: repo-remove /ścieżka/do/repo.db.tar.gz kernel26"
 
-#: scripts/repo-remove.sh.in:147
-#, fuzzy
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
-msgstr "Sprawdzanie możliwych aktualizacji..."
+msgstr "Szukam pakietu '%s'..."
 
-#: scripts/repo-remove.sh.in:152
-#, fuzzy
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
-msgstr "pakiet '%s' nie został odnaleziony\n"
+msgstr "Nie odnaleziono pakietu pasującego do '%s'."
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
+msgstr "Tworzę uaktualniony plik bazy '%s'..."
+
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
 msgstr ""
 
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
-msgstr ""
+msgstr "Użycie %s <akcja> <plikwynikowy> <opcja> [katalog_pakietów]"
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
 "then compresses it to <destfile>.\\n\\n"
 msgstr ""
+"updatesync uaktualni bazę pakietów czytając PKGBUILD i modyfikując plik"
+"\\nwynikowy. updatesync aktualizuje bazę w katalogu tymczasowym, po czym"
+"\\nkompresuje ją do <plikwynikowy>.\\n\\n"
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
-msgstr ""
+msgstr "Istnieją dwa rodzaje akcji:\\n\\n"
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
 msgstr ""
+"upd - Zaktualizuje wpis pakietu lub stworzy jeżeli nie istnieje.\\n      "
+"Przyjmuje PKGBUILD pakietu jako opcję.\\n"
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
 msgstr ""
+"del - Usunie wpis pakietu z bazy. Przyjmuje nazwę pakietu jako opcję\\n\\n"
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
+"updatesync obliczy sumy kontrolne paketów z tego samego katalogu co"
+"\\n<plikwynikowy>, chyba że podano inny [katalog_pakietów].\\n\\n"
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
-msgstr ""
+msgstr "Przykład: updatesync upd /home/mojepakiety/custom.db.tar.gz PKGBUILD"
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
+"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nTo jest wolne "
+"oprogramowanie; warunki dystrybucji znajdziesz w źródłach\\nBRAK GWARANCJI, "
+"na ile pozwala prawo.\\n"
 
-#: scripts/updatesync.sh.in:120
-#, fuzzy
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
-msgstr "pakiet \"%s\" nie został odnaleziony\n"
+msgstr "%s nie znaleziony"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Installing package with pacman -U..."
-#~ msgstr "ładowanie informacji o pakietach... "
-
-#, fuzzy
-#~ msgid "Updating %s..."
-#~ msgstr "aktualizowanie %s... "
-
-#, fuzzy
-#~ msgid "failed to parse parse %s"
-#~ msgstr "nie udało się zaktualizować %s (%s)\n"
-
-#~ msgid ":: %.1f MB required, have %.1f MB"
-#~ msgstr ":: %.1f MB wymagane, dostępnych %.1f MB"
-
-#~ msgid "error"
-#~ msgstr "błąd"
-
-#~ msgid "warning"
-#~ msgstr "ostrzeżenie"
-
-#~ msgid "Removes        :"
-#~ msgstr "Usuwa        :"
-
-#~ msgid "Build Type     : %s\n"
-#~ msgstr "Typ budowy     : %s\n"
-
-#~ msgid "SHA1 Sum       : %s"
-#~ msgstr "Suma SHA1       : %s"
-
-#~ msgid "usage:  %s {-R --remove} [options] <package>\n"
-#~ msgstr "składnia:  %s {-R --remove} [opcje] <package>\n"
-
-#~ msgid ""
-#~ "      --ask <number>   pre-specify answers for questions (see manpage)\n"
-#~ msgstr ""
-#~ "      --ask <number>   zadaje pytania z góry (zobacz stronę podręcznika)\n"
-
-#~ msgid "'%s' is not a valid root path\n"
-#~ msgstr "'%s' nie jest ważną ścieżką docelową\n"
-
-#~ msgid "Targets  :"
-#~ msgstr "Cele  :"
-
-#~ msgid "no package file was specified for --file\n"
-#~ msgstr "nie podano pliku pakietu dla --file\n"
-
-#~ msgid ":: %s is required by %s\n"
-#~ msgstr ":: %s jest wymagane przez %s\n"
-
-#~ msgid "synchronizing package lists"
-#~ msgstr "synchronizowanie list pakietów"
-
-#~ msgid "starting full system upgrade"
-#~ msgstr "rozpoczynanie pełnej aktualizacji systemu"
-
-#~ msgid ""
-#~ "\n"
-#~ ":: pacman has detected a newer version of the \"pacman\" package.\n"
-#~ msgstr ""
-#~ "\n"
-#~ ":: pacman wykrył nowszą wersję pakietu \"pacman\".\n"
-
-#~ msgid ":: It is recommended that you allow pacman to upgrade itself\n"
-#~ msgstr ":: Rekomendowane jest ażeby pozwolić pacman'owi zaktualizować się\n"
-
-#~ msgid ""
-#~ ":: first, then you can re-run the operation with the newer version.\n"
-#~ msgstr ":: najpierw, po czym uruchomić ponownie operację z nowszą wersją.\n"
-
-#~ msgid ":: Upgrade pacman first? [Y/n] "
-#~ msgstr ":: Zaktualizować pacman'a najpierw? [T/n] "
-
-#~ msgid "requires"
-#~ msgstr "wymaga"
-
-#~ msgid "installed %s (%s)"
-#~ msgstr "zainstalowano %s (%s)"
-
-#~ msgid "removed %s (%s)"
-#~ msgstr "usunięto %s (%s)"
-
-#~ msgid "upgraded %s (%s -> %s)"
-#~ msgstr "zaktualizowano %s (%s -> %s)"
-
-#~ msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
-#~ msgstr ""
-#~ ":: %s-%s: lokalny pakiet jest już w najnowszej wersji. Aktualizować mimo "
-#~ "tego? [T/n] "
-
-#~ msgid ""
-#~ "\n"
-#~ "Total Package Size:   %.2f MB\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Całkowity rozmiar pakietów:   %.2f MB\n"
-
-#~ msgid "requires: %s"
-#~ msgstr "wymaga: %s"
-
-#~ msgid "usage:  %s {-h --help}\n"
-#~ msgstr "składnia:  %s {-h --help}\n"
-
-#~ msgid "        %s {-V --version}\n"
-#~ msgstr "        %s {-V --version}\n"
-
-#~ msgid "        %s {-A --add}     [options] <file>\n"
-#~ msgstr "        %s {-A --add}     [opcje] <file>\n"
-
-#~ msgid "        %s {-F --freshen} [options] <file>\n"
-#~ msgstr "        %s {-F --freshen} [opcje] <file>\n"
-
-#~ msgid "        %s {-Q --query}   [options] [package]\n"
-#~ msgstr "        %s {-Q --query}   [opcje] [pakiet]\n"
-
-#~ msgid "        %s {-R --remove}  [options] <package>\n"
-#~ msgstr "        %s {-R --remove}  [opcje] <package>\n"
-
-#~ msgid "        %s {-S --sync}    [options] [package]\n"
-#~ msgstr "        %s {-S --sync}    [opcje] [pakiet]\n"
-
-#~ msgid "        %s {-U --upgrade} [options] <file>\n"
-#~ msgstr "        %s {-U --upgrade} [opcje] <file>\n"
-
-#~ msgid "usage:  %s {-F --freshen} [options] <file>\n"
-#~ msgstr "składnia:  %s {-F --freshen} [opcje] <file>\n"
-
-#~ msgid "usage:  %s {-U --upgrade} [options] <file>\n"
-#~ msgstr "składnia:  %s {-U --upgrade} [opcje] <file>\n"
+msgstr "nie znaleziono %s-%s-%s-%s.%s - przerywam"
 
-#~ msgid "usage:  %s {-Q --query} [options] [package]\n"
-#~ msgstr "składnia:  %s {-Q --query} [opcje] [pakiet]\n"
+#~ msgid "error: failed to add target '%s' (%s)"
+#~ msgstr "błąd: nie udało się dodać celu '%s' (%s)"
 
-#~ msgid "                       required by any package\n"
-#~ msgstr "                       wymagane już przez jakikolwiek pakiet\n"
+#~ msgid ":: %s: conflicts with %s"
+#~ msgstr ":: %s: konfliktuje z %s"
 
-#~ msgid "usage:  %s {-S --sync} [options] [package]\n"
-#~ msgstr "składnia:  %s {-S --sync} [opcje] [paczka]\n"
+#~ msgid "error: failed to add target '%s' (%s)\n"
+#~ msgstr "błąd: nie udało się dodać celu '%s' (%s)\n"
 
-#~ msgid "                       the terms of the GNU General Public License\n"
-#~ msgstr "                       zasadach Licencji Publicznej GNU (GPL)\n"
+#~ msgid ":: Cancel current operation? [Y/n] "
+#~ msgstr ":: Anulować obecną operację? [T/n] "
 
-#~ msgid "warning: current locale is invalid; using default \"C\" locale"
-#~ msgstr ""
-#~ "ostrzeżenie: ustawione locale jest niewłaściwe; używanie locale \"C\""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d3fde86b..2cc6fb57 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,20 +2,22 @@
 # Brazilian Portuguese translations for Pacman package manager package.
 # Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
-#
 # Lincoln de Sousa <lincoln@archlinux-br.org>, 2007.
 # Douglas Soares de Andrade <douglas@archlinux-br.org>, 2008.
-# Hugo Doria <hugodoria@archlinux-br.org>, 2008.
+# Hugo Doria <hugodoria@archlinux-br.org>, 2007-2008.
 # Leandro Inacio <leandro@archlinux-br.org>, 2008.
 # Joao Felipe Santos <jfsantos@archlinux-br.org>, 2008.
+# Kessia Pinheiro <kessiapinheiro@gmail.com>, 2008.
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
-"PO-Revision-Date: 2008-01-05 17:09-0200\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
+"PO-Revision-Date: 2008-02-13 15:15+0000\n"
 "Last-Translator: João Felipe Santos <jfsantos@archlinux-br.org>\n"
-"Language-Team: Brazillian Portuguese\n"
+"Language-Team: Brazillian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,8 +28,8 @@ msgstr ""
 msgid "failed to release transaction (%s)\n"
 msgstr "falha ao liberar a transação (%s)\n"
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "nenhum arquivo definido (use -h para obter ajuda)\n"
 
@@ -42,7 +44,7 @@ msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s.\n"
 msgstr ""
-"  caso tenha certeza que nenhum gerenciador de pacotes esteja,\n"
+"  caso tenha certeza que nenhum gerenciador de pacotes esteja\n"
 "  rodando, você pode remover %s.\n"
 
 #: src/pacman/add.c:114 src/pacman/remove.c:106
@@ -50,43 +52,43 @@ msgstr ""
 msgid "loading package data... "
 msgstr "carregando informações do pacote... "
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "erro: falha ao adicionar alvo '%s' (%s)"
+msgid "error: '%s': %s\n"
+msgstr "erro: '%s': %s\n"
 
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "concluído.\n"
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr "erro: falha ao preparar transação (%s)\n"
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: requer %s\n"
 
-#: src/pacman/add.c:149
+#: src/pacman/add.c:150 src/pacman/sync.c:660
 #, c-format
-msgid ":: %s: conflicts with %s"
-msgstr ":: %s: conflita com %s"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: conflita com %s\n"
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s existe em '%s' e em '%s'\n"
 
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s existe no sistema de arquivos\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -95,7 +97,7 @@ msgstr ""
 "\n"
 "ocorreram alguns erros, portanto, nenhum pacote foi atualizado.\n"
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr "falha ao terminar a transação (%s)\n"
@@ -176,14 +178,15 @@ msgid ""
 ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
 "n] "
 msgstr ""
-":: %s$s requer %s, mas ele está em IgnorePkg. Instalar assim mesmo? [S/n] "
+":: %s$s requer %s, mas ele está em IgnorePkg ou IgnoreGroup. Instalar assim "
+"mesmo? [S/n] "
 
 #: src/pacman/callback.c:270
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
 msgstr ""
-":: O pacote %s está na lista de pacotes ignorados (IgnorePkg). Instalar "
-"assim mesmo? [S/n] "
+":: O pacote %s está na lista de pacotes ignorados (IgnorePkg ou "
+"IgnoreGroup). Instalar assim mesmo? [S/n] "
 
 #: src/pacman/callback.c:276
 #, c-format
@@ -197,11 +200,8 @@ msgstr ":: Substituir %s com %s/%s? [S/n] "
 
 #: src/pacman/callback.c:288
 #, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
+msgid "Replacing %s with %s/%s\n"
 msgstr "Substituindo %s com %s/%s\n"
-"."
 
 #: src/pacman/callback.c:296
 #, c-format
@@ -362,7 +362,7 @@ msgstr "Arquivos de Backup:\n"
 #: src/pacman/package.c:189
 #, c-format
 msgid "error: could not calculate checksums for %s\n"
-msgstr "erro: não foi possível calcular as somas de verificação para %s\n"
+msgstr "erro: não foi possível calcular os checksums para %s\n"
 
 #: src/pacman/package.c:197
 #, c-format
@@ -403,7 +403,7 @@ msgstr "pacote"
 
 #: src/pacman/pacman.c:63
 msgid "usage"
-msgstr "utilização"
+msgstr "uso"
 
 #: src/pacman/pacman.c:64
 msgid "operation"
@@ -428,46 +428,45 @@ msgstr ""
 #: src/pacman/pacman.c:119
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps           ignora a verificação de dependências\n"
+msgstr "  -d, --nodeps         ignora a verificação de dependências\n"
 
 #: src/pacman/pacman.c:83 src/pacman/pacman.c:97 src/pacman/pacman.c:121
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr ""
-"  -f, --force            forçar instalação, sobrescrever arquivos "
-"conflitantes\n"
+"  -f, --force         forçar instalação, sobrescrever arquivos conflitantes\n"
 
 #: src/pacman/pacman.c:87
 #, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade          remove pacotes e suas dependências\n"
+msgstr "  -c, --cascade        remove pacotes e suas dependências\n"
 
 #: src/pacman/pacman.c:89
 #, c-format
 msgid ""
 "  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr ""
-"  -k, --dbonly           remove apenas a entrada na base de dados, mas não "
+"  -k, --dbonly         remove apenas a entrada na base de dados, mas não "
 "remove os arquivos\n"
 
 #: src/pacman/pacman.c:90
 #, c-format
 msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave           remove os arquivos de configuração\n"
+msgstr "  -n, --nosave         remove os arquivos de configuração\n"
 
 #: src/pacman/pacman.c:91
 #, c-format
 msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
 msgstr ""
-"  -s, --recursive        remove também as dependências (aquelas que não vão "
+"  -s, --recursive      remove também as dependências (aquelas que não vão "
 "quebrar outros pacotes)\n"
 
 #: src/pacman/pacman.c:101
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
-msgstr "  -c, --changelog        visualiza o changelog de um pacote\n"
+msgstr "  -c, --changelog      visualiza o changelog de um pacote\n"
 
 #: src/pacman/pacman.c:102
 #, c-format
@@ -486,20 +485,20 @@ msgstr ""
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
 msgstr ""
-"  -g, --groups           visualiza todos os membros de um grupos de pacotes\n"
+"  -g, --groups          visualiza todos os membros de um grupos de pacotes\n"
 
 #: src/pacman/pacman.c:105
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
-"  -i, --info             visualiza informações do pacote (-ii para arquivos "
-"de backup)\n"
+"  -i, --info           visualiza informações do pacote (-ii para arquivos de "
+"backup)\n"
 
 #: src/pacman/pacman.c:106
 #, c-format
 msgid "  -l, --list           list the contents of the queried package\n"
-msgstr "  -l, --list           lista o conteúdo do pacote pesquisado\n"
+msgstr "  -l, --list           lista o conteúdo do pacote consultado\n"
 
 #: src/pacman/pacman.c:107
 #, c-format
@@ -512,14 +511,14 @@ msgstr ""
 #: src/pacman/pacman.c:108
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr "  -o, --owns <arquivo>   pesquisa o pacote que contém <arquivo>\n"
+msgstr "  -o, --owns <arquivo>   consulta o pacote que contém <arquivo>\n"
 
 #: src/pacman/pacman.c:109
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
-"  -p, --file <pacote>    pesquisa o arquivo de pacote <pacote> ao invés da "
-"base de dados\n"
+"  -p, --file <pacote> consulta o arquivo de pacote <pacote> ao invés da base "
+"de dados\n"
 
 #: src/pacman/pacman.c:110
 #, c-format
@@ -527,7 +526,7 @@ msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search <regex>   busca em arquivos localmente instalados por textos "
+"  -s, --search <regex> pesquisa em arquivos localmente instalados por textos "
 "coincidentes\n"
 
 #: src/pacman/pacman.c:111
@@ -547,7 +546,7 @@ msgstr ""
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
 msgstr ""
-"  -q, --quiet          mostra menos informações para requisições e buscas\n"
+"  -q, --quiet          mostra menos informações nas consultas e pesquisas\n"
 
 #: src/pacman/pacman.c:118
 #, c-format
@@ -587,7 +586,7 @@ msgstr ""
 msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search <regex>   procura em repositórios remotos por textos "
+"  -s, --search <regex> pesquisa em repositórios remotos por textos "
 "coincidentes\n"
 
 #: src/pacman/pacman.c:127
@@ -610,15 +609,17 @@ msgstr ""
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
-msgstr "  -y, --refresh          atualizar a base de dados de pacotes\n"
+msgstr ""
+"  -y, --refresh          atualiza a base de dados de pacotes a partir do "
+"servidor\n"
 
 #: src/pacman/pacman.c:130
 #, c-format
 msgid ""
 "      --needed         only upgrade outdated or not yet installed packages\n"
 msgstr ""
-"      --needed         somente faz o upgrade para pacotes antigos ou não "
-"instalados\n"
+"      --needed         somente faz o upgrade para pacotes desatualizados ou "
+"não instalados\n"
 
 #: src/pacman/pacman.c:131
 #, c-format
@@ -643,7 +644,7 @@ msgstr ""
 #, c-format
 msgid "  -q  --quiet          show less information for query and search\n"
 msgstr ""
-"  -q, --quiet          mostra menos informações para requisições e buscas\n"
+"  -q, --quiet          mostra menos informações nas consultas e pesquisas\n"
 
 #: src/pacman/pacman.c:136
 #, c-format
@@ -674,7 +675,7 @@ msgstr ""
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
 msgstr ""
-"      --noscriptlet      não executar o scriptlet de instalação se o mesmo "
+"      --noscriptlet      não executar a rotina de instalação se o mesmo "
 "existir\n"
 
 #: src/pacman/pacman.c:141
@@ -792,51 +793,51 @@ msgstr "nenhuma operação definida (use -h para obter ajuda)\n"
 msgid "error: no file was specified for --owns\n"
 msgstr "erro: nenhum arquivo especificado para --owns\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "erro: falha ao ler o arquivo '%s': %s\n"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "erro: não é possível determinar o dono de um diretório\n"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "erro: não é possível determinar o caminho real para '%s': %s\n"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s pertence a %s %s\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, c-format
 msgid "error: No package owns %s\n"
 msgstr "erro: Nenhum pacote possui %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "erro: grupo \"%s\" não encontrado\n"
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, c-format
 msgid "Checking for package upgrades... \n"
 msgstr "Procurando por atualizações dos pacotes... \n"
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, c-format
 msgid "no upgrades found.\n"
 msgstr "nenhuma atualização encontrada.\n"
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "nenhum repositório de pacotes foi configurado corretamente.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "erro: pacote \"%s\" não encontrado\n"
@@ -855,17 +856,12 @@ msgstr "    Remover todo o conteúdo? [S/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Remover %s do grupo %s? [S/n] "
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "erro: falha ao iniciar transação (%s)\n"
 
-#: src/pacman/remove.c:111
-#, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "erro: falha ao adicionar alvo '%s' (%s)\n"
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Alvos:"
 
@@ -996,179 +992,162 @@ msgstr ":: Iniciando atualização do sistema...\n"
 
 #: src/pacman/sync.c:529
 #, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ":: pacman detectou uma nova versão dele mesmo.\n"
+
+#: src/pacman/sync.c:530
 msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
-":: pacman detectou uma nova versão dele mesmo.\n"
-":: É recomendado que você faça a atualização do pacman \n"
-":: usando 'pacman -S pacman', e então re-execute a\n"
-":: operação corrente. Se você deseja continuar a operação\n"
-":: e não fazer a atualização do pacman separadamente,\n"
-":: responda não.\n"
-
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
-msgstr ":: Cancelar operação atual? [S/n]"
+":: Você deseja cancelar a operação atual\n"
+":: e instalar a nova versão do pacman agora? [S/n]"
 
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "erro: falha ao liberar a transação (%s)\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, c-format
 msgid "error: pacman: %s\n"
 msgstr "erro: pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "erro: '%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ":: grupo %s (incluindo pacotes ignorados:):\n"
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Instalar todo o conteúdo? [S/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Instalar %s do grupo %s? [S/n] "
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, c-format
 msgid "Warning: %s provides %s\n"
 msgstr "Atenção: %s provê %s\n"
 
 # src/pacman/sync.c:624
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr "erro: vários pacotes provêem %s, por favor especifique um :\n"
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, c-format
 msgid "error: '%s': not found in sync db\n"
-msgstr "'%s': não foi encontrado na base de dados\n"
-
-#: src/pacman/sync.c:663
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: conflita com %s\n"
+msgstr "erro: '%s': não foi encontrado na base de dados\n"
 
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr " base de dados local está atualizada\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, c-format
 msgid "Beginning download...\n"
 msgstr "Iniciando download...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "Continuar o download? [S/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, c-format
 msgid "Beginning upgrade process...\n"
 msgstr "Iniciando processo de atualização...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "Continuar a instalação? [S/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr "Ocorreram alguns erros, portanto, nenhum pacote foi atualizado.\n"
 
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "Nenhum\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Remover:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Tamanho total dos pacotes a serem removidos:   %.2f MB\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
 msgstr "Tamanho total do Download:   %.2f MB\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
-msgstr "Tamanho total da instalação:   %.2f MB\n"
+msgstr "Tamanho Total da Instalação:   %.2f MB\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "S"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "SIM"
 
-#: src/pacman/util.c:543
-#, c-format
-msgid "debug: %s"
-msgstr "depurar: %s"
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, c-format
 msgid "error: %s"
 msgstr "erro: %s"
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, c-format
 msgid "warning: %s"
 msgstr "atenção: %s"
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, c-format
 msgid "function: %s"
 msgstr "função: %s"
 
-#: src/pacman/util.c:590
-#, c-format
-msgid "debug: "
-msgstr "depurar: "
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "erro: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "atenção: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, c-format
 msgid "function: "
 msgstr "função: "
 
 #: scripts/gensync.sh.in:32
 msgid "Usage: %s <root> <destfile> [package_directory]"
-msgstr "Utilização: %s <root> <arquivo_de_destino> [diretório_do_pacote]"
+msgstr "uso: %s <root> <arquivo_de_destino> [diretório_do_pacote]"
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+"NOTA: este script está OBSOLETO. ele será removido no\\npróximo release do "
+"pacman, então por favor utilize repo-add e repo-remove\\nao invés disso.\\n"
+"\\n"
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
@@ -1178,16 +1157,16 @@ msgstr ""
 "PKGBUILD de <root>. gensync construirá a base de dados\\n em um diretório "
 "temporário e então a compactará para <arquivo_de_destino>.\\n\\n"
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
-"gensync irá calcular somas md5 de pacotes no mesmo diretório que"
+"gensync irá calcular os md5sums de pacotes no mesmo diretório que"
 "\\n<arquivo_de_destino>, a não ser que um [diretório_de_pacotes] alternativo"
 "\\nseja especificado.\\n\\n"
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1201,12 +1180,12 @@ msgstr ""
 "conf\\n      A base de dados gerada deve estar no mesmo diretório que seus"
 "\\n      pacotes customizados (também configurado em /etc/pacman.conf)\\n\\n"
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr "Exemplo: gensync /var/abs/local /home/meuspacotes/custom.db.tar.gz"
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -1216,37 +1195,37 @@ msgstr ""
 "software livre, veja o código-fonte para condições de cópia.\\nNÃO HÁ "
 "GARANTIA, à extensão permitida pela lei.\\n"
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr "%s não encontrado. Não pode continuar."
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr "diretório raiz inválido: %s"
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
-msgstr "gensync: construindo entradas na base de dados, gerando somas md5..."
+msgstr "gensync: construindo entradas na base de dados, gerando md5sums..."
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 msgid "failed to parse %s"
 msgstr "falha ao interpretar %s"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr "não foi possível encontrar %s-%s-%s-%s%s - ignorando"
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 msgid "creating repo DB..."
-msgstr "criando base de dados de repositórios"
+msgstr "criando base de dados de repositórios..."
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr "ATENÇÃO:"
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr "ERRO:"
 
@@ -1274,14 +1253,14 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:285
 msgid "There is no agent set up to handle %s URLs. Check %s."
-msgstr "Não há um agente configurado para tratar URLs %s. Cheque %s."
+msgstr "Não há um agente configurado para tratar URLs %s. Verifique %s."
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr "Abortando..."
 
@@ -1343,305 +1322,309 @@ msgstr "Encontrado %s no diretório de construção"
 msgid "Using cached copy of %s"
 msgstr "Usando cópia em cache de %s"
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr "%s não foi encontrado no diretório especificado e não é uma URL."
+
+#: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
-msgstr "Fazendo o download de %s..."
+msgstr "Realizando o download de %s..."
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr "Falha ao efetuar download de %s"
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
 msgstr "Gerando checksums para arquivos fonte..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Algoritmo de integridade especificado '%s' inválido."
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr "Não foi possível encontrar o programa '%s'."
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
 msgstr "Não foi possível encontrar o arquivo fonte %s para gerar checksum."
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr "Algoritmo de integridade especificado '%s' inválido"
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr "Validando arquivos fonte com %s..."
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr "NÃO ENCONTRADO"
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr "Passou"
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr "FALHOU"
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr "Um ou mais arquivos não passaram no teste de validação!"
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr "Testes de integridade (%s) estão faltando ou incompletos."
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr "Extraindo Fontes..."
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr "Não foi possível encontrar arquivo fonte %s para extração."
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 msgid "Failed to extract %s"
 msgstr "Falha ao extrair %s"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr "Iniciando compilação..."
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr "Compilação Falhou."
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr "Organizando instalação..."
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 msgid "Removing info/doc files..."
 msgstr "Removendo arquivos info/doc..."
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr "Comprimindo man pages..."
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "Removendo símbolos de debug dos binários e bibliotecas..."
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr "Removendo arquivos .la da libtool..."
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 msgid "Removing empty directories..."
 msgstr "Removendo diretórios vazios..."
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr "Diretório pkg/ não encontrado."
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 msgid "Creating package..."
 msgstr "Criando pacote..."
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr "Gerando arquivo .PKGINFO..."
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr "Por favor, adicione uma linha de licença ao seu %s!"
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Exemplo para software sob a GPL: license=('GPL')."
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr "Adicionando script de instalação..."
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
 msgstr "Adicionando changelog do pacote..."
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
 msgstr "Compactando pacote..."
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
 msgstr "Falha ao criar o arquivo do pacote."
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr "Não foi possível encontrar o binário xdelta! xdelta está instalado?"
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr "Criando delta da versão %s..."
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr ""
 "Recriando tarball do pacote a partir do delta para igualar as assinaturas md5"
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr "NOTA: o delta deve ser distribuído SOMENTE com esse tarball"
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr "Não foi possível gerar o pacote a partir do delta."
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr "Não foi possível criar o delta."
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr "Nenhuma versão anterior encontrada, ignorando xdelta."
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 msgid "Creating source package..."
 msgstr "Criando pacote de fontes..."
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 msgid "Adding %s..."
 msgstr "Adicionando %s..."
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 msgid "Install script %s not found."
 msgstr "Script de instalação %s não encontrado."
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 msgid "Compressing source package..."
 msgstr "Comprimindo pacote de fontes..."
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr "Falha ao criar o arquivo do pacote de fontes."
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr "Determinando última revisão darcs..."
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr "Determinando última revisão cvs..."
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr "Determinando última revisão git..."
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr "Determinando última revisão svn..."
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr "Determinando última revisão bzr..."
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr "Determinando última revisão hg..."
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
 msgstr "Versão encontrada: %s"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
-msgstr "Utilização: %s [opções]"
+msgstr "Uso: %s [opções]"
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 msgid "Options:"
 msgstr "Opções:"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr "  -A, --ignorearch Ignora campo arch incompleto em %s"
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr ""
 "  -b, --builddeps  Constrói dependências não-encontradas a partir dos fontes"
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr ""
 "  -c, --clean      Apaga arquivos utilizados na compilação após empacotamento"
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache Limpa arquivos fonte do cache"
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     Ignora a verificação de dependências"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
 "  -e, --noextract  Não extrai arquivos fonte (usa diretório src/ existente)"
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      Sobrescrever pacote existente"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Gera testes de integridade para arquivos fonte"
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       Esta ajuda"
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Instala pacote após empacotamento bem-sucedido"
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Gera log do processo de empacotamento"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Desabilita mensagens de saída coloridas"
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
-msgstr "  -o, --nobuild    Somente baixa e extrai os arquivos"
+msgstr "  -o, --nobuild    Somente faz download e extrai os arquivos"
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr ""
 "  -p <buildscript> Usa um script de empacotamento alternativo (ao invés de '%"
 "s')"
 
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1088
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr ""
 "  -r, --rmdeps     Remove dependências instaladas após empacotamento bem-"
 "sucedido"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr "  -R, --repackage  Reempacota conteúdo de pkg/ sem compilar"
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Instala dependências não-encontradas com pacman"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Permite ao makepkg rodar como usuário root"
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
@@ -1649,258 +1632,259 @@ msgstr ""
 "      --holdver    Previne atualização automática da versão para PKGBUILDs "
 "de desenvolvimento"
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr ""
 "      --source     Não compila o pacote; gera um tarball somente com os "
 "fontes"
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr "Estas opções podem ser passadas ao pacman:"
 
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1098
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
 msgstr ""
 "      --noconfirm      Não pede nenhuma confirmação ao resolver dependências"
 
-#: scripts/makepkg.sh.in:1083
+#: scripts/makepkg.sh.in:1099
 msgid ""
 "      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr ""
 "      --noprogressbar  Não mostra a barra de progresso enquanto baixa os "
 "arquivos"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "Se -p não estiver especificado, makepkg irá procurar por '%s'"
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 msgid "%s not found."
 msgstr "%s não encontrado."
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr "Sudo é usado por padrão agora. A opção --usesudo não é mais utilizada!"
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
-msgstr "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
+msgstr ""
+"\\0--holdver e --forcever não podem ser especificados simultaneamente.\""
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr "Apagando TODOS os arquivos de %s."
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr "    Você tem certeza que deseja fazer isso? [S/n] "
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
 "Problema removendo arquivos; você pode não ter as permissões corretas em %s"
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr "Cache de fontes apagada."
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr "Nenhum arquivo foi removido."
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr "Destino dos fontes deve ser definido em makepkg.conf."
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr ""
 "Adicionalmente, por favor rode makepkg -C fora do seu diretório de cache."
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr "BUILDSCRIPT não está definido! Certifique-se de que você atualizou %s."
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr "Rodar makepkg como root é uma PÉSSIMA idéia e pode causar"
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr "danos permanentes e catastróficos ao seu sistema. Se você"
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr "deseja rodar como root, por favor use a opção --asroot."
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr "A opção --asroot é somente para o usuário root."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr "Por favor rode novamente makepkg sem a flag --asroot."
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr "Fakeroot deve ser instalado para utilizar a opção 'fakeroot'"
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr "no array BUILDENV em %s."
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr "Rodar makepkg como um usuário não-privilegiado resultará em"
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
 "propriedade não-root dos arquivos empacotados. Tente usar o ambiente fakeroot"
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr "adicionando 'fakeroot' no array BUILDENV em makepkg.conf."
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr ""
 "Não use a opção '-F'. Esta opção é somente para ser usada pelo makepkg."
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr "Não foi possível encontrar o binário sudo! sudo está instalado?"
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
 "Dependências não-encontradas não podem ser instaladas ou removidas como um "
 "usuário normal"
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr "sem sudo; instale e configure sudo para auto-resolver dependências."
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 msgid "%s does not exist."
 msgstr "%s não existe."
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 msgid "%s is not allowed to be empty."
 msgstr "%s não pode estar vazio."
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s não pode conter hífens."
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s não está disponível para a arquitetura '%s'."
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
 msgstr ""
 "Perceba que muitos pacotes podem precisar de uma linha adicional ao seu %s"
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr "como arch=('%s')."
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 msgid "Install scriptlet (%s) does not exist."
-msgstr "Scriptlet de instalação (%s) não existe."
+msgstr "Rotina de instalação (%s) não existe."
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr "Um pacote já foi construído, instalando pacote existente..."
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "Um pacote já foi construído. (use -f para sobrescrevê-lo)"
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr "Pulando compilação."
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr "Saindo do ambiente fakeroot."
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 msgid "Making package: %s"
 msgstr "Criando pacote: %s"
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr "Rodando makepkg como root..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr "Pacote de fontes criado: %s"
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 msgid "Skipping dependency checks."
 msgstr "Pulando testes de dependências."
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 msgid "Checking Runtime Dependencies..."
 msgstr "Verificando dependências em tempo de execução..."
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 msgid "Checking Buildtime Dependencies..."
 msgstr "Verificando dependências em tempo de compilação..."
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 msgid "Could not resolve all dependencies."
 msgstr "Não foi possível resolver todas as dependências."
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
 msgstr "pacman não foi encontrado no PATH; pulando testes de dependência."
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr "Pulando obtenção dos fontes      -- usando árvore src/ existente"
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
 "Pulando testes de integridade dos fontes -- usando árvore src/ existente"
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr "Pulando extração dos fontes      -- usando árvore src/ existente"
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "O diretório de fontes está vazio, não há nada para compilar!"
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr "O diretório do pacote está vazio, não há nada para reempacotar!"
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr "Fontes estão prontas."
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr "Removendo diretório pkg/ existente..."
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr "Entrando no ambiente fakeroot..."
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr "Compilação concluída: %s"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid "Usage: %s [pacman_db_root]"
-msgstr "Utilização: %s [raiz_db_do_pacman]"
+msgstr "Uso: %s [raiz_db_do_pacman]"
 
 #: scripts/pacman-optimize.sh.in:43
 msgid ""
@@ -1953,7 +1937,7 @@ msgstr ""
 
 #: scripts/pacman-optimize.sh.in:112
 msgid "MD5sum'ing the old database..."
-msgstr "Criando soma md5 da base de dados antiga..."
+msgstr "Criando md5sum da base de dados antiga..."
 
 #: scripts/pacman-optimize.sh.in:116
 msgid "Tar'ing up %s..."
@@ -1961,7 +1945,7 @@ msgstr "Gerando tarball de %s..."
 
 #: scripts/pacman-optimize.sh.in:121
 msgid "Tar'ing up %s failed."
-msgstr "Geração do tarball de %s falhou."
+msgstr "Criação do tarball de %s falhou."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Making and MD5sum'ing the new db..."
@@ -1993,7 +1977,7 @@ msgstr "Para o benefício total de pacman-optimize, rode 'sync' agora."
 
 #: scripts/repo-add.sh.in:57
 msgid "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
-msgstr "Utilização: %s <caminho-para-db> [--force] <pacote> ...\\n\\n"
+msgstr "Uso: %s <caminho-para-db> [--force] <pacote> ...\\n\\n"
 
 #: scripts/repo-add.sh.in:58
 msgid ""
@@ -2032,7 +2016,7 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Arquivo de pacote inválido '%s'."
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 msgid "Removing existing package '%s'..."
 msgstr "Removendo pacote existente '%s'..."
 
@@ -2042,7 +2026,7 @@ msgstr "Criando entrada 'desc' na base de dados..."
 
 #: scripts/repo-add.sh.in:203
 msgid "Computing md5 checksums..."
-msgstr "Computando somas md5..."
+msgstr "Computando md5sums..."
 
 #: scripts/repo-add.sh.in:215
 msgid "Creating 'depends' db entry..."
@@ -2060,20 +2044,20 @@ msgstr "Adicionado delta '%s'"
 msgid "Could not add delta '%s'"
 msgstr "Não foi possível adicionar delta '%s'"
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr "%s não encontrado. Não é possível continuar."
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr ""
 "Não foi possível criar diretório temporário para construção da base de dados."
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Arquivo de repositório '%s' não é uma base de dados do pacman."
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr "Extraindo base de dados para um local temporário..."
 
@@ -2093,23 +2077,23 @@ msgstr "Pacote '%s' não foi encontrado."
 msgid "Creating updated database file %s"
 msgstr "Criando arquivo atualizado da base de dados %s"
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr "Nenhuma compressão configurada."
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr "Nenhum pacote modificado, nada a fazer."
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
 msgstr "repo-remove %s\\n\\n"
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
-msgstr "utilização: %s <caminho-para-db> <nome-do-pacote> ... \\n\\n"
+msgstr "uso: %s <caminho-para-db> <nome-do-pacote> ... \\n\\n"
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
@@ -2117,30 +2101,34 @@ msgid ""
 msgstr ""
 "repo-remove irá atualizar a base de dados de um pacote removendo o nome do "
 "pacote\\nespecificado na linha de comando da base de dados do repositório "
-"dado. Pacotes\\nmúltiplos a serem removidos podem ser especificados na linha "
-"de comando.\\n\\n"
+"fornecido. Pacotes\\nmúltiplos a serem removidos podem ser especificados na "
+"linha de comando.\\n\\n"
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "Exemplo: repo-remove /caminho/para/repo.db.tar.gz kernel26"
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 msgid "Searching for package '%s'..."
-msgstr "Procurando pacote '%s'..."
+msgstr "Pesquisando pelo pacote '%s'..."
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 msgid "Package matching '%s' not found."
 msgstr "Pacote correspodente a '%s' não foi encontrado."
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr "Criando arquivo de base de dados atualizado '%s'..."
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr "Todos os pacotes foram removidos da base de dados. Removendo '%s'."
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
-msgstr "Utilização: %s <ação> <arquivo_destino> <opção> [diretório_de_pacotes]"
+msgstr "Uso: %s <ação> <arquivo_destino> <opção> [diretório_de_pacotes]"
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
@@ -2148,13 +2136,13 @@ msgid ""
 msgstr ""
 "updatesync irá atualizar uma base de dados de sincronização lendo um "
 "PKGBUILD e\\nmodificando o arquivo de destino. updatesync atualiza a base de "
-"dados em um diretório\\ntemporário e comprime-a para <destfile>.\\n\\n"
+"dados em um diretório\\ntemporário e a comprime para <destfile>.\\n\\n"
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
 msgstr "Existem dois tipos de ações:\\n\\n"
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
@@ -2162,7 +2150,7 @@ msgstr ""
 "upd - Irá atualizar a entrada de um pacote ou criá-la se ela não existir."
 "\\n      Essa ação usa o PKGBUILD do pacote como uma opção\\n."
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
@@ -2170,20 +2158,20 @@ msgstr ""
 "del - Irá remover a entrada de um pacote da base de dados. Recebe o nome"
 "\\n      do pacote como uma opção.\\n"
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
-"updatesync irá calcular somas md5 de pacotes no mesmo diretório que"
+"updatesync irá calcular os md5sums de pacotes no mesmo diretório que"
 "\\n<destfile>, a não ser que um [diretorio_de_pacote] alternativo seja "
 "especificado.\\n\\n"
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr "Exemplo: updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -2193,10 +2181,45 @@ msgstr ""
 "livre, veja o código-fonte para condições de cópia.\\nNÃO HÁ GARANTIA, à "
 "extensão permitida pela lei.\\n"
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr "não foi possível encontrar %s-%s-%s-%s%s - abortando"
+
+#~ msgid "error: failed to add target '%s' (%s)"
+#~ msgstr "erro: falha ao adicionar alvo '%s' (%s)"
+
+#~ msgid ":: %s: conflicts with %s"
+#~ msgstr ":: %s: conflita com %s"
+
+#~ msgid "error: failed to add target '%s' (%s)\n"
+#~ msgstr "erro: falha ao adicionar alvo '%s' (%s)\n"
+
+#~ msgid ""
+#~ ":: pacman has detected a newer version of itself.\n"
+#~ ":: It is recommended that you upgrade pacman by itself\n"
+#~ ":: using 'pacman -S pacman', and then rerun the current\n"
+#~ ":: operation. If you wish to continue the operation and\n"
+#~ ":: not upgrade pacman separately, answer no.\n"
+#~ msgstr ""
+#~ ":: pacman detectou uma nova versão dele mesmo.\n"
+#~ ":: É recomendado que você faça a atualização do pacman \n"
+#~ ":: usando 'pacman -S pacman', e então re-execute a\n"
+#~ ":: operação corrente. Se você deseja continuar a operação\n"
+#~ ":: e não fazer a atualização do pacman separadamente,\n"
+#~ ":: responda não.\n"
+
+#~ msgid ":: Cancel current operation? [Y/n] "
+#~ msgstr ":: Cancelar operação atual? [S/n]"
+
+#~ msgid "debug: %s"
+#~ msgstr "depurar: %s"
+
+#~ msgid "debug: "
+#~ msgstr "depurar: "
+
+#~ msgid "--"
+#~ msgstr "--"
diff --git a/po/ru_RU.po b/po/ru.po
index 3da1cab1..ddb319c1 100644
--- a/po/ru_RU.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:03-0600\n"
+"POT-Creation-Date: 2008-02-09 10:41-0600\n"
 "PO-Revision-Date: 2007-03-07 11:45-0500\n"
 "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -22,8 +22,8 @@ msgstr ""
 msgid "failed to release transaction (%s)\n"
 msgstr "не удалось продолжить операцию (%s)\n"
 
-#: src/pacman/add.c:77 src/pacman/query.c:363 src/pacman/remove.c:63
-#: src/pacman/sync.c:784
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
 msgid "no targets specified (use -h for help)\n"
 msgstr "не задано целей (для справки используйте -h)\n"
 
@@ -46,43 +46,43 @@ msgstr ""
 msgid "loading package data... "
 msgstr "чтение информации о пакете... "
 
-#: src/pacman/add.c:118
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
 #, fuzzy, c-format
-msgid "error: failed to add target '%s' (%s)"
-msgstr "не удалось добавить цель '%s' (%s)"
+msgid "error: '%s': %s\n"
+msgstr "'%s': %s\n"
 
-#: src/pacman/add.c:124 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
 #: src/pacman/sync.c:194
 #, c-format
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/pacman/add.c:129 src/pacman/remove.c:122 src/pacman/sync.c:646
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
 #, fuzzy, c-format
 msgid "error: failed to prepare transaction (%s)\n"
 msgstr "не удалось подготовить операцию (%s)\n"
 
-#: src/pacman/add.c:141 src/pacman/remove.c:130 src/pacman/sync.c:655
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
 #, fuzzy, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %s: требует %s"
 
-#: src/pacman/add.c:149
-#, c-format
-msgid ":: %s: conflicts with %s"
+#: src/pacman/add.c:150 src/pacman/sync.c:660
+#, fuzzy, c-format
+msgid ":: %s: conflicts with %s\n"
 msgstr ":: %s: конфликтует с %s"
 
-#: src/pacman/add.c:158 src/pacman/sync.c:718
+#: src/pacman/add.c:159 src/pacman/sync.c:715
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s содержится в '%s' и в '%s'\n"
 
-#: src/pacman/add.c:164 src/pacman/sync.c:724
+#: src/pacman/add.c:165 src/pacman/sync.c:721
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s уже есть на диске\n"
 
-#: src/pacman/add.c:170
+#: src/pacman/add.c:171
 #, c-format
 msgid ""
 "\n"
@@ -91,7 +91,7 @@ msgstr ""
 "\n"
 "произошли ошибки, пакеты не были обновлены.\n"
 
-#: src/pacman/add.c:183 src/pacman/remove.c:168 src/pacman/sync.c:709
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
 #, fuzzy, c-format
 msgid "error: failed to commit transaction (%s)\n"
 msgstr "не удалось завершить операцию (%s)\n"
@@ -190,9 +190,7 @@ msgstr ":: Заменить %s на %s/%s? [Y/n] "
 
 #: src/pacman/callback.c:288
 #, fuzzy, c-format
-msgid ""
-"Replacing %s with %s/%s\n"
-"."
+msgid "Replacing %s with %s/%s\n"
 msgstr ":: Заменить %s на %s/%s? [Y/n] "
 
 #: src/pacman/callback.c:296
@@ -783,51 +781,51 @@ msgstr "не задана операция (для справки использ
 msgid "error: no file was specified for --owns\n"
 msgstr "не был указан файл для --owns\n"
 
-#: src/pacman/query.c:78
+#: src/pacman/query.c:79
 #, fuzzy, c-format
 msgid "error: failed to read file '%s': %s\n"
 msgstr "не удалось прочитать файл '%s': %s"
 
-#: src/pacman/query.c:85
+#: src/pacman/query.c:86
 #, fuzzy, c-format
 msgid "error: cannot determine ownership of a directory\n"
 msgstr "не удалось определить владельца каталога"
 
-#: src/pacman/query.c:93
+#: src/pacman/query.c:97
 #, fuzzy, c-format
 msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "не удалось определить настоящий путь для '%s': %s"
 
-#: src/pacman/query.c:115
+#: src/pacman/query.c:122
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s принадлежит %s %s\n"
 
-#: src/pacman/query.c:123
+#: src/pacman/query.c:130
 #, fuzzy, c-format
 msgid "error: No package owns %s\n"
 msgstr "Ни один пакет не содержит %s\n"
 
-#: src/pacman/query.c:219
+#: src/pacman/query.c:226
 #, fuzzy, c-format
 msgid "error: group \"%s\" was not found\n"
 msgstr "группа \"%s\" не найдена\n"
 
-#: src/pacman/query.c:230
+#: src/pacman/query.c:237
 #, fuzzy, c-format
 msgid "Checking for package upgrades... \n"
 msgstr "Проверка обновлений..."
 
-#: src/pacman/query.c:241
+#: src/pacman/query.c:248
 #, fuzzy, c-format
 msgid "no upgrades found.\n"
 msgstr "обновлений не найдено"
 
-#: src/pacman/query.c:353 src/pacman/sync.c:774
+#: src/pacman/query.c:360 src/pacman/sync.c:771
 msgid "no usable package repositories configured.\n"
 msgstr "ни один репозиторий не сконфигурирован должным образом.\n"
 
-#: src/pacman/query.c:397
+#: src/pacman/query.c:404
 #, fuzzy, c-format
 msgid "error: package \"%s\" not found\n"
 msgstr "пакет \"%s\" не найден\n"
@@ -846,17 +844,12 @@ msgstr "    Удалить все содержимое? [Y/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Удалить %s из группы %s? [Y/n] "
 
-#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:543
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
 #, fuzzy, c-format
 msgid "error: failed to init transaction (%s)\n"
 msgstr "не удалось начать операцию (%s)\n"
 
-#: src/pacman/remove.c:111
-#, fuzzy, c-format
-msgid "error: failed to add target '%s' (%s)\n"
-msgstr "ну удалось добавить цель '%s' (%s)\n"
-
-#: src/pacman/remove.c:155 src/pacman/util.c:460
+#: src/pacman/remove.c:155 src/pacman/util.c:488
 msgid "Targets:"
 msgstr "Цели:"
 
@@ -993,172 +986,151 @@ msgid ":: Starting full system upgrade...\n"
 msgstr ":: Начинаю полное обновление системы...\n"
 
 #: src/pacman/sync.c:529
-#, c-format
-msgid ""
-":: pacman has detected a newer version of itself.\n"
-":: It is recommended that you upgrade pacman by itself\n"
-":: using 'pacman -S pacman', and then rerun the current\n"
-":: operation. If you wish to continue the operation and\n"
-":: not upgrade pacman separately, answer no.\n"
+#, fuzzy, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
 msgstr ""
+"\n"
+":: pacman обнаружил более новую версию пакета \"pacman\".\n"
 
-#: src/pacman/sync.c:534
-msgid ":: Cancel current operation? [Y/n] "
+#: src/pacman/sync.c:530
+msgid ""
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:536 src/pacman/sync.c:751
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, fuzzy, c-format
 msgid "error: failed to release transaction (%s)\n"
 msgstr "не удалось продолжить операцию (%s)\n"
 
-#: src/pacman/sync.c:548
+#: src/pacman/sync.c:545
 #, fuzzy, c-format
 msgid "error: pacman: %s\n"
 msgstr "pacman: %s\n"
 
-#: src/pacman/sync.c:573
-#, fuzzy, c-format
-msgid "error: '%s': %s\n"
-msgstr "'%s': %s\n"
-
-#: src/pacman/sync.c:587
+#: src/pacman/sync.c:584
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
 msgstr ""
 
-#: src/pacman/sync.c:592
+#: src/pacman/sync.c:589
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Установить в полном объеме? [Y/n] "
 
-#: src/pacman/sync.c:599
+#: src/pacman/sync.c:596
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Установить %s из группы %s? [Y/n] "
 
-#: src/pacman/sync.c:620
+#: src/pacman/sync.c:617
 #, fuzzy, c-format
 msgid "Warning: %s provides %s\n"
 msgstr ":: %s: требует %s"
 
-#: src/pacman/sync.c:624
+#: src/pacman/sync.c:621
 #, c-format
 msgid "error: several packages provide %s, please specify one :\n"
 msgstr ""
 
-#: src/pacman/sync.c:635
+#: src/pacman/sync.c:632
 #, fuzzy, c-format
 msgid "error: '%s': not found in sync db\n"
 msgstr "'%s': не найдено в базе пакетов\n"
 
-#: src/pacman/sync.c:663
-#, fuzzy, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: конфликтует с %s"
-
-#: src/pacman/sync.c:677
+#: src/pacman/sync.c:674
 #, c-format
 msgid " local database is up to date\n"
 msgstr " локальная база данных не устарела\n"
 
-#: src/pacman/sync.c:689
+#: src/pacman/sync.c:686
 #, fuzzy, c-format
 msgid "Beginning download...\n"
 msgstr ""
 "\n"
 "Начинаю загрузку...\n"
 
-#: src/pacman/sync.c:692
+#: src/pacman/sync.c:689
 msgid "Proceed with download? [Y/n] "
 msgstr "Приступить к загрузке? [Y/n] "
 
-#: src/pacman/sync.c:696
+#: src/pacman/sync.c:693
 #, fuzzy, c-format
 msgid "Beginning upgrade process...\n"
 msgstr ""
 "\n"
 "Начинаю процесс обновления...\n"
 
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:696
 msgid "Proceed with installation? [Y/n] "
 msgstr "Приступить к установке? [Y/n] "
 
-#: src/pacman/sync.c:740
+#: src/pacman/sync.c:737
 #, fuzzy, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
 msgstr ""
 "\n"
 "произошли ошибки, пакеты не были обновлены.\n"
 
-#: src/pacman/util.c:354 src/pacman/util.c:386
+#: src/pacman/util.c:382 src/pacman/util.c:414
 #, c-format
 msgid "None\n"
 msgstr "Не указано\n"
 
-#: src/pacman/util.c:452
+#: src/pacman/util.c:480
 msgid "Remove:"
 msgstr "Удалить:"
 
-#: src/pacman/util.c:456
+#: src/pacman/util.c:484
 #, fuzzy, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr ""
 "\n"
 "Итого удалено:   %.2f МБ\n"
 
-#: src/pacman/util.c:463
+#: src/pacman/util.c:491
 #, fuzzy, c-format
 msgid "Total Download Size:    %.2f MB\n"
 msgstr "Итого установлено:   %.2f МБ\n"
 
-#: src/pacman/util.c:467
+#: src/pacman/util.c:495
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Итого установлено:   %.2f МБ\n"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "Y"
 msgstr "Y"
 
-#: src/pacman/util.c:494
+#: src/pacman/util.c:522
 msgid "YES"
 msgstr "YES"
 
-#: src/pacman/util.c:543
-#, fuzzy, c-format
-msgid "debug: %s"
-msgstr "отладка"
-
-#: src/pacman/util.c:546
+#: src/pacman/util.c:574
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "ошибка: "
 
-#: src/pacman/util.c:549
+#: src/pacman/util.c:577
 #, fuzzy, c-format
 msgid "warning: %s"
 msgstr "предупреждение: "
 
-#: src/pacman/util.c:552
+#: src/pacman/util.c:580
 #, fuzzy, c-format
 msgid "function: %s"
 msgstr "функция"
 
-#: src/pacman/util.c:590
-#, fuzzy, c-format
-msgid "debug: "
-msgstr "отладка"
-
-#: src/pacman/util.c:593
+#: src/pacman/util.c:621
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: src/pacman/util.c:596
+#: src/pacman/util.c:624
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: src/pacman/util.c:601
+#: src/pacman/util.c:629
 #, fuzzy, c-format
 msgid "function: "
 msgstr "функция"
@@ -1167,20 +1139,27 @@ msgstr "функция"
 msgid "Usage: %s <root> <destfile> [package_directory]"
 msgstr ""
 
-#: scripts/gensync.sh.in:33
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+msgid ""
+"NOTE: this script is DEPRECATED. It will be removed in the next major"
+"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
+msgstr ""
+
+#: scripts/gensync.sh.in:36
 msgid ""
 "gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
 "<root>. gensync builds the database in a temporary directory\\nand then "
 "compresses it to <destfile>.\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:37
+#: scripts/gensync.sh.in:40
 msgid ""
 "gensync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:40
+#: scripts/gensync.sh.in:43
 msgid ""
 "note: The <destfile> name is important. It must be of the form\\n      "
 "{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
@@ -1189,51 +1168,51 @@ msgid ""
 "(also configured in /etc/pacman.conf)\\n\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:46
+#: scripts/gensync.sh.in:49
 msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
 msgstr ""
 
-#: scripts/gensync.sh.in:51 scripts/makepkg.sh.in:1091
-#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:64
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
 
-#: scripts/gensync.sh.in:99 scripts/updatesync.sh.in:98
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
 msgid "%s not found. Can not continue."
 msgstr ""
 
-#: scripts/gensync.sh.in:117
+#: scripts/gensync.sh.in:120
 msgid "invalid root dir: %s"
 msgstr ""
 
-#: scripts/gensync.sh.in:119
+#: scripts/gensync.sh.in:126
 msgid "gensync: building database entries, generating md5sums..."
 msgstr ""
 
-#: scripts/gensync.sh.in:128 scripts/updatesync.sh.in:126
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
 #, fuzzy
 msgid "failed to parse %s"
 msgstr "не удалось обработать конфигурационный файл (%s)\n"
 
-#: scripts/gensync.sh.in:139
+#: scripts/gensync.sh.in:146
 msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr ""
 
-#: scripts/gensync.sh.in:149
+#: scripts/gensync.sh.in:156
 #, fuzzy
 msgid "creating repo DB..."
 msgstr "убираем за собой... "
 
 #: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
-#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:43
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
 msgid "WARNING:"
 msgstr ""
 
 #: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
-#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:48
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
 msgid "ERROR:"
 msgstr ""
 
@@ -1261,11 +1240,11 @@ msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr ""
 
 #: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
-#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:476
-#: scripts/makepkg.sh.in:522 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:638 scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:775 scripts/makepkg.sh.in:1108
-#: scripts/makepkg.sh.in:1421 scripts/makepkg.sh.in:1425
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
 msgid "Aborting..."
 msgstr ""
 
@@ -1330,569 +1309,573 @@ msgstr ""
 msgid "Using cached copy of %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:470
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr ""
+
+#: scripts/makepkg.sh.in:476
 #, fuzzy
 msgid "Downloading %s..."
 msgstr "обновляю %s... "
 
-#: scripts/makepkg.sh.in:475
+#: scripts/makepkg.sh.in:481
 msgid "Failure while downloading %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:486
+#: scripts/makepkg.sh.in:492
 #, fuzzy
 msgid "Generating checksums for source files..."
 msgstr "ошибка при вычислении контрольной суммы для %s\n"
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr ""
 
-#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
 msgid "Cannot find the '%s' program."
 msgstr ""
 
-#: scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:527
 msgid "Unable to find source file %s to generate checksum."
 msgstr ""
 
-#: scripts/makepkg.sh.in:547
+#: scripts/makepkg.sh.in:553
 msgid "Invalid integrity algorithm '%s' specified"
 msgstr ""
 
-#: scripts/makepkg.sh.in:558
+#: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
 msgstr ""
 
-#: scripts/makepkg.sh.in:577
+#: scripts/makepkg.sh.in:583
 msgid "Passed"
 msgstr ""
 
-#: scripts/makepkg.sh.in:579
+#: scripts/makepkg.sh.in:585
 msgid "FAILED"
 msgstr ""
 
-#: scripts/makepkg.sh.in:587
+#: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:591
+#: scripts/makepkg.sh.in:597
 msgid "Integrity checks (%s) are missing or incomplete."
 msgstr ""
 
-#: scripts/makepkg.sh.in:597
+#: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
 msgstr ""
 
-#: scripts/makepkg.sh.in:637
+#: scripts/makepkg.sh.in:643
 #, fuzzy
 msgid "Failed to extract %s"
 msgstr "не удалось подготовить операцию (%s)\n"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:675
 msgid "Starting build()..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:699
+#: scripts/makepkg.sh.in:705
 msgid "Build Failed."
 msgstr ""
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:714
 msgid "Tidying install..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:711
+#: scripts/makepkg.sh.in:717
 #, fuzzy
 msgid "Removing info/doc files..."
 msgstr "разрешаю зависимости... "
 
-#: scripts/makepkg.sh.in:716
+#: scripts/makepkg.sh.in:722
 msgid "Compressing man pages..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:750
+#: scripts/makepkg.sh.in:756
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:762
+#: scripts/makepkg.sh.in:768
 msgid "Removing libtool .la files..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:767
+#: scripts/makepkg.sh.in:773
 #, fuzzy
 msgid "Removing empty directories..."
 msgstr "разрешаю зависимости... "
 
-#: scripts/makepkg.sh.in:774
+#: scripts/makepkg.sh.in:780
 msgid "Missing pkg/ directory."
 msgstr ""
 
-#: scripts/makepkg.sh.in:780
+#: scripts/makepkg.sh.in:786
 #, fuzzy
 msgid "Creating package..."
 msgstr "чтение информации о пакете... "
 
-#: scripts/makepkg.sh.in:791
+#: scripts/makepkg.sh.in:797
 msgid "Generating .PKGINFO file..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:837
+#: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr ""
 
-#: scripts/makepkg.sh.in:846 scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:853
+#: scripts/makepkg.sh.in:862
 #, fuzzy
 msgid "Adding package changelog..."
 msgstr "чтение информации о пакете... "
 
-#: scripts/makepkg.sh.in:859
+#: scripts/makepkg.sh.in:868
 #, fuzzy
 msgid "Compressing package..."
 msgstr "чтение информации о пакете... "
 
-#: scripts/makepkg.sh.in:864
+#: scripts/makepkg.sh.in:873
 #, fuzzy
 msgid "Failed to create package file."
 msgstr "не удалось загрузить пакет '%s' (%s)\n"
 
-#: scripts/makepkg.sh.in:873
+#: scripts/makepkg.sh.in:882
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
 msgstr ""
 
-#: scripts/makepkg.sh.in:903
+#: scripts/makepkg.sh.in:912
 msgid "Making delta from version %s..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:917
+#: scripts/makepkg.sh.in:926
 msgid "Recreating package tarball from delta to match md5 signatures"
 msgstr ""
 
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:927
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr ""
 
-#: scripts/makepkg.sh.in:922
+#: scripts/makepkg.sh.in:931
 msgid "Could not generate the package from the delta."
 msgstr ""
 
-#: scripts/makepkg.sh.in:926
+#: scripts/makepkg.sh.in:935
 msgid "Delta was not able to be created."
 msgstr ""
 
-#: scripts/makepkg.sh.in:929
+#: scripts/makepkg.sh.in:938
 msgid "No previous version found, skipping xdelta."
 msgstr ""
 
-#: scripts/makepkg.sh.in:935
+#: scripts/makepkg.sh.in:944
 #, fuzzy
 msgid "Creating source package..."
 msgstr "Проверка обновлений..."
 
-#: scripts/makepkg.sh.in:937 scripts/makepkg.sh.in:949
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
 #, fuzzy
 msgid "Adding %s..."
 msgstr "обновляю %s... "
 
-#: scripts/makepkg.sh.in:944
+#: scripts/makepkg.sh.in:953
 #, fuzzy
 msgid "Install script %s not found."
 msgstr "Скрипт при установке    : %s\n"
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:973
 #, fuzzy
 msgid "Compressing source package..."
 msgstr "Проверка обновлений..."
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:975
 msgid "Failed to create source package file."
 msgstr ""
 
-#: scripts/makepkg.sh.in:994
+#: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:997
+#: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1000
+#: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1003
+#: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1006
+#: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1009
+#: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1024
+#: scripts/makepkg.sh.in:1040
 #, fuzzy
 msgid "Version found: %s"
 msgstr "Версия                  : %s\n"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:1071
 #, fuzzy
 msgid "Usage: %s [options]"
 msgstr "использование:  %s {-A --add} [параметры] <файл>\n"
 
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1073
 #, fuzzy
 msgid "Options:"
 msgstr "параметры:\n"
 
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1074
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1078
 #, fuzzy
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps         не проверять зависимости\n"
 
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1080
 #, fuzzy
 msgid "  -f, --force      Overwrite existing package"
 msgstr ""
 "  -f, --force          принудительная установка, перезаписывать "
 "конфликтующие файлы\n"
 
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1081
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1083
 msgid "  -i, --install    Install package after successful build"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1084
 #, fuzzy
 msgid "  -L, --log        Log package build process"
 msgstr "  -i, --info           показать информацию о пакете\n"
 
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1085
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1086
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1071
+#: scripts/makepkg.sh.in:1087
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1088
 #, fuzzy
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -e, --dependsonly    установить только зависимости\n"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1090
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1091
 #, fuzzy
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -e, --dependsonly    установить только зависимости\n"
 
-#: scripts/makepkg.sh.in:1076
+#: scripts/makepkg.sh.in:1092
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1093
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1078
+#: scripts/makepkg.sh.in:1094
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1096
 msgid "These options can be passed to pacman:"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1098
 #, fuzzy
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
 msgstr "      --noconfirm      не спрашивать подтверждения\n"
 
-#: scripts/makepkg.sh.in:1083
+#: scripts/makepkg.sh.in:1099
 #, fuzzy
 msgid ""
 "      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "      --noprogressbar  не отображать прогресс при скачивании файлов\n"
 
-#: scripts/makepkg.sh.in:1085
+#: scripts/makepkg.sh.in:1101
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1107
+#: scripts/makepkg.sh.in:1123
 #, fuzzy
 msgid "%s not found."
 msgstr "пакет \"%s\" не найден\n"
 
-#: scripts/makepkg.sh.in:1169
+#: scripts/makepkg.sh.in:1185
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1184
-msgid "--"
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1191
+#: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1208
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr ""
 
-#: scripts/makepkg.sh.in:1198
+#: scripts/makepkg.sh.in:1214
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1202
+#: scripts/makepkg.sh.in:1218
 msgid "Source cache cleaned."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1207
+#: scripts/makepkg.sh.in:1223
 msgid "No files have been removed."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1212
+#: scripts/makepkg.sh.in:1228
 msgid "Source destination must be defined in makepkg.conf."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1229
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1219
+#: scripts/makepkg.sh.in:1235
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1226
+#: scripts/makepkg.sh.in:1242
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1243
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1244
 msgid "wish to run as root, please use the --asroot option."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1232
+#: scripts/makepkg.sh.in:1248
 msgid "The --asroot option is meant for the root user only."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1249
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1237
+#: scripts/makepkg.sh.in:1253
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1254
 msgid "in the BUILDENV array in %s."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1242
+#: scripts/makepkg.sh.in:1258
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1259
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1260
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1249
+#: scripts/makepkg.sh.in:1265
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1258
+#: scripts/makepkg.sh.in:1274
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1275
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1276
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1286
 #, fuzzy
 msgid "%s does not exist."
 msgstr "репозиторий '%s' не существует\n"
 
-#: scripts/makepkg.sh.in:1285 scripts/makepkg.sh.in:1289
-#: scripts/makepkg.sh.in:1293
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
 #, fuzzy
 msgid "%s is not allowed to be empty."
 msgstr "'%s' неправильно указан путь к базе данных\n"
 
-#: scripts/makepkg.sh.in:1297 scripts/makepkg.sh.in:1301
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
 msgid "%s is not allowed to contain hyphens."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1316
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
 msgid "%s is not available for the '%s' architecture."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1312 scripts/makepkg.sh.in:1317
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
 msgid "Note that many packages may need a line added to their %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
 msgid "such as arch=('%s')."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1323
+#: scripts/makepkg.sh.in:1339
 #, fuzzy
 msgid "Install scriptlet (%s) does not exist."
 msgstr "репозиторий '%s' не существует\n"
 
-#: scripts/makepkg.sh.in:1337
+#: scripts/makepkg.sh.in:1353
 msgid "A package has already been built, installing existing package..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1341 scripts/makepkg.sh.in:1372
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1350 scripts/makepkg.sh.in:1449
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
 msgid "Skipping build."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1374
 msgid "Leaving fakeroot environment."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1362
+#: scripts/makepkg.sh.in:1378
 #, fuzzy
 msgid "Making package: %s"
 msgstr "чтение информации о пакете... "
 
-#: scripts/makepkg.sh.in:1365
+#: scripts/makepkg.sh.in:1381
 msgid "Running makepkg as root..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1392
 msgid "Source package created: %s"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1383
+#: scripts/makepkg.sh.in:1399
 #, fuzzy
 msgid "Skipping dependency checks."
 msgstr "проверяю зависимости... "
 
-#: scripts/makepkg.sh.in:1390
+#: scripts/makepkg.sh.in:1406
 #, fuzzy
 msgid "Checking Runtime Dependencies..."
 msgstr "проверяю зависимости... "
 
-#: scripts/makepkg.sh.in:1393
+#: scripts/makepkg.sh.in:1409
 #, fuzzy
 msgid "Checking Buildtime Dependencies..."
 msgstr "проверяю зависимости... "
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1413
 #, fuzzy
 msgid "Could not resolve all dependencies."
 msgstr "разрешаю зависимости... "
 
-#: scripts/makepkg.sh.in:1401
+#: scripts/makepkg.sh.in:1417
 msgid "pacman was not found in PATH; skipping dependency checks."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1415
+#: scripts/makepkg.sh.in:1431
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1416
+#: scripts/makepkg.sh.in:1432
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1417
+#: scripts/makepkg.sh.in:1433
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1420
+#: scripts/makepkg.sh.in:1436
 msgid "The source directory is empty, there is nothing to build!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1424
+#: scripts/makepkg.sh.in:1440
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr ""
 
-#: scripts/makepkg.sh.in:1435
+#: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1440
+#: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1474
 msgid "Entering fakeroot environment..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:1486
 msgid "Finished making: %s"
 msgstr ""
 
@@ -2011,7 +1994,7 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr ""
 
-#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:89
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
 #, fuzzy
 msgid "Removing existing package '%s'..."
 msgstr ":: Получение пакетов с %s...\n"
@@ -2041,19 +2024,19 @@ msgstr ""
 msgid "Could not add delta '%s'"
 msgstr ""
 
-#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:121
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
 msgid "%s not found. Cannot continue."
 msgstr ""
 
-#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:131
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
 msgid "Cannot create temp directory for database building."
 msgstr ""
 
-#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:140
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr ""
 
-#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:143
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
 msgid "Extracting database to a temporary location..."
 msgstr ""
 
@@ -2075,101 +2058,124 @@ msgstr "пакет '%s' не найден\n"
 msgid "Creating updated database file %s"
 msgstr ""
 
-#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:168
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
 msgid "No compression set."
 msgstr ""
 
-#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:176
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
 msgid "No packages modified, nothing to do."
 msgstr ""
 
-#: scripts/repo-remove.sh.in:53
+#: scripts/repo-remove.sh.in:52
 msgid "repo-remove %s\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:54
+#: scripts/repo-remove.sh.in:53
 msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:54
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
 "\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:59
+#: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr ""
 
-#: scripts/repo-remove.sh.in:147
+#: scripts/repo-remove.sh.in:146
 #, fuzzy
 msgid "Searching for package '%s'..."
 msgstr "Проверка обновлений..."
 
-#: scripts/repo-remove.sh.in:152
+#: scripts/repo-remove.sh.in:151
 #, fuzzy
 msgid "Package matching '%s' not found."
 msgstr "пакет '%s' не найден\n"
 
-#: scripts/repo-remove.sh.in:159
+#: scripts/repo-remove.sh.in:158
 msgid "Creating updated database file '%s'..."
 msgstr ""
 
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr ""
+
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"
 msgstr ""
 
-#: scripts/updatesync.sh.in:34
+#: scripts/updatesync.sh.in:37
 msgid ""
 "updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
 "then compresses it to <destfile>.\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:38
+#: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:39
+#: scripts/updatesync.sh.in:42
 msgid ""
 "upd - Will update a package's entry or create it if it doesn't exist."
 "\\n      It takes the package's PKGBUILD as an option.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:43
 msgid ""
 "del - Will remove a package's entry from the db. It takes the package's"
 "\\n      name as an option.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:45
 msgid ""
 "updatesync will calculate md5sums of packages in the same directory as"
 "\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:45
+#: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
 msgstr ""
 
-#: scripts/updatesync.sh.in:50
+#: scripts/updatesync.sh.in:53
 msgid ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
 
-#: scripts/updatesync.sh.in:120
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
 #, fuzzy
 msgid "%s not found"
 msgstr "пакет \"%s\" не найден\n"
 
-#: scripts/updatesync.sh.in:133
+#: scripts/updatesync.sh.in:140
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr ""
 
 #, fuzzy
+#~ msgid "error: failed to add target '%s' (%s)"
+#~ msgstr "не удалось добавить цель '%s' (%s)"
+
+#~ msgid ":: %s: conflicts with %s"
+#~ msgstr ":: %s: конфликтует с %s"
+
+#, fuzzy
+#~ msgid "error: failed to add target '%s' (%s)\n"
+#~ msgstr "ну удалось добавить цель '%s' (%s)\n"
+
+#, fuzzy
+#~ msgid "debug: %s"
+#~ msgstr "отладка"
+
+#, fuzzy
+#~ msgid "debug: "
+#~ msgstr "отладка"
+
+#, fuzzy
 #~ msgid "Updating %s..."
 #~ msgstr "обновляю %s... "
 
@@ -2226,13 +2232,6 @@ msgstr ""
 #~ msgid "starting full system upgrade"
 #~ msgstr "начинаю полное обновление системы"
 
-#~ msgid ""
-#~ "\n"
-#~ ":: pacman has detected a newer version of the \"pacman\" package.\n"
-#~ msgstr ""
-#~ "\n"
-#~ ":: pacman обнаружил более новую версию пакета \"pacman\".\n"
-
 #~ msgid ":: It is recommended that you allow pacman to upgrade itself\n"
 #~ msgstr ""
 #~ ":: Рекомендуем Вам сначала позволить pacman'у обновить себя самого,\n"
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index cecda1d2..090ba5df 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -675,9 +675,6 @@ run_build() {
 	msg "$(gettext "Starting build()...")"
 	cd "$srcdir"
 
-	# ensure we have a sane umask set
-	umask 0022
-
 	# ensure all necessary build variables are exported
 	export CFLAGS CXXFLAGS MAKEFLAGS CHOST
 
@@ -1417,6 +1414,9 @@ else
 	warning "$(gettext "pacman was not found in PATH; skipping dependency checks.")"
 fi
 
+# ensure we have a sane umask set
+umask 0022
+
 # get back to our src directory so we can begin with sources
 mkdir -p "$srcdir"
 cd "$srcdir"
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 7d584955..f1853203 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -231,11 +231,11 @@ static void cleanup(int signum)
 	exit(signum);
 }
 
-/** Sets all libalpm required paths in one go. Called after the command line and
- * inital config file parsing. Once this is complete, we can see if any paths were
- * defined. If a rootdir was defined and nothing else, we want all of our paths to
- * live under the rootdir that was specified. Safe to call multiple times (will only
- * do anything the first time).
+/** Sets all libalpm required paths in one go. Called after the command line
+ * and inital config file parsing. Once this is complete, we can see if any
+ * paths were defined. If a rootdir was defined and nothing else, we want all
+ * of our paths to live under the rootdir that was specified. Safe to call
+ * multiple times (will only do anything the first time).
  */
 static void setlibpaths(void)
 {
@@ -244,6 +244,8 @@ static void setlibpaths(void)
 		int ret = 0;
 
 		pm_printf(PM_LOG_DEBUG, "setlibpaths() called\n");
+		/* Configure root path first. If it is set and dbpath/logfile were not
+		 * set, then set those as well to reside under the root. */
 		if(config->rootdir) {
 			char path[PATH_MAX];
 			ret = alpm_option_set_root(config->rootdir);
@@ -258,10 +260,12 @@ static void setlibpaths(void)
 			}
 			if(!config->logfile) {
 				snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE);
-				ret = alpm_option_set_dbpath(path);
 				config->logfile = strdup(path);
 			}
 		}
+		/* Set other paths if they were configured. Note that unless rootdir
+		 * was left undefined, these two paths (dbpath and logfile) will have
+		 * been set locally above, so the if cases below will now trigger. */
 		if(config->dbpath) {
 			ret = alpm_option_set_dbpath(config->dbpath);
 			if(ret != 0) {