[anjuta] Updated Spanish translation

From: Jorge Gonzalez Gonzalez <jorgegonz src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [anjuta] Updated Spanish translation
Date: Mon, 2 Nov 2009 12:33:38 +0000 (UTC)
commit a6c7a74592572a170c928ed6e5f363b6be087a03
Author: Jorge GonzÃ¡lez <jorgegonz svn gnome org>
Date:   Mon Nov 2 13:33:33 2009 +0100

    Updated Spanish translation

 po/es.po | 2567 +++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1641 insertions(+), 926 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 94cb1c1..8f2df9b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,13 +12,13 @@ msgstr ""
 "Project-Id-Version: anjuta.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=anjuta&component=core application\n"
-"POT-Creation-Date: 2009-09-02 20:21+0000\n"
-"PO-Revision-Date: 2009-09-05 13:27+0200\n"
+"POT-Creation-Date: 2009-10-17 14:09+0000\n"
+"PO-Revision-Date: 2009-11-02 13:33+0100\n"
 "Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "serrador hispalinux es>\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -75,8 +75,11 @@ msgstr ""
 
 #: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
 #, c-format
+#| msgid ""
+#| "anjuta was not able to automatically determine the encoding of the file "
+#| "you want to open."
 msgid ""
-"anjuta was not able to automatically determine the encoding of the file you "
+"Anjuta was not able to automatically determine the encoding of the file you "
 "want to open."
 msgstr ""
 "Anjuta no pudo determinar automÃ¡ticamente la codificaciÃ³n del archivo que "
@@ -213,11 +216,11 @@ msgstr "No se puede ejecutar el comando: \"%s\""
 msgid "execvp failed"
 msgstr "ha fallado execvp"
 
-#: ../libanjuta/anjuta-plugin.c:327 ../libanjuta/anjuta-plugin-manager.c:2310
+#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2310
 msgid "Anjuta Shell"
 msgstr "Shell de Anjuta"
 
-#: ../libanjuta/anjuta-plugin.c:328
+#: ../libanjuta/anjuta-plugin.c:327
 msgid "Anjuta shell that will contain the plugin"
 msgstr "El shell de Anjuta que contendrÃ¡ el complemento"
 
@@ -274,13 +277,13 @@ msgstr "Olvidar el complemento seleccionado"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1357
 #: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
-#: ../plugins/debug-manager/queue.c:556
+#: ../plugins/debug-manager/queue.c:537
 msgid "Select a plugin"
 msgstr "Seleccionar un complemento"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#: ../plugins/debug-manager/queue.c:557
+#: ../plugins/debug-manager/queue.c:538
 msgid "Please select a plugin to activate"
 msgstr "Seleccionar un complemento para activar"
 
@@ -366,7 +369,9 @@ msgid "Synchronization file"
 msgstr "Archivo de sincronizaciÃ³n"
 
 #: ../libanjuta/anjuta-profile.c:281
-msgid "File to sync the profile xml"
+#, fuzzy
+#| msgid "File to sync the profile xml"
+msgid "File to syncronize the profile XML"
 msgstr "Archivo en el que sincronizar el xml del perfil"
 
 #: ../libanjuta/anjuta-profile.c:508
@@ -374,9 +379,12 @@ msgid "Please select a plugin from the list"
 msgstr "Seleccione un complemento de la lista"
 
 #: ../libanjuta/anjuta-profile.c:672
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to read '%s': XML parse error. Invalid or corrupted anjuta plugins "
+#| "profile."
 msgid ""
-"Failed to read '%s': XML parse error. Invalid or corrupted anjuta plugins "
+"Failed to read '%s': XML parse error. Invalid or corrupted Anjuta plugins "
 "profile."
 msgstr ""
 "FallÃ³ al leer Â«%sÂ»: error de anÃ¡lisis XML. Perfil de complementos de Anjuta "
@@ -419,8 +427,8 @@ msgstr "CategorÃa"
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4 ../src/anjuta-app.c:723
-#: ../src/preferences.ui.h:10
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:723
+#: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "General"
 
@@ -501,7 +509,9 @@ msgstr ""
 
 #. Try xterm
 #: ../libanjuta/anjuta-utils.c:986
-msgid "Cannot find a terminal, using xterm, even if it may not work"
+#, fuzzy
+#| msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr ""
 "No se puede encontrar una terminal, usando xterm, aunque puede que no "
 "funcione"
@@ -513,9 +523,13 @@ msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "No se puede ejecutar el comando: %s (usando shell %s)\n"
 
 #: ../libanjuta/anjuta-utils.c:1690
+#, fuzzy
+#| msgid ""
+#| "Unable to display help. Please make sure Anjuta documentation package is "
+#| "install. It can be downloaded from http://anjuta.org";
 msgid ""
-"Unable to display help. Please make sure Anjuta documentation package is "
-"install. It can be downloaded from http://anjuta.org";
+"Unable to display help. Please make sure the Anjuta documentation package is "
+"installed. It can be downloaded from http://anjuta.org.";
 msgstr ""
 "No se puede mostrar la ayuda. AsegÃºrese de que el paquete de documentaciÃ³n "
 "de Anjuta estÃ¡ instalado. Puede ser descargado desde http://anjuta.org";
@@ -546,7 +560,8 @@ msgid "Conflicted"
 msgstr "En conflicto"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-msgid "Up to date"
+#: ../plugins/file-manager/file-view.c:73
+msgid "Up-to-date"
 msgstr "Actualizado"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
@@ -597,67 +612,77 @@ msgid "Could not find application pixmap file: %s"
 msgstr "No se puede encontrar el pixmap de la aplicaciÃ³n: %s"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
-msgid "<b>Build</b>"
-msgstr "<b>Construir</b>"
+#: ../plugins/run-program/anjuta-run-program.ui.h:1
+msgid "Arguments:"
+msgstr "Argumentos:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:2
-msgid "<b>Configuration:</b>"
-msgstr "<b>ConfiguraciÃ³n:</b>"
+#, fuzzy
+#| msgid "_Build"
+msgid "Build"
+msgstr "_Construir"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:3
-msgid "<b>Install</b>"
-msgstr "<b>Instalar</b>"
+msgid "Build Directory:"
+msgstr "Directorio de construcciÃ³n:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:4
-msgid "<b>Regenerate project</b>"
-msgstr "<b>Regenerar el proyecto</b>"
+#, fuzzy
+#| msgid "Confirmation"
+msgid "Configuration:"
+msgstr "ConfirmaciÃ³n"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:5
-msgid "<b>Select Program to run:</b>"
-msgstr "<b>Seleccionar programa que ejecutar:</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
-#: ../plugins/run-program/anjuta-run-program.ui.h:1
-msgid "Arguments:"
-msgstr "Argumentos:"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
-msgid "Build Directory:"
-msgstr "Directorio de construcciÃ³n:"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Configure Options:"
 msgstr "Opciones de configuraciÃ³n:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
 msgid "Configure Project"
 msgstr "Configurar el proyecto"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
 msgid "Continue on errors"
 msgstr "Continuar en errores"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Highlight message locations in editor"
 msgstr "Resaltar mensajes de ubicaciÃ³n en el editor"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+#, fuzzy
+#| msgid "_Install"
+msgid "Install"
+msgstr "_Instalar"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
 msgid "Install as root:"
 msgstr "Instalar como root:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
-#: ../plugins/tools/anjuta-tools.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+#, fuzzy
+#| msgid "<b>Regenerate project</b>"
+msgid "Regenerate project"
+msgstr "<b>Regenerar el proyecto</b>"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/tools/anjuta-tools.ui.h:8
 msgid "Run in terminal"
 msgstr "Ejecutar en un terminal"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
 msgid "Run several commands at a time:"
 msgstr "Ejecutar varios comandos al mismo tiempo:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
 msgid "Select Program"
 msgstr "Seleccione el programa"
 
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+#, fuzzy
+#| msgid "<b>Select Program to run:</b>"
+msgid "Select Program to run:"
+msgstr "<b>Seleccionar programa que ejecutar:</b>"
+
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:16
 msgid "Select a build directory"
 msgstr "Seleccionar un directorio de construcciÃ³n"
@@ -669,7 +694,7 @@ msgstr "Traducir mensajes"
 #: ../plugins/build-basic-autotools/configuration-list.c:62
 #: ../plugins/class-gen/window.c:525
 #: ../plugins/search/search_preferences.c:523
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2 ../src/preferences.ui.h:2
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -708,8 +733,9 @@ msgid "Program '%s' is not a local file"
 msgstr "El programa Â«%sÂ» no es un archivo local"
 
 #: ../plugins/build-basic-autotools/executer.c:310
+#: ../plugins/run-program/execute.c:76
 #, c-format
-msgid "Program '%s' does not exists"
+msgid "Program '%s' does not exist"
 msgstr "El programa Â«%sÂ» no existe"
 
 #: ../plugins/build-basic-autotools/executer.c:318
@@ -829,15 +855,17 @@ msgstr ""
 "Â¿Quiere hacerlo?"
 
 #: ../plugins/build-basic-autotools/plugin.c:1802
-#, c-format
-msgid "Can not compile \"%s\": No compile rule defined for this file type."
+#, fuzzy, c-format
+#| msgid "Can not compile \"%s\": No compile rule defined for this file type."
+msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr ""
 "No se puede compilar Â«%sÂ»: No se definiÃ³ una regla de compilaciÃ³n para este "
 "tipo de archivo."
 
 #: ../plugins/build-basic-autotools/plugin.c:1928
-#, c-format
-msgid "Can not configure project: Missing configure script in %s."
+#, fuzzy, c-format
+#| msgid "Can not configure project: Missing configure script in %s."
+msgid "Cannot configure project: Missing configure script in %s."
 msgstr ""
 "No se puede configurar el proyecto: Falta el script de configuraciÃ³n en %s."
 
@@ -876,8 +904,10 @@ msgid "Clean whole project"
 msgstr "Limpia todo el proyecto"
 
 #: ../plugins/build-basic-autotools/plugin.c:2416
-msgid "C_onfigure Project..."
-msgstr "C_onfigurar el proyectoâ?¦"
+#, fuzzy
+#| msgid "Configure Project"
+msgid "C_onfigure Projectâ?¦"
+msgstr "Configurar el proyecto"
 
 #: ../plugins/build-basic-autotools/plugin.c:2417
 msgid "Configure project"
@@ -1014,18 +1044,18 @@ msgstr "Co_mpilar (%s)"
 msgid "Co_mpile"
 msgstr "Co_mpilar"
 
-#: ../plugins/build-basic-autotools/plugin.c:3122
+#: ../plugins/build-basic-autotools/plugin.c:3121
 msgid "Build commands"
 msgstr "Comandos de construcciÃ³n"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3131
+#: ../plugins/build-basic-autotools/plugin.c:3130
 msgid "Build popup commands"
 msgstr "Comandos de construcciÃ³n emergentes"
 
-#: ../plugins/build-basic-autotools/plugin.c:3513
-#: ../plugins/build-basic-autotools/plugin.c:3521
+#: ../plugins/build-basic-autotools/plugin.c:3512
+#: ../plugins/build-basic-autotools/plugin.c:3520
 msgid "Build Autotools"
 msgstr "Autotools de construcciÃ³n"
 
@@ -1034,74 +1064,80 @@ msgid "Command aborted"
 msgstr "Comando abortado"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
-msgid "<b>Class Elements</b>"
-msgstr "<b>Elementos de la clase</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
-msgid "<b>General Class Properties</b>"
-msgstr "<b>Propiedades generales de la clase</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Project"
 msgstr "AÃ±adir al proyecto"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Repository"
 msgstr "AÃ±adir al repositorio"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
-msgid "Author Email:"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+#, fuzzy
+#| msgid "Author Email:"
+msgid "Author Email Address:"
 msgstr "Correo-e del autor:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Name:"
 msgstr "Nombre del autor:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author/Date-Time"
 msgstr "Autor/Fecha-Hora"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date/Time"
 msgstr "Autor/Fecha/Hora"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Base Class Inheritance:"
 msgstr "Herencia base de la clase:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class:"
 msgstr "Clase base:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#, fuzzy
+#| msgid "<b>Class Elements</b>"
+msgid "Class Elements"
+msgstr "<b>Elementos de la clase</b>"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Function Prefix:"
 msgstr "Prefijo de la funciÃ³n de la clase:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
 msgid "Class Generator"
 msgstr "Generador de clases"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 msgid "Class Name:"
 msgstr "Nombre de la clase:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
 msgid "Class Options:"
 msgstr "Opciones de clase:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Create"
 msgstr "Crear"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "GObject Class\t"
 msgstr "Clase GObject\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
 msgid "GObject Prefix and Type:"
 msgstr "Tipo y prefijo GObject:"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#, fuzzy
+#| msgid "<b>General Class Properties</b>"
+msgid "General Class Properties"
+msgstr "<b>Propiedades generales de la clase</b>"
+
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 #: ../plugins/file-wizard/file.c:102
 #: ../plugins/project-wizard/templates/translatable-strings.h:47
@@ -1127,7 +1163,7 @@ msgid "Lesser General Public License (LGPL)"
 msgstr "Lesser General Public License (LGPL)"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "Licencia:"
 
@@ -1190,10 +1226,14 @@ msgstr "Archivo en el que se escribirÃ¡ la plantilla procesada"
 msgid "Failed to write autogen definition file"
 msgstr "FallÃ³ al escribir el archivo de definiciÃ³n de Autogen"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1040
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1043
+#, fuzzy
+#| msgid ""
+#| "Could not find autogen version 5, please install the autogen package. You "
+#| "can get it from http://autogen.sourceforge.net";
 msgid ""
-"Could not find autogen version 5, please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net";
+"Could not find autogen version 5; please install the autogen package. You "
+"can get it from http://autogen.sourceforge.net.";
 msgstr ""
 "No se pudo encontrar autogen versiÃ³n 5, por favor instale el paquete "
 "autogen. Puede obtenerlo en http://autogen.sourceforge.net";
@@ -1208,12 +1248,11 @@ msgid "Guess from type"
 msgstr "Adivinar por el tipo"
 
 #: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
-#| msgid "Stopped"
+#: ../plugins/search/anjuta-search.ui.h:29
 msgid "Scope"
 msgstr "Rango"
 
 #: ../plugins/class-gen/window.c:500
-#| msgid "Tag _Implementation"
 msgid "Implementation"
 msgstr "ImplementaciÃ³n"
 
@@ -1238,7 +1277,6 @@ msgid "Arguments"
 msgstr "Argumentos"
 
 #: ../plugins/class-gen/window.c:521
-#| msgid "Nordic"
 msgid "Nick"
 msgstr "Apodo"
 
@@ -1247,18 +1285,15 @@ msgid "Blurb"
 msgstr "Blurb"
 
 #: ../plugins/class-gen/window.c:523
-#| msgid "Type"
 msgid "GType"
 msgstr "GType"
 
 #: ../plugins/class-gen/window.c:524
-#| msgid "Parameters:"
 msgid "ParamSpec"
 msgstr "ParamSpec"
 
 #. Somehow redundant with marshaller, but required for default handler
 #: ../plugins/class-gen/window.c:526 ../plugins/class-gen/window.c:536
-#| msgid "Tags"
 msgid "Flags"
 msgstr "Opciones"
 
@@ -1271,28 +1306,17 @@ msgid "XML description of the user interface"
 msgstr "DescripciÃ³n XML de la interfaz de usuario"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
-msgid "<b>CVS Options</b>"
-msgstr "<b>Opciones del CVS</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:2
-msgid "<b>Module Details:</b>"
-msgstr "<b>Detalles del mÃ³dulo:</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:3
-msgid "<b>Options:</b>"
-msgstr "<b>Opciones:</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
-#: ../plugins/git/anjuta-git.ui.h:1 ../plugins/search/anjuta-search.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>Opciones</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
+#, fuzzy
+#| msgid ""
+#| "<b>Please note: </b>\n"
+#| "\n"
+#| "Pressing OK will delete the file from disk and from CVS. Of course the "
+#| "file won't be removed from CVS before you use CVS Commit. <b>You have "
+#| "been warned!</b>"
 msgid ""
 "<b>Please note: </b>\n"
 "\n"
-"Pressing OK will delete the file from disk and from CVS. Of course the file "
+"Pressing OK will delete the file from disk and from CVS. Of course, the file "
 "won't be removed from CVS before you use CVS Commit. <b>You have been warned!"
 "</b>"
 msgstr ""
@@ -1302,171 +1326,204 @@ msgstr ""
 "el archivo no serÃ¡ eliminado del CVS antes de que realice un CVS commit. "
 "<b>EstÃ¡ advertido</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
-msgid "<b>Repository: </b>"
-msgstr "<b>Repositorio:</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
 msgid "Be verbose"
 msgstr "Ser prolijo"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
+#: ../plugins/git/anjuta-git.ui.h:22
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
-#: ../plugins/tools/anjuta-tools.ui.h:2
-msgid "Browse..."
+#: ../plugins/tools/anjuta-tools.ui.h:1
+#, fuzzy
+#| msgid "Browse..."
+msgid "Browseâ?¦"
 msgstr "Examinarâ?¦"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:6
+#, fuzzy
+#| msgid "CVS operations"
+msgid "CVS Options"
+msgstr "Operaciones CVS"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:7
 msgid "CVS Preferences"
 msgstr "Preferencias del CVS"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
 msgid "CVS: Add file/directory"
 msgstr "CVS: AÃ±adir archivo/directorio"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
 msgid "CVS: Commit file/directory"
 msgstr "CVS: Efectuar archivo/directorio"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
 msgid "CVS: Diff file/directory"
 msgstr "CVS: Diferencias del archivo/directorio"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
 msgid "CVS: Import"
 msgstr "CVS: Importar"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
 msgid "CVS: Log file/directory"
 msgstr "CVS: Archivo de registro/directorio"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
 msgid "CVS: Remove file/directory"
 msgstr "CVS: Eliminar archivo/directorio"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
 msgid "CVS: Status"
 msgstr "CVS: Estado"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
 msgid "CVS: Status from file/directory"
 msgstr "CVS: Estado del archivo/directorio"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
 msgid "CVS: Update file/directory"
 msgstr "CVS: Actualizar archivo/directorio"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
 msgid "CVSROOT:"
 msgstr "CVSROOT:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
 #: ../plugins/subversion/anjuta-subversion.ui.h:5
 msgid "Choose file or directory to add:"
 msgstr "Elegir archivo o directorio para aÃ±adir:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
 msgid "Choose file or directory to commit:"
 msgstr "Elija un archivo o directorio que efectuar:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
 msgid "Choose file or directory to diff:"
 msgstr "Elija el archivo o directorio del que sacar diferencias:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
-msgid "Choose file or directory to get log:"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+#, fuzzy
+#| msgid "Choose file or directory to get log:"
+msgid "Choose file or directory to get log for:"
 msgstr "Elija el archivo o directorio del que obtener el registro:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
 msgid "Choose file or directory to get the status from:"
 msgstr "Elija el archivo o directorio del que obtener el estado:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
 msgid "Choose file or directory to remove:"
 msgstr "Elija el archivo o directorio a eliminar:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
 #: ../plugins/subversion/anjuta-subversion.ui.h:6
 msgid "Choose file or directory to update:"
 msgstr "Elija el archivo o directorio para actualizar:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
 msgid "Compression Level (0=off, 10=max):"
 msgstr "Nivel de compresiÃ³n (0=ninguna, 10=mÃ¡x):"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
 msgid "Create new directories"
 msgstr "Crear directorios nuevos"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
 msgid "Delete empty directories"
 msgstr "Borrar directorios vacÃos"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
 #: ../plugins/subversion/anjuta-subversion.ui.h:13
 msgid "Do not act recursively"
 msgstr "No actuar recursivamente"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
 msgid "Extern (rsh)"
 msgstr "Externo (rsh)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "File is binary"
 msgstr "El archivo es binario"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
 msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ignorar el archivo .cvsrc (recomendado)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
-#: ../plugins/git/anjuta-git.ui.h:62 ../plugins/symbol-db/plugin.c:2333
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2333
 #: ../plugins/symbol-db/plugin.c:2397
 msgid "Local"
 msgstr "Local"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "Mensaje de registro:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+#, fuzzy
+#| msgid "<b>Module Details:</b>"
+msgid "Module Details:"
+msgstr "<b>Detalles del mÃ³dulo:</b>"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
 msgid "Module name:"
 msgstr "Nombre del mÃ³dulo:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/glade/plugin.c:3097
+#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
+#: ../plugins/subversion/anjuta-subversion.ui.h:23
+msgid "Options"
+msgstr "Opciones"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/subversion/anjuta-subversion.ui.h:24
+msgid "Options:"
+msgstr "Opciones:"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
 msgid "Password server (pserver)"
 msgstr "Servidor de contraseÃ±as (pserver)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
 #: ../plugins/subversion/anjuta-subversion.ui.h:26
 msgid "Password:"
 msgstr "ContraseÃ±a:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
 msgid "Patch-Style diff"
 msgstr "Diff estilo patch"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
 msgid "Path to \"cvs\" command"
 msgstr "Ruta hasta el comando Â«cvsÂ»"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
 msgid "Project root directory:"
 msgstr "Directorio raÃz del proyecto:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
 msgid "Release tag:"
 msgstr "Etiqueta de publicaciÃ³n [Release]:"
 
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+#, fuzzy
+#| msgid "Repository Head"
+msgid "Repository:"
+msgstr "Repositorio"
+
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:45
 msgid "Reset sticky tags"
 msgstr "Restablecer etiquetas persistentes"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
-#: ../plugins/git/anjuta-git.ui.h:91
-#: ../plugins/subversion/anjuta-subversion.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "RevisiÃ³n:"
 
@@ -1479,7 +1536,7 @@ msgid "Unified format instead of context format"
 msgstr "Formato unificado en vez de formato contextual"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:49
-#: ../plugins/subversion/anjuta-subversion.ui.h:54
+#: ../plugins/subversion/anjuta-subversion.ui.h:55
 msgid "Use revision/tag:"
 msgstr "Usar revisiÃ³n/etiqueta:"
 
@@ -1488,7 +1545,7 @@ msgid "Use revision:"
 msgstr "Usar revisiÃ³n:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:51
