diff --git a/src/pacman/po/es.po b/src/pacman/po/es.po
index dc845c4..8cd5fa9 100644
--- a/src/pacman/po/es.po
+++ b/src/pacman/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-04-25 00:44-0400\n"
+"POT-Creation-Date: 2007-06-18 11:15+0200\n"
 "PO-Revision-Date: 2007-05-11 22:38-0400\n"
 "Last-Translator: Juan Pablo González Tognarelli <jotapesan@gmail.com>\n"
 "Language-Team:  <es@li.org>\n"
@@ -20,249 +20,393 @@ msgstr ""
 "X-Poedit-Country: CHILE\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/pacman/add.c:72
-#: src/pacman/remove.c:82
-#: src/pacman/sync.c:482
-#: src/pacman/sync.c:531
+#: src/pacman/add.c:44 src/pacman/remove.c:46
+#, fuzzy, c-format
+msgid "failed to release transaction (%s)\n"
+msgstr "fallo al preparar operación (%s)\n"
+
+#: src/pacman/add.c:81 src/pacman/query.c:408 src/pacman/remove.c:67
+#: src/pacman/sync.c:491
+msgid "no targets specified (use -h for help)\n"
+msgstr "no se especificaron objetivos (use -h para ayuda)\n"
+
+#: src/pacman/add.c:108 src/pacman/pacman.c:226 src/pacman/sync.c:523
 #, c-format
+msgid "error: %s\n"
+msgstr ""
+
+#: src/pacman/add.c:111 src/pacman/remove.c:102 src/pacman/sync.c:501
+#, fuzzy, c-format
 msgid ""
-"       if you're sure a package manager is not already running,\n"
-"       you can remove %s%s\n"
+"  if you're sure a package manager is not already\n"
+"  running, you can remove %s.\n"
 msgstr ""
 "       Si está seguro que no se está ejecutando pacman,\n"
 "       puede eliminar %s%s\n"
 
-#: src/pacman/add.c:79
+#: src/pacman/add.c:118 src/pacman/remove.c:110
+#, c-format
 msgid "loading package data... "
 msgstr "Cargando información del paquete..."
 
-#: src/pacman/add.c:83
-#, c-format
-msgid "failed to add target '%s' (%s)"
+#: src/pacman/add.c:122
+#, fuzzy, c-format
+msgid "error: failed to add target '%s' (%s)"
 msgstr "fallo al procesar '%s' (%s)"
 
-#: src/pacman/add.c:88
-#: src/pacman/sync.c:196
-#: src/pacman/trans.c:73
-#: src/pacman/trans.c:80
-#: src/pacman/trans.c:91
-#: src/pacman/trans.c:105
-#: src/pacman/trans.c:119
-#: src/pacman/trans.c:131
-#: src/pacman/trans.c:142
+#: src/pacman/add.c:128 src/pacman/callback.c:181 src/pacman/callback.c:187
+#: src/pacman/callback.c:198 src/pacman/callback.c:212
+#: src/pacman/callback.c:226 src/pacman/callback.c:238
+#: src/pacman/callback.c:249 src/pacman/sync.c:183
+#, c-format
 msgid "done.\n"
 msgstr "Hecho.\n"
 
-#: src/pacman/add.c:95
-#: src/pacman/remove.c:101
-#: src/pacman/sync.c:616
-#, c-format
-msgid "failed to prepare transaction (%s)\n"
+#: src/pacman/add.c:133 src/pacman/remove.c:125 src/pacman/sync.c:646
+#, fuzzy, c-format
+msgid "error: failed to prepare transaction (%s)\n"
 msgstr "fallo al preparar operación (%s)\n"
 
-#: src/pacman/add.c:104
+#: src/pacman/add.c:143
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ":: %s: necesita %s"
 
-#: src/pacman/add.c:125
-#: src/pacman/sync.c:643
+#: src/pacman/add.c:164 src/pacman/sync.c:675
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: tiene conflictos con %s"
 
-#: src/pacman/add.c:134
-#: src/pacman/sync.c:707
+#: src/pacman/add.c:173 src/pacman/sync.c:735
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s existe en '%s' y '%s'\n"
 
-#: src/pacman/add.c:140
-#: src/pacman/sync.c:713
+#: src/pacman/add.c:179 src/pacman/sync.c:741
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s existe en el sistema de archivos\n"
 
-#: src/pacman/add.c:146
-#: src/pacman/sync.c:719
-#: src/pacman/sync.c:725
-msgid "errors occurred, no packages were upgraded.\n"
+#: src/pacman/add.c:185
+#, fuzzy, c-format
+msgid ""
+"\n"
+"errors occurred, no packages were upgraded.\n"
 msgstr "ocurrieron errores, los paquetes no fueron actualizados\n"
 
-#: src/pacman/package.c:74
-#: src/pacman/package.c:129
+#: src/pacman/add.c:198 src/pacman/remove.c:168 src/pacman/sync.c:726
+#, fuzzy, c-format
+msgid "error: failed to commit transaction (%s)\n"
+msgstr "no se pudo iniciar la operación (%s)\n"
+
+#: src/pacman/callback.c:166
+#, c-format
+msgid "checking dependencies... "
+msgstr "comprobando dependencias... "
+
+#: src/pacman/callback.c:170
+#, c-format
+msgid "checking for file conflicts... "
+msgstr "verificando si existen conflictos entre archivos... "
+
+#: src/pacman/callback.c:174
+#, c-format
+msgid "resolving dependencies... "
+msgstr "resolviendo dependencias... "
+
+#: src/pacman/callback.c:177
+#, c-format
+msgid "looking for inter-conflicts... "
+msgstr "verificando conflictos... "
+
+#: src/pacman/callback.c:193
+#, c-format
+msgid "installing %s... "
+msgstr "instalando %s..."
+
+#: src/pacman/callback.c:200
+#, c-format
+msgid "installed %s (%s)"
+msgstr "instalado %s (%s)"
+
+#: src/pacman/callback.c:207
+#, c-format
+msgid "removing %s... "
+msgstr "quitando %s..."
+
+#: src/pacman/callback.c:214
+#, c-format
+msgid "removed %s (%s)"
+msgstr "eliminado %s (%s)"
+
+#: src/pacman/callback.c:221
+#, c-format
+msgid "upgrading %s... "
+msgstr "actualizando %s... "
+
+#: src/pacman/callback.c:228
+#, c-format
+msgid "upgraded %s (%s -> %s)"
+msgstr "actualizado %s (%s -> %s)"
+
+#: src/pacman/callback.c:235
+#, c-format
+msgid "checking package integrity... "
+msgstr "Verificando la integridad de los paquetes... "
+
+#: src/pacman/callback.c:251
+#, c-format
+msgid "failed.\n"
+msgstr "falló.\n"
+
+#: src/pacman/callback.c:258
+#, c-format
+msgid ":: Retrieving packages from %s...\n"
+msgstr ":: Descargando paquetes desde %s...\n"
+
+#: src/pacman/callback.c:281
+#, fuzzy, c-format
+msgid ":: %s requires installing %s from IgnorePkg. Install anyway? [Y/n] "
+msgstr ":: %s está en la lista a ignorar. ¿Instalar de todas formas? [Y/n] "
+
+#: src/pacman/callback.c:286
+#, c-format
+msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
+msgstr ":: %s está en la lista a ignorar. ¿Instalar de todas formas? [Y/n] "
+
+#: src/pacman/callback.c:299
+#, c-format
+msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
+msgstr ":: %s está indicado como HoldPkg. ¿Quitar de todas formas? [Y/n] "
+
+#: src/pacman/callback.c:312
+#, c-format
+msgid ":: Replace %s with %s/%s? [Y/n] "
+msgstr ":: ¿Reemplazar %s con %s/%s? [Y/n] "
+
+#: src/pacman/callback.c:327
+#, c-format
+msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
+msgstr ":: %s provoca conflictos con  %s. ¿Quitar %s? [Y/n]"
+
+#: src/pacman/callback.c:343
+#, c-format
+msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
+msgstr ""
+":: %s-%s: la versión local es mas reciente. ¿Actualizar de todas formas? [Y/"
+"n] "
+
+#: src/pacman/callback.c:361
+#, c-format
+msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
+msgstr ""
+":: %s-%s: la versión local está actualizada. ¿Actualizar de todas formas? [Y/"
+"n] "
+
+#: src/pacman/callback.c:379
+#, c-format
+msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
+msgstr ":: El Archivo %s está corrupto. Desea borrarlo? [Y/n] "
+
+#: src/pacman/callback.c:430
+msgid "installing"
+msgstr "instalando"
+
+#: src/pacman/callback.c:433
+msgid "upgrading"
+msgstr "actualizando"
+
+#: src/pacman/callback.c:436
+msgid "removing"
+msgstr "quitando"
+
+#: src/pacman/callback.c:439
+msgid "checking for file conflicts"
+msgstr "verificando conflictos entre archivos"
+
+#: src/pacman/package.c:58
+msgid "Explicitly installed"
+msgstr ""
+
+#: src/pacman/package.c:61
+msgid "Installed as a dependency for another package"
+msgstr ""
+
+#: src/pacman/package.c:64 src/pacman/package.c:88
+msgid "Unknown"
+msgstr ""
+
+#: src/pacman/package.c:68 src/pacman/package.c:119
+msgid "Description    : "
+msgstr ""
+
+#: src/pacman/package.c:71 src/pacman/package.c:125
+#, fuzzy, c-format
+msgid "Name           : %s\n"
+msgstr "URL               : %s\n"
+
+#: src/pacman/package.c:72 src/pacman/package.c:126
 #, c-format
 msgid "Version        : %s\n"
 msgstr "Versión           : %s\n"
 
-#: src/pacman/package.c:75
+#: src/pacman/package.c:73
 #, c-format
 msgid "URL            : %s\n"
 msgstr "URL               : %s\n"
 
-#: src/pacman/package.c:76
+#: src/pacman/package.c:74
 msgid "License        :"
 msgstr "Licencia          :"
 
-#: src/pacman/package.c:77
-#: src/pacman/package.c:130
+#: src/pacman/package.c:75 src/pacman/package.c:127
 msgid "Groups         :"
 msgstr "Grupos            :"
 
-#: src/pacman/package.c:78
-#: src/pacman/package.c:131
+#: src/pacman/package.c:76 src/pacman/package.c:128
 msgid "Provides       :"
 msgstr "Provee            :"
 
-#: src/pacman/package.c:79
-#: src/pacman/package.c:132
+#: src/pacman/package.c:77 src/pacman/package.c:129
 msgid "Depends On     :"
 msgstr "Depende De        :"
 
 #: src/pacman/package.c:80
-#: src/pacman/package.c:133
-msgid "Removes        :"
-msgstr "Elimina           :"
-
-#: src/pacman/package.c:83
 msgid "Required By    :"
 msgstr "Requerido por     :"
 
-#: src/pacman/package.c:85
-#: src/pacman/package.c:134
+#: src/pacman/package.c:82 src/pacman/package.c:130
 msgid "Conflicts With :"
 msgstr "Conflictos con    :"
 
-#: src/pacman/package.c:86
-#: src/pacman/package.c:135
+#: src/pacman/package.c:83 src/pacman/package.c:131
 msgid "Replaces       :"
 msgstr "Reemplaza     :"
 
-#: src/pacman/package.c:87
-#: src/pacman/package.c:137
+#: src/pacman/package.c:84 src/pacman/package.c:133
 #, c-format
 msgid "Installed Size : %6.2f K\n"
 msgstr "Tamaño instalado  : %6.2f K\n"
 
-#: src/pacman/package.c:88
+#: src/pacman/package.c:85
 #, c-format
 msgid "Packager       : %s\n"
 msgstr "Empaquetador      : %s\n"
 
