Merge branch 'maint'

Remove gettext() function addition from gensync and updatesync in master as
gettext is no longer used in them anyway.

1 files changed, 12 insertions, 9 deletions

diff --git a/po/es.po b/po/es.po
index d379c38d..e2ae8f05 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\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"
+"PO-Revision-Date: 2008-02-19 12:30-0300\n"
+"Last-Translator: Fernando Lagos <fernando@zerial.org>\n"
 "Language-Team:  <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,11 +195,9 @@ msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: ¿Reemplazar %s con %s/%s? [Y/n] "
 
 #: src/pacman/callback.c:288
-#, fuzzy, c-format
+#, c-format
 msgid "Replacing %s with %s/%s\n"
-msgstr ""
-"Reemplazando %s con %s/%s\n"
-"."
+msgstr "Reemplazando %s con %s/%s\n"
 
 #: src/pacman/callback.c:296
 #, c-format
@@ -999,13 +997,15 @@ 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"
-msgstr ""
+msgstr ":: pacman ha detectado una nueva version de si mismo.\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 ""
+":: Desea cancelar la operacion actual\n"
+":: e instalar la nueva versin de pacman ahora? [S/n] "
 
 #: src/pacman/sync.c:533 src/pacman/sync.c:748
 #, c-format
@@ -1146,6 +1146,8 @@ 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 esta OBSOLETO. Sera removido en la proxima versionde "
+"pacman, por favor use repo-add y repo-remove.\\n\\n"
 
 #: scripts/gensync.sh.in:36
 msgid ""
@@ -1322,7 +1324,7 @@ msgstr "usando copia cacheada de %s"
 
 #: scripts/makepkg.sh.in:469
 msgid "%s was not found in the build directory and is not a URL."
-msgstr ""
+msgstr "%s no fue encontrado en el directorio build y no es una URL."
 
 #: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
@@ -1662,7 +1664,7 @@ msgstr "Sudo se usa ahora por defecto. ¡La opción --usesudo está obsoleta!"
 
 #: scripts/makepkg.sh.in:1200
 msgid "\\0--holdver and --forcever cannot both be specified"
-msgstr ""
+msgstr "\\0--holdver y --forcever no pueden ser usados al mismo tiempo"
 
 #: scripts/makepkg.sh.in:1207
 msgid "Cleaning up ALL files from %s."
@@ -2109,6 +2111,7 @@ 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 ""
+"Todos los paquetes han sido eliminados de la base de dtos. Eliminando '%s'."
 
 #: scripts/updatesync.sh.in:33
 msgid "Usage: %s <action> <destfile> <option> [package_directory]"