-#: ../plugins/subversion/anjuta-subversion.ui.h:55
+#: ../plugins/subversion/anjuta-subversion.ui.h:56
 msgid "Username:"
 msgstr "Usuario:"
 
@@ -1497,8 +1554,8 @@ msgid "Vendor tag:"
 msgstr "Etiqueta del fabricante:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
-#: ../plugins/git/anjuta-git.ui.h:125
-#: ../plugins/subversion/anjuta-subversion.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "Proyecto completo"
 
@@ -1549,18 +1606,24 @@ msgid "Are you sure that you do not want a log message?"
 msgstr "Â¿Seguro que no quiere un mensaje de registro?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:125
-msgid "CVS command failed - See above for details"
+#, fuzzy
+#| msgid "CVS command failed - See above for details"
+msgid "CVS command failed. See above for details"
 msgstr "El comando CVS ha fallado. Mire arriba para los detalles"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:130
-#, c-format
-msgid "CVS command successful! - Time taken: %ld second"
-msgid_plural "CVS command successful! - Time taken: %ld seconds"
+#, fuzzy, c-format
+#| msgid "CVS command successful! - Time taken: %ld second"
+#| msgid_plural "CVS command successful! - Time taken: %ld seconds"
+msgid "CVS command successful! Time taken: %ld second"
+msgid_plural "CVS command successful! Time taken: %ld seconds"
 msgstr[0] "Comando CVS exitoso; Tiempo empleado: %ld segundo"
 msgstr[1] "Comando CVS exitoso; Tiempo empleado: %ld segundos"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:221
-msgid "CVS command is running - please wait until it finishes!"
+#, fuzzy
+#| msgid "CVS command is running - please wait until it finishes!"
+msgid "CVS command is running â?? please wait until it finishes!"
 msgstr "Hay un comando CVS en ejecuciÃ³n; espere hasta que termine."
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
@@ -1621,7 +1684,9 @@ msgstr "_Actualizar"
 #. Display label
 #. short-cut
 #: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
-msgid "Sync your local copy with the CVS tree"
+#, fuzzy
+#| msgid "Sync your local copy with the CVS tree"
+msgid "Syncronize your local copy with the CVS tree"
 msgstr "Sincronizar su copia local con el Ã¡rbol CVS"
 
 #. Action name
@@ -1681,21 +1746,21 @@ msgid "CVS popup operations"
 msgstr "Operaciones emergentes de CVS"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
-msgid "<b>Debugger:</b>"
-msgstr "<b>Depurador:</b>"
-
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:2
-msgid "<b>Remote debugging</b>"
-msgstr "<b>DepuraciÃ³n remota</b>"
-
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:3
+#, fuzzy
+#| msgid ""
+#| "<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
+#| "program not using the Debug configuration ?</span>\n"
+#| "\n"
+#| "When optimizations are enabled, the debugger cannot always identify the "
+#| "source code corresponding to the instructions, some commands can perform "
+#| "in a strange way, especially steps."
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
-"program not using the Debug configuration ?</span>\n"
+"program not using the Debug configuration?</span>\n"
 "\n"
 "When optimizations are enabled, the debugger cannot always identify the "
-"source code corresponding to the instructions, some commands can perform in "
-"a strange way, especially steps."
+"source code corresponding to the instructions, so some commands can perform "
+"in a strange way, especially steps."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Â¿EstÃ¡ seguro de que quiere depurar un "
 "programa sin usar la configuraciÃ³n de Debug?</span>\n"
@@ -1704,116 +1769,128 @@ msgstr ""
 "identificar el cÃ³digo fuente que corresponde con las instrucciones, algunos "
 "comandos se comportan de una forma extraÃ±a, especialmente los pasos."
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
 msgstr "AÃ±adir vigilancia"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:5
 msgid "Address:"
 msgstr "DirecciÃ³n:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Attach to process"
 msgstr "Acoplar al proceso"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
 msgid "Breakpoint properties"
 msgstr "Propiedades de los puntos de parada"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
 #: ../plugins/debug-manager/breakpoints.c:1980
 msgid "Breakpoints"
 msgstr "Puntos de parada"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
 msgid "CPU Registers"
 msgstr "Registros CPU"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
 msgid "Change Watch"
 msgstr "Cambiar vigilancia"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
 msgid "Connect to remote target"
 msgstr "Conectar con objetivo remoto"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Debugger command"
 msgstr "Comando del depurador"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Debugger command:"
 msgstr "Comando del depurador:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+#, fuzzy
+#| msgid "Debugger"
+msgid "Debugger:"
+msgstr "Depurador"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
 #: ../plugins/project-wizard/templates/translatable-strings.h:33
 msgid "Description:"
 msgstr "DescripciÃ³n:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Display process _tree"
 msgstr "Mostrar _Ã¡rbol de procesos"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
 msgid "Do not show again"
 msgstr "No mostrar de nuevo"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 msgid "Enable _all"
 msgstr "Activar _todos"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
 msgid "Enter an address in hexadecimal or select one in the data"
 msgstr "Introduzca una direcciÃ³n hexadecimal o seleccione una en los datos"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Hide process para_meters"
 msgstr "Ocultar parÃ¡_metros del proceso"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
 msgid "Inspect"
 msgstr "Inspeccionar"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
 msgid "Inspect/Evaluate"
 msgstr "Inspeccionar/Evaluar"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
 #: ../plugins/debug-manager/plugin.c:945
 #: ../plugins/debug-manager/plugin.c:1045
 msgid "Kernel Signals"
 msgstr "SeÃ±ales del nÃºcleo"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
 #: ../plugins/debug-manager/breakpoints.c:1907
 msgid "Location"
 msgstr "UbicaciÃ³n"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
 #: ../plugins/debug-manager/memory.c:180
 msgid "Memory"
 msgstr "Memoria"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
 msgid "Pass:"
 msgstr "Pasar:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Print:"
 msgstr "Imprimir:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
 msgid "Program Interrupt"
 msgstr "InterrupciÃ³n del programa"
 
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+#, fuzzy
+#| msgid "<b>Remote debugging</b>"
+msgid "Remote debugging"
+msgstr "<b>DepuraciÃ³n remota</b>"
+
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:32
 msgid "SIGINT"
 msgstr "SIGINT"
@@ -1930,7 +2007,9 @@ msgstr "Activar un punto de parada en la posiciÃ³n actual"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/breakpoints.c:1786
-msgid "Add Breakpoint..."
+#, fuzzy
+#| msgid "Add Breakpoint..."
+msgid "Add Breakpointâ?¦"
 msgstr "AÃ±adir punto de paradaâ?¦"
 
 #. Display label
@@ -2022,7 +2101,7 @@ msgid "Disable a breakpoint"
 msgstr "Desactivar un punto de parada"
 
 #: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/tools/anjuta-tools.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "Activado"
 
@@ -2050,9 +2129,11 @@ msgid "Breakpoint operations"
 msgstr "Operaciones de los puntos de parada"
 
 #. create goto menu_item.
-#: ../plugins/debug-manager/data_view.c:390
-#: ../plugins/debug-manager/sparse_view.c:498
-msgid "_Goto address"
+#: ../plugins/debug-manager/data_view.c:389
+#: ../plugins/debug-manager/sparse_view.c:497
+#, fuzzy
+#| msgid "_Goto address"
+msgid "_Go to address"
 msgstr "_Ir a la direcciÃ³n"
 
 #: ../plugins/debug-manager/debug_tree.c:126
@@ -2105,7 +2186,9 @@ msgid "Loaded"
 msgstr "Cargado"
 
 #: ../plugins/debug-manager/plugin.c:429
-msgid "Running..."
+#, fuzzy
+#| msgid "Running..."
+msgid "Runningâ?¦"
 msgstr "EjecutÃ¡ndoseâ?¦"
 
 #: ../plugins/debug-manager/plugin.c:451
@@ -2145,7 +2228,9 @@ msgid "Start debugger and load the program"
 msgstr "Iniciar el depurador y cargar el programa"
 
 #: ../plugins/debug-manager/plugin.c:853
-msgid "_Debug Process..."
+#, fuzzy
+#| msgid "_Debug Process..."
+msgid "_Debug Processâ?¦"
 msgstr "_Depurar procesoâ?¦"
 
 #: ../plugins/debug-manager/plugin.c:855
@@ -2153,7 +2238,9 @@ msgid "Start debugger and attach to a running program"
 msgstr "Iniciar el depurador y acoplarlo al programa en ejecuciÃ³n"
 
 #: ../plugins/debug-manager/plugin.c:861
-msgid "Debug _Remote Target..."
+#, fuzzy
+#| msgid "Debug _Remote Target..."
+msgid "Debug _Remote Targetâ?¦"
 msgstr "Depurar objetivo _remotoâ?¦"
 
 #: ../plugins/debug-manager/plugin.c:863
@@ -2169,7 +2256,9 @@ msgid "Say goodbye to the debugger"
 msgstr "DespÃdase del depurador"
 
 #: ../plugins/debug-manager/plugin.c:877
-msgid "Add source paths..."
+#, fuzzy
+#| msgid "Add source paths..."
+msgid "Add source pathsâ?¦"
 msgstr "AÃ±adir rutas de fuentesâ?¦"
 
 #: ../plugins/debug-manager/plugin.c:879
@@ -2179,8 +2268,10 @@ msgstr "AÃ±adir rutas de fuentes adicionales"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/plugin.c:889 ../plugins/debug-manager/plugin.c:997
-msgid "Debugger Command..."
-msgstr "Comando de depuraciÃ³nâ?¦"
+#, fuzzy
+#| msgid "Debugger command"
+msgid "Debugger Commandâ?¦"
+msgstr "Comando del depurador"
 
 #. Display label
 #. short-cut
@@ -2227,7 +2318,9 @@ msgstr "Bibliotecas compartidas"
 
 #: ../plugins/debug-manager/plugin.c:939
 #: ../plugins/debug-manager/plugin.c:1039
-msgid "Show shared libraries mappings"
+#, fuzzy
+#| msgid "Show shared libraries mappings"
+msgid "Show shared library mappings"
 msgstr "Mostrar mapas de bibliotecas compartidas"
 
 #: ../plugins/debug-manager/plugin.c:947
@@ -2268,7 +2361,9 @@ msgid "Step _Out"
 msgstr "Avanzar al fina_l"
 
 #: ../plugins/debug-manager/plugin.c:983
-msgid "Single step out of the function"
+#, fuzzy
+#| msgid "Single step out of the function"
+msgid "Single step out of function"
 msgstr "Avanzar hasta el final de la funciÃ³n actual"
 
 #: ../plugins/debug-manager/plugin.c:989
@@ -2322,10 +2417,11 @@ msgstr "Pausa la ejecuciÃ³n del programa"
 msgid "Debugger operations"
 msgstr "Operaciones de depuraciÃ³n"
 
-#: ../plugins/debug-manager/queue.c:543
-#, c-format
-msgid ""
-"Unable to find one debugger plugin supporting a target with %s mime type"
+#: ../plugins/debug-manager/queue.c:524
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to find one debugger plugin supporting a target with %s mime type"
+msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
 msgstr ""
 "No se puede encontrar un complemento de depuraciÃ³n que soporte un objetivo "
 "con un tipo MIME %s"
@@ -2347,11 +2443,11 @@ msgstr "Actualizar"
 msgid "Shared Object"
 msgstr "Objeto compartido"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
 msgid "From"
 msgstr "De"
 
-#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:116
+#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "Para"
 
@@ -2398,19 +2494,19 @@ msgstr "SeÃ±ales del nÃºcleo"
 msgid "Signal operations"
 msgstr "Operaciones con seÃ±ales"
 
-#: ../plugins/debug-manager/sparse_view.c:1202
+#: ../plugins/debug-manager/sparse_view.c:1201
 msgid "Show Line Numbers"
 msgstr "Mostrar nÃºmeros de lÃnea"
 
-#: ../plugins/debug-manager/sparse_view.c:1203
+#: ../plugins/debug-manager/sparse_view.c:1202
 msgid "Whether to display line numbers"
 msgstr "Si se deben mostrar los nÃºmeros de lÃnea"
 
-#: ../plugins/debug-manager/sparse_view.c:1210
+#: ../plugins/debug-manager/sparse_view.c:1209
 msgid "Show Line Markers"
 msgstr "Mostrar los marcadores de lÃnea"
 
-#: ../plugins/debug-manager/sparse_view.c:1211
+#: ../plugins/debug-manager/sparse_view.c:1210
 msgid "Whether to display line marker pixbufs"
 msgstr "Si se deben mostrar los marcadores de lÃnea pixbuf"
 
@@ -2462,8 +2558,8 @@ msgid "Stack frame operations"
 msgstr "Operaciones con la pila de marcos"
 
 #: ../plugins/debug-manager/start.c:98
-msgid "Pid"
-msgstr "Pid"
+msgid "PID"
+msgstr "PID"
 
 #: ../plugins/debug-manager/start.c:98
 msgid "User"
@@ -2493,8 +2589,9 @@ msgid "Unable to open %s. Debugger cannot start."
 msgstr "No se pudo abrir %s. El depurador no puede iniciarse."
 
 #: ../plugins/debug-manager/start.c:975
-#, c-format
-msgid "Unable to detect mime-type of %s. Debugger cannot start."
+#, fuzzy, c-format
+#| msgid "Unable to detect mime-type of %s. Debugger cannot start."
+msgid "Unable to detect MIME type of %s. Debugger cannot start."
 msgstr ""
 "No se puede detectar el tipo MIME de %s. El depurador no puede iniciarse."
 
@@ -2517,8 +2614,8 @@ msgid "Set current thread"
 msgstr "Establecer el hilo actual"
 
 #: ../plugins/debug-manager/threads.c:436
-msgid "Id"
-msgstr "Id"
+msgid "ID"
+msgstr "ID"
 
 #: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
@@ -2531,8 +2628,10 @@ msgstr "Operaciones con los hilos"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/watch.c:372
-msgid "Ins_pect/Evaluate..."
-msgstr "Ins_peccionar/Evaluarâ?¦"
+#, fuzzy
+#| msgid "Inspect/Evaluate"
+msgid "Ins_pect/Evaluateâ?¦"
+msgstr "Inspeccionar/Evaluar"
 
 #. Display label
 #. short-cut
@@ -2541,8 +2640,10 @@ msgid "Inspect or evaluate an expression or variable"
 msgstr "Inspeccionar o evaluar una expresiÃ³n o variable"
 
 #: ../plugins/debug-manager/watch.c:380
-msgid "Add Watch..."
-msgstr "AÃ±adir vigilanciaâ?¦"
+#, fuzzy
+#| msgid "Add Watch"
+msgid "Add Watchâ?¦"
+msgstr "AÃ±adir vigilancia"
 
 #: ../plugins/debug-manager/watch.c:388
 msgid "Remove Watch"
@@ -2584,7 +2685,9 @@ msgstr "Buscar en la ayuda:"
 
 #: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:236
 #: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:309
-msgid "_Goto"
+#, fuzzy
+#| msgid "_Goto"
+msgid "_Go to"
 msgstr "_Ir a"
 
 #: ../plugins/devhelp/plugin.c:231
@@ -2654,20 +2757,31 @@ msgstr ""
 msgid "_Reload"
 msgstr "Re_cargar"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:235
+#: ../plugins/document-manager/anjuta-bookmarks.c:311
 msgid "Add bookmark"
 msgstr "AÃ±adir marcador"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:241
+#: ../plugins/document-manager/anjuta-bookmarks.c:317
 msgid "Remove bookmark"
 msgstr "Quitar marcador"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:255
-#: ../plugins/document-manager/anjuta-bookmarks.c:300
+#: ../plugins/document-manager/anjuta-bookmarks.c:331
+#: ../plugins/document-manager/anjuta-bookmarks.c:393
 #: ../plugins/document-manager/plugin.c:411
 msgid "Bookmarks"
 msgstr "Marcadores"
 
+#: ../plugins/document-manager/anjuta-bookmarks.c:339
+#, fuzzy
+#| msgid "_Rename"
+msgid "Rename"
+msgstr "_Renombrar"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
+#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+msgid "Remove"
+msgstr "Eliminar"
+
 #: ../plugins/document-manager/anjuta-docman.c:400
 msgid "Close file"
 msgstr "Cerrar archivo"
@@ -2705,28 +2819,32 @@ msgid "[read-only]"
 msgstr "[sÃ³lo-lectura]"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:1
-msgid "<b>Autosave</b>"
+#, fuzzy
+#| msgid "<b>Autosave</b>"
+msgid "Autosave"
 msgstr "<b>Autoguardar</b>"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:2
-msgid "<b>Editor tabs</b>"
-msgstr "<b>Solapas del editor</b>"
-
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
 msgid "Bottom"
 msgstr "Inferior"
 
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
 msgid "Do not show tabs"
 msgstr "No mostrar tabuladores"
 
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+#, fuzzy
+#| msgid "<b>Editor tabs</b>"
+msgid "Editor tabs"
+msgstr "<b>Solapas del editor</b>"
+
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:5
 msgid "Enable files autosave"
 msgstr "Activar autoguardado de archivos"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:6
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
 msgid "Left"
 msgstr "Izquierda"
 
@@ -2735,7 +2853,7 @@ msgid "Position:"
 msgstr "PosiciÃ³n:"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:8
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
 msgid "Right"
 msgstr "Derecha"
 
@@ -2760,7 +2878,7 @@ msgid "Sorted in opening order"
 msgstr "Ordenadas en orden de apertura"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:14
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 msgid "Top"
 msgstr "Superior"
 
@@ -2773,7 +2891,9 @@ msgid "Save current file"
 msgstr "Guarda el archivo actual"
 
 #: ../plugins/document-manager/plugin.c:149
-msgid "Save _As..."
+#, fuzzy
+#| msgid "Save _As..."
+msgid "Save _Asâ?¦"
 msgstr "Guardar _comoâ?¦"
 
 #: ../plugins/document-manager/plugin.c:150
@@ -2817,8 +2937,10 @@ msgid "Recent _Files"
 msgstr "_Archivos recientes"
 
 #: ../plugins/document-manager/plugin.c:168
-msgid "_Print..."
-msgstr "Im_primirâ?¦"
+#, fuzzy
+#| msgid "Print"
+msgid "_Printâ?¦"
+msgstr "Imprimir"
 
 #: ../plugins/document-manager/plugin.c:169
 msgid "Print the current file"
@@ -2829,7 +2951,9 @@ msgid "_Print Preview"
 msgstr "Vista previa de im_presiÃ³n"
 
 #: ../plugins/document-manager/plugin.c:177
-msgid "Preview the current file in print-format"
+#, fuzzy
+#| msgid "Preview the current file in print-format"
+msgid "Preview the current file in print format"
 msgstr "Vista previa de impresiÃ³n del archivo actual"
 
 #: ../plugins/document-manager/plugin.c:182
@@ -2882,7 +3006,10 @@ msgid "Convert EOL to Majority EOL"
 msgstr "Convertir EOL a mayorÃa de EOL"
 
 #: ../plugins/document-manager/plugin.c:199
-msgid "Convert End Of Line characters to majority of the EOL found in the file"
+#, fuzzy
+#| msgid ""
+#| "Convert End Of Line characters to majority of the EOL found in the file"
+msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr ""
 "Convierte caracteres de fin de lÃnea a la mayorÃa de los EOL en el archivo"
 
@@ -2944,7 +3071,9 @@ msgstr "Comentar el texto seleccionado en flujo"
 
 #. menu title
 #: ../plugins/document-manager/plugin.c:237
-msgid "_Line Number..."
+#, fuzzy
+#| msgid "_Line Number..."
+msgid "_Line Numberâ?¦"
 msgstr "_NÃºmero de lÃneaâ?¦"
 
 #: ../plugins/document-manager/plugin.c:238
@@ -2980,7 +3109,9 @@ msgid "Previous _History"
 msgstr "_HistÃ³rico anterior"
 
 #: ../plugins/document-manager/plugin.c:250
-msgid "Goto previous history"
+#, fuzzy
+#| msgid "Goto previous history"
+msgid "Go to previous history"
 msgstr "Ir al histÃ³rico anterior"
 
 #: ../plugins/document-manager/plugin.c:252
@@ -2988,7 +3119,9 @@ msgid "Next Histor_y"
 msgstr "H_istÃ³rico siguiente"
 
 #: ../plugins/document-manager/plugin.c:253
-msgid "Goto next history"
+#, fuzzy
+#| msgid "Goto next history"
+msgid "Go to next history"
 msgstr "Ir al histÃ³rico siguiente"
 
 #: ../plugins/document-manager/plugin.c:258 ../plugins/search/plugin.c:67
@@ -3064,7 +3197,7 @@ msgstr "Corta el texto seleccionado al portapapeles"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:554
+#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:592
 msgid "_Copy"
 msgstr "_Copiar"
 
@@ -3072,7 +3205,7 @@ msgstr "_Copiar"
 msgid "Copy the selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:562
+#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:600
 msgid "_Paste"
 msgstr "_Pegar"
 
@@ -3305,7 +3438,9 @@ msgid "Reload"
 msgstr "Recargar"
 
 #: ../plugins/document-manager/plugin.c:606
-msgid "Goto"
+#, fuzzy
+#| msgid "Goto"
+msgid "Go to"
 msgstr "Ir a"
 
 #: ../plugins/document-manager/plugin.c:909
@@ -3345,21 +3480,25 @@ msgid "Autosave completed"
 msgstr "Completado el autoguardado"
 
 #: ../plugins/document-manager/search-box.c:383
-#, c-format
-msgid "Search for \"%s\" reached end and was continued on top."
+#, fuzzy, c-format
+#| msgid "Search for \"%s\" reached end and was continued on top."
+msgid "Search for \"%s\" reached the end and was continued at the top."
 msgstr "La bÃºsqueda de Â«%sÂ» llegÃ³ al final y continuÃ³ por el principio."
 
 #: ../plugins/document-manager/search-box.c:389
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Search for \"%s\" reached end and was continued on top but no new match "
+#| "was found."
 msgid ""
-"Search for \"%s\" reached end and was continued on top but no new match was "
-"found."
+"Search for \"%s\" reached the end and was continued at the top but no new "
+"match was found."
 msgstr ""
 "La bÃºsqueda de Â«%sÂ» llegÃ³ al final y continuÃ³ por el principio pero no se "
 "encontrÃ³ ninguna ocurrencia mÃ¡s."
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.ui.h:22
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Match case"
 msgstr "Coincidir con capitalizaciÃ³n"
 