-#: src/pacman/package.c:89
+#: src/pacman/package.c:86
 #, c-format
 msgid "Architecture   : %s\n"
 msgstr "Arquitectura      : %s\n"
 
-#: src/pacman/package.c:90
+#: src/pacman/package.c:87
 #, c-format
 msgid "Build Date     : %s %s\n"
 msgstr "Fecha de compilación : %s %s\n"
 
-#: src/pacman/package.c:91
+#: src/pacman/package.c:88
 #, c-format
 msgid "Build Type     : %s\n"
 msgstr "Tipo de compilación  : %s\n"
 
-#: src/pacman/package.c:93
+#: src/pacman/package.c:90
 #, c-format
 msgid "Install Date   : %s %s\n"
 msgstr "Fecha de instalación : %s %s\n"
 
-#: src/pacman/package.c:94
+#: src/pacman/package.c:91
 #, c-format
 msgid "Install Reason : %s\n"
 msgstr "Tipo de instalación  : %s\n"
 
-#: src/pacman/package.c:96
+#: src/pacman/package.c:93
 #, c-format
 msgid "Install Script : %s\n"
 msgstr "Script de instalación: %s\n"
 
-#: src/pacman/package.c:97
+#: src/pacman/package.c:94
 msgid "Yes"
 msgstr "Si"
 
-#: src/pacman/package.c:97
+#: src/pacman/package.c:94
 msgid "No"
 msgstr "No"
 
-#: src/pacman/package.c:127
+#: src/pacman/package.c:124
 #, c-format
 msgid "Repository     : %s\n"
 msgstr "Repositorio    : %s\n"
 
-#: src/pacman/package.c:136
+#: src/pacman/package.c:132
 #, c-format
 msgid "Download Size  : %6.2f K\n"
 msgstr "Tamaño de la descarga  : %6.2f K\n"
 
-#: src/pacman/package.c:145
+#: src/pacman/package.c:141
 #, c-format
 msgid "MD5 Sum        : %s"
 msgstr "Hash MD5 Sum    : %s"
 
-#: src/pacman/package.c:148
+#: src/pacman/package.c:144
 #, c-format
 msgid "SHA1 Sum       : %s"
 msgstr "Hash SHA1      : %s"
 
-#: src/pacman/package.c:159
+#: src/pacman/package.c:155
 #, c-format
 msgid "Backup Files:\n"
 msgstr "Archivos de respaldo:\n"
 
-#: src/pacman/package.c:181
-#, c-format
-msgid "error calculating checksums for %s\n"
+#: src/pacman/package.c:177
+#, fuzzy, c-format
+msgid "error: could not calculate checksums for %s\n"
 msgstr "error calculando la verificación para %s\n"
 
-#: src/pacman/package.c:194
+#: src/pacman/package.c:191
 #, c-format
 msgid "MODIFIED\t%s\n"
 msgstr "MODIFICADOt%s\n"
 
-#: src/pacman/package.c:196
+#: src/pacman/package.c:193
 #, c-format
 msgid "Not Modified\t%s\n"
 msgstr "No Modificado\t%s\n"
 
-#: src/pacman/package.c:201
+#: src/pacman/package.c:198
 #, c-format
 msgid "MISSING\t\t%s\n"
 msgstr "FALTANTE\t\t%s\n"
 
-#: src/pacman/package.c:207
+#: src/pacman/package.c:204
 #, c-format
 msgid "(none)\n"
 msgstr "(nada)\n"
 
-#: src/pacman/package.c:247
-#, c-format
-msgid "No changelog available for '%s'.\n"
+#: src/pacman/package.c:244
+#, fuzzy, c-format
+msgid "error: no changelog available for '%s'.\n"
 msgstr "No hay registro de cambios para '%s'.\n"
 
-#: src/pacman/pacman.c:94
+#: src/pacman/pacman.c:69
 msgid "options"
 msgstr "opciones"
 
-#: src/pacman/pacman.c:95
+#: src/pacman/pacman.c:70
 msgid "file"
 msgstr "archivo"
 
-#: src/pacman/pacman.c:96
+#: src/pacman/pacman.c:71
 msgid "package"
 msgstr "paquete"
 
-#: src/pacman/pacman.c:97
+#: src/pacman/pacman.c:72
 msgid "usage"
 msgstr "uso"
 
-#: src/pacman/pacman.c:98
+#: src/pacman/pacman.c:73
 msgid "operation"
 msgstr "operación"
 
-#: src/pacman/pacman.c:111
+#: src/pacman/pacman.c:86
 #, c-format
 msgid ""
 "\n"
@@ -271,355 +415,557 @@ msgstr ""
 "\n"
 "digite '%s --help' con otra opción para ayuda más específica\n"
 
-#: src/pacman/pacman.c:116
-#: src/pacman/pacman.c:123
-#: src/pacman/pacman.c:134
-#: src/pacman/pacman.c:154
+#: src/pacman/pacman.c:91 src/pacman/pacman.c:98 src/pacman/pacman.c:109
+#: src/pacman/pacman.c:130
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps         se salta la verificación de dependencias \n"
 
-#: src/pacman/pacman.c:117
-#: src/pacman/pacman.c:135
-#: src/pacman/pacman.c:156
+#: src/pacman/pacman.c:92 src/pacman/pacman.c:110 src/pacman/pacman.c:132
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
-msgstr "  -f, --force          fuerza la instalación, sobreescribiendo los archivos en conflicto\n"
+msgstr ""
+"  -f, --force          fuerza la instalación, sobreescribiendo los archivos "
+"en conflicto\n"
 
-#: src/pacman/pacman.c:120
+#: src/pacman/pacman.c:95
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
 msgstr "uso:     %s {-R --remove} [opciones] <paquete>\n"
 
-#: src/pacman/pacman.c:122
+#: src/pacman/pacman.c:97
 #, c-format
-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"
+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:124
+#: src/pacman/pacman.c:99
 #, c-format
-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"
+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"
 
-#: src/pacman/pacman.c:125
+#: src/pacman/pacman.c:100
 #, c-format
 msgid "  -n, --nosave         remove configuration files as well\n"
 msgstr "  -n, --nosave         quita también los archivos de  configuración\n"
 
-#: src/pacman/pacman.c:126
+#: src/pacman/pacman.c:101
 #, c-format
-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"
+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"
 
-#: src/pacman/pacman.c:139
+#: src/pacman/pacman.c:114
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
 msgstr "  -c, --changelog      muestra el registro de cambios de un paquete\n"
 
-#: src/pacman/pacman.c:140
+#: src/pacman/pacman.c:115
 #, c-format
 msgid ""
-"  -e, --orphans        list all packages installed as dependencies but no longer\n"
+"  -e, --orphans        list all packages installed as dependencies but no "
+"longer\n"
 "                       required by any package\n"
 msgstr ""
-"  -e, --orphans        lista todos los paquetes instalados como dependencias, que ya no lo son\n"
+"  -e, --orphans        lista todos los paquetes instalados como "
+"dependencias, que ya no lo son\n"
 "                             requerido por cualquier paquete\n"
 
-#: src/pacman/pacman.c:142
-#: src/pacman/pacman.c:157
+#: src/pacman/pacman.c:117 src/pacman/pacman.c:133
 #, 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:143
-#: src/pacman/pacman.c:158
+#: src/pacman/pacman.c:118 src/pacman/pacman.c:134
 #, c-format
 msgid "  -i, --info           view package information\n"
 msgstr "  -i, --info           ver la información del paquete\n"
 
-#: src/pacman/pacman.c:144
+#: src/pacman/pacman.c:119
 #, c-format
 msgid "  -l, --list           list the contents of the queried package\n"
-msgstr "  -l, --list           lista los archivos contenidos en los paquetes consultados\n"
+msgstr ""
+"  -l, --list           lista los archivos contenidos en los paquetes "
+"consultados\n"
 
-#: src/pacman/pacman.c:145
+#: src/pacman/pacman.c:120
 #, c-format
-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"
+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"
 
-#: src/pacman/pacman.c:146
+#: src/pacman/pacman.c:121
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr "  -o, --owns <file>    consulta el paquete que contiene el archivo  indicado\n"
+msgstr ""
+"  -o, --owns <file>    consulta el paquete que contiene el archivo  "
+"indicado\n"
 
-#: src/pacman/pacman.c:147
+#: src/pacman/pacman.c:122
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr "  -p, --file <paquete> consulta un archivo de paquetes en lugar de la base de datos\n"
+msgstr ""
+"  -p, --file <paquete> consulta un archivo de paquetes en lugar de la base "
+"de datos\n"
 
-#: src/pacman/pacman.c:148
+#: src/pacman/pacman.c:123
 #, c-format
-msgid "  -s, --search <regex> search locally-installed packages for matching strings\n"
-msgstr "  -s, --search <busca> busca paquetes instalados localmente que coincidan con la cadena\n"
+msgid ""
+"  -s, --search <regex> search locally-installed packages for matching "
+"strings\n"
+msgstr ""
+"  -s, --search <busca> busca paquetes instalados localmente que coincidan "
+"con la cadena\n"
 
-#: src/pacman/pacman.c:149
+#: src/pacman/pacman.c:124
+#, fuzzy, c-format
+msgid "  -t, --test           check the consistency of the local database\n"
+msgstr ""
+"  -l, --list           lista los archivos contenidos en los paquetes "
+"consultados\n"
+
+#: src/pacman/pacman.c:125
 #, c-format
 msgid "  -u, --upgrades       list all packages that can be upgraded\n"
-msgstr "  -u, --upgrades       muestra todos los paquetes que pueden ser actualizados\n"
+msgstr ""
+"  -u, --upgrades       muestra todos los paquetes que pueden ser "
+"actualizados\n"
 
-#: src/pacman/pacman.c:153
+#: src/pacman/pacman.c:129
 #, c-format
-msgid "  -c, --clean          remove old packages from cache directory (-cc for all)\n"
-msgstr "  -c, --clean          elimina paquetes antiguos del directorio de la cache (-cc para todos los paquetes)\n"
+msgid ""
+"  -c, --clean          remove old packages from cache directory (-cc for "
+"all)\n"
+msgstr ""
+"  -c, --clean          elimina paquetes antiguos del directorio de la cache "
+"(-cc para todos los paquetes)\n"
 
-#: src/pacman/pacman.c:155
+#: src/pacman/pacman.c:131
 #, c-format
 msgid "  -e, --dependsonly    install dependencies only\n"
 msgstr "  -e, --dependsonly    instala sólo dependencias\n"
 
-#: src/pacman/pacman.c:159
+#: src/pacman/pacman.c:135
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
 msgstr "  -l, --list <repo>    ve una lista de paquetes en un repositorio\n"
 
-#: src/pacman/pacman.c:160
+#: src/pacman/pacman.c:136
 #, c-format
-msgid "  -p, --print-uris     print out URIs for given packages and their dependencies\n"
-msgstr "  -p, --print-uris     muestra las URIs (nombres de paquetes) para los archivos indicados y sus  dependencias\n"
+msgid ""
+"  -p, --print-uris     print out URIs for given packages and their "
+"dependencies\n"
+msgstr ""
+"  -p, --print-uris     muestra las URIs (nombres de paquetes) para los "
+"archivos indicados y sus  dependencias\n"
 
-#: src/pacman/pacman.c:161
+#: src/pacman/pacman.c:137
 #, c-format
-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"
+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"
 
-#: src/pacman/pacman.c:162
+#: src/pacman/pacman.c:138
 #, 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:163
+#: src/pacman/pacman.c:139
 #, c-format
