[jhbuild] Updated Galician translations

[Francisco Diéguez Souto <frandieguez src gnome org>]

commit 3428c99cf433dfab713c215957cbb333ff73feef
Author: Fran Diéguez <fran dieguez mabishu com>
Date:   Wed Sep 1 02:37:58 2010 +0200

    Updated Galician translations

 po/gl.po |  653 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 359 insertions(+), 294 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 15004c8..4980a18 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,56 +2,58 @@
 # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Fran Diéguez <fran dieguez mabishu com>, 2009.
 # Francisco Diéguez <fran dieguez mabishu com>, 2009.
+# Fran Diéguez <frandieguez ubuntu com>, 2009, 2010.
+# Fran Dieguez <frandieguez ubuntu com>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-17 15:15+0200\n"
-"PO-Revision-Date: 2009-05-02 12:56+0200\n"
-"Last-Translator: Francisco Diéguez <fran dieguez mabishu com>\n"
-"Language-Team: Galego <kde-i18n-doc kde org>\n"
+"POT-Creation-Date: 2010-09-01 02:22+0200\n"
+"PO-Revision-Date: 2010-09-01 02:37+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez ubuntu com>\n"
+"Language-Team: Galician <gnome-gl-list gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../jhbuild.desktop.in.in.h:1
 msgid "Build GNOME modules"
-msgstr ""
+msgstr "Constrúa módulos de GNOME"
 
 #: ../jhbuild.desktop.in.in.h:2
 msgid "GNOME Build Tool"
-msgstr ""
+msgstr "Ferramenta de construción de GNOME"
 
 #: ../jhbuild/commands/autobuild.py:27
 msgid "Build modules non-interactively and upload results to JhAutobuild"
-msgstr "Compilar módulos sen interacción e subir os resultados a JhAutoBuild"
+msgstr ""
+"Compilar módulos en modo non interactivo e cargar os resultados a JhAutoBuild"
 
-#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/base.py:214
-#: ../jhbuild/commands/base.py:305 ../jhbuild/commands/tinderbox.py:37
+#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/base.py:213
+#: ../jhbuild/commands/base.py:307 ../jhbuild/commands/tinderbox.py:37
 msgid "always run autogen.sh"
-msgstr "sempre executar autogen.sh"
+msgstr "executar sempre autogen.sh"
 
-#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:217
-#: ../jhbuild/commands/base.py:308 ../jhbuild/commands/tinderbox.py:40
+#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:216
+#: ../jhbuild/commands/base.py:310 ../jhbuild/commands/tinderbox.py:40
 msgid "run make clean before make"
 msgstr "executar make clean antes de make"
 
 #: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:46
-#: ../jhbuild/commands/base.py:235 ../jhbuild/commands/base.py:437
+#: ../jhbuild/commands/base.py:237 ../jhbuild/commands/base.py:475
 #: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:49
-#: ../jhbuild/commands/uninstall.py:38
 msgid "treat the given modules as up to date"
 msgstr "tratar os módulos dados como actualizados"
 
 #: ../jhbuild/commands/autobuild.py:44 ../jhbuild/commands/base.py:49
-#: ../jhbuild/commands/base.py:238 ../jhbuild/commands/clean.py:41
-#: ../jhbuild/commands/tinderbox.py:52 ../jhbuild/commands/uninstall.py:41
+#: ../jhbuild/commands/base.py:240 ../jhbuild/commands/clean.py:41
+#: ../jhbuild/commands/tinderbox.py:52
 msgid "start building at the given module"
-msgstr "comezar a compilación polo módulo proporcionado"
+msgstr "comezar a construción no módulo dado"
 
 #: ../jhbuild/commands/autobuild.py:47
 msgid "jhautobuild report URL"
@@ -59,60 +61,60 @@ msgstr "URL de informe de jhautobuild"
 
 #: ../jhbuild/commands/autobuild.py:50
 msgid "verbose mode"
-msgstr "modo verboso"
+msgstr "modo detallado"
 
-#: ../jhbuild/commands/autobuild.py:70
+#: ../jhbuild/commands/autobuild.py:67
 msgid "report url for autobuild not specified"
-msgstr "non especificou a url de informe para autobuild"
+msgstr "non especificou o url de informe de autobuild"
 
-#: ../jhbuild/commands/autobuild.py:81 ../jhbuild/commands/base.py:72
-#: ../jhbuild/commands/base.py:282 ../jhbuild/commands/base.py:471
+#: ../jhbuild/commands/autobuild.py:78 ../jhbuild/commands/base.py:72
+#: ../jhbuild/commands/base.py:284 ../jhbuild/commands/base.py:514
 #: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:86
-#: ../jhbuild/commands/uninstall.py:60
 #, python-format
 msgid "%s not in module list"
 msgstr "%s non está na lista de módulos"
 
 #: ../jhbuild/commands/base.py:37
 msgid "Update all modules from version control"
-msgstr "Actualizar tódolos módulos dende o control de versións"
+msgstr "Actualizar tódolos módulos dende o sistema de control de versións"
 
 #: ../jhbuild/commands/base.py:40 ../jhbuild/commands/base.py:88
-#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:208
-#: ../jhbuild/commands/base.py:299 ../jhbuild/commands/base.py:428
+#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:207
+#: ../jhbuild/commands/base.py:301 ../jhbuild/commands/base.py:466
 #: ../jhbuild/commands/tinderbox.py:31
 msgid "[ options ... ] [ modules ... ]"
 msgstr "[ opcións ... ] [ módulos ... ]"
 
-#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:241
-#: ../jhbuild/commands/base.py:443
+#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:243
+#: ../jhbuild/commands/base.py:481
 msgid "build only modules with the given tags"
-msgstr "compilar só os módulos coas etiquetas proporcionadas"
+msgstr "compilar só os módulos coas etiquetas dadas"
 
 #: ../jhbuild/commands/base.py:55 ../jhbuild/commands/base.py:94
-#: ../jhbuild/commands/base.py:244 ../jhbuild/commands/base.py:323
+#: ../jhbuild/commands/base.py:246 ../jhbuild/commands/base.py:328
 #: ../jhbuild/commands/tinderbox.py:55
 msgid "set a sticky date when checking out modules"
-msgstr "establecer unha data fixa cando extraia os módulos"
+msgstr "establecer unha data fixa durante a descarga dos módulos"
 
-#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:226
-#: ../jhbuild/commands/base.py:446
+#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:228
+#: ../jhbuild/commands/base.py:484
 msgid "ignore all soft-dependencies"
-msgstr "ignorar tódalas dependencias brandas"
+msgstr "ignorar tódalas dependencias suaves"
 
 #: ../jhbuild/commands/base.py:85
 msgid "Update one or more modules from version control"
 msgstr "Actualiza un ou máis módulos dende o control de versións"
 
 #: ../jhbuild/commands/base.py:103 ../jhbuild/commands/base.py:138
-#: ../jhbuild/commands/base.py:345 ../jhbuild/commands/base.py:386
+#: ../jhbuild/commands/base.py:407 ../jhbuild/commands/base.py:424
 #: ../jhbuild/commands/rdepends.py:52
 #, python-format
 msgid "A module called '%s' could not be found."
 msgstr "Non se puido atopar o módulo chamado '%s'."
 
 #: ../jhbuild/commands/base.py:106 ../jhbuild/commands/base.py:141
-#: ../jhbuild/commands/base.py:348 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/base.py:363 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/uninstall.py:41
 msgid "This command requires a module parameter."
 msgstr "Este comando require un parámetro de módulo."
 
@@ -122,151 +124,167 @@ msgstr "Limpa un ou máis módulos"
 
 #: ../jhbuild/commands/base.py:128
 msgid "honour the makeclean setting in config file"
-msgstr ""
+msgstr "respectar a configuración de makeclean no ficheiro de configuración"
 
 #: ../jhbuild/commands/base.py:145