@@ -3379,8 +3518,9 @@ msgstr "No se encontraron elementos"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:670
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:726
-#, c-format
-msgid "No recently used resource found with URI `%s'"
+#, fuzzy, c-format
+#| msgid "No recently used resource found with URI `%s'"
+msgid "No recently used resource found with URI \"%s\""
 msgstr "No se ha encontrado el recurso reciente con URI Â«%sÂ»"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:750
@@ -3402,28 +3542,30 @@ msgstr "Elementos desconocido"
 #. * in a recent files menu. The %d is the number of the item,
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:980
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:978
 #, c-format
-msgid "recent menu label|_%d. %s"
+msgctxt "recent menu label"
+msgid "_%d. %s"
 msgstr "_%d. %s"
 
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:987
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:983
 #, c-format
-msgid "recent menu label|%d. %s"
+msgctxt "recent menu label"
+msgid "%d. %s"
 msgstr "%d. %s"
 
 #: ../plugins/file-loader/plugin.c:116
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Can not open \"%s\".\n"
+#| "\n"
+#| "%s"
 msgid ""
-"Can not open \"%s\".\n"
+"Cannot open \"%s\".\n"
 "\n"
 "%s"
 msgstr ""
@@ -3432,14 +3574,24 @@ msgstr ""
 "%s"
 
 #: ../plugins/file-loader/plugin.c:257
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>Cannot open \"%s\"</b>.\n"
+#| "\n"
+#| "There is no plugin, default action, or application configured to handle "
+#| "this file type.\n"
+#| "\n"
+#| "Mime type: %s\n"
+#| "\n"
+#| "You may choose to try opening it with the following plugins or "
+#| "applications."
 msgid ""
 "<b>Cannot open \"%s\"</b>.\n"
 "\n"
 "There is no plugin, default action, or application configured to handle this "
 "file type.\n"
 "\n"
-"Mime type: %s\n"
+"MIME type: %s\n"
 "\n"
 "You may choose to try opening it with the following plugins or applications."
 msgstr ""
@@ -3500,11 +3652,15 @@ msgid "Python source files"
 msgstr "Archivos de cÃ³digo fuente Python"
 
 #: ../plugins/file-loader/plugin.c:555
-msgid "Hyper text markup files"
+#, fuzzy
+#| msgid "Hyper text markup files"
+msgid "Hypertext markup files"
 msgstr "Archivos de marcado de hipertexto"
 
 #: ../plugins/file-loader/plugin.c:564
-msgid "Shell scripts files"
+#, fuzzy
+#| msgid "Shell scripts files"
+msgid "Shell script files"
 msgstr "Archivos script de shell"
 
 #: ../plugins/file-loader/plugin.c:569
@@ -3533,8 +3689,10 @@ msgid "New empty file"
 msgstr "Archivo vacÃo nuevo"
 
 #: ../plugins/file-loader/plugin.c:892
-msgid "_Open..."
-msgstr "_Abrirâ?¦"
+#, fuzzy
+#| msgid "_Open"
+msgid "_Openâ?¦"
+msgstr "_Abrir"
 
 #: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
@@ -3548,51 +3706,51 @@ msgstr "Abrir c_on"
 msgid "Open with"
 msgstr "Abrir con"
 
-#: ../plugins/file-loader/plugin.c:1245 ../plugins/file-loader/plugin.c:1251
+#: ../plugins/file-loader/plugin.c:1243 ../plugins/file-loader/plugin.c:1249
 #: ../plugins/file-loader/anjuta-loader.plugin.in.h:1
 msgid "File Loader"
 msgstr "Cargador de archivos"
 
-#: ../plugins/file-loader/plugin.c:1255
+#: ../plugins/file-loader/plugin.c:1253
 msgid "New"
 msgstr "Nuevo"
 
-#: ../plugins/file-loader/plugin.c:1256
+#: ../plugins/file-loader/plugin.c:1254
 msgid "New file, project and project components."
 msgstr "Archivo proyecto o componentes de proyectos nuevos."
 
-#: ../plugins/file-loader/plugin.c:1263 ../plugins/file-loader/plugin.c:1303
+#: ../plugins/file-loader/plugin.c:1261 ../plugins/file-loader/plugin.c:1301
 msgid "Open"
 msgstr "Abrir"
 
-#: ../plugins/file-loader/plugin.c:1267
+#: ../plugins/file-loader/plugin.c:1265
 msgid "Open _Recent"
 msgstr "Abrir _recientes"
 
-#: ../plugins/file-loader/plugin.c:1268 ../plugins/file-loader/plugin.c:1305
+#: ../plugins/file-loader/plugin.c:1266 ../plugins/file-loader/plugin.c:1303
 msgid "Open recent file"
 msgstr "Abrir archivo reciente"
 
-#: ../plugins/file-loader/plugin.c:1274
+#: ../plugins/file-loader/plugin.c:1272
 msgid "Open recent files"
 msgstr "Abre archivos recientes"
 
-#: ../plugins/file-loader/plugin.c:1304
+#: ../plugins/file-loader/plugin.c:1302
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ../plugins/file-loader/plugin.c:1420 ../plugins/file-loader/plugin.c:1422
+#: ../plugins/file-loader/plugin.c:1416 ../plugins/file-loader/plugin.c:1418
 #, c-format
 msgid "File not found"
 msgstr "No se encontrÃ³ el archivo"
 
 #. %s is name of file that will be opened
-#: ../plugins/file-loader/plugin.c:1441
+#: ../plugins/file-loader/plugin.c:1437
 #, c-format
 msgid "Please select a plugin to open <b>%s</b>."
 msgstr "Seleccione un complemento para abrir. <b>%s</b>."
 
-#: ../plugins/file-loader/plugin.c:1445
+#: ../plugins/file-loader/plugin.c:1441
 msgid "Open With"
 msgstr "Abrir con"
 
@@ -3622,6 +3780,7 @@ msgstr "Filtro"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
 #: ../plugins/symbol-db/plugin.c:2334 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Global"
 
@@ -3629,25 +3788,24 @@ msgstr "Global"
 msgid "Root directory if no project is open:"
 msgstr "Directorio raÃz si no hay ningÃºn proyecto abierto:"
 
-#: ../plugins/file-manager/file-model.c:119
-#: ../plugins/symbol-db/symbol-db-view.c:799
+#: ../plugins/file-manager/file-model.c:120
 msgid "Loading..."
 msgstr "Cargandoâ?¦"
 
-#: ../plugins/file-manager/file-view.c:73
-msgid "Up-to-date"
-msgstr "Actualizado"
-
 #: ../plugins/file-manager/file-view.c:510
 msgid "Filename"
 msgstr "Nombre de archivo"
 
 #: ../plugins/file-manager/file-view.c:590
-msgid "Base uri"
+#, fuzzy
+#| msgid "Base uri"
+msgid "Base URI"
 msgstr "URI base"
 
 #: ../plugins/file-manager/file-view.c:591
-msgid "Uri of the top-most path displayed"
+#, fuzzy
+#| msgid "Uri of the top-most path displayed"
+msgid "URI of the top-most path displayed"
 msgstr "URI de la ruta superior mostrada"
 
 #: ../plugins/file-manager/plugin.c:74
@@ -3658,40 +3816,36 @@ msgstr "_Renombrar"
 msgid "Rename file or directory"
 msgstr "Renombrar el archivo o directorio"
 
-#: ../plugins/file-manager/plugin.c:294
+#: ../plugins/file-manager/plugin.c:298
 msgid "File manager popup actions"
 msgstr "Acciones emergentes el administrador de archivos"
 
-#: ../plugins/file-manager/plugin.c:327
+#: ../plugins/file-manager/plugin.c:331
 msgid "Files"
 msgstr "Archivos"
 
-#: ../plugins/file-manager/plugin.c:456 ../plugins/file-manager/plugin.c:465
+#: ../plugins/file-manager/plugin.c:460 ../plugins/file-manager/plugin.c:469
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "Gestor de archivos"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:1
-msgid "<b>File Information</b>"
-msgstr "<b>InformaciÃ³n del archivo</b>"
-
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add License Information"
 msgstr "AÃ±adir informaciÃ³n de licencia"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
 msgid "Add to project"
 msgstr "AÃ±adir al proyecto"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add to repository"
 msgstr "AÃ±adir al repositorio"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
 msgid "Create corresponding header file"
 msgstr "Crear el archivo de cabecera correspondiente"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
 msgid ""
 "Enter the File name.\n"
 "The extension will be added according to the type."
@@ -3699,13 +3853,19 @@ msgstr ""
 "Introduzca el nombre del archivo.\n"
 "La extensiÃ³n serÃ¡ aÃ±adida de acuerdo con el tipo."
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:69 ../plugins/macro/anjuta-macro.ui.h:6
-#: ../plugins/tools/anjuta-tools.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+#, fuzzy
+#| msgid "<b>File Information</b>"
+msgid "File Information"
+msgstr "<b>InformaciÃ³n del archivo</b>"
+
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/git/anjuta-git.ui.h:64 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
 #: ../plugins/starter/starter.c:404
 msgid "New File"
 msgstr "Archivo nuevo"
@@ -3769,21 +3929,23 @@ msgid "Invalid GbfAmConfigValue type"
 msgstr "Tipo GbfAmConfigValue no vÃ¡lido"
 
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
-msgid "<b>Select Package to add:</b>"
-msgstr "<b>Seleccione un paquete para aÃ±adir:</b>"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _Package"
 msgstr "AÃ±adir _paquete"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _module"
 msgstr "AÃ±adir _mÃ³dulo"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4
 msgid "Packages"
 msgstr "Paquetes"
 
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+#, fuzzy
+#| msgid "<b>Select Package to add:</b>"
+msgid "Select Package to add:"
+msgstr "<b>Seleccione un paquete para aÃ±adir:</b>"
+
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
 msgid "Select package"
 msgstr "Seleccionar el paquete"
@@ -3992,6 +4154,7 @@ msgid "Newly added source file could not be identified"
 msgstr "No se pudo identificar el archivo fuente reciÃ©n creado"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3521
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
 msgid "Source couldn't be removed"
 msgstr "El cÃ³digo no pudo ser eliminado"
 
@@ -4055,7 +4218,9 @@ msgid "Version:"
 msgstr "VersiÃ³n:"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:863
-msgid "Url:"
+#, fuzzy
+#| msgid "URL:"
+msgid "URI:"
 msgstr "URL:"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:1229
@@ -4157,8 +4322,10 @@ msgid "Install directory:"
 msgstr "Directorio de instalaciÃ³n:"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:1583
-msgid "Advanced..."
-msgstr "Avanzadoâ?¦"
+#, fuzzy
+#| msgid "Advanced"
+msgid "Advancedâ?¦"
+msgstr "Avanzada"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
@@ -4195,10 +4362,6 @@ msgstr "El cÃ³digo ya se encuentra en el objetivo"
 msgid "Source couldn't be added"
 msgstr "No se pudo aÃ±adir el cÃ³digo"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
-msgid "Source coudn't be removed"
-msgstr "No se pudo eliminar el cÃ³digo"
-
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
 msgid "Includes:"
 msgstr "Inclusiones:"
@@ -4227,7 +4390,9 @@ msgstr ""
 "AsegÃºrese de que Anjuta estÃ¡ instalado correctamente."
 
 #: ../plugins/gdb/debugger.c:933
-msgid "Getting ready to start debugging session...\n"
+#, fuzzy
+#| msgid "Getting ready to start debugging session...\n"
+msgid "Getting ready to start debugging sessionâ?¦\n"
 msgstr "PreparÃ¡ndose para iniciar la sesiÃ³n de depuraciÃ³nâ?¦\n"
 
 #: ../plugins/gdb/debugger.c:939
@@ -4306,8 +4471,9 @@ msgid "Program attached\n"
 msgstr "Programa acoplado\n"
 
 #: ../plugins/gdb/debugger.c:1970
-#, c-format
-msgid "Attaching to process: %d...\n"
+#, fuzzy, c-format
+#| msgid "Attaching to process: %d...\n"
+msgid "Attaching to process: %dâ?¦\n"
 msgstr "AcoplÃ¡ndose al proceso: %dâ?¦\n"
 
 #: ../plugins/gdb/debugger.c:1996
@@ -4331,8 +4497,9 @@ msgid "Program detached\n"
 msgstr "Programa desacoplado\n"
 
 #: ../plugins/gdb/debugger.c:2098
-#, c-format
-msgid "Detaching the process...\n"
+#, fuzzy, c-format
+#| msgid "Detaching the process...\n"
+msgid "Detaching the processâ?¦\n"
 msgstr "Desacoplando el procesoâ?¦\n"
 
 #: ../plugins/gdb/debugger.c:2119
@@ -4349,9 +4516,12 @@ msgid "Error whilst signaling the process."
 msgstr "Error al mandar seÃ±ales al proceso."
 
 #: ../plugins/gdb/plugin.c:112
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to create fifo file named %s. The program will run without a "
+#| "terminal."
 msgid ""
-"Failed to create fifo file named %s. The program will run without a terminal."
+"Failed to create FIFO file named %s. The program will run without a terminal."
 msgstr ""
 "FallÃ³ al crear el archivo FIFO con nombre %s. El programa se ejecutarÃ¡ sin "
 "una terminal."
@@ -4360,486 +4530,483 @@ msgstr ""
 msgid "Cannot start terminal for debugging."
 msgstr "No se pudo iniciar el terminal para depurar."
 
-#: ../plugins/git/anjuta-git.ui.h:2
-msgid "<b>Stash Message (Optional)</b>"
-msgstr "<b>Mensaje guardado (stash; opcional)</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:3
-msgid "<b>Stash to Apply</b>"
-msgstr "<b>Estado guardado (stash) para aplicar</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:4
-msgid "<b>Tags</b>"
-msgstr "<b>Etiquetas</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:5
+#: ../plugins/git/anjuta-git.ui.h:1
 msgid "Add File"
 msgstr "AÃ±adir archivo"
 
-#: ../plugins/git/anjuta-git.ui.h:6
+#: ../plugins/git/anjuta-git.ui.h:2
 msgid "Add Remote Branch"
 msgstr "AÃ±adir rama remota"
 
 #. A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.
-#: ../plugins/git/anjuta-git.ui.h:8
-msgid "Add signed off by line"
-msgstr "AÃ±adir la lÃnea Â«asignado porÂ»"
-
-#: ../plugins/git/anjuta-git.ui.h:9
-msgid "Add signed-off by line"
+#: ../plugins/git/anjuta-git.ui.h:4
+#, fuzzy
+#| msgid "Add signed-off by line"
+msgid "Add signed-off-by line"
 msgstr "AÃ±adir la lÃnea Â«revisado porÂ»"
 
-#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:5
 msgid "Amend the previous commit"
 msgstr "Corregir el commit anterior"
 
-#: ../plugins/git/anjuta-git.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:6
 msgid "Annotate this tag"
 msgstr "Anotar esta etiqueta"
 
 #. Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.
-#: ../plugins/git/anjuta-git.ui.h:13
+#: ../plugins/git/anjuta-git.ui.h:8
 msgid "Append fetch data"
 msgstr "AÃ±adir fecha de obtenciÃ³n"
 
-#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/git/anjuta-git.ui.h:9
 msgid "Apply Stash"
 msgstr "Aplicar el estado guardado (stash)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:15 ../plugins/git/plugin.c:239
+#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "Aplicar archivos del buzÃ³n de correo"
 
-#: ../plugins/git/anjuta-git.ui.h:16
+#: ../plugins/git/anjuta-git.ui.h:11
 msgid "Apply the selected stash"
 msgstr "Aplicar el estado guardado (stash) seleccionado"
 
 #. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
-#: ../plugins/git/anjuta-git.ui.h:18
+#: ../plugins/git/anjuta-git.ui.h:13
 msgid "Author/Grep"
 msgstr "Autor/Grep"
 
-#: ../plugins/git/anjuta-git.ui.h:19
+#: ../plugins/git/anjuta-git.ui.h:14
 #: ../plugins/project-wizard/templates/translatable-strings.h:24
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../plugins/git/anjuta-git.ui.h:20
+#: ../plugins/git/anjuta-git.ui.h:15
 msgid "Bad revision:"
 msgstr "RevisiÃ³n errÃ³nea:"
 
-#: ../plugins/git/anjuta-git.ui.h:21
+#: ../plugins/git/anjuta-git.ui.h:16
 msgid "Branch name:"
 msgstr "Nombre de la rama:"
 
-#: ../plugins/git/anjuta-git.ui.h:22
+#: ../plugins/git/anjuta-git.ui.h:17
 msgid "Branch to switch to:"
 msgstr "Rama a la que cambiar:"
 
-#: ../plugins/git/anjuta-git.ui.h:23
+#: ../plugins/git/anjuta-git.ui.h:18
 msgid "Branch:"
 msgstr "Rama:"
 
-#: ../plugins/git/anjuta-git.ui.h:24
+#: ../plugins/git/anjuta-git.ui.h:19
 msgid "Branches"
 msgstr "Ramas"
 
-#: ../plugins/git/anjuta-git.ui.h:25
+#: ../plugins/git/anjuta-git.ui.h:20
 msgid "Branches must be fully merged"
 msgstr "Las ramas se deben mezclar completamente"
 
-#: ../plugins/git/anjuta-git.ui.h:26
+#: ../plugins/git/anjuta-git.ui.h:21
 msgid "Branches to delete:"
 msgstr "Ramas que borrar:"
 
-#: ../plugins/git/anjuta-git.ui.h:28
+#: ../plugins/git/anjuta-git.ui.h:23
 #: ../plugins/subversion/anjuta-subversion.ui.h:4
 msgid "Changes:"
 msgstr "Cambios:"
 
-#: ../plugins/git/anjuta-git.ui.h:29
+#: ../plugins/git/anjuta-git.ui.h:24
 msgid "Check Out Files"
 msgstr "Descargar (checkout) archivos"
 
-#: ../plugins/git/anjuta-git.ui.h:30
+#: ../plugins/git/anjuta-git.ui.h:25
 msgid "Check out all local changes"
 msgstr "Descargar todos los cambios locales"
 
-#: ../plugins/git/anjuta-git.ui.h:31
+#: ../plugins/git/anjuta-git.ui.h:26
 msgid "Check out the branch after it is created"
 msgstr "Descargar (checkout) la rama despuÃ©s de que se haya creado"
 
-#: ../plugins/git/anjuta-git.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:27
 msgid "Cherry Pick"
 msgstr "Cherry Pick"
 
-#: ../plugins/git/anjuta-git.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:28
 msgid "Clear all stashes"
 msgstr "Limpiar los estados guardados (stash)"
 
-#: ../plugins/git/anjuta-git.ui.h:34
+#: ../plugins/git/anjuta-git.ui.h:29
 msgid "Column 1"
 msgstr "Columna 1"
 
-#: ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/git/anjuta-git.ui.h:30
 #: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "Efectuar cambios"
 
-#: ../plugins/git/anjuta-git.ui.h:36
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Commit on fast-forward merges"
 msgstr "Commit al mezclar en modo rÃ¡pido"
 
-#: ../plugins/git/anjuta-git.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:32
 msgid "Commit to Cherry Pick:"
 msgstr "Commit a Cherry Pick:"
 
-#: ../plugins/git/anjuta-git.ui.h:38
+#: ../plugins/git/anjuta-git.ui.h:33
 msgid "Commit to revert:"
 msgstr "Commit que revertir:"
 
-#: ../plugins/git/anjuta-git.ui.h:39
+#: ../plugins/git/anjuta-git.ui.h:34
 msgid "Create Branch"
 msgstr "Crear rama"
 
-#: ../plugins/git/anjuta-git.ui.h:40
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Create Tag"
 msgstr "Crear etiqueta"
 
-#: ../plugins/git/anjuta-git.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Create patch series"
 msgstr "Crear serie de parches"
 
-#: ../plugins/git/anjuta-git.ui.h:42 ../plugins/git/git-log-dialog.c:189
+#: ../plugins/git/anjuta-git.ui.h:37 ../plugins/git/git-log-dialog.c:189
 #: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "Fecha"
 
-#: ../plugins/git/anjuta-git.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Delete Branch"
 msgstr "Borrar rama"
 
-#: ../plugins/git/anjuta-git.ui.h:44
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Delete Remote Branch"
 msgstr "Borrar rama remota"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:40
 msgid "Delete Tags"
 msgstr "Borrar etiquetas"
 
-#: ../plugins/git/anjuta-git.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "No efectuar commit"
 
-#: ../plugins/git/anjuta-git.ui.h:47
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "Do not follow tags"
 msgstr "No seguir etiquetas"
 
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Drop the selected stash"
 msgstr "Abandonar el estado guardado (stash) seleccionado"
 
-#: ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "E-mail:"
 msgstr "Correo-e:"
 
-#: ../plugins/git/anjuta-git.ui.h:50
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Fetch remote branches after creation"
 msgstr "Obtener ramas remotas despuÃ©s de crearlas"
 
-#: ../plugins/git/anjuta-git.ui.h:51
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../plugins/git/anjuta-git.ui.h:52
+#: ../plugins/git/anjuta-git.ui.h:47
 msgid "Folder to create patches in:"
 msgstr "Carpeta donde crear los parches:"
 
-#: ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/git/anjuta-git.ui.h:48
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "Forzar"
 
-#: ../plugins/git/anjuta-git.ui.h:55
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/git/anjuta-git.ui.h:56
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Generate patches relative to:"
 msgstr "Generar parches relativos a:"
 
-#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Good revision:"
 msgstr "RevisiÃ³n buena:"
 
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:53
 msgid "Grep:"
 msgstr "Grep:"
 
-#: ../plugins/git/anjuta-git.ui.h:59
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Hard"
 msgstr "Duro"
 
-#: ../plugins/git/anjuta-git.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Head"
 msgstr "Cabecera"
 
-#: ../plugins/git/anjuta-git.ui.h:61
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Ignore Files"
 msgstr "Ignorar archivos"
 
-#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/git/anjuta-git.ui.h:58
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "Mensaje de registro:"
 
-#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Mailbox file containing patches:"
 msgstr "Archivo del buzÃ³n de correo que contiene los parches:"
 
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Merge"
 msgstr "Mezclar"
 