-msgid "  -w, --downloadonly   download packages but do not install/upgrade anything\n"
-msgstr "  -w, --downloadonly   sólo descarga los paquetes, sin  instalar/actualizar nada\n"
+msgid ""
+"  -w, --downloadonly   download packages but do not install/upgrade "
+"anything\n"
+msgstr ""
+"  -w, --downloadonly   sólo descarga los paquetes, sin  instalar/actualizar "
+"nada\n"
 
-#: src/pacman/pacman.c:164
+#: src/pacman/pacman.c:140
 #, c-format
-msgid "  -y, --refresh        download fresh package databases from the server\n"
-msgstr "  -y, --refresh        descarga bases de datos actualizadas desde el servidor\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:165
+#: src/pacman/pacman.c:141
 #, c-format
-msgid "      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"
-msgstr "      --ignore <pkg>   ignora una actualización de paquete (puede ser usado más de una vez)\n"
+msgid ""
+"      --ignore <pkg>   ignore a package upgrade (can be used more than "
+"once)\n"
+msgstr ""
+"      --ignore <pkg>   ignora una actualización de paquete (puede ser usado "
+"más de una vez)\n"
 
-#: src/pacman/pacman.c:167
+#: src/pacman/pacman.c:143
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <ruta>  define un archivo de configuración alterno\n"
 
-#: src/pacman/pacman.c:168
+#: src/pacman/pacman.c:144
 #, c-format
 msgid "      --noconfirm      do not ask for any confirmation\n"
 msgstr "      --noconfirm      no solicita confirmación alguna\n"
 
-#: src/pacman/pacman.c:169
+#: src/pacman/pacman.c:145
 #, c-format
-msgid "      --ask <number>   pre-specify answers for questions (see manpage)\n"
-msgstr "      --ask <número>   pre-define respuestas para preguntas (ver el manual)\n"
+msgid ""
+"      --ask <number>   pre-specify answers for questions (see manpage)\n"
+msgstr ""
+"      --ask <número>   pre-define respuestas para preguntas (ver el manual)\n"
 
-#: src/pacman/pacman.c:170
+#: src/pacman/pacman.c:146
 #, c-format
-msgid "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr "      --noprogressbar  no muestra la barra de progreso cuando descarga archivos\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:171
+#: src/pacman/pacman.c:147
 #, 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:172
+#: src/pacman/pacman.c:148
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose        mostrar todo\n"
 
-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:149
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr "  -r, --root <path>    define una raiz alterna para la instalación\n"
 
-#: src/pacman/pacman.c:174
+#: src/pacman/pacman.c:150
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr "  -b, --dbpath <path>  define una localización alternativa de la base de datos\n"
+msgstr ""
+"  -b, --dbpath <path>  define una localización alternativa de la base de "
+"datos\n"
 
-#: src/pacman/pacman.c:175
+#: src/pacman/pacman.c:151
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr "      --cachedir <dir> define una ruta alternativa para la localización de los archivos\n"
+msgstr ""
+"      --cachedir <dir> define una ruta alternativa para la localización de "
+"los archivos\n"
 
-#: src/pacman/pacman.c:189
+#: src/pacman/pacman.c:152
+#, fuzzy, c-format
+msgid "      --lock <file>    set an alternate lockfile location\n"
+msgstr ""
+"      --cachedir <dir> define una ruta alternativa para la localización de "
+"los archivos\n"
+
+#: src/pacman/pacman.c:166
 #, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License\n"
 msgstr ""
 "                       Este programa puede ser libremente distribuido bajo\n"
-"                       los términos de la licencia GNU General Public License\n"
+"                       los términos de la licencia GNU General Public "
+"License\n"
 
-#: src/pacman/pacman.c:340
-#, c-format
-msgid "'%s' is not a valid debug level"
+#: src/pacman/pacman.c:328
+#, fuzzy, c-format
+msgid "error: '%s' is not a valid debug level\n"
 msgstr "'%s' no es un nivel de depuración válido"
 
-#: src/pacman/pacman.c:355
-#, c-format
-msgid "'%s' is not a valid cache directory\n"
+#: src/pacman/pacman.c:344
+#, fuzzy, c-format
+msgid "error: '%s' is not a valid cache directory\n"
 msgstr "'%s' no es un directorio de cache válido\n"
 
-#: src/pacman/pacman.c:373
-#, c-format
-msgid "'%s' is not a valid db path\n"
+#: src/pacman/pacman.c:366
+#, fuzzy, c-format
+msgid "error: '%s' is not a valid db path\n"
 msgstr "%s' no es una ruta de base de datos válida\n"
 
-#: src/pacman/pacman.c:403
-#, c-format
-msgid "'%s' is not a valid root path\n"
+#: src/pacman/pacman.c:397
+#, fuzzy, c-format
+msgid "error: '%s' is not a valid root path\n"
 msgstr "'%s' no es una ruta de raíz válida\n"
 
-#: src/pacman/pacman.c:430
-msgid "only one operation may be used at a time\n"
+#: src/pacman/pacman.c:428
+#, fuzzy, c-format
+msgid "error: only one operation may be used at a time\n"
 msgstr "sólo una operación puede utilizarse a la vez\n"
 
-#: src/pacman/pacman.c:489
+#: src/pacman/pacman.c:461
+#, fuzzy, c-format
+msgid "config: attempting to read file %s\n"
+msgstr "no se pudo leer el archivo  '%s': %s"
+
+#: src/pacman/pacman.c:464
 #, c-format
-msgid "failed to initialize alpm library (%s)\n"
-msgstr "falló al iniciar la libreria alpm (%s)\n"
+msgid "config file %s could not be read.\n"
+msgstr ""
 
-#: src/pacman/pacman.c:522
-msgid "you cannot perform this operation unless you are root.\n"
-msgstr "no puede realizar esta operación, a menos que sea root.\n"
+#: src/pacman/pacman.c:497
+#, c-format
+msgid "config: new section '%s'\n"
+msgstr ""
 
-#: src/pacman/pacman.c:538
+#: src/pacman/pacman.c:499
 #, c-format
-msgid "failed to parse config (%s)\n"
-msgstr "falló al analizar la configuración (%s)\n"
+msgid "config file %s, line %d: bad section name.\n"
+msgstr ""
+
+#: src/pacman/pacman.c:505
+#, c-format
+msgid "config file %s, line %d: 'local' cannot be used as section name.\n"
+msgstr ""
+
+#: src/pacman/pacman.c:525
+#, c-format
+msgid "config file %s, line %d: syntax error in config file- missing key.\n"
+msgstr ""
+
+#: src/pacman/pacman.c:531
+#, c-format
+msgid ""
+"config file %s, line %d: 'Include' directive must belong to a section.\n"
+msgstr ""
+
+#: src/pacman/pacman.c:540
+msgid "config: nopassiveftp\n"
+msgstr ""
+
+#: src/pacman/pacman.c:543
+msgid "config: usesyslog\n"
+msgstr ""
+
+#: src/pacman/pacman.c:546
+msgid "config: chomp\n"
+msgstr ""
 
 #: src/pacman/pacman.c:549
-msgid "Targets  :"
-msgstr "Objetivos  : "
+msgid "config: usecolor\n"
+msgstr ""
+
+#: src/pacman/pacman.c:552
+msgid "config: showsize\n"
+msgstr ""
 
-#: src/pacman/pacman.c:555
+#: src/pacman/pacman.c:554 src/pacman/pacman.c:645 src/pacman/pacman.c:660
 #, c-format
-msgid "could not register 'local' database (%s)\n"
-msgstr "no se pudo registrar la base de datos 'local' (%s)\n"
+msgid "config file %s, line %d: directive '%s' not recognized.\n"
+msgstr ""
 
 #: src/pacman/pacman.c:562
-msgid "no targets specified (use -h for help)\n"
-msgstr "no se especificaron objetivos (use -h para ayuda)\n"
+#, c-format
+msgid "config: including %s\n"
+msgstr ""
 
-#: src/pacman/pacman.c:575
-msgid "no operation specified (use -h for help)\n"
+#: src/pacman/pacman.c:576 src/pacman/pacman.c:581
+#, c-format
+msgid "config: noupgrade: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:589 src/pacman/pacman.c:594
+#, c-format
+msgid "config: noextract: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:602
+#, c-format
+msgid "config: ignorepkg: %s"
+msgstr ""
+
+#: src/pacman/pacman.c:607
+#, c-format
+msgid "config: ignorepkg: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:615 src/pacman/pacman.c:620
+#, c-format
+msgid "config: holdpkg: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:623
+#, c-format
+msgid "config: dbpath: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:626
+#, c-format
+msgid "config: cachedir: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:629
+#, c-format
+msgid "config: rootdir: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:632
+#, c-format
+msgid "config: logfile: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:635
+#, c-format
+msgid "config: lockfile: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:638
+#, c-format
+msgid "config: xfercommand: %s\n"
+msgstr ""
+
+#: src/pacman/pacman.c:643
+#, c-format
+msgid "config: upgradedelay: %d\n"
+msgstr ""
+
+#: src/pacman/pacman.c:725
+#, fuzzy, c-format
+msgid "error: failed to initialize alpm library (%s)\n"
+msgstr "falló al iniciar la libreria alpm (%s)\n"
+
+#: src/pacman/pacman.c:764
+#, fuzzy, c-format
+msgid "error: you cannot perform this operation unless you are root.\n"
+msgstr "no puede realizar esta operación, a menos que sea root.\n"
+
+#: src/pacman/pacman.c:790
+#, fuzzy, c-format
+msgid "error: could not register 'local' database (%s)\n"
+msgstr "no se pudo registrar la base de datos 'local' (%s)\n"
+
+#: src/pacman/pacman.c:816
+#, fuzzy, c-format
+msgid "error: no operation specified (use -h for help)\n"
 msgstr "no se especificó una operación (utilice -h para ayuda)\n"
 
-#: src/pacman/query.c:90
-msgid "no file was specified for --owns\n"
+#: src/pacman/query.c:69
+#, fuzzy, c-format
+msgid "error: no file was specified for --owns\n"
 msgstr "no se indico un archivo para --owns\n"
 
-#: src/pacman/query.c:95
-#, c-format
-msgid "failed to read file '%s': %s"
+#: src/pacman/query.c:81
+#, fuzzy, c-format
+msgid "error: failed to read file '%s': %s\n"
 msgstr "no se pudo leer el archivo  '%s': %s"
 
-#: src/pacman/query.c:100
-msgid "cannot determine ownership of a directory"
+#: src/pacman/query.c:88
+#, fuzzy, c-format
+msgid "error: cannot determine ownership of a directory\n"
 msgstr "no se pudo determinar el propietario de un directorio"
 
-#: src/pacman/query.c:105
-#, c-format
-msgid "cannot determine real path for '%s': %s"
+#: src/pacman/query.c:94
+#, fuzzy, c-format
+msgid "error: cannot determine real path for '%s': %s\n"
 msgstr "no se pudo determinar la ruta verdadera para '%s': %s"
 
-#: src/pacman/query.c:119
+#: src/pacman/query.c:111
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s es propiedad de %s %s\n"
 
-#: src/pacman/query.c:127
-#, c-format
-msgid "No package owns %s\n"
+#: src/pacman/query.c:119
+#, fuzzy, c-format
+msgid "error: No package owns %s\n"
 msgstr "Ningún paquete posee %s\n"
 
-#: src/pacman/query.c:170
-#: src/pacman/sync.c:453
-msgid "no usable package repositories configured.\n"
-msgstr "no se encontraron repositorios útiles configurados.\n"
+#: src/pacman/query.c:206
+#, fuzzy, c-format
+msgid "error: group \"%s\" was not found\n"
+msgstr "el grupo \"%s\" no fue encontrado\n"
 