-#, fuzzy
 msgid "clean command called while makeclean is set to False, skipped."
-msgstr ""
-"I: invocar o comando clean se makeclean está establecido a Falso, omitir."
+msgstr "a chamada á orde clean durante makeclean está a False. Omitido."
 
-#: ../jhbuild/commands/base.py:193
-#, fuzzy
+#: ../jhbuild/commands/base.py:192
 msgid ""
 "bootstrap moduleset has been updated since the last time you used it, "
 "perhaps you should run jhbuild bootstrap."
 msgstr ""
-"I: o conxunto de módulos de inicio foi actualizado dende a última vez que o "
-"empregou cicais debería executar jhbuild bootstrap."
+"o conxunto de módulos de bootstrap actualizáronse actualizado desde a última "
+"vez que o usou. Pode ser que debera executar jhbuild bootstrap."
 
-#: ../jhbuild/commands/base.py:199
-#, fuzzy, python-format
+#: ../jhbuild/commands/base.py:198
+#, python-format
 msgid ""
 "some bootstrap modules have been updated, perhaps you should update them: %s."
 msgstr ""
-"I: algúns módulos de inicio foron actualizados, cicais debería actualizalos: "
-"%s."
+"algúns módulos de bootstrap actualizáronse, quizais debería actualizalos: %s."
 
-#: ../jhbuild/commands/base.py:205
+#: ../jhbuild/commands/base.py:204
 msgid "Update and compile all modules (the default)"
 msgstr "Actualizar e compilar tódolos módulos (por omisión)"
 
-#: ../jhbuild/commands/base.py:220 ../jhbuild/commands/base.py:311
+#: ../jhbuild/commands/base.py:219 ../jhbuild/commands/base.py:313
+msgid "run make check after building"
+msgstr "executar make check despois da construción"
+
+#: ../jhbuild/commands/base.py:222 ../jhbuild/commands/base.py:316
 msgid "run make dist after building"
 msgstr "executar make dist despois de compilar"
 
-#: ../jhbuild/commands/base.py:223 ../jhbuild/commands/base.py:314
+#: ../jhbuild/commands/base.py:225 ../jhbuild/commands/base.py:319
 msgid "run make distcheck after building"
 msgstr "executar make distcheck despois de compilar"
 
-#: ../jhbuild/commands/base.py:229 ../jhbuild/commands/base.py:317
+#: ../jhbuild/commands/base.py:231 ../jhbuild/commands/base.py:322
 #: ../jhbuild/commands/tinderbox.py:43
 msgid "skip version control update"
 msgstr "omitir a actualización do control de versións"
 
-#: ../jhbuild/commands/base.py:232 ../jhbuild/commands/base.py:320
+#: ../jhbuild/commands/base.py:234 ../jhbuild/commands/base.py:325
 msgid "quiet (no output)"
 msgstr "quiet (sen saída)"
 
-#: ../jhbuild/commands/base.py:247 ../jhbuild/commands/base.py:326
+#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:331
 msgid "run tests in real X and not in Xvfb"
 msgstr "executa os test nunha X real e non en Xvfb"
 
-#: ../jhbuild/commands/base.py:250 ../jhbuild/commands/tinderbox.py:58
+#: ../jhbuild/commands/base.py:252 ../jhbuild/commands/tinderbox.py:58
 msgid "try to force checkout and autogen on failure"
 msgstr "tenta forzar a extracción e autogen cando se produza un erro"
 
-#: ../jhbuild/commands/base.py:253 ../jhbuild/commands/tinderbox.py:61
+#: ../jhbuild/commands/base.py:255 ../jhbuild/commands/tinderbox.py:61
 msgid "don't poison modules on failure"
-msgstr ""
+msgstr "non envelenar os módulos en caso de fallo"
 
-#: ../jhbuild/commands/base.py:256 ../jhbuild/commands/base.py:329
+#: ../jhbuild/commands/base.py:258 ../jhbuild/commands/base.py:334
 #: ../jhbuild/commands/tinderbox.py:64
 msgid "build even if policy says not to"
 msgstr "compilar aínda que a normativa diga que non"
 
-#: ../jhbuild/commands/base.py:259
+#: ../jhbuild/commands/base.py:261
 msgid "also build soft-dependencies that could be skipped"
 msgstr "compilar tamén as dependencias brandas que deben ser omitidas"
 
-#: ../jhbuild/commands/base.py:262 ../jhbuild/commands/base.py:332
+#: ../jhbuild/commands/base.py:264 ../jhbuild/commands/base.py:337
 msgid "skip modules installed less than the given time ago"
 msgstr "omitir módulos instalados antes dun tempo dado"
 
-#: ../jhbuild/commands/base.py:286
-#, fuzzy
+#: ../jhbuild/commands/base.py:288
 msgid "requested module is in the ignore list, nothing to do."
-msgstr "I: o módulo solicitado está na lista de ignorados, non se fixo nada."
+msgstr "o módulo solicitado está na lista de ignorados, non se fixo nada."
 
-#: ../jhbuild/commands/base.py:296
+#: ../jhbuild/commands/base.py:298
 msgid "Update and compile one or more modules"
 msgstr "Actualiza e compilar un ou máis módulos"
 
-#: ../jhbuild/commands/base.py:357
+#: ../jhbuild/commands/base.py:358
+#, python-format
+msgid ""
+"module \"%s\" does not exist, created automatically using repository \"%s\""
+msgstr ""
+"o módulo «%s» non existe, foi creado automaticamente usando o repositorio «%s»"
+
+#: ../jhbuild/commands/base.py:372
 msgid "Run a command under the JHBuild environment"
-msgstr "Executar o comando baixo o entorno JHBuild"
+msgstr "Executar a orde baixo o entorno JHBuild"
 
-#: ../jhbuild/commands/base.py:360
+#: ../jhbuild/commands/base.py:375
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr "[ opcións ... ] programa [ argumentos ... ]"
 
-#: ../jhbuild/commands/base.py:366
+#: ../jhbuild/commands/base.py:381
 msgid "run command in build dir of the given module"
-msgstr "executa o comando no directorio de compilación do módulo proporcionado"
+msgstr "executa a orde no directorio de compilación do módulo proporcionado"
+
+#: ../jhbuild/commands/base.py:384
+msgid "run command in checkout dir of the given module"
+msgstr "executar a orde no cartafol de descarga do módulo fornecido"
 
-#: ../jhbuild/commands/base.py:376 ../jhbuild/commands/base.py:403
+#: ../jhbuild/commands/base.py:397 ../jhbuild/commands/base.py:441
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
-msgstr "Non se puido executar o comando '%(command)s': %(err)s"
+msgstr "Non se puido executar a orde '%(command)s': %(err)s"
 
-#: ../jhbuild/commands/base.py:394
+#: ../jhbuild/commands/base.py:415 ../jhbuild/commands/base.py:432
 #, python-format
 msgid "Unable to execute the command '%s'"
-msgstr "Non se puido executar o comando '%s'"
+msgstr "Non se puido executar a orde '%s'"
 
-#: ../jhbuild/commands/base.py:401 ../jhbuild/frontends/gtkui.py:443
+#: ../jhbuild/commands/base.py:439 ../jhbuild/frontends/gtkui.py:443
 #: ../jhbuild/frontends/terminal.py:144
 msgid "No command given"
-msgstr "Non se proporcionou o comando"
+msgstr "Non se proporcionou a orde"
 
-#: ../jhbuild/commands/base.py:410
+#: ../jhbuild/commands/base.py:448
 msgid "Start a shell under the JHBuild environment"
 msgstr "Iniciar unha terminal baixo o entorno de JHBuild"
 
-#: ../jhbuild/commands/base.py:425
+#: ../jhbuild/commands/base.py:463
 msgid "List the modules that would be built"
 msgstr "Lista de módulos que debe construír"
 