-#: ../plugins/git/anjuta-git.ui.h:67
+#: ../plugins/git/anjuta-git.ui.h:62
 msgid "Mixed"
 msgstr "Mezclado"
 
-#: ../plugins/git/anjuta-git.ui.h:68
+#: ../plugins/git/anjuta-git.ui.h:63
 msgid "Mode:"
 msgstr "Modo:"
 
-#: ../plugins/git/anjuta-git.ui.h:70 ../plugins/glade/plugin.c:3097
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
-#: ../plugins/subversion/anjuta-subversion.ui.h:23
-msgid "Options"
-msgstr "Opciones"
-
-#: ../plugins/git/anjuta-git.ui.h:71
-#: ../plugins/subversion/anjuta-subversion.ui.h:24
-msgid "Options:"
-msgstr "Opciones:"
-
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Previous commit"
 msgstr "Commit anterior"
 
-#: ../plugins/git/anjuta-git.ui.h:73
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Pull"
 msgstr "Descargar (pull)"
 
-#: ../plugins/git/anjuta-git.ui.h:74
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Push"
 msgstr "Empujar"
 
-#: ../plugins/git/anjuta-git.ui.h:75
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "Push all branches and tags"
 msgstr "Empujar todas las ramas y etiquetas"
 
-#: ../plugins/git/anjuta-git.ui.h:76
+#: ../plugins/git/anjuta-git.ui.h:71
 msgid "Push all tags"
 msgstr "Empujar todas las etiquetas"
 
-#: ../plugins/git/anjuta-git.ui.h:77
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Rebase"
 msgstr "Ajustar a base (rebase)"
 
-#: ../plugins/git/anjuta-git.ui.h:78
+#: ../plugins/git/anjuta-git.ui.h:73
 msgid "Remote"
 msgstr "Remota"
 
-#: ../plugins/git/anjuta-git.ui.h:79
+#: ../plugins/git/anjuta-git.ui.h:74
 msgid "Remote branch to rebase from:"
 msgstr "Rama remota que utilizar como base:"
 
-#: ../plugins/git/anjuta-git.ui.h:80
+#: ../plugins/git/anjuta-git.ui.h:75
 msgid "Remote to delete:"
 msgstr "Remota que borrar:"
 
-#: ../plugins/git/anjuta-git.ui.h:81
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Remove File"
 msgstr "Quitar archivo"
 
-#: ../plugins/git/anjuta-git.ui.h:82
+#: ../plugins/git/anjuta-git.ui.h:77
 msgid "Repository origin"
 msgstr "Origen del repositorio"
 
-#: ../plugins/git/anjuta-git.ui.h:83
+#: ../plugins/git/anjuta-git.ui.h:78
 msgid "Repository to pull from:"
 msgstr "Repositorio desde el que actualizar:"
 
-#: ../plugins/git/anjuta-git.ui.h:84
+#: ../plugins/git/anjuta-git.ui.h:79
 msgid "Repository to push to:"
 msgstr "Repositorio sobre el que actualizar:"
 
-#: ../plugins/git/anjuta-git.ui.h:85
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Reset Tree"
 msgstr "Restablecer Ã¡rbol"
 
-#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Reset to:"
 msgstr "Restablecer a:"
 
-#: ../plugins/git/anjuta-git.ui.h:87
+#: ../plugins/git/anjuta-git.ui.h:82
 msgid "Restore index"
 msgstr "Restablecer Ãndice"
 
-#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/git/anjuta-git.ui.h:83
 #: ../plugins/subversion/anjuta-subversion.ui.h:35
-msgid "Retrieving status..."
+#, fuzzy
+#| msgid "Retrieving status..."
+msgid "Retrieving statusâ?¦"
 msgstr "Obteniendo el estadoâ?¦"
 
-#: ../plugins/git/anjuta-git.ui.h:89
+#: ../plugins/git/anjuta-git.ui.h:84
 msgid "Revert Commit"
 msgstr "Revertir commit"
 
-#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revision/Tag:"
 msgstr "RevisiÃ³n/Etiqueta:"
 
-#: ../plugins/git/anjuta-git.ui.h:92
-msgid "Select A Folder"
-msgstr "Seleccionar una carpeta"
-
-#: ../plugins/git/anjuta-git.ui.h:93
+#: ../plugins/git/anjuta-git.ui.h:87
 msgid "Select Files to Check Out:"
 msgstr "Seleccione archivos para descargar (Â«checkoutÂ»):"
 
-#: ../plugins/git/anjuta-git.ui.h:94
-#: ../plugins/subversion/anjuta-subversion.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
 msgid "Select Files to Commit:"
 msgstr "Seleccione archivos para subir:"
 
-#: ../plugins/git/anjuta-git.ui.h:95
+#: ../plugins/git/anjuta-git.ui.h:89
 msgid "Select Files to Ignore:"
 msgstr "Seleccione archivos para ignorar:"
 
-#: ../plugins/git/anjuta-git.ui.h:96
-#: ../plugins/subversion/anjuta-subversion.ui.h:42
+#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
 msgid "Select Files to Mark as Resolved:"
 msgstr "Seleccione archivos para marcar como resueltos:"
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../plugins/git/anjuta-git.ui.h:91
 msgid "Select Files to Unstage:"
 msgstr "Seleccionar los archivos sobre los que realizar Â«unstageÂ»:"
 
-#: ../plugins/git/anjuta-git.ui.h:98
+#: ../plugins/git/anjuta-git.ui.h:92
 msgid "Select Mailbox File"
 msgstr "Seleccionar el archivo del buzÃ³n de correo"
 
-#: ../plugins/git/anjuta-git.ui.h:99
+#: ../plugins/git/anjuta-git.ui.h:93
+#, fuzzy
+#| msgid "Select A Folder"
+msgid "Select a Folder"
+msgstr "Seleccionar una carpeta"
+
+#: ../plugins/git/anjuta-git.ui.h:94
 msgid "Select file to add:"
 msgstr "Seleccionar archivo para aÃ±adir:"
 
-#: ../plugins/git/anjuta-git.ui.h:100
+#: ../plugins/git/anjuta-git.ui.h:95
 msgid "Select file to remove:"
 msgstr "Seleccionar archivos para quitar:"
 
-#: ../plugins/git/anjuta-git.ui.h:101
-#: ../plugins/subversion/anjuta-subversion.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
 msgid "Set Conflicts as Resolved"
 msgstr "Establecer conflictos como resueltos"
 
-#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/anjuta-git.ui.h:97
 msgid "Show source revision in log message"
 msgstr "Mostrar la revisiÃ³n de los fuentes en el mensaje de log"
 
-#: ../plugins/git/anjuta-git.ui.h:103
+#: ../plugins/git/anjuta-git.ui.h:98
 msgid "Show the contents of the selected stash in an editor"
 msgstr "Mostrar el contenido guardado (stash) en un editor"
 
-#: ../plugins/git/anjuta-git.ui.h:104
+#: ../plugins/git/anjuta-git.ui.h:99
 msgid "Sign this tag"
 msgstr "Firmar esta etiqueta"
 
-#: ../plugins/git/anjuta-git.ui.h:105
+#: ../plugins/git/anjuta-git.ui.h:100
 msgid "Soft"
 msgstr "Blando"
 
-#: ../plugins/git/anjuta-git.ui.h:106
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Squash"
 msgstr "Aplastar (squash)"
 
-#: ../plugins/git/anjuta-git.ui.h:107 ../plugins/git/plugin.c:811
+#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
 msgid "Stash"
 msgstr "Guardar (stash)"
 
-#: ../plugins/git/anjuta-git.ui.h:108
+#: ../plugins/git/anjuta-git.ui.h:103
+#, fuzzy
+#| msgid "<b>Stash Message (Optional)</b>"
+msgid "Stash Message (Optional)"
+msgstr "<b>Mensaje guardado (stash; opcional)</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:104
 msgid "Stash Uncommitted Changes"
 msgstr "Guardar (stash) cambios sin subir"
 
-#: ../plugins/git/anjuta-git.ui.h:109
+#: ../plugins/git/anjuta-git.ui.h:105
 msgid "Stash indexed changes"
 msgstr "Guardar (stash) cambios indexados"
 
-#: ../plugins/git/anjuta-git.ui.h:110
+#: ../plugins/git/anjuta-git.ui.h:106
 msgid "Stash the working tree's uncommitted changes"
 msgstr "Guardar (stash) los cambios no subidos del Ã¡rbol de trabajo"
 
-#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/anjuta-git.ui.h:107
+#, fuzzy
+#| msgid "<b>Stash to Apply</b>"
+msgid "Stash to Apply"
+msgstr "<b>Estado guardado (stash) para aplicar</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:108
 msgid "Switch to Another Branch"
 msgstr "Cambiar a otra rama"
 
-#: ../plugins/git/anjuta-git.ui.h:112
+#: ../plugins/git/anjuta-git.ui.h:109
 msgid "Tag name:"
 msgstr "Nombre de la etiqueta:"
 
-#: ../plugins/git/anjuta-git.ui.h:113
+#: ../plugins/git/anjuta-git.ui.h:110
 msgid "Tag/Commit"
 msgstr "Etiqueta/Commit"
 
-#: ../plugins/git/anjuta-git.ui.h:114
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: ../plugins/git/anjuta-git.ui.h:112
 msgid "Tags to delete:"
 msgstr "Etiquetas que borrar:"
 
-#: ../plugins/git/anjuta-git.ui.h:115
+#: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "Este commit finaliza con una mezcla fallida (use -i)"
 
-#: ../plugins/git/anjuta-git.ui.h:117
+#: ../plugins/git/anjuta-git.ui.h:115
 msgid "To:"
 msgstr "Para:"
 
-#: ../plugins/git/anjuta-git.ui.h:118
+#: ../plugins/git/anjuta-git.ui.h:116
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/git/anjuta-git.ui.h:119
+#: ../plugins/git/anjuta-git.ui.h:117
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/git/anjuta-git.ui.h:120
+#: ../plugins/git/anjuta-git.ui.h:118
 msgid "Unstage Files"
 msgstr "Realizar Â«unstageÂ» de archivos"
 
-#: ../plugins/git/anjuta-git.ui.h:121
+#: ../plugins/git/anjuta-git.ui.h:119
 msgid "Use a custom log message"
 msgstr "Usar un mensaje de registro personalizado"
 
-#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/git/anjuta-git.ui.h:120
 msgid "Use custom author information:"
 msgstr "Usar informaciÃ³n personalizada del autor:"
 
-#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/git/anjuta-git.ui.h:121
 msgid "View log"
 msgstr "Ver el registro"
 
-#: ../plugins/git/anjuta-git.ui.h:124
-#: ../plugins/subversion/anjuta-subversion.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "Ver el registro para el/la archivo/carpeta:"
 
-#: ../plugins/git/anjuta-git.ui.h:126
+#: ../plugins/git/anjuta-git.ui.h:124
 msgid "page 1"
 msgstr "pÃ¡gina 1"
 
-#: ../plugins/git/anjuta-git.ui.h:127
+#: ../plugins/git/anjuta-git.ui.h:125
 msgid "page 2"
 msgstr "pÃ¡gina 2"
 
-#: ../plugins/git/anjuta-git.ui.h:128
+#: ../plugins/git/anjuta-git.ui.h:126
 msgid "page 3"
 msgstr "pÃ¡gina 3"
 
@@ -4867,7 +5034,9 @@ msgstr "Introduzca un URL."
 
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetching..."
+#, fuzzy
+#| msgid "Git: Fetching..."
+msgid "Git: Fetchingâ?¦"
 msgstr "Git: Obteniendoâ?¦"
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
@@ -4948,7 +5117,9 @@ msgid "Author"
 msgstr "Autor"
 
 #: ../plugins/git/git-log-dialog.c:317
-msgid "Git: Retrieving log..."
+#, fuzzy
+#| msgid "Git: Retrieving log..."
+msgid "Git: Retrieving logâ?¦"
 msgstr "Git: Obteniendo el registroâ?¦"
 
 #: ../plugins/git/git-log-dialog.c:360
@@ -5016,7 +5187,9 @@ msgid "Please enter the URL of the repository to push to."
 msgstr "Introduzca el URL del repositorio en el que subir."
 
 #: ../plugins/git/git-push-dialog.c:193
-msgid "Git: Pushing..."
+#, fuzzy
+#| msgid "Git: Pushing..."
+msgid "Git: Pushingâ?¦"
 msgstr "Git: Subiendoâ?¦"
 
 #: ../plugins/git/git-rebase-dialog.c:60
@@ -5092,8 +5265,10 @@ msgstr "_Cambios"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
-msgid "_Commit..."
-msgstr "_Efectuarâ?¦"
+#, fuzzy
+#| msgid "_Commit"
+msgid "_Commitâ?¦"
+msgstr "_Efectuar"
 
 #. Display label
 #. short-cut
@@ -5122,7 +5297,9 @@ msgstr "Gua_rdar (stash)"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:111
-msgid "_Stash uncommitted changes..."
+#, fuzzy
+#| msgid "_Stash uncommitted changes..."
+msgid "_Stash uncommitted changesâ?¦"
 msgstr "Gua_rdar (stash) cambios sin subirâ?¦"
 
 #. Display label
@@ -5134,7 +5311,9 @@ msgstr "Guardar los cambios sin subir y aplicarlos de nuevo mÃ¡s tarde"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:119
-msgid "_Apply stashed changes..."
+#, fuzzy
+#| msgid "_Apply stashed changes..."
+msgid "_Apply stashed changesâ?¦"
 msgstr "_Aplicar los cambios guardados (stash)â?¦"
 
 #. Display label
@@ -5146,8 +5325,10 @@ msgstr "Aplicar los cambios guardados (stash) al Ã¡rbol de trabajo"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
-msgid "_View log..."
-msgstr "_Ver el registroâ?¦"
+#, fuzzy
+#| msgid "View log"
+msgid "_View logâ?¦"
+msgstr "Ver el registro"
 
 #. Display label
 #. short-cut
@@ -5164,8 +5345,10 @@ msgstr "Repositorio _remoto"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:143
-msgid "_Push..."
-msgstr "E_mpujarâ?¦"
+#, fuzzy
+#| msgid "Push"
+msgid "_Pushâ?¦"
+msgstr "Empujar"
 
 #. Display label
 #. short-cut
@@ -5176,8 +5359,10 @@ msgstr "Empujar los cambios contra un repositorio remoto"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:151
-msgid "_Pull..."
-msgstr "Ca_rgar (pull)â?¦"
+#, fuzzy
+#| msgid "Pull"
+msgid "_Pullâ?¦"
+msgstr "Descargar (pull)"
 
 #. Display label
 #. short-cut
@@ -5208,8 +5393,10 @@ msgstr "_Archivos"
 #: ../plugins/git/plugin.c:175 ../plugins/git/plugin.c:375
 #: ../plugins/git/plugin.c:591 ../plugins/subversion/plugin.c:60
 #: ../plugins/subversion/plugin.c:175
-msgid "_Add..."
-msgstr "_AÃ±adirâ?¦"
+#, fuzzy
+#| msgid "_Add"
+msgid "_Addâ?¦"
+msgstr "_AÃ±adir"
 
 #. Display label
 #. short-cut
@@ -5221,8 +5408,10 @@ msgstr "AÃ±adir archivos al repositorio"
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
 #: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "_Quitarâ?¦"
+#, fuzzy
+#| msgid "_Remove"
+msgid "_Removeâ?¦"
+msgstr "_Eliminar"
 
 #. Display label
 #. short-cut
@@ -5233,8 +5422,10 @@ msgstr "Quitar archivos del repositorio"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:191
-msgid "_Ignore..."
-msgstr "_Ignorarâ?¦"
+#, fuzzy
+#| msgid "Ignored"
+msgid "_Ignoreâ?¦"
+msgstr "Ignorado"
 
 #. Display label
 #. short-cut
@@ -5245,7 +5436,9 @@ msgstr "Ignorar archivos"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:199
-msgid "_Check out files..."
+#, fuzzy
+#| msgid "_Check out files..."
+msgid "_Check out filesâ?¦"
 msgstr "_Descargar (checkout) archivosâ?¦"
 
 #. Display label
@@ -5257,7 +5450,9 @@ msgstr "Revertir los cambios sin subir en los archivos"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:207
-msgid "_Unstage files..."
+#, fuzzy
+#| msgid "_Unstage files..."
+msgid "_Unstage filesâ?¦"
 msgstr "Realizar Â«unstageÂ» de archivos"
 
 #. Display label
@@ -5269,7 +5464,9 @@ msgstr "Quitar archivos del Ãndice del commit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:215
-msgid "_Resolve conflicts..."
+#, fuzzy
+#| msgid "_Resolve conflicts..."
+msgid "_Resolve conflictsâ?¦"
 msgstr "_Resolver conflictosâ?¦"
 
 #. Display label
@@ -5287,8 +5484,10 @@ msgstr "Parches"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:231
-msgid "Create patch series..."
-msgstr "Crear serie de parchesâ?¦"
+#, fuzzy
+#| msgid "Create patch series"
+msgid "Create patch seriesâ?¦"
+msgstr "Crear serie de parches"
 
 #. Display label
 #. short-cut
@@ -5299,7 +5498,9 @@ msgstr "Generar archivos de parches para enviar a Â«upstreamÂ»"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:247
-msgid "_Apply..."
+#, fuzzy
+#| msgid "_Apply..."
+msgid "_Applyâ?¦"
 msgstr "_Aplicarâ?¦"
 
 #. Display label
@@ -5357,7 +5558,9 @@ msgstr "_Ramas"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
-msgid "_Create branch..."
+#, fuzzy
+#| msgid "_Create branch..."
+msgid "_Create branchâ?¦"
 msgstr "_Crear ramaâ?¦"
 
 #. Display label
@@ -5369,7 +5572,9 @@ msgstr "Crear una rama"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:295
-msgid "_Delete branch..."
+#, fuzzy
+#| msgid "_Delete branch..."
+msgid "_Delete branchâ?¦"
 msgstr "_Borrar ramaâ?¦"
 
 #. Display label
@@ -5381,8 +5586,10 @@ msgstr "Borrar ramas"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:303
-msgid "_Switch to another branch..."
-msgstr "Cambia_r a otra ramaâ?¦"
+#, fuzzy
+#| msgid "Switch to another branch"
+msgid "_Switch to another branchâ?¦"
+msgstr "Cambiar a otra rama"
 
 #. Display label
 #. short-cut
@@ -5393,8 +5600,10 @@ msgstr "Cambiar a otra rama"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:311
-msgid "_Merge..."
-msgstr "_Mezclarâ?¦"
+#, fuzzy
+#| msgid "Merge"
+msgid "_Mergeâ?¦"
+msgstr "Mezclar"
 
 #. Display label
 #. short-cut
@@ -5417,7 +5626,9 @@ msgstr "Mezclar los cambios con una rama remota en Â«upstreamÂ»"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
-msgid "_Start..."
+#, fuzzy
+#| msgid "_Start..."
+msgid "_Startâ?¦"
 msgstr "_Iniciarâ?¦"
 
 #. Display label
@@ -5459,7 +5670,9 @@ msgstr "Abortar el Â«rebaseÂ» y dejar el repositorio en su estado original"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
-msgid "_Cherry pick..."
+#, fuzzy
+#| msgid "_Cherry pick..."
+msgid "_Cherry pickâ?¦"
 msgstr "_Cherry pickâ?¦"
 
 #. Display label
@@ -5485,8 +5698,10 @@ msgstr "AÃ±adir una rama remota"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:383
-msgid "_Delete..."
-msgstr "_Borrarâ?¦"
+#, fuzzy
+#| msgid "Delete"
+msgid "_Deleteâ?¦"
+msgstr "Borrar"
 
 #. Display label
 #. short-cut
@@ -5496,14 +5711,10 @@ msgstr "Borrar una rama remota"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:391
-msgid "Tags"
-msgstr "Etiquetas"
-
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
-msgid "_Create tag..."
+#, fuzzy
+#| msgid "_Create tag..."
+msgid "_Create tagâ?¦"
 msgstr "_Crear etiquetaâ?¦"
 
 #. Display label
@@ -5515,8 +5726,10 @@ msgstr "Crear una etiqueta"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:407
-msgid "_Delete tag..."
-msgstr "_Borrar etiquetaâ?¦"
+#, fuzzy
+#| msgid "Delete tags"
+msgid "_Delete tagâ?¦"
+msgstr "Borrar etiquetas"
 
 #. Display label
 #. short-cut
@@ -5533,7 +5746,9 @@ msgstr "_Restablecer/revertir"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
-msgid "_Reset tree..."
+#, fuzzy
+#| msgid "_Reset tree..."
+msgid "_Reset treeâ?¦"
 msgstr "_Restablecer Ã¡rbolâ?¦"
 
 #. Display label
@@ -5545,7 +5760,9 @@ msgstr "Restablecer la cabecera del repositorio a cualquier estado pasado"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
-msgid "_Revert commit..."
+#, fuzzy
+#| msgid "_Revert commit..."
+msgid "_Revert commitâ?¦"
 msgstr "_Revertir commitâ?¦"
 
 #. Display label
@@ -5812,8 +6029,9 @@ msgid "Association item filename has no path"
 msgstr "El nombre del archivo del elemento de asociaciÃ³n no tiene ruta"
 
 #: ../plugins/glade/plugin.c:855
-#, c-format
-msgid "No associations initialized, nothing to save"
+#, fuzzy, c-format
+#| msgid "No associations initialized, nothing to save"
+msgid "No associations initialized: nothing to save"
 msgstr "No se inicializÃ³ ninguna asociaciÃ³n, no hay nada que guardar"
 
 #: ../plugins/glade/plugin.c:862
@@ -5869,9 +6087,10 @@ msgid "There is no associated editor for the designer"
 msgstr "No hay un editor asociado para el diseÃ±ador"
 
 #: ../plugins/glade/plugin.c:1980
-#, c-format
-msgid "Unknown language of the editor \"%s\""
-msgstr "Editor del lenguaje Â«%sÂ» desconocido"
+#, fuzzy, c-format
+#| msgid "Unknown error in module %s"
+msgid "Unknown editor language \"%s\""
+msgstr "Error desconocido en el mÃ³dulo %s"
 
 #: ../plugins/glade/plugin.c:2047 ../plugins/glade/plugin.c:2124
 #: ../plugins/glade/plugin.c:2249