-#: src/pacman/query.c:176
-msgid "Checking for package upgrades..."
-msgstr "Verificando actualizaciones de paquetes..."
+#: src/pacman/query.c:221
+#, fuzzy, c-format
+msgid "error: no package file was specified for --file\n"
+msgstr "no se especificó un archivo de paquetes para --file\n"
 
-#: src/pacman/query.c:183
-msgid "no upgrades found"
-msgstr "no se encontraron actualizaciones"
+#: src/pacman/query.c:227
+#, fuzzy, c-format
+msgid "error: failed to load package '%s' (%s)\n"
+msgstr "error al cargar el paquete '%s' (%s)\n"
 
-#: src/pacman/query.c:221
+#: src/pacman/query.c:254
 #, c-format
-msgid "group \"%s\" was not found\n"
-msgstr "el grupo \"%s\" no fue encontrado\n"
+msgid "Checking database for consistency..."
+msgstr ""
 
-#: src/pacman/query.c:232
-msgid "no package file was specified for --file\n"
-msgstr "no se especificó un archivo de paquetes para --file\n"
+#: src/pacman/query.c:257
+#, c-format
+msgid "check complete.\n"
+msgstr ""
 
-#: src/pacman/query.c:236
+#: src/pacman/query.c:262
+#, fuzzy, c-format
+msgid "check failed!\n"
+msgstr "falló.\n"
+
+#: src/pacman/query.c:274
 #, c-format
-msgid "failed to load package '%s' (%s)\n"
-msgstr "error al cargar el paquete '%s' (%s)\n"
+msgid "Checking for package upgrades..."
+msgstr "Verificando actualizaciones de paquetes..."
 
-#: src/pacman/query.c:273
-#: src/pacman/query.c:305
+#: src/pacman/query.c:282
 #, c-format
-msgid "package \"%s\" not found\n"
+msgid "no upgrades found"
+msgstr "no se encontraron actualizaciones"
+
+#: src/pacman/query.c:294 src/pacman/sync.c:462
+msgid "no usable package repositories configured.\n"
+msgstr "no se encontraron repositorios útiles configurados.\n"
+
+#: src/pacman/query.c:430
+#, fuzzy, c-format
+msgid "error: package \"%s\" not found\n"
 msgstr "el paquete  \"%s\" no fue encontrado\n"
 
-#: src/pacman/remove.c:61
-#: src/pacman/sync.c:568
+#: src/pacman/remove.c:80 src/pacman/sync.c:598
 #, c-format
 msgid ":: group %s:\n"
 msgstr ":: grupo %s:\n"
 
-#: src/pacman/remove.c:63
+#: src/pacman/remove.c:82
 msgid "    Remove whole content? [Y/n] "
 msgstr "    ¿Quitar todo el contenido? [Y/n] "
 
-#: src/pacman/remove.c:67
+#: src/pacman/remove.c:86
 #, c-format
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: ¿Quitar %s del grupo %s? [Y/n] "
 
-#: src/pacman/remove.c:80
-#: src/pacman/sync.c:480
-#: src/pacman/sync.c:529
-#, c-format
-msgid "failed to init transaction (%s)\n"
+#: src/pacman/remove.c:99 src/pacman/sync.c:498 src/pacman/sync.c:555
+#, fuzzy, c-format
+msgid "error: failed to init transaction (%s)\n"
 msgstr "no se pudo iniciar la operación (%s)\n"
 
-#: src/pacman/remove.c:92
-#, c-format
-msgid "failed to add target '%s' (%s)\n"
+#: src/pacman/remove.c:115
+#, fuzzy, c-format
+msgid "error: failed to add target '%s' (%s)\n"
 msgstr "fallo al procesar '%s' (%s)\n"
 
-#: src/pacman/remove.c:106
-#, c-format
-msgid ":: %s is required by %s\n"
+#: src/pacman/remove.c:131 src/pacman/sync.c:653
+#, fuzzy, c-format
+msgid ":: %s depends on %s\n"
 msgstr ":: %s es requerido por %s\n"
 
-#: src/pacman/remove.c:128
-#: src/pacman/util.c:324
+#: src/pacman/remove.c:155 src/pacman/util.c:384
 msgid "Targets:"
-msgstr "A instalar:"
+msgstr "Paquetes:"
 
-#: src/pacman/remove.c:131
+#: src/pacman/remove.c:158
 msgid ""
 "\n"
 "Do you want to remove these packages? [Y/n] "
@@ -627,308 +973,263 @@ msgstr ""
 "\n"
 "¿Quiere eliminar estos paquetes? [Y/n] "
 
-#: src/pacman/sync.c:115
+#: src/pacman/sync.c:102
 msgid "Do you want to remove old packages from cache? [Y/n] "
 msgstr "Desea quitar los paquetes antiguos de la cache? [Y/n] "
 
-#: src/pacman/sync.c:117
+#: src/pacman/sync.c:104
+#, c-format
 msgid "removing old packages from cache... "
 msgstr "quitando paquetes antiguos de la cache..."
 
-#: src/pacman/sync.c:120
-msgid "could not access cache directory\n"
+#: src/pacman/sync.c:107
+#, fuzzy, c-format
+msgid "error: could not access cache directory\n"
 msgstr "no se pudo acceder al directorio de la cache de paquetes\n"
 
-#: src/pacman/sync.c:181
+#: src/pacman/sync.c:168
 msgid "Do you want to remove all packages from cache? [Y/n] "
 msgstr "Desea borrar todos los paquetes de la cache? [Y/n] "
 
-#: src/pacman/sync.c:183
+#: src/pacman/sync.c:170
+#, c-format
 msgid "removing all packages from cache... "
 msgstr "quitando todos los paquetes de la cache... "
 
-#: src/pacman/sync.c:186
-msgid "could not remove cache directory\n"
+#: src/pacman/sync.c:173
+#, fuzzy, c-format
+msgid "error: could not remove cache directory\n"
 msgstr "no se pudo eliminar el directorio de la cache\n"
 
-#: src/pacman/sync.c:191
-msgid "could not create new cache directory\n"
+#: src/pacman/sync.c:178
+#, fuzzy, c-format
+msgid "error: could not create new cache directory\n"
 msgstr "no se pudo crear el nuevo directorio de la cache\n"
 
-#: src/pacman/sync.c:218
-#, c-format
-msgid "failed to synchronize %s: %s\n"
+#: src/pacman/sync.c:205
+#, fuzzy, c-format
+msgid "error: failed to synchronize %s: %s\n"
 msgstr "falló al sincronizar %s: %s\n"
 
-#: src/pacman/sync.c:220
-#, c-format
-msgid "failed to update %s (%s)\n"
+#: src/pacman/sync.c:208
+#, fuzzy, c-format
+msgid "error: failed to update %s (%s)\n"
 msgstr "falló al actualizar %s (%s)\n"
 
-#: src/pacman/sync.c:223
+#: src/pacman/sync.c:212
 #, c-format
 msgid " %s is up to date\n"
 msgstr " %s está actualizado\n"
 
-#: src/pacman/sync.c:345
-#, c-format
-msgid "repository '%s' does not exist\n"
+#: src/pacman/sync.c:346
+#, fuzzy, c-format
+msgid "error: repository '%s' does not exist\n"
 msgstr "el repositorio  '%s' no existe\n"
 
-#: src/pacman/sync.c:361
-#, c-format
-msgid "package '%s' was not found in repository '%s'\n"
+#: src/pacman/sync.c:362
+#, fuzzy, c-format
+msgid "error: package '%s' was not found in repository '%s'\n"
 msgstr "el paquete  '%s' no fue encontrado en el repositorio '%s'\n"
 
-#: src/pacman/sync.c:381
-#, c-format
-msgid "package '%s' was not found\n"
+#: src/pacman/sync.c:383
+#, fuzzy, c-format
+msgid "error: package '%s' was not found\n"
 msgstr "El paquete '%s' no fue encontrado\n"
 
-#: src/pacman/sync.c:418
-#, c-format
-msgid "repository \"%s\" was not found.\n"
+#: src/pacman/sync.c:421
+#, fuzzy, c-format
+msgid "error: repository \"%s\" was not found.\n"
 msgstr "el repositorio \"%s\" no fue encontrado.\n"
 
-#: src/pacman/sync.c:490
+#: src/pacman/sync.c:509
+#, c-format
 msgid ":: Synchronizing package databases...\n"
 msgstr ":: Sincronizando las bases de datos de paquetes...\n"
 
-#: src/pacman/sync.c:491
+#: src/pacman/sync.c:510
 msgid "synchronizing package lists"
 msgstr "sincronizando la lista de paquetes"
 
-#: src/pacman/sync.c:493
-msgid "failed to synchronize any databases"
+#: src/pacman/sync.c:512
+#, fuzzy, c-format
+msgid "error: failed to synchronize any databases\n"
 msgstr "falló al sincronizar cualquier base de datos."
 
-#: src/pacman/sync.c:499
+#: src/pacman/sync.c:520
+#, c-format
 msgid ":: Starting full system upgrade...\n"
 msgstr ":: iniciando actualización completa del sistema...\n"
 
-#: src/pacman/sync.c:500
+#: src/pacman/sync.c:521
 msgid "starting full system upgrade"
 msgstr "iniciando la actualización completa del sistema"
 
-#: src/pacman/sync.c:518
+#: src/pacman/sync.c:541
+#, c-format
 msgid ""
-"\n"
-":: pacman has detected a newer version of the \"pacman\" package.\n"
+":: 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 seperately, answer no.\n"
 msgstr ""
-"\n"
-":: pacman ha detectado una nueva versión del paquete  \"pacman\".\n"
 
-#: src/pacman/sync.c:519
-msgid ":: It is recommended that you allow pacman to upgrade itself\n"
-msgstr ":: es recomendado que permita a pacman actualizarse a si mismo\n"
+#: src/pacman/sync.c:546
+msgid ":: Cancel current operation? [Y/n] "
+msgstr ""
 
-#: src/pacman/sync.c:520
-msgid ":: first, then you can re-run the operation with the newer version.\n"
-msgstr ":: primero, después puedes volver a ejecutar la operación con la nueva versión.\n"
+#: src/pacman/sync.c:548 src/pacman/sync.c:768
+#, fuzzy, c-format
+msgid "error: failed to release transaction (%s)\n"
+msgstr "fallo al preparar operación (%s)\n"
 
-#: src/pacman/sync.c:522
-msgid ":: Upgrade pacman first? [Y/n] "
-msgstr ":: ¿Actualizar pacman primero? [Y/n] "
+#: src/pacman/sync.c:560
+#, fuzzy, c-format
+msgid "error: pacman: %s\n"
+msgstr "pacman: %s\n"
 
-#: src/pacman/sync.c:537
+#: src/pacman/sync.c:584
 #, c-format
-msgid "pacman: %s\n"
-msgstr "pacman: %s\n"
+msgid "'error: %s': %s\n"
+msgstr ""
 
-#: src/pacman/sync.c:572
+#: src/pacman/sync.c:603
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: ¿Instalar el todo el contenido? [Y/n] "
 
-#: src/pacman/sync.c:579
+#: src/pacman/sync.c:610
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: ¿Instalar %s del grupo %s? [Y/n] "
 
-#: src/pacman/sync.c:603
-#, c-format
-msgid "'%s': not found in sync db\n"
+#: src/pacman/sync.c:634
+#, fuzzy, c-format
+msgid "error: '%s': not found in sync db\n"
 msgstr "'%s': no encontrado en la lista de paquetes\n"
 
-#: src/pacman/sync.c:621
-msgid "requires"
-msgstr "necesita"
-
-#: src/pacman/sync.c:663
+#: src/pacman/sync.c:689
+#, c-format
 msgid " local database is up to date\n"
 msgstr " el sistema está actualizado\n"
 