-#: ../jhbuild/commands/base.py:434
+#: ../jhbuild/commands/base.py:472
 msgid "show which revision will be built"
 msgstr "amosar que revisión se construirá"
 
-#: ../jhbuild/commands/base.py:440
+#: ../jhbuild/commands/base.py:478
 msgid "start list at the given module"
 msgstr "iniciar a lista nos módulos proporcionados"
 
-#: ../jhbuild/commands/base.py:449
+#: ../jhbuild/commands/base.py:487
 msgid "also list soft-dependencies that could be skipped"
 msgstr "listar tamén as dependencias brandas que poden ser omitidas"
 
-#: ../jhbuild/commands/base.py:452
+#: ../jhbuild/commands/base.py:490
 msgid "list all modules, not only those that would be built"
 msgstr "listar tódolos módulos, non só aqueles que deben ser construidos"
 
-#: ../jhbuild/commands/base.py:487
+#: ../jhbuild/commands/base.py:497
+#, python-format
+msgid "Conflicting options specified ('%s' and '%s')"
+msgstr "Conflito nas opcións especificadas («%s» e «%s»)"
+
+#: ../jhbuild/commands/base.py:530
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr ""
 "Debuxar unha gráfica de dependencias de Graphviz para un ou varios módulos"
 
-#: ../jhbuild/commands/base.py:490 ../jhbuild/commands/info.py:40
+#: ../jhbuild/commands/base.py:533 ../jhbuild/commands/info.py:40
+#: ../jhbuild/commands/uninstall.py:32
 msgid "[ modules ... ]"
 msgstr "[ módulos ... ]"
 
-#: ../jhbuild/commands/base.py:496
+#: ../jhbuild/commands/base.py:539
 msgid "add dotted lines to soft dependencies"
 msgstr "engadir liñas de puntos para as dependencias brandas"
 
-#: ../jhbuild/commands/base.py:499
+#: ../jhbuild/commands/base.py:542
 msgid "group modules from metamodule together"
 msgstr "agrupar módulos dos metamódulos "
 
@@ -279,7 +297,7 @@ msgid "do not use system installed modules"
 msgstr "non usar os módulos de sistema instalados"
 
 #: ../jhbuild/commands/bootstrap.py:85
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "some modules (%s) were automatically ignored as a sufficient enough version "
 "was found installed on your system. Use --ignore-system if you want to build "
@@ -289,77 +307,86 @@ msgstr ""
 "versión suficiente no seu sistema. Empregue --ignore-system se quere "
 "compilalas aínda así."
 
-#: ../jhbuild/commands/bot.py:53
+#: ../jhbuild/commands/bot.py:54
 msgid "Control buildbot"
 msgstr "Buildbot de control"
 
-#: ../jhbuild/commands/bot.py:56 ../jhbuild/commands/__init__.py:37
+#: ../jhbuild/commands/bot.py:57 ../jhbuild/commands/__init__.py:45
 msgid "[ options ... ]"
 msgstr "[ opcións ... ]"
 
-#: ../jhbuild/commands/bot.py:62
+#: ../jhbuild/commands/bot.py:63
 msgid "setup a buildbot environment"
 msgstr "configurar un entorno buildbot"
 
-#: ../jhbuild/commands/bot.py:65
+#: ../jhbuild/commands/bot.py:66
 msgid "start a buildbot slave server"
 msgstr "iniciar un servidor escravo buildbot"
 
-#: ../jhbuild/commands/bot.py:68
+#: ../jhbuild/commands/bot.py:69
 msgid "stop a buildbot slave server"
 msgstr "detén un servidor escravo buildbot"
 
-#: ../jhbuild/commands/bot.py:71
+#: ../jhbuild/commands/bot.py:72
 msgid "start a buildbot master server"
 msgstr "iniciar un servidor mestre buildbot"
 
-#: ../jhbuild/commands/bot.py:74
+#: ../jhbuild/commands/bot.py:75
 msgid "reload a buildbot master server configuration"
 msgstr "recarga a configuración dun servidor mestre buildbot"
 
-#: ../jhbuild/commands/bot.py:77
+#: ../jhbuild/commands/bot.py:78
 msgid "stop a buildbot master server"
 msgstr "detén un servidor mestre buildbot"
 
-#: ../jhbuild/commands/bot.py:80
+#: ../jhbuild/commands/bot.py:81
 msgid "start as daemon"
 msgstr "iniciar como demonio"
 
-#: ../jhbuild/commands/bot.py:83
+#: ../jhbuild/commands/bot.py:84
 msgid "pid file location"
 msgstr "localización do ficheiro pid"
 
-#: ../jhbuild/commands/bot.py:86
+#: ../jhbuild/commands/bot.py:87
 msgid "log file location"
 msgstr "localización do ficheiro de rexistro"
 
-#: ../jhbuild/commands/bot.py:89
-msgid "directory with slaves files (only with --start-server)"
+#: ../jhbuild/commands/bot.py:90
+msgid "directory with slave files (only with --start-server)"
 msgstr "directorio cos ficheiros escravos (so con --start-server)"
 
-#: ../jhbuild/commands/bot.py:92
-#, fuzzy
+#: ../jhbuild/commands/bot.py:93
 msgid "directory with buildbot work files (only with --start-server)"
 msgstr "directorio cos ficheiros escravos (so con --start-server)"
 
-#: ../jhbuild/commands/bot.py:95
+#: ../jhbuild/commands/bot.py:96
 msgid "master cfg file location (only with --start-server)"
 msgstr "localización do ficheiro cfg mestre (so con --start-server)"
 
-#: ../jhbuild/commands/bot.py:98
+#: ../jhbuild/commands/bot.py:99
 msgid "exec a buildbot step (internal use only)"
 msgstr "executar un paso de buildbot (só para uso interno)"
 
-#: ../jhbuild/commands/bot.py:117
+#: ../jhbuild/commands/bot.py:118
 msgid "buildbot and twisted not found, run jhbuild bot --setup"
 msgstr "non se atoparon buildbot e twister, execute o jhbuild bot --setup"
 
-#: ../jhbuild/commands/bot.py:694 ../jhbuild/commands/bot.py:702
+#: ../jhbuild/commands/bot.py:294
+#, python-format
+msgid "No description for slave %s."
+msgstr "No hai descrición para o escravo %s."
+
+#. parse error
+#: ../jhbuild/commands/bot.py:299
+#, python-format
+msgid "Failed to parse slave config for %s."
+msgstr "Aconteceu un erro ao analizar o tempo relativo"
+
+#: ../jhbuild/commands/bot.py:805 ../jhbuild/commands/bot.py:813
 msgid "failed to get buildbot PID"
 msgstr "fallo ao recoller o PID de buildbot"
 
 #: ../jhbuild/commands/checkbranches.py:28
-#, fuzzy
 msgid ""
 "Check modules in GNOME Git repository have the correct branch definition"
 msgstr ""
@@ -372,21 +399,20 @@ msgid "%(module)s is missing branch definition for %(branch)s"
 msgstr "falta a definición de rama de %(module)s para %(branch)s"
 
 #: ../jhbuild/commands/checkmodulesets.py:30
-msgid "Check modules in jhbuild have the correct definition"
+msgid "Check if modules in jhbuild have the correct definition"
 msgstr "Comproba que os módulos en jhbuild teñen a definición correcta"
 
 #: ../jhbuild/commands/checkmodulesets.py:42
-#, fuzzy, python-format
+#, python-format
 msgid "%(module)s is unreachable (%(href)s)"
 msgstr "E: %(module)s é inalcanzábel (%(href)s)"
 
 #: ../jhbuild/commands/checkmodulesets.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "Cannot check %(module)s (%(href)s)"
 msgstr "W: Non se puido comprobar %(module)s (%(href)s)"
 
 #: ../jhbuild/commands/clean.py:29