@@ -5880,7 +6099,9 @@ msgid "Error while adding a new handler stub: %s"
 msgstr "Error al aÃ±adir un nuevo manejador de esbozos: %s"
 
 #: ../plugins/glade/plugin.c:2054 ../plugins/glade/plugin.c:2138
-msgid "Couldn't find a signal information"
+#, fuzzy
+#| msgid "Couldn't find a signal information"
+msgid "Couldn't find signal information"
 msgstr "No se pudo encontrar una seÃ±al de informaciÃ³n"
 
 #: ../plugins/glade/plugin.c:2081
@@ -5954,11 +6175,15 @@ msgid "Associate last designer and editor"
 msgstr "Asociar el Ãºltimo diseÃ±ador y editor"
 
 #: ../plugins/glade/plugin.c:4039 ../plugins/glade/plugin.c:4041
-msgid "Associations dialog..."
+#, fuzzy
+#| msgid "Associations dialog..."
+msgid "Associations dialogâ?¦"
 msgstr "DiÃ¡logo de asociacionesâ?¦"
 
 #: ../plugins/glade/plugin.c:4047
-msgid "Versioning..."
+#, fuzzy
+#| msgid "Versioning..."
+msgid "Versioningâ?¦"
 msgstr "Versionadoâ?¦"
 
 #: ../plugins/glade/plugin.c:4049
@@ -6052,7 +6277,9 @@ msgstr "Proyecto Glade Â«%sÂ» guardado"
 
 #: ../plugins/glade/anjuta-design-document.c:379
 #: ../plugins/glade/anjuta-design-document.c:406
-msgid "Invalid glade file name"
+#, fuzzy
+#| msgid "Invalid glade file name"
+msgid "Invalid Glade file name"
 msgstr "Nombre de archivo glade invÃ¡lido"
 
 #: ../plugins/gtodo/add_edit_item.c:99
@@ -6073,7 +6300,7 @@ msgid "Summary:"
 msgstr "Resumen:"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:4
+#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
 msgid "Category:"
 msgstr "CategorÃa:"
 
@@ -6114,8 +6341,8 @@ msgstr "iniciado:"
 #: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:296
 #: ../plugins/gtodo/add_edit_item.c:332 ../plugins/gtodo/add_edit_item.c:333
 #, c-format
-msgid "n/a"
-msgstr "n/d"
+msgid "N/A"
+msgstr "N/D"
 
 #: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
@@ -6123,29 +6350,33 @@ msgid "stopped:"
 msgstr "detenido:"
 
 #: ../plugins/gtodo/callback.c:17
-msgid "You need to select a todo item before you can remove it"
+#, fuzzy
+#| msgid "You need to select a todo item before you can remove it"
+msgid "You need to select a to-do item before you can remove it"
 msgstr ""
 "Necesita seleccionar un elemento pendiente antes de que pueda eliminarlo"
 
 #: ../plugins/gtodo/callback.c:20
-msgid "Are you sure you want to remove the selected todo item?"
+#, fuzzy
+#| msgid "Are you sure you want to remove the selected todo item?"
+msgid "Are you sure you want to remove the selected to-do item?"
 msgstr "Â¿Seguro que quiere eliminar el elemento pendiente seleccionado?"
 
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
-msgid "Remove"
-msgstr "Eliminar"
-
 #: ../plugins/gtodo/callback.c:98
-#, c-format
-msgid "Are you sure you want to remove all the completed todo items?"
+#, fuzzy, c-format
+#| msgid "Are you sure you want to remove all the completed todo items?"
+msgid "Are you sure you want to remove all the completed to-do items?"
 msgstr ""
 "Â¿Seguro que quiere eliminar todos los elementos pendientes completados?"
 
 #: ../plugins/gtodo/callback.c:99
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want to remove all the completed todo items in the "
+#| "category \"%s\"?"
 msgid ""
-"Are you sure you want to remove all the completed todo items in the category "
-"\"%s\"?"
+"Are you sure you want to remove all the completed to-do items in the "
+"category \"%s\"?"
 msgstr ""
 "Â¿Seguro que desea eliminar todos los elementos pendientes completados en la "
 "categorÃa Â«%sÂ» del proyecto?"
@@ -6218,8 +6449,9 @@ msgid "Failed to read file"
 msgstr "FallÃ³ al leer el archivo"
 
 #: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
-#, c-format
-msgid "Failed to parse xml structure"
+#, fuzzy, c-format
+#| msgid "Failed to parse xml structure"
+msgid "Failed to parse XML structure"
 msgstr "FallÃ³ al analizar la estructura xml"
 
 #: ../plugins/gtodo/libgtodo.c:646
@@ -6302,7 +6534,9 @@ msgid "Hide _Completed Items"
 msgstr "Ocultar elementos _completados"
 
 #: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed todo items"
+#, fuzzy
+#| msgid "Hide completed todo items"
+msgid "Hide completed to-do items"
 msgstr "Ocultar elementos completados"
 
 #: ../plugins/gtodo/plugin.c:83
@@ -6322,11 +6556,15 @@ msgid "Hide items without an end date"
 msgstr "Ocultar elementos sin una fecha de terminaciÃ³n"
 
 #: ../plugins/gtodo/plugin.c:122
-msgid "Tasks manager"
+#, fuzzy
+#| msgid "Tasks manager"
+msgid "Task manager"
 msgstr "Administrador de tareas"
 
 #: ../plugins/gtodo/plugin.c:128
-msgid "Tasks manager view"
+#, fuzzy
+#| msgid "Tasks manager view"
+msgid "Task manager view"
 msgstr "Vista del administrador de tareas"
 
 #: ../plugins/gtodo/plugin.c:134
@@ -6334,11 +6572,15 @@ msgid "Tasks"
 msgstr "Tareas"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "Todo Manager"
+#, fuzzy
+#| msgid "Todo Manager"
+msgid "To-do Manager"
 msgstr "GestiÃ³n de pendientes"
 
 #: ../plugins/gtodo/preferences.c:21
-msgid "Todo List Preferences"
+#, fuzzy
+#| msgid "Todo List Preferences"
+msgid "To-do List Preferences"
 msgstr "Preferencias de la lista de pendientes"
 
 #: ../plugins/gtodo/preferences.c:84
@@ -6388,11 +6630,15 @@ msgstr[0] "Elementos que caducan en el siguiente %i dÃa"
 msgstr[1] "Elementos que caducan en los siguientes %i dÃas"
 
 #: ../plugins/gtodo/preferences.c:168
-msgid "Misc"
-msgstr "Varios"
+#, fuzzy
+#| msgid "Miscellaneous Data"
+msgid "Miscellaneous"
+msgstr "Datos miscelÃ¡neos"
 
 #: ../plugins/gtodo/preferences.c:171
-msgid "Auto purge completed items"
+#, fuzzy
+#| msgid "Auto purge completed items"
+msgid "Auto-purge completed items"
 msgstr "Auto purgar elementos terminados"
 
 #. Translators: First part of the sentence "Purge items after %d days"
@@ -6406,7 +6652,9 @@ msgid "days."
 msgstr "dÃas."
 
 #: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
-msgid "Auto Purge"
+#, fuzzy
+#| msgid "Auto Purge"
+msgid "Auto-Purge"
 msgstr "Autopurgar"
 
 #: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
@@ -6414,9 +6662,12 @@ msgid "Notification"
 msgstr "NotificaciÃ³n"
 
 #: ../plugins/gtodo/preferences.c:218
-#, c-format
-msgid "Allow todo items to notifiy me when they are due in %i minute"
-msgid_plural "Allow todo items to notifiy me when they are due in %i minutes"
+#, fuzzy, c-format
+#| msgid "Allow todo items to notifiy me when they are due in %i minute"
+#| msgid_plural ""
+#| "Allow todo items to notifiy me when they are due in %i minutes"
+msgid "Allow to-do items to notify me when they are due in %i minute"
+msgid_plural "Allow to-do items to notify me when they are due in %i minutes"
 msgstr[0] ""
 "Permitir a los elementos pendientes notificarme cuando venzan en %i minuto"
 msgstr[1] ""
@@ -6434,28 +6685,32 @@ msgstr "Crear una lista de tareas"
 msgid "No Date"
 msgstr "Sin fecha"
 
-#: ../plugins/macro/anjuta-macro.ui.h:1
-msgid "<b>Macro details:</b>"
-msgstr "<b>Detalles de macro:</b>"
-
 #: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "<b>Macro text:</b>"
-msgstr "<b>Texto de la macro:</b>"
+msgid "Edit&#x2026;"
+msgstr "Editar&#x2026;"
 
 #: ../plugins/macro/anjuta-macro.ui.h:3
-msgid "<b>Macros:</b>"
-msgstr "<b>Macros:</b>"
+#| msgid "<b>Macro details:</b>"
+msgid "Macro details:"
+msgstr "Detalles de la macro:"
+
+#: ../plugins/macro/anjuta-macro.ui.h:4
+#| msgid "<b>Macro text:</b>"
+msgid "Macro text:"
+msgstr "Texto de la macro:"
 
 #: ../plugins/macro/anjuta-macro.ui.h:5
-msgid "Edit..."
-msgstr "Editarâ?¦"
+#| msgid "Macros"
+msgid "Macros:"
+msgstr "Macros:"
 
 #: ../plugins/macro/anjuta-macro.ui.h:7
 msgid "Shortcut:"
 msgstr "Tecla rÃ¡pida:"
 
 #: ../plugins/macro/macro-actions.c:127
-msgid "Press macro shortcut..."
+#| msgid "Press macro shortcut..."
+msgid "Press macro shortcutâ?¦"
 msgstr "Presionar combinaciÃ³n de teclas de macroâ?¦"
 
 #: ../plugins/macro/macro-actions.c:134
@@ -6508,7 +6763,8 @@ msgid "Macros"
 msgstr "Macros"
 
 #: ../plugins/macro/plugin.c:42
-msgid "_Insert Macro..."
+#| msgid "_Insert Macro..."
+msgid "_Insert Macroâ?¦"
 msgstr "_Insertar macroâ?¦"
 
 #: ../plugins/macro/plugin.c:44
@@ -6516,7 +6772,8 @@ msgid "Insert a macro using a shortcut"
 msgstr "Insertar una macro usando una combinaciÃ³n de teclas"
 
 #: ../plugins/macro/plugin.c:49
-msgid "_Add Macro..."
+#| msgid "_Add Macro..."
+msgid "_Add Macroâ?¦"
 msgstr "_AÃ±adir macroâ?¦"
 
 #: ../plugins/macro/plugin.c:51
@@ -6524,8 +6781,9 @@ msgid "Add a macro"
 msgstr "AÃ±ade una macro"
 
 #: ../plugins/macro/plugin.c:56
-msgid "Macros..."
-msgstr "Macrosâ?¦"
+#| msgid "Macros"
+msgid "Macrosâ?¦"
+msgstr "Macros..."
 
 #: ../plugins/macro/plugin.c:58
 msgid "Add/Edit/Remove macros"
@@ -6535,71 +6793,80 @@ msgstr "AÃ±ade/Edita/Elimina macros"
 msgid "Macro operations"
 msgstr "Operaciones con macros"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
-msgid "<b>Indicators</b>"
-msgstr "<b>Indicadores</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:2
-msgid "<b>Message colors</b>"
-msgstr "<b>Colores de los mensajes</b>"
-
+#. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
-msgid "<b>Messages options</b>"
-msgstr "<b>Opciones de mensajes</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Diagonal"
 msgstr "Diagonal"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
 msgid "Error message indicator style:"
 msgstr "Estilo de indicador de mensaje de error:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Errors:"
 msgstr "Errores:"
 
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+#| msgid "<b>Indicators</b>"
+msgid "Indicators"
+msgstr "Indicadores"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+#| msgid "<b>Message colors</b>"
+msgid "Message colors"
+msgstr "Colores de los mensajes"
+
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:9
+#| msgid "<b>Messages options</b>"
+msgid "Messages options"
+msgstr "Opciones de mensajes"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Normal message indicator style:"
 msgstr "Estilo de indicador de mensaje normal:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
 msgid "Number of first characters to show:"
 msgstr "NÃºmero de caracteres iniciales a mostrar:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
 msgid "Number of last characters to show:"
 msgstr "NÃºmero de caracteres finales a mostrar:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 msgid "Strike-Out"
 msgstr "Tachado"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
-msgid "Tabs position:"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#| msgid "Tabs position:"
+msgid "Tab position:"
 msgstr "PosiciÃ³n de las solapas:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
 msgid "Truncate long messages"
 msgstr "Truncar mensajes largos"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Underline-Plain"
 msgstr "Subrayado plano"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:22
 msgid "Underline-Squiggle"
 msgstr "Subrayado en garabato"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
+#. text style in editor, TT is for typewriter text
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:24
 msgid "Underline-TT"
 msgstr "Subrayado TT"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:25
 msgid "Warning message indicator style:"
 msgstr "Estilo de indicador de mensaje de advertencia:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:26
 msgid "Warnings:"
 msgstr "Advertencias:"
 
@@ -6724,15 +6991,18 @@ msgid "Patching %s using %s\n"
 msgstr "Parcheando %s usando %s\n"
 
 #: ../plugins/patch/patch-plugin.c:209
-msgid "Patching...\n"
+#| msgid "Patching...\n"
+msgid "Patchingâ?¦\n"
 msgstr "Parcheandoâ?¦\n"
 
 #: ../plugins/patch/patch-plugin.c:219
-msgid "Patching..."
+#| msgid "Patching..."
+msgid "Patchingâ?¦"
 msgstr "Parcheandoâ?¦"
 
 #: ../plugins/patch/patch-plugin.c:224
-msgid "There are unfinished jobs, please wait until they are finished."
+#| msgid "There are unfinished jobs, please wait until they are finished."
+msgid "There are unfinished jobs: please wait until they are finished."
 msgstr "Hay trabajos no finalizados, espere hasta que estÃ©n terminados."
 
 #: ../plugins/patch/patch-plugin.c:266
@@ -6775,17 +7045,22 @@ msgstr "_Herramientas"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
-msgid "_Patch..."
-msgstr "_Parchearâ?¦"
+#| msgid "Patch"
+msgid "_Patchâ?¦"
+msgstr "_Parchear..."
 
 #: ../plugins/patch/plugin.c:92
 msgid "Patch files/directories"
 msgstr "Parcheararchivos/directorios"
 
 #: ../plugins/project-import/plugin.c:66
+#, fuzzy
+#| msgid ""
+#| "Generation of project file failed. Cannot find an appropriate project "
+#| "template to use. Please make sure your version of Anjuta is up to date."
 msgid ""
 "Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up to date."
+"template to use. Please make sure your version of Anjuta is up-to-date."
 msgstr ""
 "Ha fallado la generaciÃ³n del archivo del proyecto. No se puede encontrar una "
 "plantilla de proyecto apropiada para usar. AsegÃºrese de que su versiÃ³n de "
@@ -6797,18 +7072,25 @@ msgid "A file named \"%s\" already exists. Do you want to replace it?"
 msgstr "Ya existe un archivo llamado Â«%sÂ». Â¿Quiere reemplazarlo?"
 
 #: ../plugins/project-import/plugin.c:134
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "A file named \"%s\" cannot be written: %s.  Check if you have write "
+#| "access to the project directory."
 msgid ""
-"A file named \"%s\" cannot be written: %s.  Check if you have write access "
-"to the project directory."
+"A file named \"%s\" cannot be written: %s. Check if you have write access to "
+"the project directory."
 msgstr ""
 "No se puede escribir el archivo de nombre Â«%sÂ»: %s. Compruebe si tiene acceso "
 "de escritura al directorio del proyecto."
 
 #: ../plugins/project-import/plugin.c:204
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not find a valid project backend for the directory given (%s). "
+#| "Please select a different directory, or try upgrading to a newer version "
+#| "of Anjuta."
 msgid ""
-"Could not find a valid project backend for the directory given (%s). Please "
+"Could not find a valid project backend for the given directory (%s). Please "
 "select a different directory, or try upgrading to a newer version of Anjuta."
 msgstr ""
 "No se pudo encontrar un Â«backendÂ» vÃ¡lido del proyecto para el directorio dado "
@@ -6817,38 +7099,42 @@ msgstr ""
 
 #: ../plugins/project-import/plugin.c:274
 #: ../plugins/project-import/plugin.c:330
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
 msgid ""
-"Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
+"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
 msgstr ""
 "No se pudo descargar el URI proporcionado Â«%sÂ», el error devuelto fue: Â«%sÂ»"
 
 #: ../plugins/project-import/project-import.ui.h:1
-msgid "<b>Import options</b>"
-msgstr "<b>Opciones de importaciÃ³n</b>"
-
-#: ../plugins/project-import/project-import.ui.h:2
-msgid "<b>Project name</b>"
-msgstr "<b>Nombre del proyecto</b>"
-
-#: ../plugins/project-import/project-import.ui.h:3
 #: ../plugins/project-wizard/templates/translatable-strings.h:34
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "Destino:"
 
-#: ../plugins/project-import/project-import.ui.h:4
+#: ../plugins/project-import/project-import.ui.h:2
 msgid "Import from folder"
 msgstr "Importar desde una carpeta"
 
-#: ../plugins/project-import/project-import.ui.h:5
+#: ../plugins/project-import/project-import.ui.h:3
 msgid "Import from version control system"
 msgstr "Importar desde un sistema de control de versiones"
 
-#: ../plugins/project-import/project-import.ui.h:6
+#: ../plugins/project-import/project-import.ui.h:4
+#| msgid "<b>Import options</b>"
+msgid "Import options"
+msgstr "Opciones de importaciÃ³n"
+
+#: ../plugins/project-import/project-import.ui.h:5
 msgid "Location:"
 msgstr "UbicaciÃ³n:"
 
+#: ../plugins/project-import/project-import.ui.h:6
+#| msgid "Project name:"
+msgid "Project name"
+msgstr "Nombre del proyecto"
+
 #: ../plugins/project-import/project-import-dialog.c:292
 msgid "Import project"
 msgstr "Importar proyecto"
@@ -6902,8 +7188,9 @@ msgid "_Group name:"
 msgstr "Nombre del _grupo:"
 
 #: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to add..."
-msgstr "_Seleccionar un archivo para aÃ±adirâ?¦"
+#| msgid "Select file to add:"
+msgid "_Select file to addâ?¦"
+msgstr "_Seleccionar archivo para aÃ±adir..."
 
 #: ../plugins/project-manager/gbf-project-model.c:233
 #: ../plugins/project-manager/plugin.c:1301
@@ -6923,7 +7210,8 @@ msgstr "No se ha cargado ningÃºn proyecto"
 
 #: ../plugins/project-manager/gbf-project-util.c:236
 #: ../plugins/project-manager/gbf-project-util.c:244
-msgid "Can not add group"
+#| msgid "Can not add group"
+msgid "Cannot add group"
 msgstr "No se puede aÃ±adir el grupo"
 
 #: ../plugins/project-manager/gbf-project-util.c:245
@@ -6932,7 +7220,8 @@ msgstr "No ha seleccionado el grupo padre"
 
 #: ../plugins/project-manager/gbf-project-util.c:417
 #: ../plugins/project-manager/gbf-project-util.c:426
-msgid "Can not add target"
+#| msgid "Can not add target"
+msgid "Cannot add target"
 msgstr "No se puede aÃ±adir el objetivo"
 
 #: ../plugins/project-manager/gbf-project-util.c:427
@@ -6940,12 +7229,14 @@ msgid "No group selected"
 msgstr "No se ha seleccionado ningÃºn grupo"
 
 #: ../plugins/project-manager/gbf-project-util.c:532
-msgid "Select sources..."
+#| msgid "Select sources..."
+msgid "Select sourcesâ?¦"
 msgstr "Seleccionar fuentesâ?¦"
 
 #: ../plugins/project-manager/gbf-project-util.c:772
 #: ../plugins/project-manager/gbf-project-util.c:779
-msgid "Can not add source files"
+#| msgid "Can not add source files"
+msgid "Cannot add source files"
 msgstr "No se pueden aÃ±adir los archivos de cÃ³digo"
 
 #: ../plugins/project-manager/gbf-project-util.c:780
@@ -6969,33 +7260,50 @@ msgstr "Propiedades del grupo"
 msgid "No properties available for this target"
 msgstr "Sin propiedades disponibles para este destino"
 
+#: ../plugins/project-manager/plugin.c:478
+#| msgid "Refresh symbol browser tree"
+msgid "Refreshing symbol treeâ?¦"
+msgstr "Actualizando el Ã¡rbol de sÃmbolos..."
+
 #: ../plugins/project-manager/plugin.c:485
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "FallÃ³ al refrescar el proyecto: %s"
 
 #: ../plugins/project-manager/plugin.c:663
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to remove the following group from project?\n"
+#| "\n"
 msgid ""
-"Are you sure you want to remove the following group from project?\n"
+"Are you sure you want to remove the following group from the project?\n"
 "\n"
 msgstr ""
 "Â¿Seguro que quiere eliminar el siguiente grupo del proyecto?\n"
 "\n"
 
 #: ../plugins/project-manager/plugin.c:664
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Group: %s\n"
+#| "\n"
+#| "The group will not be deleted from file system."
 msgid ""
 "Group: %s\n"
 "\n"
-"The group will not be deleted from file system."
+"The group will not be deleted from the file system."
 msgstr ""
 "Grupo: %s\n"
 "\n"
 "El grupo no se borrarÃ¡ del sistema de archivos."
 
 #: ../plugins/project-manager/plugin.c:667
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to remove the following target from project?\n"
+#| "\n"
 msgid ""
-"Are you sure you want to remove the following target from project?\n"
+"Are you sure you want to remove the following target from the project?\n"
 "\n"
 msgstr ""
 "Â¿Seguro que quiere eliminar el siguiente archivo objetivo del proyecto?\n"
@@ -7007,19 +7315,27 @@ msgid "Target: %s"
 msgstr "Objetivo: %s"
 
 #: ../plugins/project-manager/plugin.c:671
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to remove the following source file from project?\n"
+#| "\n"
 msgid ""
