Merge branch 'maint'

Conflicts:
	scripts/makepkg.sh.in

1 files changed, 78 insertions, 18 deletions

diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 928b4513..0260bbbf 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-05 16:57-0600\n"
-"PO-Revision-Date: 2011-11-14 09:22+0000\n"
-"Last-Translator: hseara <hseara@gmail.com>\n"
+"POT-Creation-Date: 2012-01-30 21:40-0600\n"
+"PO-Revision-Date: 2012-01-05 23:01+0000\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/ca/)\n"
 "Language: ca\n"
@@ -494,8 +494,9 @@ msgstr "  --noprogressbar  No mostris un barra de progrés en baixar fitxers"
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "Si %s no s'ha especificat, %s buscarà '%s'"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nCopyright (C) 2002-2006 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"
@@ -649,8 +650,9 @@ msgstr "S'ha acabat de fer: %s"
 msgid "Usage: %s [pacman_db_root]"
 msgstr "Sintaxi: %s [arrel_bd_pacman]"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
@@ -781,6 +783,10 @@ msgstr ""
 "  --refresh-keys [keyid(s)] Actualitza totes claus de un servidor de claus o "
 "algunes especificades"
 
+#, fuzzy
+msgid "The key identified by %s could not be found locally."
+msgstr "La clau identificada per %s no existeix."
+
 msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr "No tens suficients permisos per llegir %s del clauer."
 
@@ -832,9 +838,58 @@ msgstr "Dashabilitant claus revocades del clauer..."
 msgid "Disabling key %s..."
 msgstr "Deshabilitant clau %s..."
 
-msgid "The key identified by %s does not exist."
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+
+#, fuzzy
+msgid "The key identified by %s could not be edited."
+msgstr "La clau identificada per %s no existeix."
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+
+#, fuzzy
+msgid "%s could not be imported."
+msgstr "No s'ha pogut generar delta."
+
+#, fuzzy
+msgid "File %s does not exist and could not be imported."
+msgstr "%s no existeix o no és un directori."
+
+#, fuzzy
+msgid "A specified key could not be listed."
+msgstr "No s'ha pogut crear el fitxer de repositori '%s'."
+
+#, fuzzy
+msgid "A specified signature could not be listed."
+msgstr "Una o més signatures PGP no s'han pogut verificar!"
+
+msgid "A specified key could not be locally signed."
+msgstr ""
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+#, fuzzy
+msgid "The signature identified by %s could not be verified."
 msgstr "La clau identificada per %s no existeix."
 
+msgid "Updating trust database..."
+msgstr "Actualitzant la base de dades de confiaça... "
+
+#, fuzzy
+msgid "Trust database could not be updated."
+msgstr "No s'ha pogut generar delta."
+
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr "No es pot trobar el binari %s necessari per totels les operacions %s."
 
@@ -853,9 +908,6 @@ msgstr "Multiples operacions especificades."
 msgid "Please run %s with each operation separately."
 msgstr "Si us plau executa %s amb cada operació per separat."
 
-msgid "Updating trust database..."
-msgstr "Actualitzant la base de dades de confiaça... "
-
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
@@ -972,9 +1024,10 @@ msgstr "No es pot trobar el binari xdelta3! Està instal·lat xdelta3?"
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 msgstr "Utilització: repo-add [opcions] <path-to-db> <package|delta> ...\\n"
 
+#, fuzzy
 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"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 "repo-add actualitza una base de dades de paquets llegint un fitxer de paquet."
 "\\nEs poden especificar múltiples paquets a afegir en la línia d'ordres.\\n"
@@ -990,20 +1043,25 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       actualització llista arxius en la base de dades\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+#, fuzzy
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 "Utilització: repo-remove [opcions] <path-to-db> <packagename|delta> ...\\n\\n"
 
+#, fuzzy
 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"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 "repo-remove actualitza una base de dades de paquets eliminant el nom del "
 "paquet\\nespecificat en la línia d'ordres de la base de dades del repositori "
 "donada.\\nEs poden especificar múltiples paquets a eliminar en la línia "
 "d'ordres.\\n\\n"
 
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr ""
+
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       minimitza sortida\\n"
 
@@ -1022,23 +1080,26 @@ msgstr ""
 "  -v, --verify      verifica la signatura de la base de dades abans de "
 "l'actualització\\n"
 
+#, fuzzy
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 "\\nVegis %s(8) per més detalls i descripcions de les opcions disponibles.\\n"
 "\\n"
 
+#, fuzzy
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
 "Exemple:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
 
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+#, fuzzy
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 msgstr "Exemple:  repo-remove /ruta/a/repo.bd.tar.gz kernel26"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@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 ""
@@ -1082,9 +1143,8 @@ msgstr "«%s» no té una extensió d'arxiu vàlida."
 msgid "An entry for '%s' already existed"
 msgstr "Ja existeix una entrada per '%s'"
 
-#, fuzzy
 msgid "Invalid package signature file '%s'."
-msgstr "Fitxer de paquet invàlid '%'."
+msgstr ""
 
 msgid "Adding package signature..."
 msgstr "Afegint signatura al paquet..."