-#: src/pacman/sync.c:672
-msgid ""
-"\n"
-"Beginning download...\n"
+#: src/pacman/sync.c:701
+#, fuzzy, c-format
+msgid "Beginning download...\n"
 msgstr ""
 "\n"
 "Empezando la descarga...\n"
 
-#: src/pacman/sync.c:676
+#: src/pacman/sync.c:704
 msgid "Proceed with download? [Y/n] "
 msgstr "¿Continuar con la descarga? [Y/n] "
 
-#: src/pacman/sync.c:684
-msgid ""
-"\n"
-"Beginning upgrade process...\n"
+#: src/pacman/sync.c:712
+#, fuzzy, c-format
+msgid "Beginning upgrade process...\n"
 msgstr ""
 "\n"
 "Empezando proceso de actualización...\n"
 
-#: src/pacman/sync.c:688
+#: src/pacman/sync.c:715
 msgid "Proceed with installation? [Y/n] "
 msgstr "¿Continuar con la instalación? [Y/n] "
 
-#: src/pacman/trans.c:55
-msgid "checking dependencies... "
-msgstr "comprobando dependencias... "
-
-#: src/pacman/trans.c:59
-msgid "checking for file conflicts... "
-msgstr "verificando si existen conflictos entre archivos... "
-
-#: src/pacman/trans.c:63
-msgid "cleaning up... "
-msgstr "limpiando..."
-
-#: src/pacman/trans.c:66
-msgid "resolving dependencies... "
-msgstr "resolviendo dependencias... "
-
-#: src/pacman/trans.c:69
-msgid "looking for inter-conflicts... "
-msgstr "verificando conflictos... "
-
-#: src/pacman/trans.c:86
-#, c-format
-msgid "installing %s... "
-msgstr "instalando %s..."
-
-#: src/pacman/trans.c:93
-#, c-format
-msgid "installed %s (%s)"
-msgstr "instalado %s (%s)"
-
-#: src/pacman/trans.c:100
-#, c-format
-msgid "removing %s... "
-msgstr "quitando %s..."
-
-#: src/pacman/trans.c:107
-#, c-format
-msgid "removed %s (%s)"
-msgstr "eliminado %s (%s)"
-
-#: src/pacman/trans.c:114
-#, c-format
-msgid "upgrading %s... "
-msgstr "actualizando %s... "
+#: src/pacman/sync.c:757
+#, fuzzy, c-format
+msgid "Errors occurred, no packages were upgraded.\n"
+msgstr "ocurrieron errores, los paquetes no fueron actualizados\n"
 
-#: src/pacman/trans.c:121
+#: src/pacman/util.c:307
 #, c-format
-msgid "upgraded %s (%s -> %s)"
-msgstr "actualizado %s (%s -> %s)"
-
-#: src/pacman/trans.c:128
-msgid "checking package integrity... "
-msgstr "Verificando la integridad de los paquetes... "
+msgid "None\n"
+msgstr "Nada\n"
 
-#: src/pacman/trans.c:144
-msgid "failed.\n"
-msgstr "falló.\n"
+#: src/pacman/util.c:373
+msgid "Remove:"
+msgstr "Se quitará:"
 
-#: src/pacman/trans.c:151
-#, c-format
-msgid ":: Retrieving packages from %s...\n"
-msgstr ":: Descargando paquetes desde %s...\n"
+#: src/pacman/util.c:381
+#, fuzzy, c-format
+msgid "Total Removed Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Tamaño total eliminado:   %.2f MB\n"
 
-#: src/pacman/trans.c:172
-#, c-format
-msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
-msgstr ":: %1$s requiere %2$s que en los paquetes a ignorar (IgnorePkg). ¿Instalar %2$s? [Y/n] "
+#: src/pacman/util.c:391
+#, fuzzy, c-format
+msgid "Total Package Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Tamaño total de paquetes:   %.2f MB\n"
 
-#: src/pacman/trans.c:177
+#: src/pacman/util.c:399
 #, c-format
-msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
-msgstr ":: %s está en la lista a ignorar. ¿Instalar de todas formas? [Y/n] "
+msgid "Total Installed Size:   %.2f MB\n"
+msgstr "Tamaño total instalado:   %.2f MB\n"
 
-#: src/pacman/trans.c:190
-#, c-format
-msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-msgstr ":: %s está indicado como HoldPkg. ¿Quitar de todas formas? [Y/n] "
+#: src/pacman/util.c:426
+msgid "Y"
+msgstr ""
 
-#: src/pacman/trans.c:203
-#, c-format
-msgid ":: Replace %s with %s/%s? [Y/n] "
-msgstr ":: ¿Reemplazar %s con %s/%s? [Y/n] "
+#: src/pacman/util.c:426
+msgid "YES"
+msgstr ""
 
-#: src/pacman/trans.c:218
+#: src/pacman/util.c:487
 #, c-format
-msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
-msgstr ":: %s provoca conflictos con  %s. ¿Quitar %s? [Y/n]"
+msgid "debug: "
+msgstr ""
 
-#: src/pacman/trans.c:234
+#: src/pacman/util.c:490
 #, c-format
-msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
-msgstr ":: %s-%s: la versión local es mas reciente. ¿Actualizar de todas formas? [Y/n] "
+msgid "error: "
+msgstr ""
 
-#: src/pacman/trans.c:252
+#: src/pacman/util.c:493
 #, c-format
-msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
-msgstr ":: %s-%s: la versión local está actualizada. ¿Actualizar de todas formas? [Y/n] "
+msgid "warning: "
+msgstr ""
 
-#: src/pacman/trans.c:270
+#: src/pacman/util.c:498
 #, c-format
-msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
-msgstr ":: El Archivo %s está corrupto. Desea borrarlo? [Y/n] "
+msgid "function: "
+msgstr ""
 
-#: src/pacman/trans.c:326
-msgid "installing"
-msgstr "instalando"
+#~ msgid "Removes        :"
+#~ msgstr "Elimina           :"
 
-#: src/pacman/trans.c:329
-msgid "upgrading"
-msgstr "actualizando"
+#~ msgid "failed to parse config (%s)\n"
+#~ msgstr "falló al analizar la configuración (%s)\n"
 
-#: src/pacman/trans.c:332
-msgid "removing"
-msgstr "quitando"
+#~ msgid "Targets  :"
+#~ msgstr "Objetivos  : "
 
-#: src/pacman/trans.c:335
-msgid "checking for file conflicts"
-msgstr "verificando conflictos entre archivos"
+#~ msgid ""
+#~ "\n"
+#~ ":: pacman has detected a newer version of the \"pacman\" package.\n"
+#~ msgstr ""
+#~ "\n"
+#~ ":: pacman ha detectado una nueva versión del paquete  \"pacman\".\n"
 
-#: src/pacman/util.c:259
-#, c-format
-msgid "None\n"
-msgstr "Nada\n"
+#~ msgid ":: It is recommended that you allow pacman to upgrade itself\n"
+#~ msgstr ":: es recomendado que permita a pacman actualizarse a si mismo\n"
 
-#: src/pacman/util.c:311
-msgid "Remove:"
-msgstr "Se quitará:"
+#~ msgid ""
+#~ ":: first, then you can re-run the operation with the newer version.\n"
+#~ msgstr ""
+#~ ":: primero, después puedes volver a ejecutar la operación con la nueva "
+#~ "versión.\n"
 
-#: src/pacman/util.c:319
-#, c-format
-msgid ""
-"\n"
-"Total Removed Size:   %.2f MB\n"
-msgstr ""
-"\n"
-"Tamaño total eliminado:   %.2f MB\n"
+#~ msgid ":: Upgrade pacman first? [Y/n] "
+#~ msgstr ":: ¿Actualizar pacman primero? [Y/n] "
 
-#: src/pacman/util.c:330
-#, c-format
-msgid ""
-"\n"
-"Total Package Size:   %.2f MB\n"
-msgstr ""
-"\n"
-"Tamaño total de paquetes:   %.2f MB\n"
+#~ msgid "requires"
+#~ msgstr "necesita"
 
-#: src/pacman/util.c:337
-#, c-format
-msgid "Total Installed Size:   %.2f MB\n"
-msgstr "Tamaño total instalado:   %.2f MB\n"
+#~ msgid "cleaning up... "
+#~ msgstr "limpiando..."
 
+#~ msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
+#~ msgstr ""
+#~ ":: %1$s requiere %2$s que en los paquetes a ignorar (IgnorePkg). "
+#~ "¿Instalar %2$s? [Y/n] "
diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot
index f9d28a4..d4dbec8 100644
--- a/src/pacman/po/pacman.pot
+++ b/src/pacman/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: 2007-04-25 02:56-0400\n"
+"POT-Creation-Date: 2007-06-18 11:15+0200\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"
@@ -16,350 +16,438 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482
-#: src/pacman/sync.c:531
+#: src/pacman/add.c:44 src/pacman/remove.c:46
+#, c-format
+msgid "failed to release transaction (%s)\n"
+msgstr ""
+
+#: src/pacman/add.c:81 src/pacman/query.c:408 src/pacman/remove.c:67
+#: src/pacman/sync.c:491
+msgid "no targets specified (use -h for help)\n"
+msgstr ""
+
+#: src/pacman/add.c:108 src/pacman/pacman.c:226 src/pacman/sync.c:523
+#, c-format
+msgid "error: %s\n"
+msgstr ""
+
+#: src/pacman/add.c:111 src/pacman/remove.c:102 src/pacman/sync.c:501
 #, c-format
 msgid ""
-"       if you're sure a package manager is not already running,\n"
-"       you can remove %s%s\n"
+"  if you're sure a package manager is not already\n"
+"  running, you can remove %s.\n"
 msgstr ""
 
-#: src/pacman/add.c:79
+#: src/pacman/add.c:118 src/pacman/remove.c:110
+#, c-format
 msgid "loading package data... "
 msgstr ""
 
-#: src/pacman/add.c:83
+#: src/pacman/add.c:122
 #, c-format
-msgid "failed to add target '%s' (%s)"
+msgid "error: failed to add target '%s' (%s)"
 msgstr ""
 
-#: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
-#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
-#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
+#: src/pacman/add.c:128 src/pacman/callback.c:181 src/pacman/callback.c:187
+#: src/pacman/callback.c:198 src/pacman/callback.c:212
+#: src/pacman/callback.c:226 src/pacman/callback.c:238
+#: src/pacman/callback.c:249 src/pacman/sync.c:183
+#, c-format
 msgid "done.\n"
 msgstr ""
 
-#: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616
+#: src/pacman/add.c:133 src/pacman/remove.c:125 src/pacman/sync.c:646
 #, c-format
-msgid "failed to prepare transaction (%s)\n"
+msgid "error: failed to prepare transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/add.c:104
+#: src/pacman/add.c:143
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ""
 
-#: src/pacman/add.c:125 src/pacman/sync.c:643
+#: src/pacman/add.c:164 src/pacman/sync.c:675
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ""
 
-#: src/pacman/add.c:134 src/pacman/sync.c:707
+#: src/pacman/add.c:173 src/pacman/sync.c:735
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr ""
 
-#: src/pacman/add.c:140 src/pacman/sync.c:713
+#: src/pacman/add.c:179 src/pacman/sync.c:741
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr ""
 
-#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725
+#: src/pacman/add.c:185
+#, c-format
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
 msgstr ""
 
-#: src/pacman/add.c:156 src/pacman/sync.c:650
+#: src/pacman/add.c:198 src/pacman/remove.c:168 src/pacman/sync.c:726
 #, c-format
-msgid ":: %.1f MB required, have %.1f MB"
+msgid "error: failed to commit transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
+#: src/pacman/callback.c:166
 #, c-format
-msgid "failed to commit transaction (%s)\n"
+msgid "checking dependencies... "
 msgstr ""
 