-#, fuzzy
 msgid "Clean all modules"
 msgstr "Instalando módulos"
 
@@ -416,7 +442,7 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:69
-msgid "Install-date:"
+msgid "Install date:"
 msgstr "Data de instalación:"
 
 #: ../jhbuild/commands/info.py:69
@@ -451,39 +477,63 @@ msgstr "Darcs-Archive:"
 msgid "Git-Module:"
 msgstr "Git-Module:"
 
-#: ../jhbuild/commands/info.py:87
+#: ../jhbuild/commands/info.py:89
+msgid "Git-Branch:"
+msgstr "Rama en Git:"
+
+#: ../jhbuild/commands/info.py:91
+msgid "Git-Tag:"
+msgstr "Etiqueta en Git:"
+
+#: ../jhbuild/commands/info.py:93
 msgid "URL:"
 msgstr "URL:"
 
-#: ../jhbuild/commands/info.py:88
+#: ../jhbuild/commands/info.py:94
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../jhbuild/commands/info.py:91
+#: ../jhbuild/commands/info.py:97
 msgid "Tree-ID:"
 msgstr "ID na árbore:"
 
-#: ../jhbuild/commands/info.py:97
+#: ../jhbuild/commands/info.py:102
+msgid "Sourcedir:"
+msgstr "Cartafol orixe:"
+
+#: ../jhbuild/commands/info.py:108
 msgid "Requires:"
 msgstr "Require:"
 
-#: ../jhbuild/commands/info.py:101
+#: ../jhbuild/commands/info.py:112
 msgid "Required-by:"
 msgstr "Requirido por:"
 
-#: ../jhbuild/commands/info.py:103
+#: ../jhbuild/commands/info.py:114
 msgid "Suggests:"
 msgstr "Suxire:"
 
-#: ../jhbuild/commands/info.py:105
+#: ../jhbuild/commands/info.py:116
 msgid "After:"
 msgstr "Despois:"
 
-#: ../jhbuild/commands/info.py:109
+#: ../jhbuild/commands/info.py:120
 msgid "Before:"
 msgstr "Antes:"
 
-#: ../jhbuild/commands/__init__.py:74
+#: ../jhbuild/commands/__init__.py:80
+msgid "JHBuild commands are:"
+msgstr "Os comandos JHBuild son:"
+
+#: ../jhbuild/commands/__init__.py:86
+msgid "For more information run \"jhbuild <command> --help\""
+msgstr "Para máis información execute \"jhbuild <commando> --help\""
+
+#: ../jhbuild/commands/__init__.py:95
+msgid "Information about available jhbuild commands"
+msgstr "Información sobre os comandos dispoñibles de jhbuild"
+
+#: ../jhbuild/commands/__init__.py:118
 msgid "command not found"
 msgstr "comando non atopado"
 
@@ -525,49 +575,53 @@ msgstr "o prefixo de instalación (%s) non é escribíbel"
 #: ../jhbuild/commands/sanitycheck.py:72 ../jhbuild/commands/sanitycheck.py:75
 #: ../jhbuild/commands/sanitycheck.py:78 ../jhbuild/commands/sanitycheck.py:81
 #: ../jhbuild/commands/sanitycheck.py:84 ../jhbuild/commands/sanitycheck.py:87
-#: ../jhbuild/commands/sanitycheck.py:90 ../jhbuild/commands/sanitycheck.py:93
-#: ../jhbuild/commands/sanitycheck.py:96
-#: ../jhbuild/commands/sanitycheck.py:138
-#: ../jhbuild/commands/sanitycheck.py:142
-#: ../jhbuild/commands/sanitycheck.py:146
-#: ../jhbuild/commands/sanitycheck.py:155
-#: ../jhbuild/versioncontrol/arch.py:155 ../jhbuild/versioncontrol/bzr.py:148
+#: ../jhbuild/commands/sanitycheck.py:129
+#: ../jhbuild/commands/sanitycheck.py:133
+#: ../jhbuild/commands/sanitycheck.py:141
+#: ../jhbuild/commands/sanitycheck.py:150
+#: ../jhbuild/versioncontrol/arch.py:155 ../jhbuild/versioncontrol/bzr.py:202
 #: ../jhbuild/versioncontrol/cvs.py:297 ../jhbuild/versioncontrol/darcs.py:108
-#: ../jhbuild/versioncontrol/git.py:334 ../jhbuild/versioncontrol/hg.py:101
+#: ../jhbuild/versioncontrol/fossil.py:105
+#: ../jhbuild/versioncontrol/git.py:430 ../jhbuild/versioncontrol/hg.py:101
 #: ../jhbuild/versioncontrol/mtn.py:140 ../jhbuild/versioncontrol/svn.py:311
 #, python-format
 msgid "%s not found"
 msgstr "non se atopa %s"
 
-#: ../jhbuild/commands/sanitycheck.py:108
+#: ../jhbuild/commands/sanitycheck.py:99
 #, python-format
 msgid "aclocal-%s can't see %s macros"
 msgstr "aclocal-%s non pode ver %s macros"
 
-#: ../jhbuild/commands/sanitycheck.py:113
+#: ../jhbuild/commands/sanitycheck.py:104
 #, python-format
 msgid "Please copy the lacking macros (%s) in one of the following paths: %s"
 msgstr "Copie os macros que faltan (%s) nunha das seguintes rutas: %s"
 
-#: ../jhbuild/commands/sanitycheck.py:118
+#: ../jhbuild/commands/sanitycheck.py:109
 msgid "Could not find XML catalog"
 msgstr "Non se puido atopar o catálogo XML"
 
-#: ../jhbuild/commands/sanitycheck.py:127
+#: ../jhbuild/commands/sanitycheck.py:118
 #, python-format
 msgid "Could not find %s in XML catalog"
 msgstr "Non se puido atopar %s no catálogo XML"
 
-#: ../jhbuild/commands/sanitycheck.py:134
+#: ../jhbuild/commands/sanitycheck.py:125
 #, python-format
 msgid "Could not find the perl module %s"
 msgstr "Non se puido atopar o módulo perl %s"
 
-#: ../jhbuild/commands/sanitycheck.py:151
+#: ../jhbuild/commands/sanitycheck.py:137
+#, python-format
+msgid "%s or %s not found"
+msgstr "non se atopa %s"
+
+#: ../jhbuild/commands/sanitycheck.py:146
 msgid "Installed git program is not the right git"
 msgstr "O programa git instalado non é o git axeitado"
 
-#: ../jhbuild/commands/sanitycheck.py:157
+#: ../jhbuild/commands/sanitycheck.py:152
 msgid "Could not check git program"
 msgstr "non se puido comprobar o programa git"
 
@@ -591,14 +645,9 @@ msgid "output directory for tinderbox build not specified"
 msgstr "directorio de saída da compilación tinderbox non especificado"
 
 #: ../jhbuild/commands/uninstall.py:29
-#, fuzzy
 msgid "Uninstall all modules"
 msgstr "Instalando módulos"
 
-#: ../jhbuild/commands/uninstall.py:44
-msgid "uninstall modules passed on command line only"
-msgstr ""
-
 #: ../jhbuild/frontends/autobuild.py:72
 #, python-format
 msgid "Server Error, retrying in %d seconds"
@@ -613,7 +662,7 @@ msgstr "Erro no Servidor, abortando"
 msgid "Error: %s"
 msgstr "Erro: %s"
 
-#: ../jhbuild/frontends/autobuild.py:183 ../jhbuild/utils/cmds.py:63
+#: ../jhbuild/frontends/autobuild.py:183 ../jhbuild/utils/cmds.py:66
 #, python-format
 msgid "Error running %s"
 msgstr "Erro ao executar %s"
@@ -640,22 +689,22 @@ msgstr "o prefixo de instalación (%s) non é escribíbel"
 #: ../jhbuild/frontends/buildscript.py:45
 #, python-format
 msgid "checkout root (%s) can not be created"