-"Are you sure you want to remove the following source file from project?\n"
+"Are you sure you want to remove the following source file from the project?\n"
 "\n"
 msgstr ""
 "Â¿Seguro que quiere eliminar el siguiente archivo fuente del proyecto?\n"
 "\n"
 
 #: ../plugins/project-manager/plugin.c:672
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Source: %s\n"
+#| "\n"
+#| "The source file will not be deleted from file system."
 msgid ""
 "Source: %s\n"
 "\n"
-"The source file will not be deleted from file system."
+"The source file will not be deleted from the file system."
 msgstr ""
 "Fuente: %s\n"
 "\n"
@@ -7057,8 +7373,9 @@ msgid "Refresh project manager tree"
 msgstr "Refrescar el Ã¡rbol del adm. de proyectos"
 
 #: ../plugins/project-manager/plugin.c:836
-msgid "Add _Group..."
-msgstr "AÃ±adir _grupoâ?¦"
+#| msgid "Add _Group"
+msgid "Add _Groupâ?¦"
+msgstr "AÃ±adir _grupo..."
 
 #: ../plugins/project-manager/plugin.c:836
 #: ../plugins/project-manager/plugin.c:870
@@ -7066,8 +7383,9 @@ msgid "Add a group to project"
 msgstr "AÃ±ade un grupo a un proyecto"
 
 #: ../plugins/project-manager/plugin.c:841
-msgid "Add _Target..."
-msgstr "AÃ±adir _objetivoâ?¦"
+#| msgid "Add _Target"
+msgid "Add _Targetâ?¦"
+msgstr "AÃ±adir _objetivo..."
 
 #: ../plugins/project-manager/plugin.c:841
 #: ../plugins/project-manager/plugin.c:875
@@ -7075,8 +7393,9 @@ msgid "Add a target to project"
 msgstr "AÃ±adir un objetivo al proyecto"
 
 #: ../plugins/project-manager/plugin.c:846
-msgid "Add _Source File..."
-msgstr "AÃ±adir archivo _fuenteâ?¦"
+#| msgid "Add _Source File"
+msgid "Add _Source Fileâ?¦"
+msgstr "AÃ±adir archivo _fuente..."
 
 #: ../plugins/project-manager/plugin.c:846
 #: ../plugins/project-manager/plugin.c:865
@@ -7097,8 +7416,10 @@ msgid "Properties of group/target/source"
 msgstr "Propiedades del grupo/objetivo/fuente"
 
 #: ../plugins/project-manager/plugin.c:865
-msgid "_Add To Project"
-msgstr "_AÃ±adir al proyecto"
+#, fuzzy
+#| msgid "Add to Project"
+msgid "_Add to Project"
+msgstr "AÃ±adir al proyecto"
 
 #: ../plugins/project-manager/plugin.c:870
 msgid "Add _Group"
@@ -7126,7 +7447,9 @@ msgid "Loading project: %s"
 msgstr "Cargando proyecto: %s"
 
 #: ../plugins/project-manager/plugin.c:1267
-msgid "Created project view..."
+#, fuzzy
+#| msgid "Created project view..."
+msgid "Created project viewâ?¦"
 msgstr "Vista de proyecto creadaâ?¦"
 
 #: ../plugins/project-manager/plugin.c:1280
@@ -7152,7 +7475,9 @@ msgid "Project manager popup actions"
 msgstr "Acciones emergentes el administrador de proyectos"
 
 #: ../plugins/project-manager/plugin.c:2641
-msgid "Initializing Project..."
+#, fuzzy
+#| msgid "Initializing Project..."
+msgid "Initializing Projectâ?¦"
 msgstr "Inicializando el proyectoâ?¦"
 
 #: ../plugins/project-manager/plugin.c:2644
@@ -7160,7 +7485,9 @@ msgid "Project Loaded"
 msgstr "Proyecto cargado"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
-msgid "<b>Details</b>"
+#, fuzzy
+#| msgid "<b>Details</b>"
+msgid "Details"
 msgstr "<b>Detalles</b>"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:2
@@ -7168,10 +7495,6 @@ msgstr "<b>Detalles</b>"
 msgid "Error"
 msgstr "Error"
 
-#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:3
-msgid "Select project type"
-msgstr "Seleccionar el tipo de proyecto"
-
 #: ../plugins/project-wizard/druid.c:139 ../plugins/project-wizard/druid.c:143
 msgid "Warning"
 msgstr "Advertencia"
@@ -7195,12 +7518,12 @@ msgstr ""
 msgid "Project Type: %s\n"
 msgstr "Tipo de proyecto: %s\n"
 
-#: ../plugins/project-wizard/druid.c:374
+#: ../plugins/project-wizard/druid.c:377
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "No se puede encontrar ninguna plantilla de proyecto en %s"
 
-#: ../plugins/project-wizard/druid.c:575
+#: ../plugins/project-wizard/druid.c:578
 #, c-format
 msgid ""
 "\n"
@@ -7209,21 +7532,24 @@ msgstr ""
 "\n"
 "El campo Â«%sÂ» es obligatorio. IntrodÃºzcalo."
 
-#: ../plugins/project-wizard/druid.c:590
-#, c-format
+#: ../plugins/project-wizard/druid.c:593
+#, fuzzy, c-format
+#| msgid ""
+#| "Field \"%s\" must start with a letter, a digit or an underscore and "
+#| "contains only letters, digits, underscore, minus and dot. Please fix it."
 msgid ""
-"Field \"%s\" must start with a letter, a digit or an underscore and contains "
+"Field \"%s\" must start with a letter, a digit or an underscore and contain "
 "only letters, digits, underscore, minus and dot. Please fix it."
 msgstr ""
 "El campo Â«%sÂ» debe comenzar por una letra, un dÃgito o un guiÃ³n bajo, y "
 "contener sÃ³lo letras, dÃgitos, guiÃ³n bajo, menos y punto. ArrÃ©glelo."
 
-#: ../plugins/project-wizard/druid.c:595
+#: ../plugins/project-wizard/druid.c:598
 #, c-format
 msgid "Unknown error."
 msgstr "Elementos desconocido."
 
-#: ../plugins/project-wizard/druid.c:622
+#: ../plugins/project-wizard/druid.c:625
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
@@ -7232,20 +7558,20 @@ msgstr ""
 "El directorio Â«%sÂ» no estÃ¡ vacÃo. La creaciÃ³n del proyecto podrÃa fallar si "
 "algunos archivos no se pudiesen escribir. Â¿Quiere continuar?"
 
-#: ../plugins/project-wizard/druid.c:624
+#: ../plugins/project-wizard/druid.c:627
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "El archivo Â«%sÂ» ya existe. Â¿Quiere sobreescribirlo?"
 
-#: ../plugins/project-wizard/druid.c:655
+#: ../plugins/project-wizard/druid.c:658
 msgid "Invalid entry"
 msgstr "Entrada no vÃ¡lida"
 
-#: ../plugins/project-wizard/druid.c:666
+#: ../plugins/project-wizard/druid.c:669
 msgid "Dubious entry"
 msgstr "Entrada dudosa"
 
-#: ../plugins/project-wizard/druid.c:776
+#: ../plugins/project-wizard/druid.c:779
 #, c-format
 msgid ""
 "\n"
@@ -7254,7 +7580,7 @@ msgstr ""
 "\n"
 "Faltan programas: %s"
 
-#: ../plugins/project-wizard/druid.c:787
+#: ../plugins/project-wizard/druid.c:790
 #, c-format
 msgid ""
 "\n"
@@ -7263,7 +7589,7 @@ msgstr ""
 "\n"
 "Faltan paquetes: %s."
 
-#: ../plugins/project-wizard/druid.c:795
+#: ../plugins/project-wizard/druid.c:798
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
@@ -7273,14 +7599,22 @@ msgstr ""
 "faltan para construir este proyecto. AsegÃºrese de que estÃ¡n instalados "
 "adecuadamente antes de generar el proyecto.\n"
 
-#: ../plugins/project-wizard/druid.c:801
+#: ../plugins/project-wizard/druid.c:804
+#, fuzzy
+#| msgid ""
+#| "The missing programs are usually part of some distrubution packages and "
+#| "can be searched in your Application Manager. Similarly, the development "
+#| "packages are contained in special packages that your distribution provide "
+#| "to allow development of projects based on them. They usually end with -"
+#| "dev or -devel suffix in package names and can be found by searching in "
+#| "your Application Manager."
 msgid ""
 "The missing programs are usually part of some distrubution packages and can "
-"be searched in your Application Manager. Similarly, the development packages "
-"are contained in special packages that your distribution provide to allow "
-"development of projects based on them. They usually end with -dev or -devel "
-"suffix in package names and can be found by searching in your Application "
-"Manager."
+"be searched for in your Application Manager. Similarly, the development "
+"packages are contained in special packages that your distribution provides "
+"to allow development of projects based on them. They usually end with a \"-"
+"dev\" or \"-devel\" suffix in package names and can be found by searching in "
+"your Application Manager."
 msgstr ""
 "Los programas faltantes generalmente son parte de alguna distribuciÃ³n de "
 "paquetes y se pueden buscar en su Gestor de aplicaciones. De forma similar, "
@@ -7289,11 +7623,11 @@ msgstr ""
 "ellos. Generalmente acaban con el sufijo -dev o -devel en el nombre del "
 "paquete y se pueden encontrar buscando en su Gestor de aplicaciones."
 
-#: ../plugins/project-wizard/druid.c:809
+#: ../plugins/project-wizard/druid.c:812
 msgid "Missing components"
 msgstr "Faltan componentes"
 
-#: ../plugins/project-wizard/druid.c:941
+#: ../plugins/project-wizard/druid.c:944
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr ""
@@ -7314,18 +7648,21 @@ msgid "Skipping %s: file already exists"
 msgstr "Saltando %s: el archivo ya existe"
 
 #: ../plugins/project-wizard/install.c:503
-#, c-format
-msgid "Creating %s ... Fail to create directory"
+#, fuzzy, c-format
+#| msgid "Creating %s ... Fail to create directory"
+msgid "Creating %s â?¦ Failed to create directory"
 msgstr "Creando %s â?¦ FallÃ³ al crear el directorio"
 
 #: ../plugins/project-wizard/install.c:519
-#, c-format
-msgid "Creating %s (using AutoGen)... %s"
+#, fuzzy, c-format
+#| msgid "Creating %s (using AutoGen)... %s"
+msgid "Creating %s (using AutoGen)â?¦ %s"
 msgstr "Creando %s (usando AutoGen)â?¦ %s"
 
 #: ../plugins/project-wizard/install.c:524
-#, c-format
-msgid "Creating %s ... %s"
+#, fuzzy, c-format
+#| msgid "Creating %s ... %s"
+msgid "Creating %s â?¦ %s"
 msgstr "Creando %s â?¦ %s"
 
 #. The %s is a name of a unix command line, by example
@@ -7395,7 +7732,9 @@ msgid "A generic Xlib project"
 msgstr "Un proyecto Xlib genÃ©rico"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:7
-msgid "A generic java project using automake project management"
+#, fuzzy
+#| msgid "A generic java project using automake project management"
+msgid "A generic Java project using automake project management"
 msgstr "Un proyecto Java genÃ©rico usando la gestiÃ³n de proyectos de automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:8
@@ -7403,8 +7742,11 @@ msgid "A generic minimal and flat project"
 msgstr "Un proyecto pequeÃ±o y plano genÃ©rico"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:9
+#, fuzzy
+#| msgid ""
+#| "A generic natively compiled java project using the GNU Java Compiler (gcj)"
 msgid ""
-"A generic natively compiled java project using the GNU Java Compiler (gcj)"
+"A generic natively compiled Java project using the GNU Java Compiler (gcj)"
 msgstr ""
 "Un proyecto compilado en Java nativo usando el el compilador de Java de GNU "
 "(gcj)"
@@ -7414,11 +7756,15 @@ msgid "A generic project"
 msgstr "Un proyecto genÃ©rico"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:11
-msgid "A generic python project using automake project management"
+#, fuzzy
+#| msgid "A generic python project using automake project management"
+msgid "A generic Python project using automake project management"
 msgstr "Un proyecto Python genÃ©rico usando la gestiÃ³n de proyectos de automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:12
-msgid "A generic wx Widgets project"
+#, fuzzy
+#| msgid "A generic wx Widgets project"
+msgid "A generic wxWidgets project"
 msgstr "Un proyecto wx Widgets genÃ©rico"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:13
@@ -7481,8 +7827,12 @@ msgid "Berkeley Software Distribution License (BSD)"
 msgstr "Licencia de DistribuciÃ³n de Software Berkeley (BSD)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:27
+#, fuzzy
+#| msgid ""
+#| "Comma separated, other plugins that this plugin depends on. It could be "
+#| "either primary interface name or plugin location (library:class)"
 msgid ""
-"Comma separated, other plugins that this plugin depends on. It could be "
+"Comma-separated, other plugins that this plugin depends on. It could be "
 "either primary interface name or plugin location (library:class)"
 msgstr ""
 "Separados por comas, otros complementos de los que depende este complemento. "
@@ -7498,15 +7848,16 @@ msgid "Configure external packages:"
 msgstr "Configurar paquetes externos:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:30
-msgid "Create Gtk Builder interface file"
+#, fuzzy
+#| msgid "Create Gtk Builder interface file"
+msgid "Create GtkBuilder interface file"
 msgstr "Crear un archivo de interfaz de constructor Gtk "
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:31
-msgid "Create a template Gtk Builder interface file"
-msgstr "Crear un archivo de plantilla de constructor Gtk para la interfaz"
-
 #: ../plugins/project-wizard/templates/translatable-strings.h:32
-msgid "Create a template gtk builder interface file"
+#, fuzzy
+#| msgid "Create a template Gtk Builder interface file"
+msgid "Create a template GtkBuilder interface file"
 msgstr "Crear un archivo de plantilla de constructor Gtk para la interfaz"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:35
@@ -7570,15 +7921,21 @@ msgid "Generic C++"
 msgstr "C++ genÃ©rico"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:51
-msgid "Generic gcj compiled java"
+#, fuzzy
+#| msgid "Generic gcj compiled java"
+msgid "Generic gcj compiled Java"
 msgstr "Java genÃ©rico compilado con gcj"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:52
-msgid "Generic java (automake)"
+#, fuzzy
+#| msgid "Generic java (automake)"
+msgid "Generic Java (automake)"
 msgstr "Java genÃ©rico (automake)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:53
-msgid "Generic python (automake)"
+#, fuzzy
+#| msgid "Generic python (automake)"
+msgid "Generic Python (automake)"
 msgstr "Python genÃ©rico (automake)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:54
@@ -7668,7 +8025,9 @@ msgid "Plugin class name"
 msgstr "Nombre de la clase del complemento"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:75
-msgid "Plugin has menus or/and toolbars"
+#, fuzzy
+#| msgid "Plugin has menus or/and toolbars"
+msgid "Plugin has menus and/or toolbars"
 msgstr "El complemento tiene menÃºs y/o barras de herramientas"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:76
@@ -7680,7 +8039,9 @@ msgid "Project Name:"
 msgstr "Nombre del proyecto:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:78
-msgid "Project directory, output file etc."
+#, fuzzy
+#| msgid "Project directory, output file etc."
+msgid "Project directory, output file, etc."
 msgstr "Directorio del proyecto, archivo de salida, etc."
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:79
@@ -7688,9 +8049,13 @@ msgid "Project directory:"
 msgstr "Directorio del proyecto:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:80
+#, fuzzy
+#| msgid ""
+#| "Project name must not contain spaces, because it will be the name of the "
+#| "project build target (executable, library etc.)"
 msgid ""
 "Project name must not contain spaces, because it will be the name of the "
-"project build target (executable, library etc.)"
+"project build target (executable, library, etc.)"
 msgstr ""
 "El nombre del proyecto no debe contener espacios porque serÃ¡ el nombre del "
 "proyecto objetivo (ejecutable, biblioteca, etc.)"
@@ -7704,7 +8069,9 @@ msgid "Project options"
 msgstr "Opciones del proyecto"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:83
-msgid "Python webproject using Django Web Framework"
+#, fuzzy
+#| msgid "Python webproject using Django Web Framework"
+msgid "Python web project using Django Web Framework"
 msgstr "Proyecto web Python usando el entorno de trabajo web Django"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:84
@@ -7785,8 +8152,10 @@ msgid "Whether the plugin has menus or toolbars"
 msgstr "Indica si el complemento tiene menÃºs o barras de herramientas"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:104
-msgid "Wx Widgets"
-msgstr "Wx Widgets"
+#, fuzzy
+#| msgid "Widgets"
+msgid "wxWidgets"
+msgstr "Widgets"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:105
 msgid "Xlib"
@@ -7797,7 +8166,10 @@ msgid "Xlib dock"
 msgstr "Empotrable Xlib"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:107
-msgid "gtk-doc is used to compile API documentations for GObject based classes"
+#, fuzzy
+#| msgid ""
+#| "gtk-doc is used to compile API documentations for GObject based classes"
+msgid "gtk-doc is used to compile API documentation for GObject-based classes"
 msgstr ""
 "gtk-doc se usa para compilar la documentaciÃ³n de la API para las clases "
 "basadas en GObject"
@@ -7823,18 +8195,13 @@ msgid "Program:"
 msgstr "Programa:"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:6
-msgid "Run In Terminal"
+msgid "Run in Terminal"
 msgstr "Ejecutar en un terminal"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:7
 msgid "Working Directory:"
 msgstr "Directorio de trabajo:"
 
-#: ../plugins/run-program/execute.c:76
-#, c-format
-msgid "Program '%s' does not exist"
-msgstr "El programa Â«%sÂ» no existe"
-
 #. Only local directory are supported
 #: ../plugins/run-program/execute.c:107
 #, c-format
@@ -7882,11 +8249,15 @@ msgid "Kill program"
 msgstr "Matar programa"
 
 #: ../plugins/run-program/plugin.c:253
-msgid "Program Parameters..."
-msgstr "ParÃ¡metros del programaâ?¦"
+#, fuzzy
+#| msgid "Program Parameters"
+msgid "Program Parametersâ?¦"
+msgstr "ParÃ¡metros del programa"
 
 #: ../plugins/run-program/plugin.c:255
-msgid "Set current program, arguments and so on"
+#, fuzzy
+#| msgid "Set current program, arguments and so on"
+msgid "Set current program, arguments, etc."
 msgstr "Establecer el programa actual, los argumentos y demÃ¡s"
 
 #: ../plugins/run-program/plugin.c:280
@@ -7894,156 +8265,165 @@ msgid "Run operations"
 msgstr "Ejecutar operaciones"
 
 #: ../plugins/search/anjuta-search.ui.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Acciones</b>"
+#, fuzzy
+#| msgid "Action"
+msgid "Actions"
+msgstr "AcciÃ³n"
 
 #: ../plugins/search/anjuta-search.ui.h:2
-msgid "<b>File Filter</b>"
-msgstr "<b>Filtro de archivo</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:4
-msgid "<b>Parameters</b>"
-msgstr "<b>ParÃ¡metros</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:5
-msgid "<b>Scope</b>"
-msgstr "<b>Ã?mbito</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:6
-msgid "<b>Search variable</b>"
-msgstr "<b>Variable de bÃºsqueda</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:7
 #: ../plugins/search/search-replace.c:92
 msgid "Backward"
 msgstr "Hacia atrÃ¡s"
 
-#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/anjuta-search.ui.h:3
 msgid "Basic Search & Replace"
 msgstr "BÃºsqueda y reemplazo bÃ¡sicos"
 
-#: ../plugins/search/anjuta-search.ui.h:9
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Directories:"
 msgstr "Elegir directorios:"
 
-#: ../plugins/search/anjuta-search.ui.h:10
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "Choose Files:"
 msgstr "Elegir archivos:"
 
-#: ../plugins/search/anjuta-search.ui.h:11
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "Expand regex back references"
 msgstr "Expandir referencias hacia atrÃ¡s de regex"
 
-#: ../plugins/search/anjuta-search.ui.h:12
+#: ../plugins/search/anjuta-search.ui.h:7
+#, fuzzy
+#| msgid "<b>File Filter</b>"
+msgid "File Filter"
+msgstr "<b>Filtro de archivo</b>"
+
+#: ../plugins/search/anjuta-search.ui.h:8
 msgid "Find & Replace"
 msgstr "Buscar y reemplazar"
 
-#: ../plugins/search/anjuta-search.ui.h:13
+#: ../plugins/search/anjuta-search.ui.h:9
 #: ../plugins/search/search-replace.c:91
 msgid "Forward"
 msgstr "Hacia adelante"
 
 #. the order of these matters - it must match the order of the corresponding
 #. radio buttons on another page
-#: ../plugins/search/anjuta-search.ui.h:14
+#: ../plugins/search/anjuta-search.ui.h:10
 #: ../plugins/search/search-replace.c:90
 msgid "Full Buffer"
 msgstr "Rellenar bÃºfer"
 
-#: ../plugins/search/anjuta-search.ui.h:15
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Greedy matching"
 msgstr "Coincidencia voraz"
 
-#: ../plugins/search/anjuta-search.ui.h:16
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Ignore Binary Files"
 msgstr "Ignorar archivos binarios"
 
-#: ../plugins/search/anjuta-search.ui.h:17
+#: ../plugins/search/anjuta-search.ui.h:13
 msgid "Ignore Directories:"
 msgstr "Ignorar directorios:"
 
-#: ../plugins/search/anjuta-search.ui.h:18
+#: ../plugins/search/anjuta-search.ui.h:14
 msgid "Ignore Files:"
 msgstr "Ignorar archivos:"
 
-#: ../plugins/search/anjuta-search.ui.h:19
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Ignore Hidden Directories"
 msgstr "Ignorar directorios ocultos"
 
-#: ../plugins/search/anjuta-search.ui.h:20
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Ignore Hidden Files"
 msgstr "Ignorar archivos ocultos"
 
-#: ../plugins/search/anjuta-search.ui.h:21
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Match at start of word"
 msgstr "Coincidir con el inicio de palabra"
 
-#: ../plugins/search/anjuta-search.ui.h:23
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Match complete lines"
 msgstr "Coincidir con lÃneas completas"
 
-#: ../plugins/search/anjuta-search.ui.h:24
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Match complete words"
 msgstr "Coincidir con palabras completas"
 