-#: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
-#: src/pacman/sync.c:741
+#: src/pacman/callback.c:170
 #, c-format
-msgid "failed to release transaction (%s)\n"
+msgid "checking for file conflicts... "
+msgstr ""
+
+#: src/pacman/callback.c:174
+#, c-format
+msgid "resolving dependencies... "
 msgstr ""
 
-#: src/pacman/log.c:63
+#: src/pacman/callback.c:177
 #, c-format
-msgid "debug"
+msgid "looking for inter-conflicts... "
 msgstr ""
 
-#: src/pacman/log.c:66
+#: src/pacman/callback.c:193
 #, c-format
-msgid "error"
+msgid "installing %s... "
 msgstr ""
 
-#: src/pacman/log.c:69
+#: src/pacman/callback.c:200
 #, c-format
-msgid "warning"
+msgid "installed %s (%s)"
 msgstr ""
 
-#: src/pacman/log.c:75
+#: src/pacman/callback.c:207
 #, c-format
-msgid "function"
+msgid "removing %s... "
 msgstr ""
 
-#: src/pacman/log.c:194
-msgid "Y"
+#: src/pacman/callback.c:214
+#, c-format
+msgid "removed %s (%s)"
 msgstr ""
 
-#: src/pacman/log.c:194
-msgid "YES"
+#: src/pacman/callback.c:221
+#, c-format
+msgid "upgrading %s... "
 msgstr ""
 
-#: src/pacman/log.h:30
-msgid "error: "
+#: src/pacman/callback.c:228
+#, c-format
+msgid "upgraded %s (%s -> %s)"
 msgstr ""
 
-#: src/pacman/log.h:34
-msgid "warning: "
+#: src/pacman/callback.c:235
+#, c-format
+msgid "checking package integrity... "
+msgstr ""
+
+#: src/pacman/callback.c:251
+#, c-format
+msgid "failed.\n"
+msgstr ""
+
+#: src/pacman/callback.c:258
+#, c-format
+msgid ":: Retrieving packages from %s...\n"
+msgstr ""
+
+#: src/pacman/callback.c:281
+#, c-format
+msgid ":: %s requires installing %s from IgnorePkg. Install anyway? [Y/n] "
+msgstr ""
+
+#: src/pacman/callback.c:286
+#, c-format
+msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
+msgstr ""
+
+#: src/pacman/callback.c:299
+#, c-format
+msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
+msgstr ""
+
+#: src/pacman/callback.c:312
+#, c-format
+msgid ":: Replace %s with %s/%s? [Y/n] "
+msgstr ""
+
+#: src/pacman/callback.c:327
+#, c-format
+msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
+msgstr ""
+
+#: src/pacman/callback.c:343
+#, c-format
+msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
+msgstr ""
+
+#: src/pacman/callback.c:361
+#, c-format
+msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
+msgstr ""
+
+#: src/pacman/callback.c:379
+#, c-format
+msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ""
 
-#: src/pacman/package.c:60
+#: src/pacman/callback.c:430
+msgid "installing"
+msgstr ""
+
+#: src/pacman/callback.c:433
+msgid "upgrading"
+msgstr ""
+
+#: src/pacman/callback.c:436
+msgid "removing"
+msgstr ""
+
+#: src/pacman/callback.c:439
+msgid "checking for file conflicts"
+msgstr ""
+
+#: src/pacman/package.c:58
 msgid "Explicitly installed"
 msgstr ""
 
-#: src/pacman/package.c:63
+#: src/pacman/package.c:61
 msgid "Installed as a dependency for another package"
 msgstr ""
 
-#: src/pacman/package.c:66 src/pacman/package.c:91
+#: src/pacman/package.c:64 src/pacman/package.c:88
 msgid "Unknown"
 msgstr ""
 
-#: src/pacman/package.c:70 src/pacman/package.c:122
+#: src/pacman/package.c:68 src/pacman/package.c:119
 msgid "Description    : "
 msgstr ""
 
-#: src/pacman/package.c:73 src/pacman/package.c:128
+#: src/pacman/package.c:71 src/pacman/package.c:125
 #, c-format
 msgid "Name           : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:74 src/pacman/package.c:129
+#: src/pacman/package.c:72 src/pacman/package.c:126
 #, c-format
 msgid "Version        : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:75
+#: src/pacman/package.c:73
 #, c-format
 msgid "URL            : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:76
+#: src/pacman/package.c:74
 msgid "License        :"
 msgstr ""
 
-#: src/pacman/package.c:77 src/pacman/package.c:130
+#: src/pacman/package.c:75 src/pacman/package.c:127
 msgid "Groups         :"
 msgstr ""
 
-#: src/pacman/package.c:78 src/pacman/package.c:131
+#: src/pacman/package.c:76 src/pacman/package.c:128
 msgid "Provides       :"
 msgstr ""
 
-#: src/pacman/package.c:79 src/pacman/package.c:132
+#: src/pacman/package.c:77 src/pacman/package.c:129
 msgid "Depends On     :"
 msgstr ""
 
-#: src/pacman/package.c:80 src/pacman/package.c:133
-msgid "Removes        :"
-msgstr ""
-
-#: src/pacman/package.c:83
+#: src/pacman/package.c:80
 msgid "Required By    :"
 msgstr ""
 
-#: src/pacman/package.c:85 src/pacman/package.c:134
+#: src/pacman/package.c:82 src/pacman/package.c:130
 msgid "Conflicts With :"
 msgstr ""
 
-#: src/pacman/package.c:86 src/pacman/package.c:135
+#: src/pacman/package.c:83 src/pacman/package.c:131
 msgid "Replaces       :"
 msgstr ""
 
-#: src/pacman/package.c:87 src/pacman/package.c:137
+#: src/pacman/package.c:84 src/pacman/package.c:133
 #, c-format
 msgid "Installed Size : %6.2f K\n"
 msgstr ""
 
-#: src/pacman/package.c:88
+#: src/pacman/package.c:85
 #, c-format
 msgid "Packager       : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:89
+#: src/pacman/package.c:86
 #, c-format
 msgid "Architecture   : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:90
+#: src/pacman/package.c:87
 #, c-format
 msgid "Build Date     : %s %s\n"
 msgstr ""
 
-#: src/pacman/package.c:91
+#: src/pacman/package.c:88
 #, c-format
 msgid "Build Type     : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:93
+#: src/pacman/package.c:90
 #, c-format
 msgid "Install Date   : %s %s\n"
 msgstr ""
 
-#: src/pacman/package.c:94
+#: src/pacman/package.c:91
 #, c-format
 msgid "Install Reason : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:96
+#: src/pacman/package.c:93
 #, c-format
 msgid "Install Script : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:97
+#: src/pacman/package.c:94
 msgid "Yes"
 msgstr ""
 
-#: src/pacman/package.c:97
+#: src/pacman/package.c:94
 msgid "No"
 msgstr ""
 
-#: src/pacman/package.c:127
+#: src/pacman/package.c:124
 #, c-format
 msgid "Repository     : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:136
+#: src/pacman/package.c:132
 #, c-format
 msgid "Download Size  : %6.2f K\n"
 msgstr ""
 
-#: src/pacman/package.c:145
+#: src/pacman/package.c:141
 #, c-format
 msgid "MD5 Sum        : %s"
 msgstr ""
 
-#: src/pacman/package.c:148
+#: src/pacman/package.c:144
 #, c-format
 msgid "SHA1 Sum       : %s"
 msgstr ""
 
-#: src/pacman/package.c:159
+#: src/pacman/package.c:155
 #, c-format
 msgid "Backup Files:\n"
 msgstr ""
 
-#: src/pacman/package.c:181
+#: src/pacman/package.c:177
 #, c-format
-msgid "error calculating checksums for %s\n"
+msgid "error: could not calculate checksums for %s\n"
 msgstr ""
 
-#: src/pacman/package.c:194
+#: src/pacman/package.c:191
 #, c-format
 msgid "MODIFIED\t%s\n"
 msgstr ""
 
-#: src/pacman/package.c:196
+#: src/pacman/package.c:193
 #, c-format
 msgid "Not Modified\t%s\n"
 msgstr ""
 
-#: src/pacman/package.c:201
+#: src/pacman/package.c:198
 #, c-format
 msgid "MISSING\t\t%s\n"
 msgstr ""
 
-#: src/pacman/package.c:207
+#: src/pacman/package.c:204
 #, c-format
 msgid "(none)\n"
 msgstr ""
 
-#: src/pacman/package.c:247
+#: src/pacman/package.c:244
 #, c-format
-msgid "No changelog available for '%s'.\n"
+msgid "error: no changelog available for '%s'.\n"
 msgstr ""
 
-#: src/pacman/pacman.c:94
+#: src/pacman/pacman.c:69
 msgid "options"
 msgstr ""
 
-#: src/pacman/pacman.c:95
+#: src/pacman/pacman.c:70
 msgid "file"
 msgstr ""
 
-#: src/pacman/pacman.c:96
+#: src/pacman/pacman.c:71
 msgid "package"
 msgstr ""
 
-#: src/pacman/pacman.c:97
+#: src/pacman/pacman.c:72
 msgid "usage"
 msgstr ""
 
-#: src/pacman/pacman.c:98
+#: src/pacman/pacman.c:73
 msgid "operation"
 msgstr ""
 
-#: src/pacman/pacman.c:111
+#: src/pacman/pacman.c:86
 #, c-format
 msgid ""
 "\n"
 "use '%s --help' with other options for more syntax\n"
 msgstr ""
 
-#: src/pacman/pacman.c:116 src/pacman/pacman.c:123 src/pacman/pacman.c:134
-#: src/pacman/pacman.c:154
+#: src/pacman/pacman.c:91 src/pacman/pacman.c:98 src/pacman/pacman.c:109
+#: src/pacman/pacman.c:130
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr ""
 
-#: src/pacman/pacman.c:117 src/pacman/pacman.c:135 src/pacman/pacman.c:156
+#: src/pacman/pacman.c:92 src/pacman/pacman.c:110 src/pacman/pacman.c:132
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr ""
 
-#: src/pacman/pacman.c:120
+#: src/pacman/pacman.c:95
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
 msgstr ""
 
-#: src/pacman/pacman.c:122
+#: src/pacman/pacman.c:97
 #, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
 msgstr ""
 
-#: src/pacman/pacman.c:124
+#: src/pacman/pacman.c:99
 #, c-format
 msgid ""
 "  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr ""
 
-#: src/pacman/pacman.c:125
+#: src/pacman/pacman.c:100
 #, c-format
 msgid "  -n, --nosave         remove configuration files as well\n"
 msgstr ""
 
-#: src/pacman/pacman.c:126
+#: src/pacman/pacman.c:101
 #, c-format
 msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:139
+#: src/pacman/pacman.c:114
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
 msgstr ""
 
-#: src/pacman/pacman.c:140
+#: src/pacman/pacman.c:115
 #, c-format
 msgid ""
 "  -e, --orphans        list all packages installed as dependencies but no "
@@ -367,603 +455,668 @@ msgid ""
 "                       required by any package\n"
 msgstr ""
 
-#: src/pacman/pacman.c:142 src/pacman/pacman.c:157
+#: src/pacman/pacman.c:117 src/pacman/pacman.c:133
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
 msgstr ""
 
-#: src/pacman/pacman.c:143 src/pacman/pacman.c:158
+#: src/pacman/pacman.c:118 src/pacman/pacman.c:134
 #, c-format
 msgid "  -i, --info           view package information\n"
 msgstr ""
 
-#: src/pacman/pacman.c:144
+#: src/pacman/pacman.c:119
 #, c-format
 msgid "  -l, --list           list the contents of the queried package\n"
 msgstr ""
 