-msgstr ""
+msgstr "non é posíbel crear a raíz da descarga (%s)"
 
 #: ../jhbuild/frontends/buildscript.py:47
 #, python-format
 msgid "checkout root (%s) must be writable"
-msgstr ""
+msgstr "a raíz da descarga (%s) debe ser escribíbel"
 
 #: ../jhbuild/frontends/buildscript.py:54
 #, python-format
 msgid "checkout copy dir (%s) can not be created"
-msgstr ""
+msgstr "non é posíbel crear o cartafol de descarga da copia (%s)"
 
 #: ../jhbuild/frontends/buildscript.py:56
 #, python-format
 msgid "checkout copy dir (%s) must be writable"
-msgstr ""
+msgstr "o cartafol de descarga da copia (%s) debe ser escribíbel"
 
 #: ../jhbuild/frontends/buildscript.py:63
 #, python-format
@@ -667,81 +716,76 @@ msgstr "non se pode crear o directorio %s"
 msgid "Skipping %s (installed recently)"
 msgstr "Omitindo %s (instalado recentemente)"
 
-#: ../jhbuild/frontends/buildscript.py:95
+#: ../jhbuild/frontends/buildscript.py:96
 #, python-format
 msgid "module %(mod)s will be build even though %(dep)s failed"
-msgstr ""
+msgstr "os módulos %(mod)s construiranse aínda que %(dep)s fallen"
 
-#: ../jhbuild/frontends/buildscript.py:98
+#: ../jhbuild/frontends/buildscript.py:99
 #, python-format
 msgid "module %(mod)s not built due to non buildable %(dep)s"
-msgstr ""
+msgstr "módulo %(mod)s non construído de acordo coas %(dep)s non construíbeis"
 
 #: ../jhbuild/frontends/gtkui.py:99
 msgid "Others..."
-msgstr ""
+msgstr "Outros..."
 
 #: ../jhbuild/frontends/gtkui.py:140
-#, fuzzy
 msgid "Choose Module:"
-msgstr "CVS-Module:"
+msgstr "Seleccionar módulo:"
 
 #: ../jhbuild/frontends/gtkui.py:160
 msgid "Build Progress"
-msgstr ""
+msgstr "Progreso da construción"
 
 #: ../jhbuild/frontends/gtkui.py:163
-#, fuzzy
 msgid "Terminal"
-msgstr "_Terminal"
+msgstr "Terminal"
 
 #. Translators: This is a button label (to start build)
 #: ../jhbuild/frontends/gtkui.py:203
 msgid "Start"
-msgstr ""
+msgstr "Iniciar"
 
 #: ../jhbuild/frontends/gtkui.py:347
 msgid "Build Completed"
-msgstr ""
+msgstr "Construción completada"
 
 #: ../jhbuild/frontends/gtkui.py:373 ../jhbuild/frontends/terminal.py:254
-#, fuzzy, python-format
+#, python-format
 msgid "Error during phase %(phase)s of %(module)s"
-msgstr "erro na fase %(stage)s de %(module)s"
+msgstr "erro na fase %(phase)s de %(module)s"
 
 #: ../jhbuild/frontends/gtkui.py:390
 msgid "Pick an Action"
-msgstr ""
+msgstr "Escoller unha acción"
 
 #: ../jhbuild/frontends/gtkui.py:393 ../jhbuild/frontends/terminal.py:281
 #, python-format
 msgid "Rerun phase %s"
-msgstr ""
+msgstr "Executar fase %s de novo"
 
 #: ../jhbuild/frontends/gtkui.py:396 ../jhbuild/frontends/terminal.py:283
-#, fuzzy, python-format
+#, python-format
 msgid "Ignore error and continue to %s"
 msgstr "  [2] ignorar erro e continuar con %s"
 
 #: ../jhbuild/frontends/gtkui.py:399 ../jhbuild/frontends/terminal.py:285
-#, fuzzy
 msgid "Ignore error and continue to next module"
 msgstr "  [2] ignorar erro e continuar con %s"
 
 #: ../jhbuild/frontends/gtkui.py:401 ../jhbuild/frontends/terminal.py:286
-#, fuzzy
 msgid "Give up on module"
 msgstr "  [3] abandonar módulo"
 
 #: ../jhbuild/frontends/gtkui.py:408 ../jhbuild/frontends/terminal.py:295
-#, fuzzy, python-format
+#, python-format
 msgid "Go to phase \"%s\""
-msgstr "Ir a %s"
+msgstr "Ir á fase «%s»"
 
 #: ../jhbuild/frontends/gtkui.py:411
-#, fuzzy
 msgid "Open Terminal"
-msgstr "_Terminal"
+msgstr "Abrir unha terminal"
 
 #: ../jhbuild/frontends/gtkui.py:585
 #, python-format
@@ -754,12 +798,10 @@ msgid "%(command)s returned with an error code (%(rc)s)"
 msgstr ""
 
 #: ../jhbuild/frontends/gtkui.py:639
-#, fuzzy
 msgid "Module"
 msgstr "Conxunto de módulo:"
 
 #: ../jhbuild/frontends/gtkui.py:658
-#, fuzzy
 msgid "Start At"
 msgstr "Comezar a compilación en:"
 
@@ -810,12 +852,10 @@ msgid "automatically forcing a fresh checkout"
 msgstr ""
 
 #: ../jhbuild/frontends/terminal.py:287
-#, fuzzy
 msgid "Start shell"
 msgstr "  [4] iniciar terminal"
 
 #: ../jhbuild/frontends/terminal.py:288
-#, fuzzy
 msgid "Reload configuration"
 msgstr "empregar un ficheiro de configuración distinto do que está por defecto"
 
@@ -823,26 +863,26 @@ msgstr "empregar un ficheiro de configuración distinto do que está por defecto
 msgid "choice: "
 msgstr "elección: "
 
-#: ../jhbuild/frontends/terminal.py:311
+#: ../jhbuild/frontends/terminal.py:312
 msgid "exit shell to continue with build"
 msgstr "saír da terminal e continuar coa compilación"
 
-#: ../jhbuild/frontends/terminal.py:321
+#: ../jhbuild/frontends/terminal.py:322
 msgid "invalid choice"
 msgstr "elección inválida"
 
-#: ../jhbuild/frontends/terminal.py:329
+#: ../jhbuild/frontends/terminal.py:330
 msgid "Type \"yes\" to confirm the action: "
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:331
-msgid "Yes"
+#: ../jhbuild/frontends/terminal.py:333
+msgid "yes"
 msgstr ""
 
-#: ../jhbuild/modtypes/ant.py:63 ../jhbuild/modtypes/autotools.py:213
-#: ../jhbuild/modtypes/cmake.py:75 ../jhbuild/modtypes/distutils.py:62
+#: ../jhbuild/modtypes/ant.py:63 ../jhbuild/modtypes/autotools.py:214
+#: ../jhbuild/modtypes/cmake.py:83 ../jhbuild/modtypes/distutils.py:62
 #: ../jhbuild/modtypes/linux.py:164 ../jhbuild/modtypes/perl.py:58
-#: ../jhbuild/modtypes/waf.py:99
+#: ../jhbuild/modtypes/waf.py:97
 msgid "Building"
 msgstr "Compilando"
 
@@ -854,8 +894,8 @@ msgstr "Falta a ferramenta de compilación ant"
 #. "It's not clear to me how to install a typical
 #. ant-based project, so I left that out."
 #. -- http://bugzilla.gnome.org/show_bug.cgi?id=537037