-#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "Maximum Actions"
 msgstr "Acciones mÃ¡ximas"
 
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/search/anjuta-search.ui.h:22
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/search/anjuta-search.ui.h:27
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "New Name:"
 msgstr "Nombre nuevo:"
 
-#: ../plugins/search/anjuta-search.ui.h:28
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "No Limit"
 msgstr "Sin lÃmite"
 
-#: ../plugins/search/anjuta-search.ui.h:29
+#: ../plugins/search/anjuta-search.ui.h:26
+#, fuzzy
+#| msgid "Parameters:"
+msgid "Parameters"
+msgstr "ParÃ¡metros:"
+
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Regular expression"
 msgstr "ExpresiÃ³n regular"
 
-#: ../plugins/search/anjuta-search.ui.h:30
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Replace With:"
 msgstr "Reemplazar con:"
 
-#: ../plugins/search/anjuta-search.ui.h:31
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Search Action:"
 msgstr "AcciÃ³n de bÃºsqueda:"
 
-#: ../plugins/search/anjuta-search.ui.h:32
+#: ../plugins/search/anjuta-search.ui.h:31
 msgid "Search Direction:"
 msgstr "DirecciÃ³n de bÃºsqueda:"
 
+#. This is "the search expression" (noun)
 #: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search Expression"
 msgstr "Buscar expresiÃ³n"
 
-#: ../plugins/search/anjuta-search.ui.h:34
+#. This is "the search expression" (noun)
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search Expression:"
 msgstr "Buscar expresiÃ³n:"
 
-#: ../plugins/search/anjuta-search.ui.h:35
+#: ../plugins/search/anjuta-search.ui.h:36
 msgid "Search In:"
 msgstr "Buscar en:"
 
-#: ../plugins/search/anjuta-search.ui.h:36
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search Recursively"
 msgstr "Buscar recursivamente"
 
-#: ../plugins/search/anjuta-search.ui.h:37
+#: ../plugins/search/anjuta-search.ui.h:38
 msgid "Search Target"
 msgstr "Buscar objetivo"
 
-#: ../plugins/search/anjuta-search.ui.h:38
+#. User can select variables that contain lists of files, so this is a combined noun
+#: ../plugins/search/anjuta-search.ui.h:40
+#, fuzzy
+#| msgid "<b>Search variable</b>"
+msgid "Search variable"
+msgstr "<b>Variable de bÃºsqueda</b>"
+
+#: ../plugins/search/anjuta-search.ui.h:41
 msgid "Setting"
 msgstr "Ajuste"
 
 #: ../plugins/search/plugin.c:68
-msgid "_Find..."
+#, fuzzy
+#| msgid "_Find..."
+msgid "_Findâ?¦"
 msgstr "_Buscarâ?¦"
 
 #: ../plugins/search/plugin.c:69
@@ -8063,7 +8443,9 @@ msgid "Find _Previous"
 msgstr "Buscar _anterior"
 
 #: ../plugins/search/plugin.c:78
-msgid "Find and R_eplace..."
+#, fuzzy
+#| msgid "Find and R_eplace..."
+msgid "Find and R_eplaceâ?¦"
 msgstr "Buscar y _reemplazarâ?¦"
 
 #: ../plugins/search/plugin.c:80
@@ -8076,7 +8458,9 @@ msgid "Search and Replace"
 msgstr "Buscar y reemplazar"
 
 #: ../plugins/search/plugin.c:85
-msgid "Fin_d in Files..."
+#, fuzzy
+#| msgid "Fin_d in Files..."
+msgid "Fin_d in Filesâ?¦"
 msgstr "_Buscar en archivosâ?¦"
 
 #: ../plugins/search/plugin.c:86
@@ -8084,8 +8468,10 @@ msgid "Search for a string in multiple files or directories"
 msgstr "Buscar una cadena en mÃºltiples archivos o directorios"
 
 #: ../plugins/search/plugin.c:102
-msgid "Searching..."
-msgstr "Buscandoâ?¦"
+#, fuzzy
+#| msgid "Searching"
+msgid "Searchingâ?¦"
+msgstr "Buscando"
 
 #: ../plugins/search/search_preferences.c:44
 msgid "Basic Search"
@@ -8186,22 +8572,30 @@ msgstr[0] "Se ha reemplazado %d coincidencia."
 msgstr[1] "Se han reemplazado %d coincidencias."
 
 #: ../plugins/search/search-replace.c:1298
-msgid "Unable to build user interface for Search And Replace"
+#, fuzzy
+#| msgid "Unable to build user interface for Search And Replace"
+msgid "Unable to build user interface for Search and Replace"
 msgstr "No se pudo construir la interfaz de usuario para Â«Buscar y reemplazarÂ»"
 
 #: ../plugins/sourceview/sourceview.c:364
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "The file '%s' on the disk is more recent than the current buffer.\n"
+#| "Do you want to reload it?"
 msgid ""
-"The file '%s' on the disk is more recent than the current buffer.\n"
+"The file \"%s\" on the disk is more recent than the current buffer.\n"
 "Do you want to reload it?"
 msgstr ""
 "El archivo Â«%sÂ» en el disco es mÃ¡s reciente que el bÃºfer actual.\n"
 "Â¿Quiere recargarlo?"
 
 #: ../plugins/sourceview/sourceview.c:401
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "The file '%s' has been deleted on the disk.\n"
+#| "Do you want to close it?"
 msgid ""
-"The file '%s' has been deleted on the disk.\n"
+"The file \"%s\" has been deleted on the disk.\n"
 "Do you want to close it?"
 msgstr ""
 "Se ha borrado del disco el archivo Â«%sÂ».\n"
@@ -8214,8 +8608,9 @@ msgid "Could not open %s: %s"
 msgstr "No se pudo abrir %s: %s"
 
 #: ../plugins/sourceview/sourceview.c:492
-#, c-format
-msgid "The file '%s' is read-only! Edit anyway?"
+#, fuzzy, c-format
+#| msgid "The file '%s' is read-only! Edit anyway?"
+msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "El archivo Â«%sÂ» es de sÃ³lo lectura. Â¿Editarlo de todas formas?"
 
 #. Could not open <filename>: <error message>
@@ -8224,14 +8619,14 @@ msgstr "El archivo Â«%sÂ» es de sÃ³lo lectura. Â¿Editarlo de todas formas?"
 msgid "Could not save %s: %s"
 msgstr "No se puede guardar %s: %s."
 
-#: ../plugins/sourceview/sourceview-io.c:274
+#: ../plugins/sourceview/sourceview-io.c:273
 #, c-format
 msgid "Could not save file because filename not yet specified"
 msgstr ""
 "No se puede guardar el archivo porque el nombre de archivo aÃºn no se ha "
 "especificado"
 
-#: ../plugins/sourceview/sourceview-io.c:504
+#: ../plugins/sourceview/sourceview-io.c:503
 #, c-format
 msgid "New file %d"
 msgstr "Archivo nuevo %d"
@@ -8273,7 +8668,9 @@ msgid "Indentation and auto-format options"
 msgstr "Opciones de sangrÃa y autoformato"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
-msgid "Print Linenumbers"
+#, fuzzy
+#| msgid "Print Linenumbers"
+msgid "Print line numbers"
 msgstr "Imprimir nÃºmeros de lÃnea"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
@@ -8355,7 +8752,9 @@ msgid "Anjuta Manual"
 msgstr "Manual de Anjuta"
 
 #: ../plugins/starter/starter.c:481
-msgid "Gnome Online API Documentation"
+#, fuzzy
+#| msgid "Gnome Online API Documentation"
+msgid "GNOME Online API Documentation"
 msgstr "DocumentaciÃ³n en lÃnea de la API de GNOME"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:1
@@ -8443,82 +8842,88 @@ msgid "Repository authorization"
 msgstr "AutorizaciÃ³n del repositorio"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:36
+#, fuzzy
+#| msgid "Retrieving status..."
+msgid "Retrieving statusâ?¦â?¦"
+msgstr "Obteniendo el estadoâ?¦"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:37
 msgid "Revert Changes"
 msgstr "Revertir cambios"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:38
+#: ../plugins/subversion/anjuta-subversion.ui.h:39
 msgid "Save open files before diffing"
 msgstr "Guardar los archivos abiertos antes de hacer el diff"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:39
+#: ../plugins/subversion/anjuta-subversion.ui.h:40
 msgid "Second Path:"
 msgstr "Segunda ruta:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:41
 msgid "Select Changes to Revert:"
 msgstr "Seleccionar los cambios que revertir:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:44
+#: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source/Destination Paths:"
 msgstr "Rutas de origen/destino:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:45
+#: ../plugins/subversion/anjuta-subversion.ui.h:46
 msgid "Source:"
 msgstr "Origen:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:46
+#: ../plugins/subversion/anjuta-subversion.ui.h:47
 msgid "Start Revision:"
 msgstr "RevisiÃ³n de inicio:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:47
+#: ../plugins/subversion/anjuta-subversion.ui.h:48
 msgid "Subversion Options"
 msgstr "Opciones de Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:48
+#: ../plugins/subversion/anjuta-subversion.ui.h:49
 msgid "Subversion Preferences"
 msgstr "Preferencias de Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:50
 msgid "Switch to branch/tag"
 msgstr "Cambiar a una rama/etiqueta"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:50
+#: ../plugins/subversion/anjuta-subversion.ui.h:51
 msgid "Trust server"
 msgstr "Confiar en el servidor"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:52
 msgid "Update file/directory"
 msgstr "Actualizar archivo/directorio"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:52
+#: ../plugins/subversion/anjuta-subversion.ui.h:53
 msgid "Use first path"
 msgstr "Usar la primera ruta"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:54
 msgid "Use previous message"
 msgstr "Usar el mensaje anterior"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:56
+#: ../plugins/subversion/anjuta-subversion.ui.h:57
 msgid "View Log"
 msgstr "Ver el registro"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:57
+#: ../plugins/subversion/anjuta-subversion.ui.h:58
 msgid "View Selected Revision"
 msgstr "Ver la revisiÃ³n seleccionada"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:59
+#: ../plugins/subversion/anjuta-subversion.ui.h:60
 msgid "Whole Project"
 msgstr "Proyecto completo"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:61
+#: ../plugins/subversion/anjuta-subversion.ui.h:62
 msgid "Working Copy"
 msgstr "Copia de trabajo"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:62
+#: ../plugins/subversion/anjuta-subversion.ui.h:63
 msgid "Working Copy Path:"
 msgstr "Ruta a la copia de trabajo:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:63
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
 msgstr "reino"
 
@@ -8549,7 +8954,9 @@ msgstr "Efectuar sus cambios al Ã¡rbol Subversion"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
-msgid "_Revert..."
+#, fuzzy
+#| msgid "_Revert..."
+msgid "_Revertâ?¦"
 msgstr "_Revertirâ?¦"
 
 #. Display label
@@ -8561,7 +8968,9 @@ msgstr "Revertir los cambios a su copia de trabajo."
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
-msgid "_Resolve Conflicts..."
+#, fuzzy
+#| msgid "_Resolve Conflicts..."
+msgid "_Resolve Conflictsâ?¦"
 msgstr "_Resolver conflictosâ?¦"
 
 #. Display label
@@ -8573,19 +8982,25 @@ msgstr "Resolver conflictos en su copia de trabajo."
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
-msgid "_Update..."
-msgstr "_Actualizarâ?¦"
+#, fuzzy
+#| msgid "_Update"
+msgid "_Updateâ?¦"
+msgstr "_Actualizar"
 
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
-msgid "Sync your local copy with the Subversion tree"
+#, fuzzy
+#| msgid "Sync your local copy with the Subversion tree"
+msgid "Syncronize your local copy with the Subversion tree"
 msgstr "Sincronizar su copia local con el Ã¡rbol Subversion"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:108
-msgid "Copy Files/Folders..."
+#, fuzzy
+#| msgid "Copy Files/Folders..."
+msgid "Copy Files/Foldersâ?¦"
 msgstr "Copiar archivos/carpetasâ?¦"
 
 #. Display label
@@ -8597,7 +9012,9 @@ msgstr "Copiar archivos/carpetas en el repositorio"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:116
-msgid "Switch to a Branch/Tag..."
+#, fuzzy
+#| msgid "Switch to a Branch/Tag..."
+msgid "Switch to a Branch/Tagâ?¦"
 msgstr "Cambiar a una rama/etiquetaâ?¦"
 
 #. Display label
@@ -8609,8 +9026,10 @@ msgstr "Cambiar su copia local por una rama o etiqueta del repositorio"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
-msgid "Merge..."
-msgstr "Mezclarâ?¦"
+#, fuzzy
+#| msgid "Merge"
+msgid "Mergeâ?¦"
+msgstr "Mezclar"
 
 #. Display label
 #. short-cut
@@ -8621,8 +9040,10 @@ msgstr "Mezclar los cambios en su copia de trabajo"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
-msgid "_View Log..."
-msgstr "_Ver el registroâ?¦"
+#, fuzzy
+#| msgid "View Log"
+msgid "_View Logâ?¦"
+msgstr "Ver el registro"
 
 #. Display label
 #. short-cut
@@ -8633,8 +9054,10 @@ msgstr "Ver el histÃ³rico del archivo"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
-msgid "_Diff..."
-msgstr "_Diffâ?¦"
+#, fuzzy
+#| msgid "_Diff"
+msgid "_Diffâ?¦"
+msgstr "_Diff"
 
 #. Display label
 #. short-cut
@@ -8645,14 +9068,18 @@ msgstr "Diff del Ã¡rbol local con el repositorio"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:199
-msgid "Copy..."
-msgstr "Copiarâ?¦"
+#, fuzzy
+#| msgid "Copy"
+msgid "Copyâ?¦"
+msgstr "Copiar"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:207
-msgid "Diff..."
-msgstr "Diffâ?¦"
+#, fuzzy
+#| msgid "Diff"
+msgid "Diffâ?¦"
+msgstr "Diff"
 
 #: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
@@ -8675,7 +9102,9 @@ msgid "Subversion: Commit complete."
 msgstr "Subversion: Carga completada."
 
 #: ../plugins/subversion/subversion-commit-dialog.c:123
-msgid "Subversion: Committing changes to the repository..."
+#, fuzzy
+#| msgid "Subversion: Committing changes to the repository..."
+msgid "Subversion: Committing changes to the repositoryâ?¦"
 msgstr "Subversion: Efectuando los cambios sobre el repositorioâ?¦"
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
@@ -8697,7 +9126,9 @@ msgstr "[Head/Copia de trabajo]"
 #: ../plugins/subversion/subversion-diff-dialog.c:61
 #: ../plugins/subversion/subversion-log-dialog.c:426
 #: ../plugins/subversion/subversion-log-dialog.c:493
-msgid "Subversion: Retrieving diff..."
+#, fuzzy
+#| msgid "Subversion: Retrieving diff..."
+msgid "Subversion: Retrieving diffâ?¦"
 msgstr "Subversion: Obteniendo Diffâ?¦"
 
 #: ../plugins/subversion/subversion-log-dialog.c:119
@@ -8713,7 +9144,9 @@ msgid "Short Log"
 msgstr "Registro corto"
 
 #: ../plugins/subversion/subversion-log-dialog.c:257
-msgid "Subversion: Retrieving log..."
+#, fuzzy
+#| msgid "Subversion: Retrieving log..."
+msgid "Subversion: Retrieving logâ?¦"
 msgstr "Subversion: Obteniendo el registroâ?¦"
 
 #: ../plugins/subversion/subversion-log-dialog.c:309
@@ -8721,7 +9154,9 @@ msgid "Subversion: File retrieved."
 msgstr "Subversion: Archivo obtenido."
 
 #: ../plugins/subversion/subversion-log-dialog.c:351
-msgid "Subversion: Retrieving file..."
+#, fuzzy
+#| msgid "Subversion: Retrieving file..."
+msgid "Subversion: Retrieving fileâ?¦"
 msgstr "Subversion: Obteniendo archivoâ?¦"
 
 #: ../plugins/subversion/subversion-merge-dialog.c:38
@@ -8869,7 +9304,9 @@ msgid "Tag De_claration"
 msgstr "DeclaraciÃ³n de _etiqueta"
 
 #: ../plugins/symbol-db/plugin.c:315
-msgid "Goto symbol declaration"
+#, fuzzy
+#| msgid "Goto symbol declaration"
+msgid "Go to symbol declaration"
 msgstr "Ir a declaraciÃ³n del sÃmbolo"
 
 #. Translators: Go to the line where the tag is implemented
@@ -8878,20 +9315,25 @@ msgid "Tag _Implementation"
 msgstr "_ImplementaciÃ³n de etiquetas"
 
 #: ../plugins/symbol-db/plugin.c:324
-msgid "Goto symbol definition"
+#, fuzzy
+#| msgid "Goto symbol definition"
+msgid "Go to symbol definition"
 msgstr "Ir a definiciÃ³n del sÃmbolo"
 
 #: ../plugins/symbol-db/plugin.c:331
-msgid "_Find Symbol..."
-msgstr "_Buscar sÃmboloâ?¦"
+#, fuzzy
+#| msgid "Find Symbol"
+msgid "_Find Symbolâ?¦"
+msgstr "Buscar sÃmbolo"
 
 #: ../plugins/symbol-db/plugin.c:332
 msgid "Find Symbol"
 msgstr "Buscar sÃmbolo"
 
 #: ../plugins/symbol-db/plugin.c:1170
-#, c-format
-msgid "%s: Generating inheritances..."
+#, fuzzy, c-format
+#| msgid "%s: Generating inheritances..."
+msgid "%s: Generating inheritancesâ?¦"
 msgstr "%s: Generando herenciasâ?¦"
 
 #: ../plugins/symbol-db/plugin.c:1175
@@ -8900,8 +9342,9 @@ msgid "%s: %d files scanned out of %d"
 msgstr "%s: %d archivos analizados de %d"
 
 #: ../plugins/symbol-db/plugin.c:1206
-#, c-format
-msgid "Generating inheritances..."
+#, fuzzy, c-format
+#| msgid "Generating inheritances..."
+msgid "Generating inheritancesâ?¦"
 msgstr "Generando herenciasâ?¦"
 
 #: ../plugins/symbol-db/plugin.c:1208
@@ -8910,7 +9353,9 @@ msgid "%d files scanned out of %d"
 msgstr "%d archivos analizados de %d"
 
 #: ../plugins/symbol-db/plugin.c:1968
-msgid "Populating symbols' db..."
+#, fuzzy
+#| msgid "Populating symbols' db..."
+msgid "Populating symbol databaseâ?¦"
 msgstr "Llenando la BB DD de sÃmbolosâ?¦"
 
 #: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
@@ -8948,125 +9393,149 @@ msgstr "Resumiendo el anÃ¡lisis glb."
 msgid "Symbol"
 msgstr "SÃmbolo"
 
+#: ../plugins/symbol-db/symbol-db-view.c:799
+#, fuzzy
+#| msgid "Loading..."
+msgid "Loadingâ?¦"
+msgstr "Cargandoâ?¦"
+
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
-msgid "<b>Available API tags</b>"
-msgstr "<b>Etiquetas de la API disponibles</b>"
+msgid "Automatically scan project's packages"
+msgstr "Analizar automÃ¡ticamente los paquetes del proyecto"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
-msgid "<b>Global</b>"
-msgstr "<b>Global</b>"
+msgid "Automatically update symbols without saving file"
+msgstr "Actualizar automÃ¡ticamente los sÃmbolos sin guardar el archivo"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid "Automatically scan project's packages"
-msgstr "Analizar automÃ¡ticamente los paquetes del proyecto"
+#, fuzzy
+#| msgid ""
+#| "Update automatically the file's symbols without saving. The update occurs "
+#| "after 10 seconds of no keypress by user."
+msgid ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by the user."
+msgstr ""
+"Actualizar automÃ¡ticamente los sÃmbolos de los archivos sin guardar. La "
+"actualizaciÃ³n sucede despuÃ©s de 10 segundos si el usuario no pulsa ninguna "
+"tecla."
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
-msgid "Automatically update symbols without saving file"
-msgstr "Actualizar automÃ¡ticamente los sÃmbolos sin guardar el archivo"
+#, fuzzy
+#| msgid "<b>Available API tags</b>"
+msgid "Available API tags"
+msgstr "<b>Etiquetas de la API disponibles</b>"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
-msgid "Checking if package is parseable..."
+#, fuzzy
+#| msgid "Checking if package is parseable..."
+msgid "Checking if package is parseableâ?¦"
 msgstr "Comprobando si el paquete se puede analizarâ?¦"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "AnÃ¡lisis paralelo de sÃmbolos global y del proyecto"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
+#, fuzzy
+#| msgid ""
+#| "This option enables the default packages required by your opened project, "
+#| "e.g. glib and gtk+ if you create a Gtk+ project (may require more cpu "
+#| "work)"
 msgid ""
 "This option enables the default packages required by your opened project, e."
-"g. glib and gtk+ if you create a Gtk+ project (may require more cpu work)"
+"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
 msgstr ""
 "Esta opciÃ³n activa los paquetes predeterminados necesarios por su proyecto "
 "abierto, ej. glib y gtk+ y crea un proyecto GTK+ (puede necesitar mÃ¡s "
 "trabajo de CPU)"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
+#, fuzzy
+#| msgid ""
+#| "This option means that the global system packages will be scanned "
+#| "contemporary with the project's ones"
 msgid ""
 "This option means that the global system packages will be scanned "
-"contemporary with the project's ones"
+"simultaneously with the project's ones"
 msgstr ""
 "Esta opciÃ³n significa que los paquetes globales del sistema se analizarÃ¡n a "
 "la vez que los del proyecto"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
-msgid ""
-"Update automatically the file's symbols without saving. The update occurs "
-"after 10 seconds of no keypress by user."
-msgstr ""
-"Actualizar automÃ¡ticamente los sÃmbolos de los archivos sin guardar. La "
-"actualizaciÃ³n sucede despuÃ©s de 10 segundos si el usuario no pulsa ninguna "
-"tecla."
-
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
-msgid "<b>Terminal options</b>"
-msgstr "<b>Opciones de terminal</b>"
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
+#, fuzzy
+#| msgid "terminal operations"
+msgid "Terminal options"
+msgstr "operaciones en la terminal"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:3
-msgid "Use GNOME terminal profile:"
+#, fuzzy
+#| msgid "Use GNOME terminal profile:"
+msgid "Use GNOME Terminal profile:"
 msgstr "Usar el perfil del terminal de GNOME:"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:4
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "Usar el perfil actualmente seleccionado en el terminal de GNOME"
 