-#: src/pacman/pacman.c:145
+#: src/pacman/pacman.c:120
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:146
+#: src/pacman/pacman.c:121
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
 msgstr ""
 
-#: src/pacman/pacman.c:147
+#: src/pacman/pacman.c:122
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
 
-#: src/pacman/pacman.c:148
+#: src/pacman/pacman.c:123
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
 
-#: src/pacman/pacman.c:149
+#: src/pacman/pacman.c:124
+#, c-format
+msgid "  -t, --test           check the consistency of the local database\n"
+msgstr ""
+
+#: src/pacman/pacman.c:125
 #, c-format
 msgid "  -u, --upgrades       list all packages that can be upgraded\n"
 msgstr ""
 
-#: src/pacman/pacman.c:153
+#: src/pacman/pacman.c:129
 #, c-format
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:155
+#: src/pacman/pacman.c:131
 #, c-format
 msgid "  -e, --dependsonly    install dependencies only\n"
 msgstr ""
 
-#: src/pacman/pacman.c:159
+#: src/pacman/pacman.c:135
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
 msgstr ""
 
-#: src/pacman/pacman.c:160
+#: src/pacman/pacman.c:136
 #, c-format
 msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
 msgstr ""
 
-#: src/pacman/pacman.c:161
+#: src/pacman/pacman.c:137
 #, c-format
 msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 
-#: src/pacman/pacman.c:162
+#: src/pacman/pacman.c:138
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr ""
 
-#: src/pacman/pacman.c:163
+#: src/pacman/pacman.c:139
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
 msgstr ""
 
-#: src/pacman/pacman.c:164
+#: src/pacman/pacman.c:140
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 msgstr ""
 
-#: src/pacman/pacman.c:165
+#: src/pacman/pacman.c:141
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:167
+#: src/pacman/pacman.c:143
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr ""
 
-#: src/pacman/pacman.c:168
+#: src/pacman/pacman.c:144
 #, c-format
 msgid "      --noconfirm      do not ask for any confirmation\n"
 msgstr ""
 
-#: src/pacman/pacman.c:169
+#: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "      --ask <number>   pre-specify answers for questions (see manpage)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:170
+#: src/pacman/pacman.c:146
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""
 
-#: src/pacman/pacman.c:171
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
 msgstr ""
 
-#: src/pacman/pacman.c:172
+#: src/pacman/pacman.c:148
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
 msgstr ""
 
-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:149
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
 
-#: src/pacman/pacman.c:174
+#: src/pacman/pacman.c:150
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr ""
 
-#: src/pacman/pacman.c:175
+#: src/pacman/pacman.c:151
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr ""
 
-#: src/pacman/pacman.c:189
+#: src/pacman/pacman.c:152
+#, c-format
+msgid "      --lock <file>    set an alternate lockfile location\n"
+msgstr ""
+
+#: src/pacman/pacman.c:166
 #, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License\n"
 msgstr ""
 
-#: src/pacman/pacman.c:340
+#: src/pacman/pacman.c:328
 #, c-format
-msgid "'%s' is not a valid debug level"
+msgid "error: '%s' is not a valid debug level\n"
 msgstr ""
 
-#: src/pacman/pacman.c:355
+#: src/pacman/pacman.c:344
 #, c-format
-msgid "'%s' is not a valid cache directory\n"
+msgid "error: '%s' is not a valid cache directory\n"
 msgstr ""
 
-#: src/pacman/pacman.c:373
+#: src/pacman/pacman.c:366
 #, c-format
-msgid "'%s' is not a valid db path\n"
+msgid "error: '%s' is not a valid db path\n"
 msgstr ""
 
-#: src/pacman/pacman.c:403
+#: src/pacman/pacman.c:397
 #, c-format
-msgid "'%s' is not a valid root path\n"
+msgid "error: '%s' is not a valid root path\n"
 msgstr ""
 
-#: src/pacman/pacman.c:430
-msgid "only one operation may be used at a time\n"
+#: src/pacman/pacman.c:428
+#, c-format
+msgid "error: only one operation may be used at a time\n"
 msgstr ""
 
-#: src/pacman/pacman.c:489
+#: src/pacman/pacman.c:461
 #, c-format
-msgid "failed to initialize alpm library (%s)\n"
+msgid "config: attempting to read file %s\n"
 msgstr ""
 
-#: src/pacman/pacman.c:522
-msgid "you cannot perform this operation unless you are root.\n"
+#: src/pacman/pacman.c:464
+#, c-format
+msgid "config file %s could not be read.\n"
 msgstr ""
 
-#: src/pacman/pacman.c:538
+#: src/pacman/pacman.c:497
 #, c-format
-msgid "failed to parse config (%s)\n"
+msgid "config: new section '%s'\n"
 msgstr ""
 
-#: src/pacman/pacman.c:549
-msgid "Targets  :"
+#: src/pacman/pacman.c:499
+#, c-format
+msgid "config file %s, line %d: bad section name.\n"
 msgstr ""
 
-#: src/pacman/pacman.c:555
+#: src/pacman/pacman.c:505
 #, c-format
-msgid "could not register 'local' database (%s)\n"
+msgid "config file %s, line %d: 'local' cannot be used as section name.\n"
 msgstr ""
 
-#: src/pacman/pacman.c:562
-msgid "no targets specified (use -h for help)\n"
+#: src/pacman/pacman.c:525
+#, c-format
+msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
 
-#: src/pacman/pacman.c:575
-msgid "no operation specified (use -h for help)\n"
+#: src/pacman/pacman.c:531
+#, c-format
+msgid ""
+"config file %s, line %d: 'Include' directive must belong to a section.\n"
 msgstr ""
 
-#: src/pacman/query.c:90
-msgid "no file was specified for --owns\n"
+#: src/pacman/pacman.c:540
+msgid "config: nopassiveftp\n"
 msgstr ""
 
-#: src/pacman/query.c:95
-#, c-format
-msgid "failed to read file '%s': %s"
+#: src/pacman/pacman.c:543
+msgid "config: usesyslog\n"
 msgstr ""
 
-#: src/pacman/query.c:100
-msgid "cannot determine ownership of a directory"
+#: src/pacman/pacman.c:546
+msgid "config: chomp\n"
 msgstr ""
 
-#: src/pacman/query.c:105
-#, c-format
-msgid "cannot determine real path for '%s': %s"
+#: src/pacman/pacman.c:549
+msgid "config: usecolor\n"
 msgstr ""
 
-#: src/pacman/query.c:119
-#, c-format
-msgid "%s is owned by %s %s\n"
+#: src/pacman/pacman.c:552
+msgid "config: showsize\n"
 msgstr ""
 
-#: src/pacman/query.c:127
+#: src/pacman/pacman.c:554 src/pacman/pacman.c:645 src/pacman/pacman.c:660
 #, c-format
-msgid "No package owns %s\n"
+msgid "config file %s, line %d: directive '%s' not recognized.\n"
 msgstr ""
 
-#: src/pacman/query.c:170 src/pacman/sync.c:453
-msgid "no usable package repositories configured.\n"
+#: src/pacman/pacman.c:562
+#, c-format
+msgid "config: including %s\n"
 msgstr ""
 
-#: src/pacman/query.c:176
-msgid "Checking for package upgrades..."
+#: src/pacman/pacman.c:576 src/pacman/pacman.c:581
+#, c-format
+msgid "config: noupgrade: %s\n"
 msgstr ""
 
-#: src/pacman/query.c:183
-msgid "no upgrades found"
+#: src/pacman/pacman.c:589 src/pacman/pacman.c:594
+#, c-format
+msgid "config: noextract: %s\n"
 msgstr ""
 
-#: src/pacman/query.c:221
+#: src/pacman/pacman.c:602
 #, c-format
-msgid "group \"%s\" was not found\n"
+msgid "config: ignorepkg: %s"
 msgstr ""
 
-#: src/pacman/query.c:232
-msgid "no package file was specified for --file\n"
+#: src/pacman/pacman.c:607
+#, c-format
+msgid "config: ignorepkg: %s\n"
 msgstr ""
 
-#: src/pacman/query.c:236
+#: src/pacman/pacman.c:615 src/pacman/pacman.c:620
 #, c-format
-msgid "failed to load package '%s' (%s)\n"
+msgid "config: holdpkg: %s\n"
 msgstr ""
 
-#: src/pacman/query.c:273 src/pacman/query.c:305
+#: src/pacman/pacman.c:623
 #, c-format
-msgid "package \"%s\" not found\n"
+msgid "config: dbpath: %s\n"
 msgstr ""
 
-#: src/pacman/remove.c:61 src/pacman/sync.c:568
+#: src/pacman/pacman.c:626
 #, c-format
-msgid ":: group %s:\n"
+msgid "config: cachedir: %s\n"
 msgstr ""
 
-#: src/pacman/remove.c:63
-msgid "    Remove whole content? [Y/n] "
+#: src/pacman/pacman.c:629
+#, c-format
+msgid "config: rootdir: %s\n"
 msgstr ""
 
-#: src/pacman/remove.c:67
+#: src/pacman/pacman.c:632
 #, c-format
-msgid ":: Remove %s from group %s? [Y/n] "
+msgid "config: logfile: %s\n"
 msgstr ""
 
-#: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529
+#: src/pacman/pacman.c:635
 #, c-format
-msgid "failed to init transaction (%s)\n"
+msgid "config: lockfile: %s\n"
 msgstr ""
 
-#: src/pacman/remove.c:92
+#: src/pacman/pacman.c:638
 #, c-format
-msgid "failed to add target '%s' (%s)\n"
+msgid "config: xfercommand: %s\n"
 msgstr ""
 
-#: src/pacman/remove.c:106
+#: src/pacman/pacman.c:643
 #, c-format
-msgid ":: %s is required by %s\n"
+msgid "config: upgradedelay: %d\n"
 msgstr ""
 
-#: src/pacman/remove.c:128 src/pacman/util.c:324
-msgid "Targets:"
+#: src/pacman/pacman.c:725
+#, c-format
+msgid "error: failed to initialize alpm library (%s)\n"
 msgstr ""
 
-#: src/pacman/remove.c:131
-msgid ""
-"\n"
-"Do you want to remove these packages? [Y/n] "
+#: src/pacman/pacman.c:764
+#, c-format
+msgid "error: you cannot perform this operation unless you are root.\n"
 msgstr ""
 
-#: src/pacman/sync.c:115
-msgid "Do you want to remove old packages from cache? [Y/n] "
+#: src/pacman/pacman.c:790
+#, c-format
+msgid "error: could not register 'local' database (%s)\n"
 msgstr ""
 
-#: src/pacman/sync.c:117
-msgid "removing old packages from cache... "
+#: src/pacman/pacman.c:816
+#, c-format
+msgid "error: no operation specified (use -h for help)\n"
 msgstr ""
 
-#: src/pacman/sync.c:120
-msgid "could not access cache directory\n"
+#: src/pacman/query.c:69
+#, c-format
+msgid "error: no file was specified for --owns\n"
 msgstr ""
 
-#: src/pacman/sync.c:181
-msgid "Do you want to remove all packages from cache? [Y/n] "
+#: src/pacman/query.c:81
+#, c-format
+msgid "error: failed to read file '%s': %s\n"
 msgstr ""
 
-#: src/pacman/sync.c:183
-msgid "removing all packages from cache... "
+#: src/pacman/query.c:88
+#, c-format
+msgid "error: cannot determine ownership of a directory\n"
 msgstr ""
 
-#: src/pacman/sync.c:186
-msgid "could not remove cache directory\n"
+#: src/pacman/query.c:94
+#, c-format
+msgid "error: cannot determine real path for '%s': %s\n"
 msgstr ""
 