-#: ../jhbuild/modtypes/ant.py:81 ../jhbuild/modtypes/autotools.py:265
-#: ../jhbuild/modtypes/cmake.py:91 ../jhbuild/modtypes/distutils.py:74
+#: ../jhbuild/modtypes/ant.py:81 ../jhbuild/modtypes/autotools.py:268
+#: ../jhbuild/modtypes/cmake.py:99 ../jhbuild/modtypes/distutils.py:74
 #: ../jhbuild/modtypes/perl.py:72 ../jhbuild/modtypes/waf.py:132
 msgid "Installing"
 msgstr "Instalando"
@@ -865,26 +905,25 @@ msgstr "Instalando"
 msgid "Configuring"
 msgstr "Configurando"
 
-#: ../jhbuild/modtypes/autotools.py:203 ../jhbuild/modtypes/linux.py:151
-#: ../jhbuild/modtypes/waf.py:92
+#: ../jhbuild/modtypes/autotools.py:204 ../jhbuild/modtypes/linux.py:151
+#: ../jhbuild/modtypes/waf.py:90
 msgid "Cleaning"
 msgstr "Limpando"
 
-#: ../jhbuild/modtypes/autotools.py:231 ../jhbuild/modtypes/waf.py:111
+#: ../jhbuild/modtypes/autotools.py:234 ../jhbuild/modtypes/waf.py:111
 msgid "Checking"
 msgstr "Comprobando"
 
-#: ../jhbuild/modtypes/autotools.py:245 ../jhbuild/modtypes/autotools.py:255
-#: ../jhbuild/modtypes/cmake.py:83 ../jhbuild/modtypes/waf.py:122
+#: ../jhbuild/modtypes/autotools.py:248 ../jhbuild/modtypes/autotools.py:258
+#: ../jhbuild/modtypes/cmake.py:91 ../jhbuild/modtypes/waf.py:122
 msgid "Creating tarball for"
 msgstr "Creando o tarball de"
 
-#: ../jhbuild/modtypes/autotools.py:277
+#: ../jhbuild/modtypes/autotools.py:280
 msgid "Distcleaning"
 msgstr "Executando distclean"
 
-#: ../jhbuild/modtypes/autotools.py:294 ../jhbuild/modtypes/waf.py:139
-#, fuzzy
+#: ../jhbuild/modtypes/autotools.py:297 ../jhbuild/modtypes/waf.py:139
 msgid "Uninstalling"
 msgstr "Instalando"
 
@@ -915,27 +954,27 @@ msgid ""
 "s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:183
+#: ../jhbuild/modtypes/__init__.py:189
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr "Omitindo %s (non actualizado)"
 
-#: ../jhbuild/modtypes/__init__.py:195
+#: ../jhbuild/modtypes/__init__.py:201
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr "Omitindo %s (o paquete e as dependencias non están actualizadas)"
 
-#: ../jhbuild/modtypes/__init__.py:247 ../jhbuild/modtypes/__init__.py:265
+#: ../jhbuild/modtypes/__init__.py:253 ../jhbuild/modtypes/__init__.py:271
 #: ../jhbuild/modtypes/linux.py:88 ../jhbuild/modtypes/linux.py:95
 msgid "Checking out"
 msgstr "Verificando"
 
-#: ../jhbuild/modtypes/__init__.py:251
+#: ../jhbuild/modtypes/__init__.py:257
 #, python-format
 msgid "source directory %s was not created"
 msgstr "o directorio de orixe %s non foi creado"
 
-#: ../jhbuild/modtypes/__init__.py:268
+#: ../jhbuild/modtypes/__init__.py:274
 msgid "wipe directory and start over"
 msgstr ""
 
@@ -957,7 +996,6 @@ msgid "Installing modules"
 msgstr "Instalando módulos"
 
 #: ../jhbuild/modtypes/linux.py:210
-#, fuzzy
 msgid "Installing kernel headers"
 msgstr "Instalando kernel"
 
@@ -976,12 +1014,12 @@ msgid ""
 msgstr ""
 
 #: ../jhbuild/modtypes/tarball.py:68
-#, fuzzy, python-format
+#, python-format
 msgid "module '%(module)s' has invalid size attribute ('%(size)s')"
 msgstr "W: o módulo '%s' ten un atributo de tamaño inválido ('%s')"
 
-#: ../jhbuild/modtypes/waf.py:81
-msgid "Missing waf, try jhbuild -m bootstrap buildone waf"
+#: ../jhbuild/utils/cmds.py:40
+msgid "Call to undefined command"
 msgstr ""
 
 #: ../jhbuild/utils/httpcache.py:46 ../jhbuild/utils/packagedb.py:24
@@ -993,16 +1031,21 @@ msgstr "Requírense os paquetes de xml de Python pero non se puideron atopar"
 msgid "file not in cache, but not allowed to check network"
 msgstr ""
 
-#: ../jhbuild/utils/unpack.py:132
+#: ../jhbuild/utils/unpack.py:144
 #, python-format
 msgid "Failed to unpack %s (unknown archive type)"
 msgstr "Occorreu un fallo ao desempaquetar %s (tipo de ficheiro descoñecido)"
 
-#: ../jhbuild/utils/unpack.py:134
+#: ../jhbuild/utils/unpack.py:146
 #, python-format
 msgid "Failed to unpack %s"
 msgstr "Ocorreu un fallo ao desempaquetar %s"
 
+#: ../jhbuild/utils/unpack.py:152
+#, python-format
+msgid "Failed to unpack %s (empty file?)"
+msgstr "Ocorreu un fallo ao desempaquetar %s"
+
 #: ../jhbuild/versioncontrol/arch.py:40 ../jhbuild/versioncontrol/arch.py:83
 #, python-format
 msgid "could not register archive %s"
@@ -1013,22 +1056,35 @@ msgstr "non se puido rexistrar o ficheiro %s"
 msgid "archive %s not registered"
 msgstr "o ficheiro %s non está rexistrado"
 
-#: ../jhbuild/versioncontrol/arch.py:92 ../jhbuild/versioncontrol/bzr.py:72
-#: ../jhbuild/versioncontrol/darcs.py:55 ../jhbuild/versioncontrol/hg.py:53
+#: ../jhbuild/versioncontrol/arch.py:92 ../jhbuild/versioncontrol/bzr.py:74
+#: ../jhbuild/versioncontrol/darcs.py:55
+#: ../jhbuild/versioncontrol/fossil.py:49 ../jhbuild/versioncontrol/hg.py:53
 #: ../jhbuild/versioncontrol/mtn.py:52 ../jhbuild/versioncontrol/tarball.py:67
 #, python-format
 msgid "branch for %s has wrong override, check your .jhbuildrc"
 msgstr ""
 
 #: ../jhbuild/versioncontrol/arch.py:128 ../jhbuild/versioncontrol/arch.py:141
-#: ../jhbuild/versioncontrol/bzr.py:131 ../jhbuild/versioncontrol/bzr.py:137
 #: ../jhbuild/versioncontrol/darcs.py:84 ../jhbuild/versioncontrol/darcs.py:90
-#: ../jhbuild/versioncontrol/git.py:433 ../jhbuild/versioncontrol/git.py:473
-#: ../jhbuild/versioncontrol/git.py:549 ../jhbuild/versioncontrol/hg.py:85
-#: ../jhbuild/versioncontrol/hg.py:91
+#: ../jhbuild/versioncontrol/fossil.py:82
+#: ../jhbuild/versioncontrol/fossil.py:95 ../jhbuild/versioncontrol/git.py:536
+#: ../jhbuild/versioncontrol/git.py:576 ../jhbuild/versioncontrol/git.py:652
+#: ../jhbuild/versioncontrol/hg.py:85 ../jhbuild/versioncontrol/hg.py:91
 msgid "date based checkout not yet supported\n"
 msgstr "a verificación baseada na data non está soportada todavía\n"
 