-#: ../plugins/terminal/terminal.c:701
+#: ../plugins/terminal/terminal.c:739
 msgid "terminal operations"
 msgstr "operaciones en la terminal"
 
-#: ../plugins/terminal/terminal.c:719 ../plugins/terminal/terminal.c:886
-#: ../plugins/terminal/terminal.c:939
+#: ../plugins/terminal/terminal.c:757 ../plugins/terminal/terminal.c:926
+#: ../plugins/terminal/terminal.c:979
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../plugins/tools/anjuta-tools.ui.h:1
-msgid "<b>Tools</b>"
-msgstr "<b>Herramientas</b>"
-
-#: ../plugins/tools/anjuta-tools.ui.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:2
 msgid "Command:"
 msgstr "Comando:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:4
+#: ../plugins/tools/anjuta-tools.ui.h:3
 msgid "Edit as script"
 msgstr "Editar como script"
 
-#: ../plugins/tools/anjuta-tools.ui.h:5
+#: ../plugins/tools/anjuta-tools.ui.h:4
 msgid "Edit command as script in Anjuta on close"
 msgstr "Editar comando como script de Anjuta al cerrar"
 
-#: ../plugins/tools/anjuta-tools.ui.h:8
+#: ../plugins/tools/anjuta-tools.ui.h:7
 msgid "Parameters:"
 msgstr "ParÃ¡metros:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:10
+#: ../plugins/tools/anjuta-tools.ui.h:9
 msgid "Save all files"
 msgstr "Guardar todos los archivos"
 
-#: ../plugins/tools/anjuta-tools.ui.h:11
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Short cut:"
 msgstr "Tecla rÃ¡pida:"
 
 #. This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:13
+#: ../plugins/tools/anjuta-tools.ui.h:12
 msgid "Standard error:"
 msgstr "Error estÃ¡ndar:"
 
 #. This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:15
+#: ../plugins/tools/anjuta-tools.ui.h:14
 msgid "Standard input:"
 msgstr "Entrada estÃ¡ndar:"
 
 #. This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:17
+#: ../plugins/tools/anjuta-tools.ui.h:16
 msgid "Standard output:"
 msgstr "Salida estÃ¡ndar:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:18
+#: ../plugins/tools/anjuta-tools.ui.h:17
 msgid "Tool Editor"
 msgstr "Editor de herramientas"
 
+#: ../plugins/tools/anjuta-tools.ui.h:18 ../plugins/tools/plugin.c:256
+#: ../plugins/tools/plugin.c:263 ../plugins/tools/anjuta-tools.plugin.in.h:1
+msgid "Tools"
+msgstr "Herramientas"
+
 #: ../plugins/tools/anjuta-tools.ui.h:19
 msgid "Variable list"
 msgstr "Lista de variables"
@@ -9076,8 +9545,10 @@ msgid "Working directory:"
 msgstr "Directorio de trabajo:"
 
 #: ../plugins/tools/anjuta-tools.ui.h:21
-msgid "_Variable..."
-msgstr "_Variableâ?¦"
+#, fuzzy
+#| msgid "Variable"
+msgid "_Variableâ?¦"
+msgstr "Variable"
 
 #: ../plugins/tools/dialog.c:177
 #, c-format
@@ -9129,7 +9600,9 @@ msgid "Unable to edit script"
 msgstr "No se puede editar el script"
 
 #: ../plugins/tools/editor.c:1044
-msgid "New accelerator..."
+#, fuzzy
+#| msgid "New accelerator..."
+msgid "New acceleratorâ?¦"
 msgstr "Acelerador nuevoâ?¦"
 
 #: ../plugins/tools/execute.c:314
@@ -9155,8 +9628,9 @@ msgstr "(error)"
 
 #. Display the name of the command
 #: ../plugins/tools/execute.c:469
-#, c-format
-msgid "Running command: %s...\n"
+#, fuzzy, c-format
+#| msgid "Running command: %s...\n"
+msgid "Running command: %sâ?¦\n"
 msgstr "Comando en ejecuciÃ³n: %sâ?¦\n"
 
 #: ../plugins/tools/execute.c:509
@@ -9165,11 +9639,15 @@ msgid "Completed unsuccessfully with status code %d\n"
 msgstr "Completado incorrectamente con el cÃ³digo de estado %d\n"
 
 #: ../plugins/tools/execute.c:629
-msgid "Unable to create a buffer, command aborted"
+#, fuzzy
+#| msgid "Unable to create a buffer, command aborted"
+msgid "Unable to create a buffer: command aborted"
 msgstr "No se puede crear un bÃºfer, comando abortado"
 
 #: ../plugins/tools/execute.c:641
-msgid "No document currently open, command aborted"
+#, fuzzy
+#| msgid "No document currently open, command aborted"
+msgid "No document currently open: command aborted"
 msgstr "Actualmente no hay ningÃºn documento abierto, comando abortado"
 
 #: ../plugins/tools/execute.c:1019
@@ -9199,11 +9677,6 @@ msgstr "No se puede abrir el archivo %s para escribir"
 msgid "Tool operations"
 msgstr "Operaciones con herramientas"
 
-#: ../plugins/tools/plugin.c:256 ../plugins/tools/plugin.c:263
-#: ../plugins/tools/anjuta-tools.plugin.in.h:1
-msgid "Tools"
-msgstr "Herramientas"
-
 #: ../plugins/tools/variable.c:84
 msgid "Project root URI"
 msgstr "URI raÃz del proyecto"
@@ -9337,7 +9810,9 @@ msgid "Replace buffer"
 msgstr "Reemplazar bÃºfer"
 
 #: ../plugins/tools/tool.c:86
-msgid "Insert in buffer"
+#, fuzzy
+#| msgid "Insert in buffer"
+msgid "Insert into buffer"
 msgstr "Insertar en el bÃºfer"
 
 #: ../plugins/tools/tool.c:87
@@ -9377,8 +9852,10 @@ msgstr "Cadena"
 msgid "Copyright (c) Naba Kumar"
 msgstr "Copyright Â© Naba Kumar"
 
-#: ../src/anjuta.c:428
-msgid "Loaded Session..."
+#: ../src/anjuta.c:424
+#, fuzzy
+#| msgid "Loaded Session..."
+msgid "Loaded Sessionâ?¦"
 msgstr "SesiÃ³n cargadaâ?¦"
 
 #: ../src/anjuta-actions.h:23
@@ -9510,7 +9987,9 @@ msgid "About External _Plugins"
 msgstr "Acerca de los com_plementos de Anjuta"
 
 #: ../src/anjuta-actions.h:96
-msgid "About third party Anjuta plugins"
+#, fuzzy
+#| msgid "About third party Anjuta plugins"
+msgid "About third-party Anjuta plugins"
 msgstr "Acerca de los complementos de terceros"
 
 #: ../src/anjuta-app.c:489
@@ -9541,11 +10020,15 @@ msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
 #: ../src/main.c:70
-msgid "Do not show the splashscreen"
+#, fuzzy
+#| msgid "Do not show the splashscreen"
+msgid "Do not show the splash screen"
 msgstr "No mostrar la pantalla de inicio"
 
 #: ../src/main.c:76
-msgid "Start a new instance and do not open the file in a existing"
+#, fuzzy
+#| msgid "Start a new instance and do not open the file in a existing"
+msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "Iniciar una instancia nueva y no abrir el archivo en la existente"
 
 #: ../src/main.c:82
@@ -9557,7 +10040,9 @@ msgid "Do not open last project and files on startup"
 msgstr "No abrir el Ãºltimo proyecto y los archivos al iniciar"
 
 #: ../src/main.c:94
-msgid "Shutdown anjuta properly releasing all resources (for debugging)"
+#, fuzzy
+#| msgid "Shutdown anjuta properly releasing all resources (for debugging)"
+msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr ""
 "Detener anjuta apropiadamente liberando todos los recursos (para depuraciÃ³n)"
 
@@ -9565,7 +10050,7 @@ msgstr ""
 msgid "- Integrated Development Environment"
 msgstr "- Entorno Integrado de Desarrollo"
 
-#: ../src/main.c:216
+#: ../src/main.c:232
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -9598,8 +10083,10 @@ msgstr "No cargar la Ãºltima sesiÃ³n al iniciar"
 msgid "Dock switcher style:"
 msgstr "Estilo de los anclajes:"
 
-#: ../src/preferences.ui.h:11
-msgid "Gnome toolbar setting"
+#: ../src/preferences.ui.h:10
+#, fuzzy
+#| msgid "Gnome toolbar setting"
+msgid "GNOME toolbar setting"
 msgstr "ConfiguraciÃ³n de la barra de herramientas de GNOME"
 
 #: ../src/preferences.ui.h:12
@@ -9615,7 +10102,9 @@ msgid "Project Defaults"
 msgstr "Valores predeterminados del proyecto"
 
 #: ../src/preferences.ui.h:15
-msgid "Select projects directory"
+#, fuzzy
+#| msgid "Select projects directory"
+msgid "Select project directory"
 msgstr "Seleccionar el directorio de proyectos"
 
 #: ../src/preferences.ui.h:16
@@ -9663,7 +10152,9 @@ msgstr ""
 "AÃ±adir un espacio despuÃ©s de la llamada de autocompletado de la funciÃ³n"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
-msgid "Autocomplete"
+#, fuzzy
+#| msgid "Autocomplete"
+msgid "Auto-complete"
 msgstr "Autocompletar"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
@@ -9707,7 +10198,9 @@ msgid "Line up parentheses"
 msgstr "Alinear parÃ©ntesis"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
-msgid "Parenthese indentation"
+#, fuzzy
+#| msgid "Parenthese indentation"
+msgid "Parenthesis indentation"
 msgstr "Sangrado de parÃ©ntesis"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
@@ -9723,19 +10216,27 @@ msgid "Statement indentation size in spaces:"
 msgstr "TamaÃ±o de sangrÃa en espacios:"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1921
-msgid "_AutoComplete"
+#, fuzzy
+#| msgid "_AutoComplete"
+msgid "_Auto-Complete"
 msgstr "_Autocompletar"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1922
-msgid "AutoComplete the current word"
+#, fuzzy
+#| msgid "AutoComplete the current word"
+msgid "Auto-complete the current word"
 msgstr "Autocompletar la palabra actual"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1928
-msgid "Auto Indent"
+#, fuzzy
+#| msgid "Auto Indent"
+msgid "Auto-Indent"
 msgstr "SangrÃa automÃ¡tica"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1929
-msgid "Auto indent current line or selection based on indentation settings"
+#, fuzzy
+#| msgid "Auto indent current line or selection based on indentation settings"
+msgid "Auto-indent current line or selection based on indentation settings"
 msgstr ""
 "Auto sangrar la lÃnea actual o la selecciÃ³n basÃ¡ndose en los ajustes de "
 "sangrado"
@@ -9745,7 +10246,9 @@ msgid "Swap .h/.c"
 msgstr "Intercambiar .h/.c"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1935
-msgid "Swap c header and source files"
+#, fuzzy
+#| msgid "Swap c header and source files"
+msgid "Swap C header and source files"
 msgstr "Intercambia la cabecera c y el archivo fuente"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1978
@@ -9862,23 +10365,31 @@ msgid "CVS Plugin"
 msgstr "Complemento CVS"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
-msgid "Import an existing autotools project to anjuta"
+#, fuzzy
+#| msgid "Import an existing autotools project to anjuta"
+msgid "Import an existing autotools project to Anjuta"
 msgstr "Importar un proyecto de autotools existente en Anjuta"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:2
-msgid "Project From Existing Sources"
-msgstr "Proyecto desde fuentes existentes"
-
-#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
 msgid "Project Import Assistant"
 msgstr "Asistente de importaciÃ³n de proyectos"
 
+#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
+#, fuzzy
+#| msgid "Project From Existing Sources"
+msgid "Project from Existing Sources"
+msgstr "Proyecto desde fuentes existentes"
+
 #: ../plugins/sourceview/sourceview.plugin.in.h:1
-msgid "GtkSourceview editor"
-msgstr "Editor GtkSourceview"
+#, fuzzy
+#| msgid "GtkSourceView Editor"
+msgid "GtkSourceView editor"
+msgstr "Editor GtkSourceView"
 
 #: ../plugins/sourceview/sourceview.plugin.in.h:2
-msgid "The default editor based on GtkSourceview"
+#, fuzzy
+#| msgid "The default editor based on GtkSourceview"
+msgid "The default editor based on GtkSourceView"
 msgstr "El editor predeterminado basado en GtkSourceview"
 
 #: ../plugins/starter/anjuta-starter.plugin.in.h:2
@@ -9890,7 +10401,10 @@ msgid "C++ and Java support Plugin"
 msgstr "Complemento de soporte para C++ y Java"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in.h:2
-msgid "C++ and Java support plugin for code completion, auto indentation etc."
+#, fuzzy
+#| msgid ""
+#| "C++ and Java support plugin for code completion, auto indentation etc."
+msgid "C++ and Java support plugin for code completion, auto-indentation, etc."
 msgstr ""
 "Complemento de soporte para C++ y Java para completado de cÃ³digo, auto "
 "sangrado, etc."
@@ -9977,6 +10491,219 @@ msgstr "Backend de autotools"
 msgid "Autotools backend for project manager"
 msgstr "Backend de autotools para el gestor de proyectos"
 
+#~ msgid "Up to date"
+#~ msgstr "Actualizado"
+
+#~ msgid "<b>Build</b>"
+#~ msgstr "<b>Construir</b>"
+
+#~ msgid "<b>Configuration:</b>"
+#~ msgstr "<b>ConfiguraciÃ³n:</b>"
+
+#~ msgid "<b>Install</b>"
+#~ msgstr "<b>Instalar</b>"
+
+#~ msgid "Program '%s' does not exists"
+#~ msgstr "El programa Â«%sÂ» no existe"
+
+#~ msgid "C_onfigure Project..."
+#~ msgstr "C_onfigurar el proyectoâ?¦"
+
+#~ msgid "<b>CVS Options</b>"
+#~ msgstr "<b>Opciones del CVS</b>"
+
+#~ msgid "<b>Options:</b>"
+#~ msgstr "<b>Opciones:</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Opciones</b>"
+
+#~ msgid "<b>Repository: </b>"
+#~ msgstr "<b>Repositorio:</b>"
+
+#~ msgid "<b>Debugger:</b>"
+#~ msgstr "<b>Depurador:</b>"
+
+#~ msgid "Debugger Command..."
+#~ msgstr "Comando de depuraciÃ³nâ?¦"
+
+#~ msgid "Pid"
+#~ msgstr "Pid"
+
+#~ msgid "Id"
+#~ msgstr "Id"
+
+#~ msgid "Ins_pect/Evaluate..."
+#~ msgstr "Ins_peccionar/Evaluarâ?¦"
+
+#~ msgid "Add Watch..."
+#~ msgstr "AÃ±adir vigilanciaâ?¦"
+
+#~ msgid "_Print..."
+#~ msgstr "Im_primirâ?¦"
+
+#~ msgid "recent menu label|_%d. %s"
+#~ msgstr "_%d. %s"
+
+#~ msgid "recent menu label|%d. %s"
+#~ msgstr "%d. %s"
+
+#~ msgid "_Open..."
+#~ msgstr "_Abrirâ?¦"
+
+#~ msgid "Url:"
+#~ msgstr "URL:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Avanzadoâ?¦"
+
+#~ msgid "Source coudn't be removed"
+#~ msgstr "No se pudo eliminar el cÃ³digo"
+
+#~ msgid "<b>Tags</b>"
+#~ msgstr "<b>Etiquetas</b>"
+
+#~ msgid "Add signed off by line"
+#~ msgstr "AÃ±adir la lÃnea Â«asignado porÂ»"
+
+#~ msgid "_Commit..."
+#~ msgstr "_Efectuarâ?¦"
+
+#~ msgid "_View log..."
+#~ msgstr "_Ver el registroâ?¦"
+
+#~ msgid "_Push..."
+#~ msgstr "E_mpujarâ?¦"
+
+#~ msgid "_Pull..."
+#~ msgstr "Ca_rgar (pull)â?¦"
+
+#~ msgid "_Add..."
+#~ msgstr "_AÃ±adirâ?¦"
+
+#~ msgid "_Remove..."
+#~ msgstr "_Quitarâ?¦"
+
+#~ msgid "_Ignore..."
+#~ msgstr "_Ignorarâ?¦"
+
+#~ msgid "Create patch series..."
+#~ msgstr "Crear serie de parchesâ?¦"
+
+#~ msgid "_Switch to another branch..."
+#~ msgstr "Cambia_r a otra ramaâ?¦"
+
+#~ msgid "_Merge..."
+#~ msgstr "_Mezclarâ?¦"
+
+#~ msgid "_Delete..."
+#~ msgstr "_Borrarâ?¦"
+
+#~ msgid "_Delete tag..."
+#~ msgstr "_Borrar etiquetaâ?¦"
+
+#~ msgid "Unknown language of the editor \"%s\""
+#~ msgstr "Editor del lenguaje Â«%sÂ» desconocido"
+
+#~ msgid "n/a"
+#~ msgstr "n/d"
+
+#~ msgid "Misc"
+#~ msgstr "Varios"
+
+#~ msgid "<b>Macros:</b>"
+#~ msgstr "<b>Macros:</b>"
+
+#~ msgid "Edit..."
+#~ msgstr "Editarâ?¦"
+
+#~ msgid "Macros..."
+#~ msgstr "Macrosâ?¦"
+
+#~ msgid "_Patch..."
+#~ msgstr "_Parchearâ?¦"
+
+#~ msgid "<b>Project name</b>"
+#~ msgstr "<b>Nombre del proyecto</b>"
+
+#~ msgid "_Select file to add..."
+#~ msgstr "_Seleccionar un archivo para aÃ±adirâ?¦"
+
+#~ msgid "Add _Group..."
+#~ msgstr "AÃ±adir _grupoâ?¦"
+
+#~ msgid "Add _Target..."
+#~ msgstr "AÃ±adir _objetivoâ?¦"
+
+#~ msgid "Add _Source File..."
+#~ msgstr "AÃ±adir archivo _fuenteâ?¦"
+
+#~ msgid "_Add To Project"
+#~ msgstr "_AÃ±adir al proyecto"
+
+#~ msgid "Select project type"
+#~ msgstr "Seleccionar el tipo de proyecto"
+
+#~ msgid "Create a template gtk builder interface file"
+#~ msgstr "Crear un archivo de plantilla de constructor Gtk para la interfaz"
+
+#~ msgid "Wx Widgets"
+#~ msgstr "Wx Widgets"
+
+#~ msgid "Run In Terminal"
+#~ msgstr "Ejecutar en un terminal"
+
+#~ msgid "Program Parameters..."
+#~ msgstr "ParÃ¡metros del programaâ?¦"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Acciones</b>"
+
+#~ msgid "<b>Parameters</b>"
+#~ msgstr "<b>ParÃ¡metros</b>"
+
+#~ msgid "<b>Scope</b>"
+#~ msgstr "<b>Ã?mbito</b>"
+
+#~ msgid "Searching..."
+#~ msgstr "Buscandoâ?¦"
+
+#~ msgid "_Update..."
+#~ msgstr "_Actualizarâ?¦"
+
+#~ msgid "Merge..."
+#~ msgstr "Mezclarâ?¦"
+
+#~ msgid "_View Log..."
+#~ msgstr "_Ver el registroâ?¦"
+
+#~ msgid "_Diff..."
+#~ msgstr "_Diffâ?¦"
+
+#~ msgid "Copy..."
+#~ msgstr "Copiarâ?¦"
+
+#~ msgid "Diff..."
+#~ msgstr "Diffâ?¦"
+
+#~ msgid "_Find Symbol..."
+#~ msgstr "_Buscar sÃmboloâ?¦"
+
+#~ msgid "<b>Global</b>"
+#~ msgstr "<b>Global</b>"
+
+#~ msgid "<b>Terminal options</b>"
+#~ msgstr "<b>Opciones de terminal</b>"
+
+#~ msgid "<b>Tools</b>"
+#~ msgstr "<b>Herramientas</b>"
+
+#~ msgid "_Variable..."
+#~ msgstr "_Variableâ?¦"
+
+#~ msgid "GtkSourceview editor"
+#~ msgstr "Editor GtkSourceview"
+
 #~ msgid "on_widget_signal"
 #~ msgstr "a_la_seÃ±al_del_widget"
 
@@ -9995,9 +10722,6 @@ msgstr "Backend de autotools para el gestor de proyectos"
 #~ msgid "Execute Program"
 #~ msgstr "Ejecutar el programa"
 
-#~ msgid "Run in Terminal"
-#~ msgstr "Ejecutar en un terminal"
-
 #~ msgid "_Pass:"
 #~ msgstr "_Pasada:"
 
@@ -10368,9 +11092,6 @@ msgstr "Backend de autotools para el gestor de proyectos"
 #~ msgid "<b>Enter the base path of your project:</b>"
 #~ msgstr "<b>Introduzca la ruta base de su proyecto:</b>"
 
-#~ msgid "Confirmation"
-#~ msgstr "ConfirmaciÃ³n"
-
 #~ msgid "_Sample action"
 #~ msgstr "AcciÃ³n de _ejemplo"
 
@@ -10996,9 +11717,6 @@ msgstr "Backend de autotools para el gestor de proyectos"
 #~ msgid "Cut"
 #~ msgstr "Cortar"
 
-#~ msgid "Copy"
-#~ msgstr "Copiar"
-
 #~ msgid "Paste"
 #~ msgstr "Pegar"
 
@@ -11182,9 +11900,6 @@ msgstr "Backend de autotools para el gestor de proyectos"
 #~ msgid "Find usage of symbol in project"
 #~ msgstr "Buscar uso del sÃmbolo en el proyecto"
 
-#~ msgid "Refresh symbol browser tree"
-#~ msgstr "Refrescar el Ã¡rbol del explorador de sÃmbolos"
-
 #~ msgid "Symbol navigations"
 #~ msgstr "NavegaciÃ³n de sÃmbolos"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]