-#: src/pacman/sync.c:191
-msgid "could not create new cache directory\n"
+#: src/pacman/query.c:111
+#, c-format
+msgid "%s is owned by %s %s\n"
 msgstr ""
 
-#: src/pacman/sync.c:218
+#: src/pacman/query.c:119
 #, c-format
-msgid "failed to synchronize %s: %s\n"
+msgid "error: No package owns %s\n"
 msgstr ""
 
-#: src/pacman/sync.c:220
+#: src/pacman/query.c:206
 #, c-format
-msgid "failed to update %s (%s)\n"
+msgid "error: group \"%s\" was not found\n"
 msgstr ""
 
-#: src/pacman/sync.c:223
+#: src/pacman/query.c:221
 #, c-format
-msgid " %s is up to date\n"
+msgid "error: no package file was specified for --file\n"
 msgstr ""
 
-#: src/pacman/sync.c:345
+#: src/pacman/query.c:227
 #, c-format
-msgid "repository '%s' does not exist\n"
+msgid "error: failed to load package '%s' (%s)\n"
 msgstr ""
 
-#: src/pacman/sync.c:361
+#: src/pacman/query.c:254
 #, c-format
-msgid "package '%s' was not found in repository '%s'\n"
+msgid "Checking database for consistency..."
 msgstr ""
 
-#: src/pacman/sync.c:381
+#: src/pacman/query.c:257
 #, c-format
-msgid "package '%s' was not found\n"
+msgid "check complete.\n"
 msgstr ""
 
-#: src/pacman/sync.c:418
+#: src/pacman/query.c:262
 #, c-format
-msgid "repository \"%s\" was not found.\n"
+msgid "check failed!\n"
 msgstr ""
 
-#: src/pacman/sync.c:490
-msgid ":: Synchronizing package databases...\n"
+#: src/pacman/query.c:274
+#, c-format
+msgid "Checking for package upgrades..."
 msgstr ""
 
-#: src/pacman/sync.c:491
-msgid "synchronizing package lists"
+#: src/pacman/query.c:282
+#, c-format
+msgid "no upgrades found"
 msgstr ""
 
-#: src/pacman/sync.c:493
-msgid "failed to synchronize any databases"
+#: src/pacman/query.c:294 src/pacman/sync.c:462
+msgid "no usable package repositories configured.\n"
 msgstr ""
 
-#: src/pacman/sync.c:499
-msgid ":: Starting full system upgrade...\n"
+#: src/pacman/query.c:430
+#, c-format
+msgid "error: package \"%s\" not found\n"
 msgstr ""
 
-#: src/pacman/sync.c:500
-msgid "starting full system upgrade"
+#: src/pacman/remove.c:80 src/pacman/sync.c:598
+#, c-format
+msgid ":: group %s:\n"
 msgstr ""
 
-#: src/pacman/sync.c:518
-msgid ""
-"\n"
-":: pacman has detected a newer version of the \"pacman\" package.\n"
+#: src/pacman/remove.c:82
+msgid "    Remove whole content? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:519
-msgid ":: It is recommended that you allow pacman to upgrade itself\n"
+#: src/pacman/remove.c:86
+#, c-format
+msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:520
-msgid ":: first, then you can re-run the operation with the newer version.\n"
+#: src/pacman/remove.c:99 src/pacman/sync.c:498 src/pacman/sync.c:555
+#, c-format
+msgid "error: failed to init transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/sync.c:522
-msgid ":: Upgrade pacman first? [Y/n] "
+#: src/pacman/remove.c:115
+#, c-format
+msgid "error: failed to add target '%s' (%s)\n"
 msgstr ""
 
-#: src/pacman/sync.c:537
+#: src/pacman/remove.c:131 src/pacman/sync.c:653
 #, c-format
-msgid "pacman: %s\n"
+msgid ":: %s depends on %s\n"
 msgstr ""
 
-#: src/pacman/sync.c:572
-msgid ":: Install whole content? [Y/n] "
+#: src/pacman/remove.c:155 src/pacman/util.c:384
+msgid "Targets:"
 msgstr ""
 
-#: src/pacman/sync.c:579
-#, c-format
-msgid ":: Install %s from group %s? [Y/n] "
+#: src/pacman/remove.c:158
+msgid ""
+"\n"
+"Do you want to remove these packages? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:603
-#, c-format
-msgid "'%s': not found in sync db\n"
+#: src/pacman/sync.c:102
+msgid "Do you want to remove old packages from cache? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:621
-msgid "requires"
+#: src/pacman/sync.c:104
+#, c-format
+msgid "removing old packages from cache... "
 msgstr ""
 
-#: src/pacman/sync.c:663
-msgid " local database is up to date\n"
+#: src/pacman/sync.c:107
+#, c-format
+msgid "error: could not access cache directory\n"
 msgstr ""
 
-#: src/pacman/sync.c:672
-msgid ""
-"\n"
-"Beginning download...\n"
+#: src/pacman/sync.c:168
+msgid "Do you want to remove all packages from cache? [Y/n] "
 msgstr ""
 
-#: src/pacman/sync.c:676
-msgid "Proceed with download? [Y/n] "
+#: src/pacman/sync.c:170
+#, c-format
+msgid "removing all packages from cache... "
 msgstr ""
 
-#: src/pacman/sync.c:684
-msgid ""
-"\n"
-"Beginning upgrade process...\n"
+#: src/pacman/sync.c:173
+#, c-format
+msgid "error: could not remove cache directory\n"
 msgstr ""
 
-#: src/pacman/sync.c:688
-msgid "Proceed with installation? [Y/n] "
+#: src/pacman/sync.c:178
+#, c-format
+msgid "error: could not create new cache directory\n"
 msgstr ""
 
-#: src/pacman/trans.c:55
-msgid "checking dependencies... "
+#: src/pacman/sync.c:205
+#, c-format
+msgid "error: failed to synchronize %s: %s\n"
 msgstr ""
 
-#: src/pacman/trans.c:59
-msgid "checking for file conflicts... "
+#: src/pacman/sync.c:208
+#, c-format
+msgid "error: failed to update %s (%s)\n"
 msgstr ""
 
-#: src/pacman/trans.c:63
-msgid "cleaning up... "
+#: src/pacman/sync.c:212
+#, c-format
+msgid " %s is up to date\n"
 msgstr ""
 
-#: src/pacman/trans.c:66
-msgid "resolving dependencies... "
+#: src/pacman/sync.c:346
+#, c-format
+msgid "error: repository '%s' does not exist\n"
 msgstr ""
 
-#: src/pacman/trans.c:69
-msgid "looking for inter-conflicts... "
+#: src/pacman/sync.c:362
+#, c-format
+msgid "error: package '%s' was not found in repository '%s'\n"
 msgstr ""
 
-#: src/pacman/trans.c:86
+#: src/pacman/sync.c:383
 #, c-format
-msgid "installing %s... "
+msgid "error: package '%s' was not found\n"
 msgstr ""
 
-#: src/pacman/trans.c:93
+#: src/pacman/sync.c:421
 #, c-format
-msgid "installed %s (%s)"
+msgid "error: repository \"%s\" was not found.\n"
 msgstr ""
 
-#: src/pacman/trans.c:100
+#: src/pacman/sync.c:509
 #, c-format
-msgid "removing %s... "
+msgid ":: Synchronizing package databases...\n"
 msgstr ""
 
-#: src/pacman/trans.c:107
-#, c-format
-msgid "removed %s (%s)"
+#: src/pacman/sync.c:510
+msgid "synchronizing package lists"
 msgstr ""
 
-#: src/pacman/trans.c:114
+#: src/pacman/sync.c:512
 #, c-format
-msgid "upgrading %s... "
+msgid "error: failed to synchronize any databases\n"
 msgstr ""
 
-#: src/pacman/trans.c:121
+#: src/pacman/sync.c:520
 #, c-format
-msgid "upgraded %s (%s -> %s)"
+msgid ":: Starting full system upgrade...\n"
 msgstr ""
 
-#: src/pacman/trans.c:128
-msgid "checking package integrity... "
+#: src/pacman/sync.c:521
+msgid "starting full system upgrade"
 msgstr ""
 
-#: src/pacman/trans.c:144
-msgid "failed.\n"
+#: src/pacman/sync.c:541
+#, 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 seperately, answer no.\n"
 msgstr ""
 
-#: src/pacman/trans.c:151
-#, c-format
-msgid ":: Retrieving packages from %s...\n"
+#: src/pacman/sync.c:546
+msgid ":: Cancel current operation? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:172
+#: src/pacman/sync.c:548 src/pacman/sync.c:768
 #, c-format
-msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
+msgid "error: failed to release transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/trans.c:177
+#: src/pacman/sync.c:560
 #, c-format
-msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
+msgid "error: pacman: %s\n"
 msgstr ""
 
-#: src/pacman/trans.c:190
+#: src/pacman/sync.c:584
 #, c-format
-msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
+msgid "'error: %s': %s\n"
 msgstr ""
 
-#: src/pacman/trans.c:203
-#, c-format
-msgid ":: Replace %s with %s/%s? [Y/n] "
+#: src/pacman/sync.c:603
+msgid ":: Install whole content? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:218
+#: src/pacman/sync.c:610
 #, c-format
-msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
+msgid ":: Install %s from group %s? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:234
+#: src/pacman/sync.c:634
 #, c-format
-msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
+msgid "error: '%s': not found in sync db\n"
 msgstr ""
 
-#: src/pacman/trans.c:252
+#: src/pacman/sync.c:689
 #, c-format
-msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
+msgid " local database is up to date\n"
 msgstr ""
 
-#: src/pacman/trans.c:270
+#: src/pacman/sync.c:701
 #, c-format
-msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
+msgid "Beginning download...\n"
 msgstr ""
 
-#: src/pacman/trans.c:326
-msgid "installing"
+#: src/pacman/sync.c:704
+msgid "Proceed with download? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:329
-msgid "upgrading"
+#: src/pacman/sync.c:712
+#, c-format
+msgid "Beginning upgrade process...\n"
 msgstr ""
 
-#: src/pacman/trans.c:332
-msgid "removing"
+#: src/pacman/sync.c:715
+msgid "Proceed with installation? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:335
-msgid "checking for file conflicts"
+#: src/pacman/sync.c:757
+#, c-format
+msgid "Errors occurred, no packages were upgraded.\n"
 msgstr ""
 
-#: src/pacman/util.c:259
+#: src/pacman/util.c:307
 #, c-format
 msgid "None\n"
 msgstr ""
 
-#: src/pacman/util.c:311
+#: src/pacman/util.c:373
 msgid "Remove:"
 msgstr ""
 
-#: src/pacman/util.c:319
+#: src/pacman/util.c:381
 #, c-format
-msgid ""
-"\n"
-"Total Removed Size:   %.2f MB\n"
+msgid "Total Removed Size:   %.2f MB\n"
 msgstr ""
 
-#: src/pacman/util.c:330
+#: src/pacman/util.c:391
 #, c-format
-msgid ""
-"\n"
-"Total Package Size:   %.2f MB\n"
+msgid "Total Package Size:   %.2f MB\n"
 msgstr ""
 
-#: src/pacman/util.c:337
+#: src/pacman/util.c:399
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr ""
+
+#: src/pacman/util.c:426
+msgid "Y"
+msgstr ""
+
+#: src/pacman/util.c:426
+msgid "YES"
+msgstr ""
+
+#: src/pacman/util.c:487
+#, c-format
+msgid "debug: "
+msgstr ""
+
+#: src/pacman/util.c:490
+#, c-format
+msgid "error: "
+msgstr ""
+
+#: src/pacman/util.c:493
+#, c-format
+msgid "warning: "
+msgstr ""
+
+#: src/pacman/util.c:498
+#, c-format
+msgid "function: "
+msgstr ""