+#: ../jhbuild/versioncontrol/bzr.py:117
+msgid "attribute is deprecated. Use revspec instead."
+msgstr ""
+
+#: ../jhbuild/versioncontrol/bzr.py:171
+#, python-format
+msgid ""
+"\n"
+"Path %s does not seem to be a checkout from dvcs_mirror_dir.\n"
+"Remove it or change your dvcs_mirror_dir settings."
+msgstr ""
+
 #: ../jhbuild/versioncontrol/cvs.py:104
 #, python-format
 msgid "could not log into %s\n"
@@ -1057,22 +1113,40 @@ msgstr ""
 msgid "Consider using the changecvsroot.py script to fix this."
 msgstr "Considere empregar o script changecvsroot.py para arranxar isto."
 
-#: ../jhbuild/versioncontrol/git.py:94
-#, fuzzy
+#: ../jhbuild/versioncontrol/git.py:102
 msgid "ignored bad branch redefinition for module:"
 msgstr "W: ignorouse a redefinición de rama incorrecta para o módulo:"
 
-#: ../jhbuild/versioncontrol/git.py:188
+#: ../jhbuild/versioncontrol/git.py:187
+msgid "Need at least git-1.5.6 from June/08 to operate"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/git.py:201
+msgid "Unexpected: Checkoutdir is not a git repository:"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/git.py:257
+#, python-format
+msgid ""
+"The requested branch \"%s\" is not available. Neither locally, nor remotely "
+"in the origin remote."
+msgstr ""
+
+#: ../jhbuild/versioncontrol/git.py:265
+msgid "Refusing to switch a dirty tree."
+msgstr ""
+
+#: ../jhbuild/versioncontrol/git.py:341
 #, python-format
 msgid "Command %s returned no output"
-msgstr "O comando %s non devolveu ningunha saída"
+msgstr "A orde %s non devolveu ningunha saída"
 
-#: ../jhbuild/versioncontrol/git.py:193
+#: ../jhbuild/versioncontrol/git.py:346
 #, python-format
 msgid "Command %s did not include commit line: %r"
 msgstr "O comando %s non inclúe unha liña de entrega: %r"
 
-#: ../jhbuild/versioncontrol/git.py:255
+#: ../jhbuild/versioncontrol/git.py:408
 msgid ""
 "Failed to update module as it switched to git (you should check for changes "
 "then remove the directory)."
@@ -1080,7 +1154,7 @@ msgstr ""
 "Ocorreu un fallo ao actualizar o módulo xa que cambiou a git (debería "
 "comprobar os cambios e eliminar o directorio)."
 
-#: ../jhbuild/versioncontrol/git.py:256
+#: ../jhbuild/versioncontrol/git.py:409
 msgid ""
 "Failed to update module (missing .git) (you should check for changes then "
 "remove the directory)."
@@ -1088,11 +1162,7 @@ msgstr ""
 "Ocorreu un fallo ao actualizar o módulo (falta .git) (debería comprobar os "
 "cambios e logo eliminar o directorio)."
 
-#: ../jhbuild/versioncontrol/git.py:279
-msgid "Failed to update module (corrupt .git?)"
-msgstr ""
-
-#: ../jhbuild/versioncontrol/git.py:400
+#: ../jhbuild/versioncontrol/git.py:503
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1100,7 +1170,7 @@ msgstr ""
 "Xestión externa fallida\n"
 " Se está executando unha versión de git < 1.5.6 recomendase actualizar.\n"
 
-#: ../jhbuild/versioncontrol/git.py:445
+#: ../jhbuild/versioncontrol/git.py:548
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr ""
@@ -1167,126 +1237,126 @@ msgstr ""
 msgid "URL has no filename component: %s"
 msgstr "a URL non ten un compoñente de nome de ficheiro: %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:162
+#: ../jhbuild/versioncontrol/tarball.py:164
 msgid "file not downloaded"
 msgstr "o ficheiro non foi descargado"
 
-#: ../jhbuild/versioncontrol/tarball.py:167
+#: ../jhbuild/versioncontrol/tarball.py:169
 #, python-format
 msgid "downloaded file size is incorrect (expected %(size1)d, got %(size2)d)"
 msgstr ""
 "tamaño de ficheiro descargado incorrecto (esperábase %(size1)d e "
 "descargáronse %(size2)d)"
 
-#: ../jhbuild/versioncontrol/tarball.py:173
-#, fuzzy, python-format
+#: ../jhbuild/versioncontrol/tarball.py:175
+#, python-format
 msgid "invalid hash attribute on module %s"
 msgstr "modo de verificación inválido (módulo: %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:186
-#, fuzzy, python-format
+#: ../jhbuild/versioncontrol/tarball.py:188
+#, python-format
 msgid "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
 msgstr ""
 "a suma MD5 non é correcta (esperábase %(sum1)s, pero recolleuse %(sum2)s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:189
+#: ../jhbuild/versioncontrol/tarball.py:191
 #, python-format
 msgid "skipped hash check (missing support for %s)"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:198
+#: ../jhbuild/versioncontrol/tarball.py:200
 #, python-format
 msgid "tarball dir (%s) can not be created"
 msgstr "non se puido crear o directorio de tarball (%s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:200
+#: ../jhbuild/versioncontrol/tarball.py:202
 #, python-format
 msgid "tarball dir (%s) must be writable"
 msgstr "o directorio de tarball (%s) debe ser escribíbel"
 
-#: ../jhbuild/versioncontrol/tarball.py:212
+#: ../jhbuild/versioncontrol/tarball.py:220
 msgid "unable to find wget or curl"
 msgstr "non se puido atopara wget ou curl"
 
-#: ../jhbuild/versioncontrol/tarball.py:220
+#: ../jhbuild/versioncontrol/tarball.py:228
 #, python-format
 msgid "failed to unpack %s"
 msgstr "ocorreu un fallo ao desempaquetar %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:223
+#: ../jhbuild/versioncontrol/tarball.py:231
 #, python-format
 msgid "could not unpack tarball (expected %s dir)"
 msgstr "non se puido desempaquetar o tarball (esperábase o directorio %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:238
+#: ../jhbuild/versioncontrol/tarball.py:246
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr "non se puido descargar o parche (erro: %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:240
+#: ../jhbuild/versioncontrol/tarball.py:248
 msgid "could not download patch"
 msgstr "non se puido descargar o parche"
 
-#: ../jhbuild/versioncontrol/tarball.py:272
-#, fuzzy, python-format
+#: ../jhbuild/versioncontrol/tarball.py:280
+#, python-format
 msgid "Failed to find patch: %s"
 msgstr "Ocorreu un fallo ao desempaquetar %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:274
+#: ../jhbuild/versioncontrol/tarball.py:282
 msgid "Applying patch"
 msgstr "Aplicando parche"
 
-#: ../jhbuild/versioncontrol/tarball.py:281
+#: ../jhbuild/versioncontrol/tarball.py:289
 msgid "unable to find quilt"
 msgstr "non se puido atopar quilt"
 
-#: ../jhbuild/versioncontrol/tarball.py:292
+#: ../jhbuild/versioncontrol/tarball.py:300
 msgid "could not checkout quilt patch set"
 msgstr ""
 
-#: ../jhbuild/config.py:138
+#: ../jhbuild/config.py:137
 #, python-format
 msgid "unable to parse '%s' as relative time."
 msgstr "non se puido analizar '%s' como un tempo relativo."
 
-#: ../jhbuild/config.py:165
+#: ../jhbuild/config.py:164
 msgid ""
 "JHBuild start script has been installed in ~/.local/bin/jhbuild, you should "
 "remove the old version that is still in ~/bin/ (or make it a symlink to ~/."
 "local/bin/jhbuild)"
 msgstr ""
 
-#: ../jhbuild/config.py:177
+#: ../jhbuild/config.py:176
 msgid ""
 "Obsolete JHBuild start script, make sure it is removed then do run 'make "
 "install'"
 msgstr ""
 
-#: ../jhbuild/config.py:185
+#: ../jhbuild/config.py:184
 msgid "could not load config defaults"
 msgstr "non se puido cargar a configuración por defecto"
 
-#: ../jhbuild/config.py:189
+#: ../jhbuild/config.py:188
 #, python-format
 msgid "could not load config file, %s is missing"
 msgstr "non se puido cargar a configuración por defecto, falta %s"
 
-#: ../jhbuild/config.py:205
-#, fuzzy, python-format
+#: ../jhbuild/config.py:204
+#, python-format
 msgid "Could not include config file (%s)"
 msgstr "non se puido cargar o ficheiro de configuración"
 
-#: ../jhbuild/config.py:218
+#: ../jhbuild/config.py:217
 msgid "could not load config file"
 msgstr "non se puido cargar o ficheiro de configuración"
 
-#: ../jhbuild/config.py:232
-#, fuzzy, python-format
+#: ../jhbuild/config.py:231
+#, python-format
 msgid "unknown keys defined in configuration file: %s"
 msgstr "I: chaves definidas no ficheiro de configuración descoñecidas: %s"
 
-#: ../jhbuild/config.py:239
-#, fuzzy, python-format
+#: ../jhbuild/config.py:238
+#, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use \"repos"
 "['gnome.org']\"."
@@ -1294,72 +1364,67 @@ msgstr ""
 "W: a variable de configuración \"%s\" está obsoleta, debería empregar "
 "\"repos ['gnome.org']\"."
 
-#: ../jhbuild/config.py:244 ../jhbuild/config.py:249
-#, fuzzy, python-format
+#: ../jhbuild/config.py:243 ../jhbuild/config.py:248
+#, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use \"repos\"."
 msgstr ""
 "W: a variable de configuración \"%s\" está obsoleta, debería empregar \"repos"
 "\"."
 
-#: ../jhbuild/config.py:270
+#: ../jhbuild/config.py:269
 msgid "invalid checkout mode"
 msgstr "modo de verificación inválido"
 
-#: ../jhbuild/config.py:274
+#: ../jhbuild/config.py:273
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr "modo de verificación inválido (módulo: %s)"
 
-#: ../jhbuild/config.py:276
+#: ../jhbuild/config.py:275
 msgid "copy mode requires copy_dir to be set"
 msgstr "o modo de copia require que se estableza copy_dir"
 
-#: ../jhbuild/config.py:281
+#: ../jhbuild/config.py:280
 #, python-format
 msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
 msgstr ""
 
-#: ../jhbuild/config.py:293
+#: ../jhbuild/config.py:292
 #, python-format
 msgid "install prefix (%s) can not be created"
 msgstr "o prefixo de instalación (%s) non pode ser creado"
 
-#: ../jhbuild/config.py:363
+#: ../jhbuild/config.py:375
 #, python-format
 msgid "Can't create %s directory"
 msgstr "Non se pode crear o directorio %s"
 
-#: ../jhbuild/config.py:438
-#, fuzzy, python-format
+#: ../jhbuild/config.py:459
+#, python-format
 msgid "Could not create GConf config (%s)"
 msgstr "non se pode crear o directorio %s"
 
-#: ../jhbuild/config.py:522
+#: ../jhbuild/config.py:546
 msgid "Failed to parse relative time"
 msgstr "Aconteceu un erro ao analizar o tempo relativo"
 
-#: ../jhbuild/config.py:532
-#, fuzzy
+#: ../jhbuild/config.py:556
 msgid ""
 "quiet mode has been disabled because the Python curses module is missing."
 msgstr ""
 "W: o modo silencioso está desactivado xa que o módulo curses de Python non "
 "está dispoñíbel."
 
-#: ../jhbuild/main.py:91
-msgid "JHBuild commands are:"
-msgstr "Os comandos JHBuild son:"
-
-#: ../jhbuild/main.py:97
-msgid "For more information run \"jhbuild <command> --help\""
-msgstr "Para máis información execute \"jhbuild <commando> --help\""
+#: ../jhbuild/main.py:98
+msgid "You should not run jhbuild as root.\n"
+msgstr ""
 
-#: ../jhbuild/main.py:111
+#: ../jhbuild/main.py:106
 msgid "%prog [ -f config ] command [ options ... ]"
 msgstr "%prog [ -f config ] comando [ opcións ... ]"
 
-#: ../jhbuild/main.py:112
+#: ../jhbuild/main.py:108
 msgid ""
 "Build a set of modules from diverse repositories in correct dependency order "
 "(such as GNOME)."
@@ -1367,61 +1432,64 @@ msgstr ""
 "Compilar o conxunto de módulos dende distintos repositorios en orde de "
 "dependencias correcto (como GNOME)."
 
-#: ../jhbuild/main.py:116
-msgid "Information about available jhbuild commands"
-msgstr "Información sobre os comandos dispoñibles de jhbuild"
+#: ../jhbuild/main.py:112
+msgid "Display this help and exit"
+msgstr "amosa esta mensaxe de axuda e sae"
 
-#: ../jhbuild/main.py:120
+#: ../jhbuild/main.py:119
 msgid "use a non default configuration file"
 msgstr "empregar un ficheiro de configuración distinto do que está por defecto"
 
-#: ../jhbuild/main.py:123
+#: ../jhbuild/main.py:122
 msgid "use a non default module set"
 msgstr "empregar un conxunto de módulos distinto do que está por defecto"
 
-#: ../jhbuild/main.py:126
+#: ../jhbuild/main.py:125
 msgid "do not prompt for input"
 msgstr "non solicitar inserción de datos"
 
-#: ../jhbuild/main.py:157
+#: ../jhbuild/main.py:156
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: ../jhbuild/main.py:160
+#: ../jhbuild/main.py:159
 msgid "EOF"
 msgstr "EOF"
 
-#: ../jhbuild/moduleset.py:56
+#: ../jhbuild/moduleset.py:61
 #, python-format
 msgid "fixed case of module '%(orig)s' to '%(new)s'"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:71
+#: ../jhbuild/moduleset.py:76
 #, python-format
 msgid "module \"%s\" not found"
 msgstr "o módulo \"%s\" non se atopou"
 
-#: ../jhbuild/moduleset.py:85
+#: ../jhbuild/moduleset.py:90
 #, python-format
 msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
 msgstr "%(module)s depende do módulo \"%(invalid)s\" descoñecido "
 
-#: ../jhbuild/moduleset.py:230
-#, fuzzy
+#: ../jhbuild/moduleset.py:235
 msgid "Unknown module:"
 msgstr "W: Módulo descoñecido:"
 
-#: ../jhbuild/moduleset.py:293 ../jhbuild/moduleset.py:323
+#: ../jhbuild/moduleset.py:298 ../jhbuild/moduleset.py:328
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr "aconteceu un fallo ao analizar %s: %s"
 
-#: ../jhbuild/moduleset.py:318
+#: ../jhbuild/moduleset.py:323
 #, python-format
 msgid "could not download %s: %s"
 msgstr "non se puido descargar %s: %s"
 
-#: ../jhbuild/moduleset.py:443
+#: ../jhbuild/moduleset.py:353
+msgid "Duplicate repository:"
+msgstr ""
+
+#: ../jhbuild/moduleset.py:455
 msgid ""
 "Modulesets were edited locally but JHBuild is configured to get them from "
 "the network, perhaps you need to add use_local_modulesets = True to your ."
@@ -1474,9 +1542,6 @@ msgstr "Grupo con nome non recoñecido no patrón"
 #~ msgid "option %s: invalid choice: %r (choose from %s)"
 #~ msgstr "opción %s: elección inválida: %r (elixa entre %s)"
 
-#~ msgid "show this help message and exit"
-#~ msgstr "amosa esta mensaxe de axuda e sae"
-
 #~ msgid "show program's version number and exit"
 #~ msgstr "amosa o número de versión do programa e sae"