[anjuta] Updated Catalan translation



commit de2098e36d54701a9358d42040d85d9da8814713
Author: Joan Duran <jodufi gmail com>
Date:   Fri Oct 9 17:48:31 2009 +0200

    Updated Catalan translation

 po/ca.po | 6162 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 3725 insertions(+), 2437 deletions(-)
---
diff --git a/po/ca.po b/po/ca.po
index 36bdd37..23295af 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: anjuta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-03 10:34+0200\n"
-"PO-Revision-Date: 2009-08-03 10:05+0200\n"
+"POT-Creation-Date: 2009-10-09 17:48+0200\n"
+"PO-Revision-Date: 2009-10-03 19:38+0200\n"
 "Last-Translator: Joan Duran <jodufi gmail com>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
 "MIME-Version: 1.0\n"
@@ -65,9 +65,9 @@ msgid "The file you are trying to open contains an invalid byte sequence."
 msgstr "El fitxer que intenteu obrir conté una seqüència de bytes no vàlida."
 
 #: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
-#, c-format
+#, fuzzy, c-format
 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 ""
 "l'Anjuta no ha pogut determinar automàticament la codificació del fitxer que "
@@ -186,36 +186,36 @@ msgstr "Vietnamita"
 msgid "Thai"
 msgstr "Tailandès"
 
-#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:3205
-#: ../plugins/gbf-am/gbf-am-properties.c:130
-#: ../plugins/gbf-am/gbf-am-properties.c:174
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3093
+#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:3204
+#: ../plugins/gbf-am/gbf-am-properties.c:129
+#: ../plugins/gbf-am/gbf-am-properties.c:173
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3092
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:104
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:148
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../libanjuta/anjuta-launcher.c:1147 ../libanjuta/resources.c:267
+#: ../libanjuta/anjuta-launcher.c:1154 ../libanjuta/resources.c:267
 #: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
 #, c-format
 msgid "Cannot execute command: \"%s\""
 msgstr "No es pot executar l'ordre: «%s»"
 
-#: ../libanjuta/anjuta-launcher.c:1148
+#: ../libanjuta/anjuta-launcher.c:1155
 msgid "execvp failed"
 msgstr "Ha fallat la crida 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 "Intèrpret d'ordres de l'Anjuta"
 
-#: ../libanjuta/anjuta-plugin.c:328
+#: ../libanjuta/anjuta-plugin.c:327
 msgid "Anjuta shell that will contain the plugin"
 msgstr "Intèrpret d'ordres de l'Anjuta que contindrà el connector"
 
 #: ../libanjuta/anjuta-plugin-manager.c:733
 #, c-format
-msgid "Plugin '%s' do not want to be deactivated"
+msgid "Plugin '%s' does not want to be deactivated"
 msgstr "El connector «%s» no es vol desactivar"
 
 #: ../libanjuta/anjuta-plugin-manager.c:764
@@ -232,7 +232,7 @@ msgstr ""
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
-#: ../plugins/symbol-db/symbol-db-prefs.c:451
+#: ../plugins/symbol-db/symbol-db-prefs.c:463
 msgid "Load"
 msgstr "Carrega"
 
@@ -241,7 +241,7 @@ msgstr "Carrega"
 msgid "Available Plugins"
 msgstr "Connectors disponibles"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:665
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:736
 msgid "Preferred plugins"
 msgstr "Connectors preferits"
 
@@ -265,19 +265,19 @@ msgstr "Oblida el connector seleccionat"
 
 #: ../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 "Seleccioneu un connector"
 
 #: ../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 "Seleccioneu un connector per a activar"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1372
 #, c-format
-msgid "No plugin able to load other plugins in %s"
+msgid "No plugin is able to load other plugins in %s"
 msgstr "No existeix cap connector capaç de carregar altres connectors a %s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1960
@@ -309,8 +309,8 @@ msgid "Currently activated plugins"
 msgstr "Connectors activats actualment"
 
 #: ../libanjuta/anjuta-plugin-manager.c:2311
-msgid "Anjuta shell for which the plugins are"
-msgstr "Intèrpret d'ordres de l'Anjuta que contindrà el connector"
+msgid "Anjuta shell for which the plugins are made"
+msgstr "Intèrpret d'ordres de l'Anjuta pel qual s'han fet els connectors"
 
 #: ../libanjuta/anjuta-plugin-manager.c:2319
 msgid "Anjuta Status"
@@ -355,7 +355,8 @@ msgid "Synchronization file"
 msgstr "Fitxer de sincronització"
 
 #: ../libanjuta/anjuta-profile.c:281
-msgid "File to sync the profile xml"
+#, fuzzy
+msgid "File to syncronize the profile XML"
 msgstr "Fitxer on sincronitzar el perfil xml"
 
 #: ../libanjuta/anjuta-profile.c:508
@@ -363,9 +364,9 @@ msgid "Please select a plugin from the list"
 msgstr "Seleccioneu un connector de la llista"
 
 #: ../libanjuta/anjuta-profile.c:672
-#, c-format
+#, fuzzy, c-format
 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 ""
 "No s'ha pogut llegir «%s»: s'ha produït un error en analitzar l'XML. El "
@@ -386,7 +387,7 @@ msgstr ""
 "No s'ha pogut llegir «%s»: falten els connectors obligatoris següents:\n"
 "%s"
 
-#: ../libanjuta/anjuta-preferences.c:1589
+#: ../libanjuta/anjuta-preferences.c:1534
 msgid ""
 "Are you sure you want to reset the preferences to\n"
 "their default settings?"
@@ -396,7 +397,7 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1593 ../plugins/git/plugin.c:203
+#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:455
 msgid "_Reset"
 msgstr "_Reinicia"
 
@@ -408,8 +409,8 @@ msgstr "Categoria"
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:4 ../src/anjuta.glade.h:16
-#: ../src/anjuta-app.c:652
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:723
+#: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "General"
 
@@ -475,77 +476,92 @@ msgid "Shortcut"
 msgstr "Drecera"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:363
+#: ../libanjuta/anjuta-utils.c:355
 msgid "System:"
 msgstr "Sistema:"
 
-#: ../libanjuta/anjuta-utils.c:501
+#: ../libanjuta/anjuta-utils.c:493
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
 "Please install it."
 msgstr "Heu d'instal·lar la utilitat «%s»."
 
-#: ../libanjuta/anjuta-utils.c:941 ../libanjuta/anjuta-utils.c:945
+#. Try xterm
+#: ../libanjuta/anjuta-utils.c:986
+#, fuzzy
+msgid "Cannot find a terminal; using xterm, even if it may not work"
+msgstr ""
+"No es pot trobar un terminal; s'utilitzarà l'xterm, encara que pot ser que "
+"no funcioni"
+
+#: ../libanjuta/anjuta-utils.c:1022 ../libanjuta/anjuta-utils.c:1026
+#: ../libanjuta/anjuta-utils.c:1054 ../libanjuta/anjuta-utils.c:1058
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr ""
 "No es pot executar l'ordre: %s (es fa servir l'intèrpret d'ordres %s)\n"
 
-#: ../libanjuta/anjuta-utils.c:1577
+#: ../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";
+"Unable to display help. Please make sure the Anjuta documentation package is "
+"installed. It can be downloaded from http://anjuta.org.";
 msgstr ""
 "No es pot mostrar l'ajuda. Assegureu-vos que el paquet de documentació de "
-"l'Anjuta està instal·lat. El podeu baixar d'http://anjuta.org";
+"l'Anjuta està instal·lat. El podeu baixar de http://anjuta.org";
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:292
+#: ../libanjuta/anjuta-utils.c:2129
+#, c-format
+msgid "Unable to load user interface file: %s"
+msgstr "No es pot carregar el fitxer de la interfície d'usuari: %s"
+
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:92
 #: ../plugins/file-manager/file-view.c:65
 msgid "Modified"
 msgstr "Modificat"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:296
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:95
 #: ../plugins/file-manager/file-view.c:69
 msgid "Added"
 msgstr "Afegit"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:300
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:98
 #: ../plugins/file-manager/file-view.c:67
 msgid "Deleted"
 msgstr "Suprimit"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:304
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:101
 #: ../plugins/file-manager/file-view.c:71
 msgid "Conflicted"
 msgstr "Amb conflictes"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:308
-#, fuzzy
-msgid "Up to date"
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:105
+#: ../plugins/file-manager/file-view.c:73
+msgid "Up-to-date"
 msgstr "Actualitzat"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:312
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:109
 #: ../plugins/file-manager/file-view.c:75
 msgid "Locked"
 msgstr "Blocat"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:316
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:112
 #: ../plugins/file-manager/file-view.c:77
 msgid "Missing"
 msgstr "Falta"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:320
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:115
 #: ../plugins/file-manager/file-view.c:79
 msgid "Unversioned"
 msgstr "Sense versió"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:324
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:119
 #: ../plugins/file-manager/file-view.c:81
 msgid "Ignored"
 msgstr "Ignorat"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:218
+#: ../libanjuta/cell-renderer-captioned-image.c:218 ../src/preferences.ui.h:18
 msgid "Text"
 msgstr "Text"
 
@@ -561,8 +577,8 @@ msgstr "Objecte de memòria de píxels"
 msgid "The pixbuf to render."
 msgstr "Memòria de píxels que s'ha de dibuixar."
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3031
-#: ../plugins/glade/plugin.c:3066
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3041
+#: ../plugins/glade/plugin.c:3076
 #, c-format
 msgid "Widget not found: %s"
 msgstr "No s'ha trobat el giny d'interfície gràfica: %s"
@@ -572,132 +588,139 @@ msgstr "No s'ha trobat el giny d'interfície gràfica: %s"
 msgid "Could not find application pixmap file: %s"
 msgstr "No s'ha trobat el fitxer de mapa de píxels de l'aplicació: %s"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:1
-msgid "<b>Build</b>"
-msgstr "<b>Munta</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:2
-msgid "<b>Configuration:</b>"
-msgstr "<b>Configuració:</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:3
-msgid "<b>Install</b>"
-msgstr "<b>Instal·la</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:4
-msgid "<b>Regenerate project</b>"
-msgstr "<b>Regenera el projecte</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:5
-msgid "<b>Select Program to run:</b>"
-msgstr "<b>Seleccioneu el programa a executar:</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:6
-#: ../plugins/run-program/anjuta-run-program.glade.h:1
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
+#: ../plugins/run-program/anjuta-run-program.ui.h:1
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:7
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:2
+#, fuzzy
+msgid "Build"
+msgstr "_Munta"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:3
 msgid "Build Directory:"
 msgstr "Directori de muntatge:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:8
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:4
+#, fuzzy
+msgid "Configuration:"
+msgstr "Configura les opcions:"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:5
 msgid "Configure Options:"
 msgstr "Configura les opcions:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
 msgid "Configure Project"
 msgstr "Configura el projecte"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:10
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
 msgid "Continue on errors"
 msgstr "Continua encara que hi hagi errors"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:11
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Highlight message locations in editor"
 msgstr "Ressalta les ubicacions dels missatges a l'editor"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:12
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+#, fuzzy
+msgid "Install"
+msgstr "_Instal·la"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
 msgid "Install as root:"
 msgstr "Instal·la com a superusuari:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:13
-#: ../plugins/tools/anjuta-tools.glade.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+#, fuzzy
+msgid "Regenerate project"
+msgstr "<b>Torna a generar el projecte</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 "Executa en un terminal"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:14
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
 msgid "Run several commands at a time:"
 msgstr "Executa diverses ordres a la vegada:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:15
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
 msgid "Select Program"
 msgstr "Selecciona el programa"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:16
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+#, fuzzy
+msgid "Select Program to run:"
+msgstr "<b>Seleccioneu el programa a executar:</b>"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:16
 msgid "Select a build directory"
 msgstr "Selecciona un directori de muntatge"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:17
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:17
 msgid "Translate messages"
 msgstr "Tradueix missatges"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:61
+#: ../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:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "Predeterminat"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:62
+#: ../plugins/build-basic-autotools/configuration-list.c:63
 #: ../plugins/gdb/utilities.c:297
 msgid "Debug"
 msgstr "Depuració"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:63
+#: ../plugins/build-basic-autotools/configuration-list.c:64
 msgid "Profiling"
 msgstr "Perfilat"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:64
+#: ../plugins/build-basic-autotools/configuration-list.c:65
 msgid "Optimized"
 msgstr "Optimitzat"
 
-#: ../plugins/build-basic-autotools/executer.c:74
+#: ../plugins/build-basic-autotools/executer.c:72
 msgid "No executables in this project!"
 msgstr "No hi ha cap executable en aquest projecte."
 
-#: ../plugins/build-basic-autotools/executer.c:152
-#: ../plugins/gbf-am/gbf-am-project.c:3195
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3087
+#: ../plugins/build-basic-autotools/executer.c:154
+#: ../plugins/gbf-am/gbf-am-project.c:3194
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3086
 msgid "Program"
 msgstr "Programa"
 
-#: ../plugins/build-basic-autotools/executer.c:253
+#: ../plugins/build-basic-autotools/executer.c:255
 msgid "No file or project currently opened."
 msgstr "No hi ha cap fitxer o projecte obert."
 
 #. Only local program are supported
-#: ../plugins/build-basic-autotools/executer.c:293
+#: ../plugins/build-basic-autotools/executer.c:295
 #: ../plugins/run-program/execute.c:70
 #, c-format
 msgid "Program '%s' is not a local file"
 msgstr "El programa «%s» no és un fitxer local"
 
-#: ../plugins/build-basic-autotools/executer.c:308
-#: ../plugins/scratchbox/plugin.c:213
+#: ../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 "No existeix el programa «%s»"
 
-#: ../plugins/build-basic-autotools/executer.c:316
+#: ../plugins/build-basic-autotools/executer.c:318
 #: ../plugins/run-program/execute.c:80
 #, c-format
 msgid "Program '%s' does not have execution permission"
 msgstr "El programa «%s» no té permís d'execució"
 
-#: ../plugins/build-basic-autotools/executer.c:348
+#: ../plugins/build-basic-autotools/executer.c:350
 msgid "No executable for this file."
 msgstr "No hi ha cap executable per a aquest fitxer."
 
-#: ../plugins/build-basic-autotools/executer.c:354
+#: ../plugins/build-basic-autotools/executer.c:356
 #, c-format
 msgid "Executable '%s' is not up-to-date."
 msgstr "L'executable «%s» no està actualitzat."
@@ -739,12 +762,12 @@ msgid "Leaving: %s"
 msgstr "S'està sortint: %s"
 
 #: ../plugins/build-basic-autotools/plugin.c:896
-#: ../plugins/tools/execute.c:331
+#: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "avís:"
 
 #: ../plugins/build-basic-autotools/plugin.c:902
-#: ../plugins/tools/execute.c:336
+#: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "errors:"
 
@@ -754,6 +777,7 @@ msgid "Command exited with status %d"
 msgstr "L'ordre ha sortit amb l'estat %d"
 
 #: ../plugins/build-basic-autotools/plugin.c:1029
+#: ../plugins/build-basic-autotools/plugin.c:1505
 #, c-format
 msgid "Command canceled by user"
 msgstr "Ordre cancel·lada per l'usuari"
@@ -772,224 +796,234 @@ msgstr "L'ordre ha acabat amb el senyal %d"
 msgid "Command terminated for an unknown reason"
 msgstr "Ordre acabada per una raó desconeguda"
 
-#: ../plugins/build-basic-autotools/plugin.c:1064
+#: ../plugins/build-basic-autotools/plugin.c:1065
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "Temps total: %lu segons\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1071
+#: ../plugins/build-basic-autotools/plugin.c:1072
 msgid "Completed unsuccessfully\n"
 msgstr "No s'ha completat correctament\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1079
-#: ../plugins/tools/execute.c:517
+#: ../plugins/build-basic-autotools/plugin.c:1080
+#: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "S'ha completat correctament\n"
 
 #. Translators: the first number is the number of the build attemp,
 #. the string is the directory where the build takes place
-#: ../plugins/build-basic-autotools/plugin.c:1167
+#: ../plugins/build-basic-autotools/plugin.c:1168
 #, c-format
 msgid "Build %d: %s"
 msgstr "Munta %d: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:1727
-#, c-format
-msgid "Can not compile \"%s\": No compile rule defined for this file type."
+#. Need to run make clean before
+#: ../plugins/build-basic-autotools/plugin.c:1499
+msgid ""
+"Before using this new configuration, the default one needs to be removed. Do "
+"you want to do that ?"
+msgstr ""
+"Si utilitzeu aquesta configuració nova s'haurà de suprimir la "
+"predeterminada. Voleu fer-ho?"
+
+#: ../plugins/build-basic-autotools/plugin.c:1802
+#, fuzzy, c-format
+msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr ""
 "No es pot compilar «%s»: No s'ha definit cap regla de compilació per a aquest "
 "tipus de fitxer."
 
-#: ../plugins/build-basic-autotools/plugin.c:1853
-#, c-format
-msgid "Can not configure project: Missing configure script in %s."
+#: ../plugins/build-basic-autotools/plugin.c:1928
+#, fuzzy, c-format
+msgid "Cannot configure project: Missing configure script in %s."
 msgstr "No es pot configurar el projecte: manca l'script de configuració a %s."
 
-#: ../plugins/build-basic-autotools/plugin.c:2272
-#: ../plugins/build-basic-autotools/plugin.c:2346
-#: ../plugins/build-basic-autotools/plugin.c:2356
-#: ../plugins/build-basic-autotools/plugin.c:2374
-#: ../plugins/build-basic-autotools/plugin.c:2384
-#: ../plugins/build-basic-autotools/plugin.c:2441
+#: ../plugins/build-basic-autotools/plugin.c:2394
+#: ../plugins/build-basic-autotools/plugin.c:2468
+#: ../plugins/build-basic-autotools/plugin.c:2478
+#: ../plugins/build-basic-autotools/plugin.c:2496
+#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../plugins/build-basic-autotools/plugin.c:2563
 #, c-format
 msgid "_Build"
 msgstr "_Munta"
 
-#: ../plugins/build-basic-autotools/plugin.c:2276
+#: ../plugins/build-basic-autotools/plugin.c:2398
 msgid "_Build Project"
 msgstr "_Munta el projecte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2277
+#: ../plugins/build-basic-autotools/plugin.c:2399
 msgid "Build whole project"
 msgstr "Munta el projecte sencer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2282
+#: ../plugins/build-basic-autotools/plugin.c:2404
 msgid "_Install Project"
 msgstr "_Instal·la el projecte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2283
+#: ../plugins/build-basic-autotools/plugin.c:2405
 msgid "Install whole project"
 msgstr "Instal·la el projecte sencer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2288
+#: ../plugins/build-basic-autotools/plugin.c:2410
 msgid "_Clean Project"
 msgstr "Neteja el proje_cte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2289
+#: ../plugins/build-basic-autotools/plugin.c:2411
 msgid "Clean whole project"
 msgstr "Neteja el projecte sencer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2294
-msgid "C_onfigure Project..."
-msgstr "C_onfigura el projecte..."
+#: ../plugins/build-basic-autotools/plugin.c:2416
+#, fuzzy
+msgid "C_onfigure Projectâ?¦"
+msgstr "Configura el projecte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2295
+#: ../plugins/build-basic-autotools/plugin.c:2417
 msgid "Configure project"
 msgstr "Configura el projecte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2300
+#: ../plugins/build-basic-autotools/plugin.c:2422
 msgid "Build _Tarball"
 msgstr "Mun_ta un fitxer tar"
 
-#: ../plugins/build-basic-autotools/plugin.c:2301
+#: ../plugins/build-basic-autotools/plugin.c:2423
 msgid "Build project tarball distribution"
 msgstr "Munta el fitxer tar de distribució"
 
-#: ../plugins/build-basic-autotools/plugin.c:2306
+#: ../plugins/build-basic-autotools/plugin.c:2428
 msgid "_Build Module"
 msgstr "_Munta el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2307
+#: ../plugins/build-basic-autotools/plugin.c:2429
 msgid "Build module associated with current file"
 msgstr "Munta el mòdul associat al fitxer actual"
 
-#: ../plugins/build-basic-autotools/plugin.c:2312
+#: ../plugins/build-basic-autotools/plugin.c:2434
 msgid "_Install Module"
 msgstr "_Instal·la el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2313
+#: ../plugins/build-basic-autotools/plugin.c:2435
 msgid "Install module associated with current file"
 msgstr "Instal·la el mòdul associat al fitxer actual"
 
-#: ../plugins/build-basic-autotools/plugin.c:2318
+#: ../plugins/build-basic-autotools/plugin.c:2440
 msgid "_Clean Module"
 msgstr "_Neteja el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2319
+#: ../plugins/build-basic-autotools/plugin.c:2441
 msgid "Clean module associated with current file"
 msgstr "Neteja el mòdul associat al fitxer actual"
 
-#: ../plugins/build-basic-autotools/plugin.c:2324
+#: ../plugins/build-basic-autotools/plugin.c:2446
 msgid "Co_mpile File"
 msgstr "Co_mpila el fitxer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2325
+#: ../plugins/build-basic-autotools/plugin.c:2447
 msgid "Compile current editor file"
 msgstr "Compila el fitxer actual de l'editor"
 
-#: ../plugins/build-basic-autotools/plugin.c:2330
+#: ../plugins/build-basic-autotools/plugin.c:2452
 msgid "Select Configuration"
 msgstr "Seleccioneu la configuració"
 
-#: ../plugins/build-basic-autotools/plugin.c:2331
+#: ../plugins/build-basic-autotools/plugin.c:2453
 msgid "Select current configuration"
 msgstr "Selecciona la configuració actual"
 
-#: ../plugins/build-basic-autotools/plugin.c:2336
+#: ../plugins/build-basic-autotools/plugin.c:2458
 msgid "Remove Configuration"
 msgstr "Suprimeix la configuració"
 
-#: ../plugins/build-basic-autotools/plugin.c:2337
+#: ../plugins/build-basic-autotools/plugin.c:2459
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr ""
 "Neteja el projecte (distclean) i suprimeix el directori de configuració si "
 "és possible"
 
-#: ../plugins/build-basic-autotools/plugin.c:2350
-#: ../plugins/build-basic-autotools/plugin.c:2378
+#: ../plugins/build-basic-autotools/plugin.c:2472
+#: ../plugins/build-basic-autotools/plugin.c:2500
 msgid "_Compile"
 msgstr "_Compila"
 
-#: ../plugins/build-basic-autotools/plugin.c:2351
-#: ../plugins/build-basic-autotools/plugin.c:2379
+#: ../plugins/build-basic-autotools/plugin.c:2473
+#: ../plugins/build-basic-autotools/plugin.c:2501
 msgid "Compile file"
 msgstr "Compila el fitxer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2357
-#: ../plugins/build-basic-autotools/plugin.c:2385
+#: ../plugins/build-basic-autotools/plugin.c:2479
+#: ../plugins/build-basic-autotools/plugin.c:2507
 msgid "Build module"
 msgstr "Munta el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2362
-#: ../plugins/build-basic-autotools/plugin.c:2390
-#: ../plugins/build-basic-autotools/plugin.c:2448
+#: ../plugins/build-basic-autotools/plugin.c:2484
+#: ../plugins/build-basic-autotools/plugin.c:2512
+#: ../plugins/build-basic-autotools/plugin.c:2570
 #, c-format
 msgid "_Install"
 msgstr "_Instal·la"
 
-#: ../plugins/build-basic-autotools/plugin.c:2363
-#: ../plugins/build-basic-autotools/plugin.c:2391
+#: ../plugins/build-basic-autotools/plugin.c:2485
+#: ../plugins/build-basic-autotools/plugin.c:2513
 msgid "Install module"
 msgstr "Instal·la el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2368
-#: ../plugins/build-basic-autotools/plugin.c:2396
-#: ../plugins/build-basic-autotools/plugin.c:2455
+#: ../plugins/build-basic-autotools/plugin.c:2490
+#: ../plugins/build-basic-autotools/plugin.c:2518
+#: ../plugins/build-basic-autotools/plugin.c:2577
 #, c-format
 msgid "_Clean"
 msgstr "Nete_ja"
 
-#: ../plugins/build-basic-autotools/plugin.c:2369
-#: ../plugins/build-basic-autotools/plugin.c:2397
+#: ../plugins/build-basic-autotools/plugin.c:2491
+#: ../plugins/build-basic-autotools/plugin.c:2519
 msgid "Clean module"
 msgstr "Neteja el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2402
+#: ../plugins/build-basic-autotools/plugin.c:2524
 msgid "_Cancel command"
 msgstr "_Cancel·la l'ordre"
 
-#: ../plugins/build-basic-autotools/plugin.c:2403
+#: ../plugins/build-basic-autotools/plugin.c:2525
 msgid "Cancel build command"
 msgstr "Cancel·la l'ordre de muntatge"
 
-#: ../plugins/build-basic-autotools/plugin.c:2441
+#: ../plugins/build-basic-autotools/plugin.c:2563
 #, c-format
 msgid "_Build (%s)"
 msgstr "_Munta (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2448
+#: ../plugins/build-basic-autotools/plugin.c:2570
 #, c-format
 msgid "_Install (%s)"
 msgstr "_Instal·la (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2455
+#: ../plugins/build-basic-autotools/plugin.c:2577
 #, c-format
 msgid "_Clean (%s)"
 msgstr "Nete_ja (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2463
+#: ../plugins/build-basic-autotools/plugin.c:2585
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "Co_mpila (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2463
+#: ../plugins/build-basic-autotools/plugin.c:2585
 #, c-format
 msgid "Co_mpile"
 msgstr "Co_mpila"
 
-#: ../plugins/build-basic-autotools/plugin.c:2999
+#: ../plugins/build-basic-autotools/plugin.c:3121
 msgid "Build commands"
 msgstr "Ordres per a muntar"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3008
+#: ../plugins/build-basic-autotools/plugin.c:3130
 msgid "Build popup commands"
 msgstr "Ordres emergents per a muntar"
 
-#: ../plugins/build-basic-autotools/plugin.c:3365
-#: ../plugins/build-basic-autotools/plugin.c:3383
+#: ../plugins/build-basic-autotools/plugin.c:3512
+#: ../plugins/build-basic-autotools/plugin.c:3520
 msgid "Build Autotools"
 msgstr "Munta les autotools"
 
@@ -997,118 +1031,144 @@ msgstr "Munta les autotools"
 msgid "Command aborted"
 msgstr "Ordre interrompuda"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:1
-msgid "<b>Class Elements</b>"
-msgstr "<b>Elements de classe</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:2
-msgid "<b>General Class Properties</b>"
-msgstr "<b>Propietats generals de classe</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:3
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
 msgid "Add to Project"
 msgstr "Afegeix al projecte"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Repository"
 msgstr "Afegeix al dipòsit"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:5
-msgid "Author Email:"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+#, fuzzy
+msgid "Author Email Address:"
 msgstr "Correu electrònic de l'autor:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Name:"
 msgstr "Nom de l'autor:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author/Date-Time"
 msgstr "Autor/hora i data"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date/Time"
 msgstr "Autor/data/hora"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Base Class Inheritance:"
 msgstr "Herència de la classe base:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class:"
 msgstr "Classe base:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#, fuzzy
+msgid "Class Elements"
+msgstr "<b>Elements de la classe</b>"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Function Prefix:"
 msgstr "Prefix de la funció de la classe:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.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 classes"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 msgid "Class Name:"
 msgstr "Nom de classe:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
 msgid "Class Options:"
 msgstr "Opcions de classe:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Create"
 msgstr "Crea"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "GObject Class\t"
 msgstr "Classe GObject\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
 msgid "GObject Prefix and Type:"
 msgstr "Prefix i tipus del GObject:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:17
-msgid ""
-"General Public License (GPL)\n"
-"Lesser General Public License (LGPL)\n"
-"No License"
-msgstr ""
-"Llicència pública general de (GPL)\n"
-"Llicència pública general menor (LGPL)\n"
-"Sense llicència"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#, fuzzy
+msgid "General Class Properties"
+msgstr "<b>Propietats generals de la classe</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
+msgid "General Public License (GPL)"
+msgstr "Llicència pública general (GPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:20
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
 msgid "Generic C++ Class"
 msgstr "Classe genèrica C++"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:21
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "Header File:"
 msgstr "Fitxer de capçalera:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:22
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "Inline the declaration and implementation"
 msgstr "Insereix en la mateixa línia la declaració i la implementació"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:23
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
+#: ../plugins/file-wizard/file.c:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:60
+msgid "Lesser General Public License (LGPL)"
+msgstr "Llicència pública general menor (LGPL)"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "Llicència:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:24
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
 msgid "Member Functions/Variables"
 msgstr "Membre de funcions/variables"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:25
-#: ../plugins/glade/plugin.c:4436
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
+msgid "No License"
+msgstr "Sense llicència"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/glade/plugin.c:4446
 msgid "Properties"
 msgstr "Propietats"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
 msgid "Signals"
 msgstr "Senyals"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "Source File:"
 msgstr "Fitxer de codi:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:28
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
 msgid "Source/Header Headings:"
 msgstr "Encapçalaments per als fitxers de capçalera i de codi:"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
+msgid "private"
+msgstr "privada"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
+msgid "protected"
+msgstr "protegida"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
+msgid "public"
+msgstr "pública"
+
 #: ../plugins/class-gen/generator.c:132
 #, c-format
 msgid "Header or source file has not been created"
@@ -1131,49 +1191,88 @@ msgstr "Fitxer on s'escriurà la plantilla processada"
 msgid "Failed to write autogen definition file"
 msgstr "No s'ha pogut escriure el fitxer de definició 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";
+"Could not find autogen version 5; please install the autogen package. You "
+"can get it from http://autogen.sourceforge.net.";
 msgstr ""
-"No s'ha pogut trobar l'autogen versió 5. Instal·leu el paquet autogen. Podeu "
-"obtenir-lo d'http://autogen.sourceforge.net";
+"No s'ha pogut trobar la versió 5 de l'autogen. Instal·leu el paquet autogen. "
+"Podeu obtenir-lo de http://autogen.sourceforge.net";
 
 #: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:412
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "No es pot executar el autogen: %s"
 
-#: ../plugins/class-gen/window.c:818
-msgid "XML description of the user interface"
-msgstr "Descripció XML de la interfície d'usuari"
+#: ../plugins/class-gen/window.c:94
+msgid "Guess from type"
+msgstr "Endevina-ho pel tipus"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:1
-msgid "<b>CVS Options</b>"
-msgstr "<b>Opcions del CVS</b>"
+#: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+#: ../plugins/search/anjuta-search.ui.h:29
+msgid "Scope"
+msgstr "Abast"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:2
-msgid "<b>Module Details:</b>"
-msgstr "<b>Detalls del mòdul:</b>"
+#: ../plugins/class-gen/window.c:500
+msgid "Implementation"
+msgstr "Implementació"
+
+#: ../plugins/class-gen/window.c:501 ../plugins/class-gen/window.c:511
+#: ../plugins/class-gen/window.c:533
+#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/debug_tree.c:126
+msgid "Type"
+msgstr "Tipus"
+
+#: ../plugins/class-gen/window.c:502 ../plugins/class-gen/window.c:512
+#: ../plugins/class-gen/window.c:520 ../plugins/class-gen/window.c:534
+#: ../plugins/run-program/parameters.c:749
+#: ../plugins/search/search_preferences.c:534
+msgid "Name"
+msgstr "Nom"
+
+#: ../plugins/class-gen/window.c:503 ../plugins/class-gen/window.c:513
+#: ../plugins/class-gen/window.c:535
+#: ../plugins/debug-manager/stack_trace.c:679
+msgid "Arguments"
+msgstr "Arguments"
+
+#: ../plugins/class-gen/window.c:521
+msgid "Nick"
+msgstr "Sobrenom"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:3
-#: ../plugins/git/anjuta-git.glade.h:15
-#: ../plugins/subversion/anjuta-subversion.glade.h:8
-msgid "<b>Options:</b>"
-msgstr "<b>Opcions:</b>"
+#: ../plugins/class-gen/window.c:522
+msgid "Blurb"
+msgstr "Ressenya"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:4
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:2
-#: ../plugins/search/anjuta-search.glade.h:3
-#: ../plugins/subversion/anjuta-subversion.glade.h:9
-msgid "<b>Options</b>"
-msgstr "<b>Opcions</b>"
+#: ../plugins/class-gen/window.c:523
+msgid "GType"
+msgstr "GType"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:5
+#: ../plugins/class-gen/window.c:524
+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 "Flags"
+msgstr "Indicadors"
+
+#: ../plugins/class-gen/window.c:537
+msgid "Marshaller"
+msgstr "Marshaller"
+
+#: ../plugins/class-gen/window.c:818
+msgid "XML description of the user interface"
+msgstr "Descripció XML de la interfície d'usuari"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
+#, fuzzy
 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 ""
@@ -1182,264 +1281,300 @@ msgstr ""
 "En prémer D'acord se suprimirà el fitxer del disc i del CVS. El fitxer no se "
 "suprimirà del CVS fins que publiqueu els canvis al CVS."
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:8
-msgid "<b>Repository: </b>"
-msgstr "<b>Dipòsit: </b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
 msgid "Be verbose"
 msgstr "Sigues detallat"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:10
-#: ../plugins/subversion/anjuta-subversion.glade.h:21
-#: ../plugins/tools/anjuta-tools.glade.h:2
-msgid "Browse..."
+#: ../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:1
+#, fuzzy
+msgid "Browseâ?¦"
 msgstr "Navega..."
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:11
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:6
+#, fuzzy
+msgid "CVS Options"
+msgstr "Operacions del CVS"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:7
 msgid "CVS Preferences"
 msgstr "Preferències del CVS"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:12
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
 msgid "CVS: Add file/directory"
 msgstr "CVS: afegeix el fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:13
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
 msgid "CVS: Commit file/directory"
 msgstr "CVS: publica els canvis a un fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:14
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
 msgid "CVS: Diff file/directory"
 msgstr "CVS: diferències de fitxers/directoris"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:15
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
 msgid "CVS: Import"
 msgstr "CVS: importa"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:16
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
 msgid "CVS: Log file/directory"
 msgstr "CVS: historial de fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:17
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
 msgid "CVS: Remove file/directory"
 msgstr "CVS: suprimeix el fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:18
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
 msgid "CVS: Status"
 msgstr "CVS: estat"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:19
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
 msgid "CVS: Status from file/directory"
 msgstr "CVS: estat del fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:20
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
 msgid "CVS: Update file/directory"
 msgstr "CVS: actualitza el fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:21
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
 msgid "CVSROOT:"
 msgstr "CVSROOT:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:22
-#: ../plugins/subversion/anjuta-subversion.glade.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 "Escolliu el fitxer o directori a afegir:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
 msgid "Choose file or directory to commit:"
 msgstr "Escolliu el fitxer o directori a publicar els canvis:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:24
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
 msgid "Choose file or directory to diff:"
 msgstr "Escolliu de quin directori o fitxer obtenir les diferències:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.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 for:"
 msgstr "Escolliu de quin fitxer o directori obtenir el registre:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:26
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
 msgid "Choose file or directory to get the status from:"
 msgstr "Escolliu de quin fitxer o directori obtenir l'estat:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
 msgid "Choose file or directory to remove:"
 msgstr "Escolliu quin fitxer o directori suprimir:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:28
-#: ../plugins/subversion/anjuta-subversion.glade.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
+#: ../plugins/subversion/anjuta-subversion.ui.h:6
 msgid "Choose file or directory to update:"
 msgstr "Escolliu el fitxer o directori a actualitzar:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:29
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
 msgid "Compression Level (0=off, 10=max):"
 msgstr "Nivell de compressió (0=cap, 10=màx):"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
 msgid "Create new directories"
 msgstr "Crea directoris nous"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:31
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
 msgid "Delete empty directories"
 msgstr "Suprimeix els directoris buits"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:32
-#: ../plugins/subversion/anjuta-subversion.glade.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
+#: ../plugins/subversion/anjuta-subversion.ui.h:13
 msgid "Do not act recursively"
 msgstr "No ho facis recursivament"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:33
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
+msgid "Extern (rsh)"
+msgstr "Extern (rsh)"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "File is binary"
 msgstr "El fitxer és binari"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:34
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
 msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ignora el fitxer .cvsrc (recomanat)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:35
-msgid ""
-"Local\n"
-"Extern (rsh)\n"
-"Password server (pserver)\n"
-msgstr ""
-"Local\n"
-"Extern (rsh)\n"
-"Servidor de contrasenyes (pserver)\n"
+#: ../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.glade.h:39
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "Missatge de registre:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:40
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+#, fuzzy
+msgid "Module Details:"
+msgstr "<b>Detalls del mòdul:</b>"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
 msgid "Module name:"
 msgstr "Nom del mòdul:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:41
-#: ../plugins/subversion/anjuta-subversion.glade.h:36
+#: ../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 "Opcions"
+
+#: ../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 "Opcions:"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
+msgid "Password server (pserver)"
+msgstr "Servidor de contrasenyes (pserver)"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
+#: ../plugins/subversion/anjuta-subversion.ui.h:26
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:42
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
+msgid "Patch-Style diff"
+msgstr "Diff estil pedaç"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
 msgid "Path to \"cvs\" command"
 msgstr "Camí a l'ordre «cvs»"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:43
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
 msgid "Project root directory:"
 msgstr "Directori arrel del projecte:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:44
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
 msgid "Release tag:"
 msgstr "Etiqueta de la versió:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:45
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+#, fuzzy
+msgid "Repository:"
+msgstr "Cap del dipòsit"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:45
 msgid "Reset sticky tags"
 msgstr "Reinicia les etiquetes recurrents"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:46
-#: ../plugins/git/anjuta-git.glade.h:78
-#: ../plugins/subversion/anjuta-subversion.glade.h:46
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "Revisió:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:47
-msgid ""
-"Standard diff\n"
-"Patch-Style diff"
-msgstr ""
-"Diff estàndard\n"
-"Diff estil pedaç"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:47
+msgid "Standard diff"
+msgstr "Diff estàndard"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:49
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:48
 msgid "Unified format instead of context format"
 msgstr "Format unificat en comptes del contextual"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:50
-#: ../plugins/subversion/anjuta-subversion.glade.h:55
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:55
 msgid "Use revision/tag:"
 msgstr "Utilitza la revisió/etiqueta:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:51
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:50
 msgid "Use revision:"
 msgstr "Utilitza la revisió:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:52
-#: ../plugins/subversion/anjuta-subversion.glade.h:56
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:56
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:53
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:52
 msgid "Vendor tag:"
 msgstr "Etiqueta del proveïdor:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:54
-#: ../plugins/git/anjuta-git.glade.h:92
-#: ../plugins/subversion/anjuta-subversion.glade.h:60
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
+#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "Tot el projecte"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:47
+#: ../plugins/cvs-plugin/cvs-callbacks.c:46
 msgid "Please enter a filename!"
 msgstr "Introduïu un nom de fitxer"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:60
+#: ../plugins/cvs-plugin/cvs-callbacks.c:59
 #, c-format
 msgid "Please fill field: %s"
 msgstr "Heu d'omplir el camp: %s"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:79
+#: ../plugins/cvs-plugin/cvs-callbacks.c:78
 msgid "CVS command is running! Please wait until it is finished!"
 msgstr "S'està executant l'ordre CVS. Espereu fins que acabi"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:153
+#: ../plugins/cvs-plugin/cvs-callbacks.c:152
 msgid "Unable to delete file"
 msgstr "No es pot suprimir el fitxer"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:245
-#: ../plugins/git/git-commit-dialog.c:74
-#: ../plugins/git/git-create-tag-dialog.c:127
-#: ../plugins/git/git-merge-dialog.c:80
-#: ../plugins/subversion/subversion-commit-dialog.c:70
+#: ../plugins/cvs-plugin/cvs-callbacks.c:244
+#: ../plugins/git/git-commit-dialog.c:79
+#: ../plugins/git/git-create-tag-dialog.c:130
+#: ../plugins/git/git-merge-dialog.c:91
+#: ../plugins/subversion/subversion-commit-dialog.c:88
 msgid "Are you sure that you want to pass an empty log message?"
 msgstr "Segur que voleu passar un missatge de registre buit?"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:436
+#: ../plugins/cvs-plugin/cvs-callbacks.c:435
 msgid "CVSROOT"
 msgstr "CVSROOT"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:439
-#: ../plugins/gbf-am/gbf-am-properties.c:1227
+#: ../plugins/cvs-plugin/cvs-callbacks.c:438
+#: ../plugins/gbf-am/gbf-am-properties.c:1234
 msgid "Module"
 msgstr "Mòdul"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:442
+#: ../plugins/cvs-plugin/cvs-callbacks.c:441
 msgid "Vendor"
 msgstr "Proveïdor"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:445
+#: ../plugins/cvs-plugin/cvs-callbacks.c:444
 msgid "Release"
 msgstr "Versió"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:461
+#: ../plugins/cvs-plugin/cvs-callbacks.c:460
 msgid "Are you sure that you do not want a log message?"
 msgstr "Segur que no voleu un missatge de registre?"
 
-#: ../plugins/cvs-plugin/cvs-execute.c:126
-msgid "CVS command failed - See above for details"
+#: ../plugins/cvs-plugin/cvs-execute.c:125
+#, fuzzy
+msgid "CVS command failed. See above for details"
 msgstr "Ha fallat l'ordre CVS. Vegeu a dalt els detalls"
 
-#: ../plugins/cvs-plugin/cvs-execute.c:131
-#, c-format
-msgid "CVS command successful! - Time taken: %ld second"
-msgid_plural "CVS command successful! - Time taken: %ld seconds"
+#: ../plugins/cvs-plugin/cvs-execute.c:130
+#, fuzzy, c-format
+msgid "CVS command successful! Time taken: %ld second"
+msgid_plural "CVS command successful! Time taken: %ld seconds"
 msgstr[0] "L'ordre CVS s'ha executat correctament. Temps utilitzat: %ld segon"
 msgstr[1] "L'ordre CVS s'ha executat correctament. Temps utilitzat: %ld segons"
 
-#: ../plugins/cvs-plugin/cvs-execute.c:222
-msgid "CVS command is running - please wait until it finishes!"
+#: ../plugins/cvs-plugin/cvs-execute.c:221
+#, fuzzy
+msgid "CVS command is running â?? please wait until it finishes!"
 msgstr "S'està executant l'ordre CVS. Espereu fins que acabi"
 
-#: ../plugins/cvs-plugin/cvs-execute.c:230
-#: ../plugins/cvs-plugin/cvs-execute.c:234 ../plugins/cvs-plugin/plugin.c:462
-#: ../plugins/cvs-plugin/plugin.c:469
+#: ../plugins/cvs-plugin/cvs-execute.c:229
+#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:467
+#: ../plugins/cvs-plugin/plugin.c:474
 msgid "CVS"
 msgstr "CVS"
 
@@ -1488,15 +1623,15 @@ msgstr "Publiqueu els canvis a l'arbre del CVS"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/cvs-plugin/plugin.c:76 ../plugins/cvs-plugin/plugin.c:135
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:50
-#: ../plugins/gdb/anjuta-gdb.glade.h:38
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "Act_ualitza"
 
 #. 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 "Syncronize your local copy with the CVS tree"
 msgstr "Sincronitzeu la còpia local amb l'arbre CVS"
 
 #. Action name
@@ -1555,404 +1690,395 @@ msgstr "Operacions del CVS"
 msgid "CVS popup operations"
 msgstr "Operacions emergents del CVS"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:1
-msgid "<b>Debugger:</b>"
-msgstr "<b>Depurador:</b>"
-
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:2
-msgid "<b>Remote debugging</b>"
-msgstr "<b>Depuració remota</b>"
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
+#, 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, so some commands can perform "
+"in a strange way, especially steps."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Segur que voleu depurar un programa "
+"que no utilitza la configuració de depuració?</span>\n"
+"\n"
+"Quan s'habiliten les optimitzacions, a vegades el depurador no pot "
+"identificar el codi font al que corresponen les instruccions i algunes "
+"ordres es comportaran de forma estranya, especialment els passos."
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:3
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
 msgstr "Afegeix vigilància"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:5
 msgid "Address:"
 msgstr "Adreça:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:5
-#: ../plugins/gdb/anjuta-gdb.glade.h:2
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Attach to process"
 msgstr "Adjunta a procés"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:6
-#: ../plugins/gdb/anjuta-gdb.glade.h:3
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
 msgid "Breakpoint properties"
 msgstr "Propietats dels punts de ruptura"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:7
-#: ../plugins/debug-manager/breakpoints.c:1977
-#: ../plugins/gdb/anjuta-gdb.glade.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/breakpoints.c:1980
 msgid "Breakpoints"
 msgstr "Punts de ruptura"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:8
-#: ../plugins/gdb/anjuta-gdb.glade.h:5
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
 msgid "CPU Registers"
 msgstr "Registres de la CPU"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
 msgid "Change Watch"
 msgstr "Canvia una vigilància"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
 msgid "Connect to remote target"
 msgstr "Connecta a l'objectiu remot"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:11
-#: ../plugins/gdb/anjuta-gdb.glade.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Debugger command"
 msgstr "Ordre del depurador"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:12
-#: ../plugins/gdb/anjuta-gdb.glade.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Debugger command:"
 msgstr "Ordre del depurador:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:13
-#: ../plugins/gdb/anjuta-gdb.glade.h:9
-#: ../plugins/project-wizard/templates/translatable-strings.h:32
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+#, fuzzy
+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ó:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
 msgid "Disable"
 msgstr "Inhabilita"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:15
-#: ../plugins/gdb/anjuta-gdb.glade.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Display process _tree"
 msgstr "Mos_tra l'arbre de processos"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:16
-#: ../plugins/gdb/anjuta-gdb.glade.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
+msgid "Do not show again"
+msgstr "No ho mostris una altra vegada"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 msgid "Enable _all"
 msgstr "Habilit_a-ho tot"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
 msgid "Enter an address in hexadecimal or select one in the data"
 msgstr "Introduïu una adreça en hexadecimal o seleccioneu-ne una en les dades"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:18
-#: ../plugins/gdb/anjuta-gdb.glade.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Hide process para_meters"
 msgstr "Oculta els parà_metres del procés"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:19
-#: ../plugins/gdb/anjuta-gdb.glade.h:15
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
 msgid "Inspect"
 msgstr "Inspecciona"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
 msgid "Inspect/Evaluate"
 msgstr "Inspecciona/avalua"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:21
-#: ../plugins/debug-manager/plugin.c:926
-#: ../plugins/debug-manager/plugin.c:1026 ../plugins/gdb/anjuta-gdb.glade.h:16
+#: ../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 "Senyals del nucli"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:22
-#: ../plugins/debug-manager/breakpoints.c:1904
-#: ../plugins/gdb/anjuta-gdb.glade.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/breakpoints.c:1907
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:23
-#: ../plugins/debug-manager/memory.c:180 ../plugins/gdb/anjuta-gdb.glade.h:18
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
+#: ../plugins/debug-manager/memory.c:180
 msgid "Memory"
 msgstr "Memòria"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:24
-#: ../plugins/gdb/anjuta-gdb.glade.h:19
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
 msgid "Pass:"
 msgstr "Passa:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
 msgid "Port:"
 msgstr "Port:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:26
-#: ../plugins/gdb/anjuta-gdb.glade.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Print:"
 msgstr "Imprimeix:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:27
-#: ../plugins/gdb/anjuta-gdb.glade.h:21
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
 msgid "Program Interrupt"
 msgstr "Interrupció del programa"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:28
-#: ../plugins/gdb/anjuta-gdb.glade.h:23
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+#, fuzzy
+msgid "Remote debugging"
+msgstr "<b>Depuració remota</b>"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:32
 msgid "SIGINT"
 msgstr "SIGINT"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:33
 msgid "Select one directory"
 msgstr "Seleccioneu un directori"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:34
 msgid "Serial Line Connection"
 msgstr "Connexió per línia sèrie"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:31
-#: ../plugins/gdb/anjuta-gdb.glade.h:24
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:35
 msgid "Set Signal Property"
 msgstr "Estableix les propietats del senyal"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:32
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:36
 #: ../plugins/debug-manager/sharedlib.c:214
-#: ../plugins/gdb/anjuta-gdb.glade.h:25
 msgid "Shared libraries"
 msgstr "Biblioteques compartides"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:33
-#: ../plugins/gdb/anjuta-gdb.glade.h:26
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:37
 msgid "Signal:"
 msgstr "Senyal:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:34
-#: ../plugins/gdb/anjuta-gdb.glade.h:27
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:38
 msgid "Source Directories"
 msgstr "Directoris font"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:35
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:39
 msgid "Start Debugger"
 msgstr "Inicia el depurador"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:36
-#: ../plugins/gdb/anjuta-gdb.glade.h:28
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:40
 msgid "Stop:"
 msgstr "Atura:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:37
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:41
 msgid "TCP/IP Connection"
 msgstr "Connexió per TCP/IP"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:38
-#: ../plugins/gdb/anjuta-gdb.glade.h:29
-#: ../plugins/project-wizard/property.c:287
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
+#: ../plugins/project-wizard/property.c:286
 msgid "Yes"
 msgstr "Sí"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:39
-#: ../plugins/gdb/anjuta-gdb.glade.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:43
 msgid "_Attach"
 msgstr "_Adjunta"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:40
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:44
 msgid "_Automatic update"
 msgstr "_Actualització automàtica"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:41
-#: ../plugins/gdb/anjuta-gdb.glade.h:31
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:45
 msgid "_Condition:"
 msgstr "_Condició:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:42
-#: ../plugins/gdb/anjuta-gdb.glade.h:32
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:46
 msgid "_Disable all"
 msgstr "Inhabilita'ls _tots"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:43
-#: ../plugins/gdb/anjuta-gdb.glade.h:33
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:47
 msgid "_Hide paths"
 msgstr "Ocul_ta els camins"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:44
-#: ../plugins/gdb/anjuta-gdb.glade.h:34
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:48
 msgid "_Location:"
 msgstr "_Ubicació:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:45
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:49
 msgid "_Name:"
 msgstr "_Nom:"
 
 #. This is the number of time that the program executes the line where a breakpoint is located. It is used as a list header, so I have tried to find a quite short name.
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:47
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:51
 msgid "_Pass count:"
 msgstr "_Número de passades:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:48
-#: ../plugins/gdb/anjuta-gdb.glade.h:36
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:52
 msgid "_Process to attach to:"
 msgstr "_Procés a adjuntar-hi:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:49
-#: ../plugins/gdb/anjuta-gdb.glade.h:37
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:53
 msgid "_Remove all"
 msgstr "Sup_rimeix-los tots"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:51
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:55
 msgid "_Value:"
 msgstr "_Valor:"
 
-#: ../plugins/debug-manager/breakpoints.c:1670
+#: ../plugins/debug-manager/breakpoints.c:1673
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "Segur que voleu suprimir tots els punts de ruptura?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1767
+#: ../plugins/debug-manager/breakpoints.c:1770
 msgid "_Breakpoints"
 msgstr "_Punts de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1775
+#: ../plugins/debug-manager/breakpoints.c:1778
 msgid "Toggle Breakpoint"
 msgstr "Commuta el punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1777
+#: ../plugins/debug-manager/breakpoints.c:1780
 msgid "Toggle breakpoint at the current location"
 msgstr "Commuta el punt de ruptura a la ubicació actual"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1783
-msgid "Add Breakpoint..."
+#: ../plugins/debug-manager/breakpoints.c:1786
+#, fuzzy
+msgid "Add Breakpointâ?¦"
 msgstr "Afegeix un punt de ruptura..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1785
+#: ../plugins/debug-manager/breakpoints.c:1788
 msgid "Add a breakpoint"
 msgstr "Afegeix un punt de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1791
+#: ../plugins/debug-manager/breakpoints.c:1794
 msgid "Remove Breakpoint"
 msgstr "Suprimeix el punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1793
+#: ../plugins/debug-manager/breakpoints.c:1796
 msgid "Remove a breakpoint"
 msgstr "Suprimeix un punt de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1799
+#: ../plugins/debug-manager/breakpoints.c:1802
 msgid "Edit Breakpoint"
 msgstr "Edita el punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1801
+#: ../plugins/debug-manager/breakpoints.c:1804
 msgid "Edit breakpoint properties"
 msgstr "Edita les propietats del punt de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1807
-#: ../plugins/debug-manager/breakpoints.c:1878
+#: ../plugins/debug-manager/breakpoints.c:1810
+#: ../plugins/debug-manager/breakpoints.c:1881
 msgid "Enable Breakpoint"
 msgstr "Activa el punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1809
-#: ../plugins/debug-manager/breakpoints.c:1879
+#: ../plugins/debug-manager/breakpoints.c:1812
+#: ../plugins/debug-manager/breakpoints.c:1882
 msgid "Enable a breakpoint"
 msgstr "Activa un punt de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1815
+#: ../plugins/debug-manager/breakpoints.c:1818
 msgid "Disable All Breakpoints"
 msgstr "Desactiva tots els punts de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1817
+#: ../plugins/debug-manager/breakpoints.c:1820
 msgid "Deactivate all breakpoints"
 msgstr "Desactiva tots els punts de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1823
+#: ../plugins/debug-manager/breakpoints.c:1826
 msgid "R_emove All Breakpoints"
 msgstr "_Suprimeix tots els punts de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1825
+#: ../plugins/debug-manager/breakpoints.c:1828
 msgid "Remove all breakpoints"
 msgstr "Suprimeix tots els punts de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1834
+#: ../plugins/debug-manager/breakpoints.c:1837
 msgid "Jump to Breakpoint"
 msgstr "Salta al punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1836
+#: ../plugins/debug-manager/breakpoints.c:1839
 msgid "Jump to breakpoint location"
 msgstr "Salta a la ubicació del punt de ruptura"
 
-#: ../plugins/debug-manager/breakpoints.c:1873
+#: ../plugins/debug-manager/breakpoints.c:1876
 msgid "Disable Breakpoint"
 msgstr "Desactiva el punt de ruptura"
 
-#: ../plugins/debug-manager/breakpoints.c:1874
+#: ../plugins/debug-manager/breakpoints.c:1877
 msgid "Disable a breakpoint"
 msgstr "Desactiva el punt de ruptura"
 
-#: ../plugins/debug-manager/breakpoints.c:1904
-#: ../plugins/tools/anjuta-tools.glade.h:6
+#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../plugins/debug-manager/breakpoints.c:1904
+#: ../plugins/debug-manager/breakpoints.c:1907
 #: ../plugins/debug-manager/stack_trace.c:667
 #: ../plugins/debug-manager/threads.c:481
 msgid "Address"
 msgstr "Adreça"
 
-#: ../plugins/debug-manager/breakpoints.c:1904
-#: ../plugins/debug-manager/debug_tree.c:126
-msgid "Type"
-msgstr "Tipus"
-
-#: ../plugins/debug-manager/breakpoints.c:1905
+#: ../plugins/debug-manager/breakpoints.c:1908
 msgid "Condition"
 msgstr "Condició"
 
-#: ../plugins/debug-manager/breakpoints.c:1905
+#: ../plugins/debug-manager/breakpoints.c:1908
 msgid "Pass count"
 msgstr "Número de passades"
 
-#: ../plugins/debug-manager/breakpoints.c:1905
+#: ../plugins/debug-manager/breakpoints.c:1908
 msgid "State"
 msgstr "Estat"
 
-#: ../plugins/debug-manager/breakpoints.c:1954
-#: ../plugins/debug-manager/breakpoints.c:1960
+#: ../plugins/debug-manager/breakpoints.c:1957
+#: ../plugins/debug-manager/breakpoints.c:1963
 msgid "Breakpoint operations"
 msgstr "Operacions dels punts de ruptura"
 
 #. create goto menu_item.
-#: ../plugins/debug-manager/data_view.c:383
-#: ../plugins/debug-manager/sparse_view.c:491
-msgid "_Goto address"
+#: ../plugins/debug-manager/data_view.c:389
+#: ../plugins/debug-manager/sparse_view.c:497
+#, fuzzy
+msgid "_Go to address"
 msgstr "_Vés a l'adreça"
 
 #: ../plugins/debug-manager/debug_tree.c:126
-#: ../plugins/gbf-am/gbf-am-properties.c:964 ../plugins/tools/editor.c:461
+#: ../plugins/gbf-am/gbf-am-properties.c:971 ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "Variable"
 
 #: ../plugins/debug-manager/debug_tree.c:126
 #: ../plugins/debug-manager/registers.c:469
-#: ../plugins/gbf-am/gbf-am-properties.c:974
-#: ../plugins/run-program/parameters.c:741 ../plugins/tools/editor.c:467
+#: ../plugins/gbf-am/gbf-am-properties.c:981
+#: ../plugins/run-program/parameters.c:758 ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "Valor"
 
@@ -1974,249 +2100,256 @@ msgstr "Línies"
 msgid "Locals"
 msgstr "Locals"
 
-#: ../plugins/debug-manager/plugin.c:313
+#: ../plugins/debug-manager/plugin.c:315
 msgid "Debugger Log"
 msgstr "Registre del depurador"
 
-#: ../plugins/debug-manager/plugin.c:387 ../plugins/debug-manager/plugin.c:407
-#: ../plugins/debug-manager/plugin.c:427 ../plugins/debug-manager/plugin.c:449
-#: ../plugins/debug-manager/plugin.c:483 ../plugins/debug-manager/plugin.c:518
+#: ../plugins/debug-manager/plugin.c:389 ../plugins/debug-manager/plugin.c:409
+#: ../plugins/debug-manager/plugin.c:429 ../plugins/debug-manager/plugin.c:451
+#: ../plugins/debug-manager/plugin.c:485 ../plugins/debug-manager/plugin.c:520
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
 msgstr "Depurador"
 
-#: ../plugins/debug-manager/plugin.c:387
+#: ../plugins/debug-manager/plugin.c:389
 msgid "Started"
 msgstr "Iniciat"
 
-#: ../plugins/debug-manager/plugin.c:407
+#: ../plugins/debug-manager/plugin.c:409
 msgid "Loaded"
 msgstr "Carregat"
 
-#: ../plugins/debug-manager/plugin.c:427
-msgid "Running..."
+#: ../plugins/debug-manager/plugin.c:429
+#, fuzzy
+msgid "Runningâ?¦"
 msgstr "S'esta executant..."
 
-#: ../plugins/debug-manager/plugin.c:449
+#: ../plugins/debug-manager/plugin.c:451
 msgid "Stopped"
 msgstr "Aturat"
 
-#: ../plugins/debug-manager/plugin.c:483
+#: ../plugins/debug-manager/plugin.c:485
 msgid "Unloaded"
 msgstr "Descarregat"
 
-#: ../plugins/debug-manager/plugin.c:524
+#: ../plugins/debug-manager/plugin.c:529
 #, c-format
 msgid "Debugger terminated with error %d: %s\n"
 msgstr "El depurador ha finalitzat amb l'error %d: %s\n"
 
-#: ../plugins/debug-manager/plugin.c:537
+#: ../plugins/debug-manager/plugin.c:542
 #, c-format
 msgid "Program has received signal: %s\n"
 msgstr "El programa ha rebut el senyal: %s\n"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:810
+#: ../plugins/debug-manager/plugin.c:829
 msgid "_Debug"
 msgstr "_Depura"
 
-#: ../plugins/debug-manager/plugin.c:818
+#: ../plugins/debug-manager/plugin.c:837
 msgid "_Start Debugger"
 msgstr "_Inicia el depurador"
 
-#: ../plugins/debug-manager/plugin.c:826
+#: ../plugins/debug-manager/plugin.c:845
 msgid "_Debug Program"
 msgstr "_Depura el programa"
 
-#: ../plugins/debug-manager/plugin.c:828
+#: ../plugins/debug-manager/plugin.c:847
 msgid "Start debugger and load the program"
 msgstr "Inicia el depurador i carrega el programa"
 
-#: ../plugins/debug-manager/plugin.c:834
-msgid "_Debug Process..."
+#: ../plugins/debug-manager/plugin.c:853
+#, fuzzy
+msgid "_Debug Processâ?¦"
 msgstr "_Depura un procés..."
 
-#: ../plugins/debug-manager/plugin.c:836
+#: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
 msgstr "Inicia el depurador i adjunta'l a un programa en execució"
 
-#: ../plugins/debug-manager/plugin.c:842
-msgid "Debug _Remote Target..."
+#: ../plugins/debug-manager/plugin.c:861
+#, fuzzy
+msgid "Debug _Remote Targetâ?¦"
 msgstr "Depura un objectiu _remot..."
 
-#: ../plugins/debug-manager/plugin.c:844
+#: ../plugins/debug-manager/plugin.c:863
 msgid "Connect to a remote debugging target"
 msgstr "Connecta a un objectiu remot a depurar"
 
-#: ../plugins/debug-manager/plugin.c:850
+#: ../plugins/debug-manager/plugin.c:869
 msgid "Stop Debugger"
 msgstr "Atura el depurador"
 
-#: ../plugins/debug-manager/plugin.c:852
+#: ../plugins/debug-manager/plugin.c:871
 msgid "Say goodbye to the debugger"
 msgstr "Atureu el depurador"
 
-#: ../plugins/debug-manager/plugin.c:858
-msgid "Add source paths..."
+#: ../plugins/debug-manager/plugin.c:877
+#, fuzzy
+msgid "Add source pathsâ?¦"
 msgstr "Afegeix camins de fonts..."
 
-#: ../plugins/debug-manager/plugin.c:860
+#: ../plugins/debug-manager/plugin.c:879
 msgid "Add additional source paths"
 msgstr "Afegix camins de fonts addicionals"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:870 ../plugins/debug-manager/plugin.c:978
-msgid "Debugger Command..."
-msgstr "Ordre del depurador..."
+#: ../plugins/debug-manager/plugin.c:889 ../plugins/debug-manager/plugin.c:997
+#, fuzzy
+msgid "Debugger Commandâ?¦"
+msgstr "Ordre del depurador"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:872 ../plugins/debug-manager/plugin.c:980
+#: ../plugins/debug-manager/plugin.c:891 ../plugins/debug-manager/plugin.c:999
 msgid "Custom debugger command"
 msgstr "Ordre personalitzada del depurador"
 
-#: ../plugins/debug-manager/plugin.c:878 ../plugins/debug-manager/plugin.c:986
+#: ../plugins/debug-manager/plugin.c:897
+#: ../plugins/debug-manager/plugin.c:1005
 msgid "_Info"
 msgstr "_Informació"
 
-#: ../plugins/debug-manager/plugin.c:886
+#: ../plugins/debug-manager/plugin.c:905
 msgid "Info _Target Files"
 msgstr "Fi_txers objectiu d'informació"
 
-#: ../plugins/debug-manager/plugin.c:888
+#: ../plugins/debug-manager/plugin.c:907
 msgid "Display information on the files the debugger is active with"
 msgstr ""
 "Visualitza la informació dels fitxers amb els que treballa el depurador"
 
-#: ../plugins/debug-manager/plugin.c:894
+#: ../plugins/debug-manager/plugin.c:913
 msgid "Info _Program"
 msgstr "_Programa d'informació"
 
-#: ../plugins/debug-manager/plugin.c:896
+#: ../plugins/debug-manager/plugin.c:915
 msgid "Display information on the execution status of the program"
 msgstr "Visualitza la informació de l'estat d'execució del programa"
 
-#: ../plugins/debug-manager/plugin.c:902
+#: ../plugins/debug-manager/plugin.c:921
 msgid "Info _Kernel User Struct"
 msgstr "Informació d'estructura d'usuari del _nucli"
 
-#: ../plugins/debug-manager/plugin.c:904
+#: ../plugins/debug-manager/plugin.c:923
 msgid "Display the contents of kernel 'struct user' for current child"
 msgstr ""
 "Visualitza els continguts de l'estructura d'usuari del nucli per al fill "
 "actual"
 
-#: ../plugins/debug-manager/plugin.c:918
-#: ../plugins/debug-manager/plugin.c:1018
+#: ../plugins/debug-manager/plugin.c:937
+#: ../plugins/debug-manager/plugin.c:1037
 msgid "Shared Libraries"
 msgstr "Biblioteques compartides"
 
-#: ../plugins/debug-manager/plugin.c:920
-#: ../plugins/debug-manager/plugin.c:1020
-msgid "Show shared libraries mappings"
+#: ../plugins/debug-manager/plugin.c:939
+#: ../plugins/debug-manager/plugin.c:1039
+#, fuzzy
+msgid "Show shared library mappings"
 msgstr "Mostra les correspondències de les biblioteques compartides"
 
-#: ../plugins/debug-manager/plugin.c:928
-#: ../plugins/debug-manager/plugin.c:1028
+#: ../plugins/debug-manager/plugin.c:947
+#: ../plugins/debug-manager/plugin.c:1047
 msgid "Show kernel signals"
 msgstr "Mostra els senyals del nucli"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:938
+#: ../plugins/debug-manager/plugin.c:957
 msgid "Run/_Continue"
 msgstr "Executa/_continua"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:940
+#: ../plugins/debug-manager/plugin.c:959
 msgid "Continue the execution of the program"
 msgstr "Continua amb l'execució del programa"
 
-#: ../plugins/debug-manager/plugin.c:946
+#: ../plugins/debug-manager/plugin.c:965
 msgid "Step _In"
 msgstr "_Avança un pas"
 
-#: ../plugins/debug-manager/plugin.c:948
+#: ../plugins/debug-manager/plugin.c:967
 msgid "Single step into function"
 msgstr "Avança un pas en la funció"
 
-#: ../plugins/debug-manager/plugin.c:954
+#: ../plugins/debug-manager/plugin.c:973
 msgid "Step O_ver"
 msgstr "A_vança al final"
 
-#: ../plugins/debug-manager/plugin.c:956
+#: ../plugins/debug-manager/plugin.c:975
 msgid "Single step over function"
 msgstr "Avança fins el final de la funció"
 
-#: ../plugins/debug-manager/plugin.c:962
+#: ../plugins/debug-manager/plugin.c:981
 msgid "Step _Out"
 msgstr "_Avança"
 
-#: ../plugins/debug-manager/plugin.c:964
-msgid "Single step out of the function"
-msgstr "Avança al final de la funció"
+#: ../plugins/debug-manager/plugin.c:983
+#, fuzzy
+msgid "Single step out of function"
+msgstr "Avança fins al final de la funció"
 
-#: ../plugins/debug-manager/plugin.c:970
+#: ../plugins/debug-manager/plugin.c:989
 msgid "_Run to Cursor"
 msgstr "Executa fins al cu_rsor"
 
-#: ../plugins/debug-manager/plugin.c:972
+#: ../plugins/debug-manager/plugin.c:991
 msgid "Run to the cursor"
 msgstr "Executa fins al cursor"
 
-#: ../plugins/debug-manager/plugin.c:994
+#: ../plugins/debug-manager/plugin.c:1013
 msgid "Info _Global Variables"
 msgstr "Informació de les variables _globals"
 
-#: ../plugins/debug-manager/plugin.c:996
+#: ../plugins/debug-manager/plugin.c:1015
 msgid "Display all global and static variables of the program"
 msgstr "Visualitza totes les variables globals i estàtiques del programa"
 
-#: ../plugins/debug-manager/plugin.c:1002
+#: ../plugins/debug-manager/plugin.c:1021
 msgid "Info _Current Frame"
 msgstr "Informació del marc a_ctual"
 
-#: ../plugins/debug-manager/plugin.c:1004
+#: ../plugins/debug-manager/plugin.c:1023
 msgid "Display information about the current frame of execution"
 msgstr "Visualitza informació sobre el marc d'execució actual"
 
-#: ../plugins/debug-manager/plugin.c:1010
+#: ../plugins/debug-manager/plugin.c:1029
 msgid "Info Function _Arguments"
 msgstr "Informació dels _arguments de la funció"
 
-#: ../plugins/debug-manager/plugin.c:1012
+#: ../plugins/debug-manager/plugin.c:1031
 msgid "Display function arguments of the current frame"
 msgstr "Visualitza els arguments de la funció del marc actual"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:1038
+#: ../plugins/debug-manager/plugin.c:1057
 msgid "Pa_use Program"
 msgstr "Fes una pa_usa al programa"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:1040
+#: ../plugins/debug-manager/plugin.c:1059
 msgid "Pauses the execution of the program"
 msgstr "Fes una pausa a l'execució del programa"
 
-#: ../plugins/debug-manager/plugin.c:1080
-#: ../plugins/debug-manager/plugin.c:1086
-#: ../plugins/debug-manager/plugin.c:1092
-#: ../plugins/debug-manager/plugin.c:1098
+#: ../plugins/debug-manager/plugin.c:1099
+#: ../plugins/debug-manager/plugin.c:1105
+#: ../plugins/debug-manager/plugin.c:1111
+#: ../plugins/debug-manager/plugin.c:1117
 msgid "Debugger operations"
 msgstr "Operacions del depurador"
 
-#: ../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 a debugger plugin supporting a target with %s MIME type"
 msgstr ""
-"No es pot trobar un connector de depuració que admeti un objectiu amb tipus "
-"MIME %s"
+"No es pot trobar un connector de depuració que admeti un objectiu per al "
+"tipus MIME %s"
 
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
@@ -2235,13 +2368,11 @@ msgstr "Actualitza"
 msgid "Shared Object"
 msgstr "Objecte compartit"
 
-#: ../plugins/debug-manager/sharedlib.c:173
-#: ../plugins/git/anjuta-git.glade.h:58
+#: ../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.glade.h:86
+#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "A"
 
@@ -2288,19 +2419,19 @@ msgstr "Senyals del nucli"
 msgid "Signal operations"
 msgstr "Operacions amb senyals"
 
-#: ../plugins/debug-manager/sparse_view.c:1195
+#: ../plugins/debug-manager/sparse_view.c:1201
 msgid "Show Line Numbers"
 msgstr "Mostra els números de línia"
 
-#: ../plugins/debug-manager/sparse_view.c:1196
+#: ../plugins/debug-manager/sparse_view.c:1202
 msgid "Whether to display line numbers"
 msgstr "Si s'han de mostrar els números de línia"
 
-#: ../plugins/debug-manager/sparse_view.c:1203
+#: ../plugins/debug-manager/sparse_view.c:1209
 msgid "Show Line Markers"
 msgstr "Mostra els marcadors de línia"
 
-#: ../plugins/debug-manager/sparse_view.c:1204
+#: ../plugins/debug-manager/sparse_view.c:1210
 msgid "Whether to display line marker pixbufs"
 msgstr "Si s'han de mostrar les imatges de marcat de línia"
 
@@ -2327,7 +2458,7 @@ msgstr "Marc"
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:631
 #: ../plugins/debug-manager/threads.c:451 ../plugins/tools/tool.c:100
-#: ../src/anjuta-app.c:422
+#: ../src/anjuta-app.c:485
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "Fitxer"
@@ -2343,10 +2474,6 @@ msgstr "Línia"
 msgid "Function"
 msgstr "Funció"
 
-#: ../plugins/debug-manager/stack_trace.c:679
-msgid "Arguments"
-msgstr "Arguments"
-
 #: ../plugins/debug-manager/stack_trace.c:703
 msgid "Stack"
 msgstr "Pila"
@@ -2355,54 +2482,48 @@ msgstr "Pila"
 msgid "Stack frame operations"
 msgstr "Operacions del marc de la pila"
 
-#: ../plugins/debug-manager/start.c:97
-msgid "Pid"
-msgstr "Identificador de procés"
+#: ../plugins/debug-manager/start.c:98
+msgid "PID"
+msgstr ""
 
-#: ../plugins/debug-manager/start.c:97
+#: ../plugins/debug-manager/start.c:98
 msgid "User"
 msgstr "Usuari"
 
-#: ../plugins/debug-manager/start.c:97
+#: ../plugins/debug-manager/start.c:98
 msgid "Time"
 msgstr "Temps"
 
-#: ../plugins/debug-manager/start.c:97
+#: ../plugins/debug-manager/start.c:98
 msgid "Command"
 msgstr "Ordre"
 
-#: ../plugins/debug-manager/start.c:621
+#: ../plugins/debug-manager/start.c:627
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "No es pot executar: %s."
 
-#: ../plugins/debug-manager/start.c:635
+#: ../plugins/debug-manager/start.c:641
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "No es pot obrir el fitxer: %s\n"
 
-#: ../plugins/debug-manager/start.c:913
+#: ../plugins/debug-manager/start.c:965
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "No es pot obrir %s. No es pot iniciar el depurador."
 
-#: ../plugins/debug-manager/start.c:923
-#, c-format
-msgid "Unable to detect mime-type of %s. Debugger cannot start."
+#: ../plugins/debug-manager/start.c:975
+#, fuzzy, c-format
+msgid "Unable to detect MIME type of %s. Debugger cannot start."
 msgstr ""
 "No es pot detectar el tipus MIME de %s. No es pot iniciar el depurador."
 
-#: ../plugins/debug-manager/start.c:1059 ../plugins/debug-manager/start.c:1251
-#: ../plugins/run-program/parameters.c:600
-#, c-format
-msgid "Missing file %s"
-msgstr "Falta el fitxer %s"
-
-#: ../plugins/debug-manager/start.c:1272
+#: ../plugins/debug-manager/start.c:1336
 msgid "Path"
 msgstr "Camí"
 
-#: ../plugins/debug-manager/start.c:1320 ../plugins/gdb/debugger.c:1699
+#: ../plugins/debug-manager/start.c:1385 ../plugins/gdb/debugger.c:1699
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2417,8 +2538,8 @@ msgid "Set current thread"
 msgstr "Estableix el fil actual"
 
 #: ../plugins/debug-manager/threads.c:436
-msgid "Id"
-msgstr "Id"
+msgid "ID"
+msgstr ""
 
 #: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
@@ -2430,51 +2551,53 @@ msgstr "Operacions del fil"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:378
-msgid "Ins_pect/Evaluate..."
-msgstr "Ins_pecciona/avalua..."
+#: ../plugins/debug-manager/watch.c:372
+#, fuzzy
+msgid "Ins_pect/Evaluateâ?¦"
+msgstr "Inspecciona/avalua"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/watch.c:380
+#: ../plugins/debug-manager/watch.c:374
 msgid "Inspect or evaluate an expression or variable"
 msgstr "Inspecciona o avalua una expressió o variable"
 
-#: ../plugins/debug-manager/watch.c:386
-msgid "Add Watch..."
-msgstr "Afegeix la vigilància..."
+#: ../plugins/debug-manager/watch.c:380
+#, fuzzy
+msgid "Add Watchâ?¦"
+msgstr "Afegeix vigilància"
 
-#: ../plugins/debug-manager/watch.c:394
+#: ../plugins/debug-manager/watch.c:388
 msgid "Remove Watch"
 msgstr "Suprimeix la vigilància"
 
-#: ../plugins/debug-manager/watch.c:402
+#: ../plugins/debug-manager/watch.c:396
 msgid "Update Watch"
 msgstr "Actualitza la vigilància"
 
-#: ../plugins/debug-manager/watch.c:410
+#: ../plugins/debug-manager/watch.c:404
 msgid "Change Value"
 msgstr "Canvia el valor"
 
-#: ../plugins/debug-manager/watch.c:418
+#: ../plugins/debug-manager/watch.c:412
 msgid "Update all"
 msgstr "Actualitza'ls tots"
 
-#: ../plugins/debug-manager/watch.c:426
+#: ../plugins/debug-manager/watch.c:420
 msgid "Remove all"
 msgstr "Suprimeix-los tots"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:437
+#: ../plugins/debug-manager/watch.c:431
 msgid "Automatic update"
 msgstr "Actualització automàtica"
 
-#: ../plugins/debug-manager/watch.c:463 ../plugins/debug-manager/watch.c:469
+#: ../plugins/debug-manager/watch.c:457 ../plugins/debug-manager/watch.c:463
 msgid "Watch operations"
 msgstr "Operacions de vigilància"
 
-#: ../plugins/debug-manager/watch.c:541
+#: ../plugins/debug-manager/watch.c:535
 msgid "Watches"
 msgstr "Vigilància"
 
@@ -2484,7 +2607,8 @@ msgstr "Cerca ajuda:"
 
 #: ../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 "_Go to"
 msgstr "_Vés a"
 
 #: ../plugins/devhelp/plugin.c:231
@@ -2511,34 +2635,36 @@ msgstr "_Cerca ajuda"
 msgid "Search for a term in help"
 msgstr "Cerca un terme a l'ajuda"
 
-#: ../plugins/devhelp/plugin.c:325
+#: ../plugins/devhelp/plugin.c:358
 msgid "Help operations"
 msgstr "Operacions d'ajuda"
 
-#: ../plugins/devhelp/plugin.c:355
-msgid "Online"
-msgstr "En línia"
-
-#: ../plugins/devhelp/plugin.c:396
+#: ../plugins/devhelp/plugin.c:368
 msgid "Contents"
 msgstr "Contingut"
 
-#: ../plugins/devhelp/plugin.c:398 ../plugins/search/search-replace.c:1035
-#: ../plugins/search/search-replace.c:1708
-#: ../plugins/search/search-replace.c:1715
-#: ../plugins/search/search-replace.c:1727
-#: ../plugins/search/search-replace.c:2056 ../plugins/symbol-db/plugin.c:2278
+#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
+#: ../plugins/search/search-replace.c:1717
+#: ../plugins/search/search-replace.c:1724
+#: ../plugins/search/search-replace.c:1736
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2335
+#: ../plugins/symbol-db/plugin.c:2447
 msgid "Search"
 msgstr "Cerca"
 
-#: ../plugins/devhelp/plugin.c:420 ../src/anjuta-app.c:439
+#: ../plugins/devhelp/plugin.c:375 ../plugins/devhelp/plugin.c:495
+#: ../src/anjuta-app.c:502
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../plugins/devhelp/plugin.c:424
+#: ../plugins/devhelp/plugin.c:405 ../plugins/devhelp/plugin.c:500
 msgid "Help display"
 msgstr "Mostreu l'ajuda"
 
+#: ../plugins/devhelp/plugin.c:422
+msgid "Online"
+msgstr "En línia"
+
 #: ../plugins/document-manager/action-callbacks.c:276
 #, c-format
 msgid ""
@@ -2552,11 +2678,30 @@ msgstr ""
 msgid "_Reload"
 msgstr "_Torna a carregar"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:282
+#: ../plugins/document-manager/anjuta-bookmarks.c:311
+msgid "Add bookmark"
+msgstr "Afegeix una adreça d'interès"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:317
+msgid "Remove bookmark"
+msgstr "Suprimeix l'adreça d'interès"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:331
+#: ../plugins/document-manager/anjuta-bookmarks.c:393
 #: ../plugins/document-manager/plugin.c:411
 msgid "Bookmarks"
 msgstr "Adreces d'interès"
 
+#: ../plugins/document-manager/anjuta-bookmarks.c:339
+#, fuzzy
+msgid "Rename"
+msgstr "Canvia el _nom"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
+#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+msgid "Remove"
+msgstr "Suprimeix"
+
 #: ../plugins/document-manager/anjuta-docman.c:400
 msgid "Close file"
 msgstr "Tanca el fitxer"
@@ -2566,8 +2711,8 @@ msgid "Path:"
 msgstr "Camí:"
 
 #: ../plugins/document-manager/anjuta-docman.c:565
-#: ../plugins/file-loader/plugin.c:564 ../plugins/file-loader/plugin.c:862
-#: ../plugins/file-loader/plugin.c:872 ../plugins/file-loader/plugin.c:885
+#: ../plugins/file-loader/plugin.c:591 ../plugins/file-loader/plugin.c:894
+#: ../plugins/file-loader/plugin.c:904 ../plugins/file-loader/plugin.c:917
 msgid "Open file"
 msgstr "Obre un fitxer"
 
@@ -2593,58 +2738,67 @@ msgstr "_Reemplaça"
 msgid "[read-only]"
 msgstr "[només-lectura]"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:1
-msgid "<b>Autosave</b>"
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:1
+#, fuzzy
+msgid "Autosave"
 msgstr "<b>Desa automàticament</b>"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:2
-msgid "<b>Editor tabs</b>"
-msgstr "<b>Pestanyes de l'editor</b>"
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:2
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
+msgid "Bottom"
+msgstr "Inferior"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:3
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
 msgid "Do not show tabs"
 msgstr "No mostris les pestanyes"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:4
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+#, fuzzy
+msgid "Editor tabs"
+msgstr "<b>Pestanyes de l'editor</b>"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:5
 msgid "Enable files autosave"
 msgstr "Habilita el desat automàtic"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:5
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
+msgid "Left"
+msgstr "Esquerra"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:7
 msgid "Position:"
 msgstr "Posició:"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:6
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+msgid "Right"
+msgstr "Dreta"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:9
 msgid "Save files interval in minutes"
 msgstr "Interval en minuts per a desar fitxers"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:7
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:10
 msgid "Save session interval in minutes"
 msgstr "Interval en minuts per a desar la sessió"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:8
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:11
 msgid "Sorted by most recent use"
 msgstr "Ordenats segons l'utilitzat més recentment"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:9
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:12
 msgid "Sorted in alphabetical order"
 msgstr "Ordenats alfabèticament"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:10
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:13
 msgid "Sorted in opening order"
 msgstr "Ordenats per quan s'obren"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:11
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:10
-msgid ""
-"Top\n"
-"Bottom\n"
-"Left\n"
-"Right"
-msgstr ""
-"Superior\n"
-"Inferior\n"
-"Esquerra\n"
-"Dreta"
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:14
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
+msgid "Top"
+msgstr "Principi"
 
 #: ../plugins/document-manager/plugin.c:147
 msgid "_Save"
@@ -2655,7 +2809,8 @@ msgid "Save current file"
 msgstr "Desa el fitxer actual"
 
 #: ../plugins/document-manager/plugin.c:149
-msgid "Save _As..."
+#, fuzzy
+msgid "Save _Asâ?¦"
 msgstr "_Anomena i desa..."
 
 #: ../plugins/document-manager/plugin.c:150
@@ -2699,8 +2854,9 @@ msgid "Recent _Files"
 msgstr "_Fitxers recents"
 
 #: ../plugins/document-manager/plugin.c:168
-msgid "_Print..."
-msgstr "_Imprimeix..."
+#, fuzzy
+msgid "_Printâ?¦"
+msgstr "Imprimeix"
 
 #: ../plugins/document-manager/plugin.c:169
 msgid "Print the current file"
@@ -2711,7 +2867,8 @@ msgid "_Print Preview"
 msgstr "_Previsualitza la impressió"
 
 #: ../plugins/document-manager/plugin.c:177
-msgid "Preview the current file in print-format"
+#, fuzzy
+msgid "Preview the current file in print format"
 msgstr "Previsualitza el fitxer actual en format d'impressió"
 
 #: ../plugins/document-manager/plugin.c:182
@@ -2764,7 +2921,8 @@ msgid "Convert EOL to Majority EOL"
 msgstr "Converteix EOL a la majoria d'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 the most common EOL found in the file"
 msgstr ""
 "Converteix caràcters de fi de línia a la majoria d'EOL trobats al fitxer"
 
@@ -2826,7 +2984,8 @@ msgstr "Comenta el text seleccionat a l'inici i al final"
 
 #. menu title
 #: ../plugins/document-manager/plugin.c:237
-msgid "_Line Number..."
+#, fuzzy
+msgid "_Line Numberâ?¦"
 msgstr "Número de _línia..."
 
 #: ../plugins/document-manager/plugin.c:238
@@ -2862,7 +3021,8 @@ msgid "Previous _History"
 msgstr "_Historial anterior"
 
 #: ../plugins/document-manager/plugin.c:250
-msgid "Goto previous history"
+#, fuzzy
+msgid "Go to previous history"
 msgstr "Vés a l'historial anterior"
 
 #: ../plugins/document-manager/plugin.c:252
@@ -2870,7 +3030,8 @@ msgid "Next Histor_y"
 msgstr "Historial _següent"
 
 #: ../plugins/document-manager/plugin.c:253
-msgid "Goto next history"
+#, fuzzy
+msgid "Go to next history"
 msgstr "Vés a l'historial següent"
 
 #: ../plugins/document-manager/plugin.c:258 ../plugins/search/plugin.c:67
@@ -2895,7 +3056,7 @@ msgstr "Repeteix la cerca ràpida"
 
 #: ../plugins/document-manager/plugin.c:268 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1894
+#: ../plugins/language-support-cpp-java/plugin.c:1915
 msgid "_Edit"
 msgstr "_Edita"
 
@@ -2924,7 +3085,7 @@ msgstr "Suprimeix la visualització actual de l'editor"
 msgid "U_ndo"
 msgstr "Des_fés"
 
-#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4079
+#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4089
 msgid "Undo the last action"
 msgstr "Desfés l'última acció"
 
@@ -2946,7 +3107,7 @@ msgstr "Retalla el text seleccionat de l'editor al porta-retalls"
 
 #. 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 "_Copia"
 
@@ -2954,7 +3115,7 @@ msgstr "_Copia"
 msgid "Copy the selected text to the clipboard"
 msgstr "Copia el text seleccionat al porta-retalls"
 
-#: ../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 "_Enganxa"
 
@@ -3173,8 +3334,8 @@ msgstr "Cercant senzilla"
 
 #: ../plugins/document-manager/plugin.c:410
 #: ../plugins/document-manager/plugin.c:1713
-#: ../plugins/document-manager/plugin.c:2125
-#: ../plugins/document-manager/plugin.c:2135
+#: ../plugins/document-manager/plugin.c:2130
+#: ../plugins/document-manager/plugin.c:2140
 msgid "Documents"
 msgstr "Documents"
 
@@ -3187,7 +3348,8 @@ msgid "Reload"
 msgstr "Torna a carregar"
 
 #: ../plugins/document-manager/plugin.c:606
-msgid "Goto"
+#, fuzzy
+msgid "Go to"
 msgstr "Vés a"
 
 #: ../plugins/document-manager/plugin.c:909
@@ -3227,21 +3389,21 @@ msgid "Autosave completed"
 msgstr "S'ha completat el desat automàtic"
 
 #: ../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 the end and was continued at the top."
 msgstr "La cerca de «%s» ha arribat al final i ha continuat pel començament."
 
 #: ../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."
+"Search for \"%s\" reached the end and was continued at the top but no new "
+"match was found."
 msgstr ""
 "La cerca de «%s» ha arribat al final i ha continuat pel començament però no "
 "s'ha trobat cap concordança."
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.glade.h:23
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Match case"
 msgstr "Coincidència de majúscules i minúscules"
 
@@ -3261,8 +3423,8 @@ msgstr "No s'ha trobat cap element"
 
 #: ../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\""
 msgstr "No s'ha trobat cap recurs utilitzat recentment amb l'URI «%s»"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:750
@@ -3284,21 +3446,17 @@ msgstr "Element desconegut"
 #. * 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
-#, fuzzy, c-format
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:978
+#, c-format
 msgctxt "recent menu label"
 msgid "_%d. %s"
-msgstr "_Desfés: %s"
+msgstr ""
 
 #. 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
 msgctxt "recent menu label"
 msgid "%d. %s"
@@ -3306,9 +3464,9 @@ msgstr ""
 
 # Projecte_Mandrake [tm-mandrake.po]
 #: ../plugins/file-loader/plugin.c:116
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Can not open \"%s\".\n"
+"Cannot open \"%s\".\n"
 "\n"
 "%s"
 msgstr ""
@@ -3316,15 +3474,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../plugins/file-loader/plugin.c:223
-#, c-format
+#: ../plugins/file-loader/plugin.c:257
+#, 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"
+"MIME type: %s\n"
 "\n"
 "You may choose to try opening it with the following plugins or applications."
 msgstr ""
@@ -3337,247 +3495,244 @@ msgstr ""
 "\n"
 "Podeu intentar obrir-lo amb els connectors o aplicacions següents."
 
-#: ../plugins/file-loader/plugin.c:246
+#: ../plugins/file-loader/plugin.c:280
 msgid "Open with:"
 msgstr "Obre amb:"
 
 #. Document manager plugin
-#: ../plugins/file-loader/plugin.c:252
+#: ../plugins/file-loader/plugin.c:286
 #: ../plugins/document-manager/anjuta-document-manager.plugin.in.h:1
 msgid "Document Manager"
 msgstr "Gestor de documents"
 
-#: ../plugins/file-loader/plugin.c:470 ../plugins/patch/patch-plugin.c:116
+#: ../plugins/file-loader/plugin.c:497 ../plugins/patch/patch-plugin.c:122
 #: ../plugins/run-program/parameters.c:308
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: ../plugins/file-loader/plugin.c:475
+#: ../plugins/file-loader/plugin.c:502
 msgid "Anjuta Projects"
 msgstr "Projectes de l'Anjuta"
 
-#: ../plugins/file-loader/plugin.c:481
+#: ../plugins/file-loader/plugin.c:508
 msgid "C/C++ source files"
 msgstr "Fitxers de codi C/C++"
 
-#: ../plugins/file-loader/plugin.c:493
+#: ../plugins/file-loader/plugin.c:520
 msgid "C# source files"
 msgstr "Fitxers de codi C#"
 
-#: ../plugins/file-loader/plugin.c:499
+#: ../plugins/file-loader/plugin.c:526
 msgid "Java source files"
 msgstr "Fitxers de codi Java"
 
-#: ../plugins/file-loader/plugin.c:505
+#: ../plugins/file-loader/plugin.c:532
 msgid "Pascal source files"
 msgstr "Fitxers de codi Pascal"
 
-#: ../plugins/file-loader/plugin.c:510
+#: ../plugins/file-loader/plugin.c:537
 msgid "PHP source files"
 msgstr "Fitxers de codi PHP"
 
-#: ../plugins/file-loader/plugin.c:517
+#: ../plugins/file-loader/plugin.c:544
 msgid "Perl source files"
 msgstr "Fitxers de codi Perl"
 
-#: ../plugins/file-loader/plugin.c:523
+#: ../plugins/file-loader/plugin.c:550
 msgid "Python source files"
 msgstr "Fitxers de codi Python"
 
-#: ../plugins/file-loader/plugin.c:528
-msgid "Hyper text markup files"
+#: ../plugins/file-loader/plugin.c:555
+#, fuzzy
+msgid "Hypertext markup files"
 msgstr "Fitxers HTML"
 
-#: ../plugins/file-loader/plugin.c:537
-msgid "Shell scripts files"
-msgstr "Fitxers d'script per al intèrpret d'ordres"
+#: ../plugins/file-loader/plugin.c:564
+#, fuzzy
+msgid "Shell script files"
+msgstr "Fitxers d'script per a l'intèrpret d'ordres"
 
-#: ../plugins/file-loader/plugin.c:542
+#: ../plugins/file-loader/plugin.c:569
 msgid "Makefiles"
 msgstr "Fitxers makefile"
 
-#: ../plugins/file-loader/plugin.c:548
+#: ../plugins/file-loader/plugin.c:575
 msgid "Lua files"
 msgstr "Fitxers Lua"
 
-#: ../plugins/file-loader/plugin.c:553
+#: ../plugins/file-loader/plugin.c:580
 msgid "Diff files"
 msgstr "Fitxers de diferències"
 
-#: ../plugins/file-loader/plugin.c:791
+#: ../plugins/file-loader/plugin.c:823
 #, c-format
 msgid "Failed to activate plugin: %s"
 msgstr "No es pot activar el connector: %s"
 
-#: ../plugins/file-loader/plugin.c:852
+#: ../plugins/file-loader/plugin.c:884
 msgid "_New"
 msgstr "_Nou"
 
-#: ../plugins/file-loader/plugin.c:854
+#: ../plugins/file-loader/plugin.c:886
 msgid "New empty file"
 msgstr "Fitxer buit nou"
 
-#: ../plugins/file-loader/plugin.c:860
-msgid "_Open..."
-msgstr "_Obre..."
+#: ../plugins/file-loader/plugin.c:892
+#, fuzzy
+msgid "_Openâ?¦"
+msgstr "_Obre"
 
-#: ../plugins/file-loader/plugin.c:871 ../plugins/file-loader/plugin.c:884
+#: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
 msgstr "_Obre"
 
-#: ../plugins/file-loader/plugin.c:878 ../plugins/file-loader/plugin.c:891
+#: ../plugins/file-loader/plugin.c:910 ../plugins/file-loader/plugin.c:923
 msgid "Open _With"
 msgstr "Obre a_mb"
 
-#: ../plugins/file-loader/plugin.c:879 ../plugins/file-loader/plugin.c:892
+#: ../plugins/file-loader/plugin.c:911 ../plugins/file-loader/plugin.c:924
 msgid "Open with"
 msgstr "Obre amb"
 
-#: ../plugins/file-loader/plugin.c:1213 ../plugins/file-loader/plugin.c:1219
+#: ../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 "Carregador de fitxer"
 
-#: ../plugins/file-loader/plugin.c:1223
+#: ../plugins/file-loader/plugin.c:1253
 msgid "New"
 msgstr "Nou"
 
-#: ../plugins/file-loader/plugin.c:1224
+#: ../plugins/file-loader/plugin.c:1254
 msgid "New file, project and project components."
 msgstr "Fitxer, projecte i components del projecte nous."
 
-#: ../plugins/file-loader/plugin.c:1231 ../plugins/file-loader/plugin.c:1271
+#: ../plugins/file-loader/plugin.c:1261 ../plugins/file-loader/plugin.c:1301
 msgid "Open"
 msgstr "Obre"
 
-#: ../plugins/file-loader/plugin.c:1235
+#: ../plugins/file-loader/plugin.c:1265
 msgid "Open _Recent"
 msgstr "Ob_re'n un recent"
 
-#: ../plugins/file-loader/plugin.c:1236 ../plugins/file-loader/plugin.c:1273
+#: ../plugins/file-loader/plugin.c:1266 ../plugins/file-loader/plugin.c:1303
 msgid "Open recent file"
 msgstr "Obre un fitxer recent"
 
-#: ../plugins/file-loader/plugin.c:1242
+#: ../plugins/file-loader/plugin.c:1272
 msgid "Open recent files"
 msgstr "Obre fitxers recents"
 
-#: ../plugins/file-loader/plugin.c:1272
+#: ../plugins/file-loader/plugin.c:1302
 msgid "Open a file"
 msgstr "Obre un fitxer"
 
-#: ../plugins/file-loader/plugin.c:1381 ../plugins/file-loader/plugin.c:1383
+#: ../plugins/file-loader/plugin.c:1416 ../plugins/file-loader/plugin.c:1418
 #, c-format
 msgid "File not found"
 msgstr "No s'ha trobat el fitxer"
 
 #. %s is name of file that will be opened
-#: ../plugins/file-loader/plugin.c:1402
+#: ../plugins/file-loader/plugin.c:1437
 #, c-format
 msgid "Please select a plugin to open <b>%s</b>."
 msgstr "Seleccioneu un connector per a obrir <b>%s</b>."
 
-#: ../plugins/file-loader/plugin.c:1406
+#: ../plugins/file-loader/plugin.c:1441
 msgid "Open With"
 msgstr "Obre amb"
 
-#: ../plugins/file-manager/file-manager.glade.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>Filtre</b>"
-
-#: ../plugins/file-manager/file-manager.glade.h:2
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:2
-msgid "<b>Global</b>"
-msgstr "<b>Global</b>"
-
-#: ../plugins/file-manager/file-manager.glade.h:3
+#: ../plugins/file-manager/file-manager.ui.h:1
 msgid "Choose Directory to show if no project is open"
 msgstr "Escolliu el directori a mostrar si no hi ha cap projecte obert"
 
-#: ../plugins/file-manager/file-manager.glade.h:4
+#: ../plugins/file-manager/file-manager.ui.h:2
 msgid "Do not show backup files"
 msgstr "No mostris els fitxers de còpia de seguretat"
 
-#: ../plugins/file-manager/file-manager.glade.h:5
+#: ../plugins/file-manager/file-manager.ui.h:3
 msgid "Do not show binary files (.o, .la, etc.)"
 msgstr "No mostris els fitxers binaris (.o, .la, etc.)"
 
-#: ../plugins/file-manager/file-manager.glade.h:6
+#: ../plugins/file-manager/file-manager.ui.h:4
 msgid "Do not show hidden files"
 msgstr "No mostris els fitxers ocults"
 
-#: ../plugins/file-manager/file-manager.glade.h:7
+#: ../plugins/file-manager/file-manager.ui.h:5
 msgid "Do not show unversioned files"
 msgstr "No mostris els fitxers sense versió"
 
-#: ../plugins/file-manager/file-manager.glade.h:8
+#: ../plugins/file-manager/file-manager.ui.h:6
+msgid "Filter"
+msgstr "Filtre"
+
+#: ../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"
+
+#: ../plugins/file-manager/file-manager.ui.h:8
 msgid "Root directory if no project is open:"
 msgstr "Directori arrel si no hi ha cap projecte obert:"
 
-#: ../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 "S'està carregant..."
 
-#: ../plugins/file-manager/file-view.c:73
-msgid "Up-to-date"
-msgstr "Actualitzat"
-
 #: ../plugins/file-manager/file-view.c:510
 msgid "Filename"
 msgstr "Nom del fitxer"
 
 #: ../plugins/file-manager/file-view.c:590
-msgid "Base uri"
-msgstr "URI bàsic"
+#, fuzzy
+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"
 msgstr "URI del camí que s'ha mostrat més"
 
-#: ../plugins/file-manager/plugin.c:75
+#: ../plugins/file-manager/plugin.c:74
 msgid "_Rename"
 msgstr "Canvia el _nom"
 
-#: ../plugins/file-manager/plugin.c:75
+#: ../plugins/file-manager/plugin.c:74
 msgid "Rename file or directory"
 msgstr "Canvia el nom del fitxer o directori"
 
-#: ../plugins/file-manager/plugin.c:295
+#: ../plugins/file-manager/plugin.c:298
 msgid "File manager popup actions"
 msgstr "Accions emergents del gestor de fitxers"
 
 # Mozilla 1.3->sidebar.files.label
-#: ../plugins/file-manager/plugin.c:328
+#: ../plugins/file-manager/plugin.c:331
 msgid "Files"
 msgstr "Fitxers"
 
-#: ../plugins/file-manager/plugin.c:452 ../plugins/file-manager/plugin.c:461
+#: ../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 fitxers"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:1
-msgid "<b>File Information</b>"
-msgstr "<b>Informació del fitxer</b>"
-
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:3
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:1
 msgid "Add License Information"
 msgstr "Afegeix informació sobre la llicència"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
 msgid "Add to project"
 msgstr "Afegeix al projecte"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:5
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add to repository"
 msgstr "Afegeix al dipòsit"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
 msgid "Create corresponding header file"
 msgstr "Crea el fitxer de capçalera corresponent"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.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."
@@ -3585,80 +3740,74 @@ msgstr ""
 "Introduïu el nom del fitxer.\n"
 "Segons el tipus s'afegirà l'extensió."
 
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+#, fuzzy
+msgid "File Information"
+msgstr "<b>Informació del fitxer</b>"
+
 # Winrar 2.9->String:rarlng.dll
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:10
-#: ../plugins/git/anjuta-git.glade.h:66
-#: ../plugins/macro/anjuta-macro.glade.h:6
-#: ../plugins/tools/anjuta-tools.glade.h:7
+#: ../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 "Nom:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:11
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
 #: ../plugins/starter/starter.c:404
 msgid "New File"
 msgstr "Fitxer nou"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:12
-#: ../plugins/gbf-am/gbf-am-properties.c:1517
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:12
+#: ../plugins/gbf-am/gbf-am-properties.c:1524
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:350
 msgid "Type:"
 msgstr "Tipus:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:13
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:13
 msgid "Use Template for the Header file"
 msgstr "Utilitza la plantilla per al fitxer de capçalera"
 
-#: ../plugins/file-wizard/file.c:81
+#: ../plugins/file-wizard/file.c:83
 msgid "C Source File"
 msgstr "Fitxer de codi C"
 
-#: ../plugins/file-wizard/file.c:82
+#: ../plugins/file-wizard/file.c:84
 msgid "C/C++ Header File"
 msgstr "Fitxer de capçalera C/C++"
 
-#: ../plugins/file-wizard/file.c:83
+#: ../plugins/file-wizard/file.c:85
 msgid "C++ Source File"
 msgstr "Fitxer de codi C++"
 
-#: ../plugins/file-wizard/file.c:84
+#: ../plugins/file-wizard/file.c:86
 msgid "C# Source File"
 msgstr "Fitxer de codi C#"
 
-#: ../plugins/file-wizard/file.c:85
+#: ../plugins/file-wizard/file.c:87
 msgid "Java Source File"
 msgstr "Fitxer de codi Java"
 
-#: ../plugins/file-wizard/file.c:86
+#: ../plugins/file-wizard/file.c:88
 msgid "Perl Source File"
 msgstr "Fitxer de codi Perl"
 
-#: ../plugins/file-wizard/file.c:87
+#: ../plugins/file-wizard/file.c:89
 msgid "Python Source File"
 msgstr "Fitxer de codi Python"
 
-#: ../plugins/file-wizard/file.c:88
+#: ../plugins/file-wizard/file.c:90
 msgid "Shell Script File"
 msgstr "Fitxer d'script per al intèrpret d'ordres"
 
-#: ../plugins/file-wizard/file.c:89
+#: ../plugins/file-wizard/file.c:91
 msgid "Other"
 msgstr "Altres"
 
-#: ../plugins/file-wizard/file.c:100
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
-msgid "General Public License (GPL)"
-msgstr "Llicència pública general (GPL)"
-
-#: ../plugins/file-wizard/file.c:101
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
-msgid "Lesser General Public License (LGPL)"
-msgstr "Llicència pública general menor (LGPL)"
-
-#: ../plugins/file-wizard/file.c:102
+#: ../plugins/file-wizard/file.c:104
 msgid "BSD Public License"
 msgstr "Llicència Pública BSD"
 
-#: ../plugins/file-wizard/file.c:178
+#: ../plugins/file-wizard/file.c:182
 msgid "Unable to build user interface for New File"
 msgstr "No es pot muntar la interfície d'usuari per al fitxer nou"
 
@@ -3666,256 +3815,258 @@ msgstr "No es pot muntar la interfície d'usuari per al fitxer nou"
 msgid "Invalid GbfAmConfigValue type"
 msgstr "El tipus «GbfAmConfigValue» no és vàlid"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:1
-msgid "<b>Select Package to add:</b>"
-msgstr "<b>Seleccioneu el paquet a afegir:</b>"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:2
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
 msgid "Add _Package"
 msgstr "Afegeix el _paquet"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _module"
 msgstr "Afegeix el _mòdul"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:5
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4
 msgid "Packages"
 msgstr "Paquets"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:6
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+#, fuzzy
+msgid "Select Package to add:"
+msgstr "<b>Seleccioneu el paquet a afegir:</b>"
+
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
 msgid "Select package"
 msgstr "Seleccioneu el paquet"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:7
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:7
 msgid "Variables"
 msgstr "Variables"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2392
-#: ../plugins/gbf-am/gbf-am-project.c:2470
-#: ../plugins/gbf-am/gbf-am-project.c:2679
-#: ../plugins/gbf-am/gbf-am-project.c:2888
-#: ../plugins/gbf-am/gbf-am-project.c:3038
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2332
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2410
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2638
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2824
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2972
+#: ../plugins/gbf-am/gbf-am-project.c:2391
+#: ../plugins/gbf-am/gbf-am-project.c:2469
+#: ../plugins/gbf-am/gbf-am-project.c:2678
+#: ../plugins/gbf-am/gbf-am-project.c:2887
+#: ../plugins/gbf-am/gbf-am-project.c:3037
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2331
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2409
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2637
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2823
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2971
 msgid "Group doesn't exist"
 msgstr "No existeix el grup"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2412
-#: ../plugins/gbf-am/gbf-am-project.c:2515
-#: ../plugins/gbf-am/gbf-am-project.c:2931
-#: ../plugins/gbf-am/gbf-am-project.c:3153
-#: ../plugins/gbf-am/gbf-am-project.c:3373
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2352
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2455
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2867
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3047
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3233
+#: ../plugins/gbf-am/gbf-am-project.c:2411
+#: ../plugins/gbf-am/gbf-am-project.c:2514
+#: ../plugins/gbf-am/gbf-am-project.c:2930
+#: ../plugins/gbf-am/gbf-am-project.c:3152
+#: ../plugins/gbf-am/gbf-am-project.c:3372
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2351
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2454
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2866
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3046
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3232
 msgid "Target doesn't exist"
 msgstr "No existeix l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2446
-#: ../plugins/gbf-am/gbf-am-project.c:2490
-#: ../plugins/gbf-am/gbf-am-project.c:2533
-#: ../plugins/gbf-am/gbf-am-project.c:2849
-#: ../plugins/gbf-am/gbf-am-project.c:2909
-#: ../plugins/gbf-am/gbf-am-project.c:3113
-#: ../plugins/gbf-am/gbf-am-project.c:3174
-#: ../plugins/gbf-am/gbf-am-project.c:3476
-#: ../plugins/gbf-am/gbf-am-project.c:3537
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2386
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2430
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2473
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2785
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2845
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3008
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3068
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3300
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3361
+#: ../plugins/gbf-am/gbf-am-project.c:2445
+#: ../plugins/gbf-am/gbf-am-project.c:2489
+#: ../plugins/gbf-am/gbf-am-project.c:2532
+#: ../plugins/gbf-am/gbf-am-project.c:2848
+#: ../plugins/gbf-am/gbf-am-project.c:2908
+#: ../plugins/gbf-am/gbf-am-project.c:3112
+#: ../plugins/gbf-am/gbf-am-project.c:3173
+#: ../plugins/gbf-am/gbf-am-project.c:3475
+#: ../plugins/gbf-am/gbf-am-project.c:3536
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2385
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2429
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2472
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2784
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2844
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3007
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3067
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3299
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3360
 msgid "Unable to update project"
 msgstr "No s'ha pogut actualitzar el projecte"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2576
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2518
+#: ../plugins/gbf-am/gbf-am-project.c:2575
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2517
 msgid "Invalid or remote path (only local paths supported)"
 msgstr ""
 "El camí és remot o no és vàlid (només es poden fer servir camins locals)"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2584
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2539
+#: ../plugins/gbf-am/gbf-am-project.c:2583
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2538
 msgid "Project doesn't exist or invalid path"
 msgstr "No existeix el projecte o el camí no és vàlid"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2595
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2553
+#: ../plugins/gbf-am/gbf-am-project.c:2594
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2552
 msgid "Malformed project"
 msgstr "Projecte mal format"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2792
+#: ../plugins/gbf-am/gbf-am-project.c:2791
 msgid "Please specify group name"
 msgstr "Especifiqueu el nom del grup"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2806
+#: ../plugins/gbf-am/gbf-am-project.c:2805
 msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr ""
 "El nom del grup només pot contenir caràcters alfanumèrics i els caràcters "
 "«_», «-» o «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2815
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2751
+#: ../plugins/gbf-am/gbf-am-project.c:2814
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2750
 msgid "Parent group doesn't exist"
 msgstr "No existeix el grup pare"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2826
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2762
+#: ../plugins/gbf-am/gbf-am-project.c:2825
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2761
 msgid "Group already exists"
 msgstr "Ja existeix el grup"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2836
-#: ../plugins/gbf-am/gbf-am-project.c:2863
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2772
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2799
+#: ../plugins/gbf-am/gbf-am-project.c:2835
+#: ../plugins/gbf-am/gbf-am-project.c:2862
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2771
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2798
 msgid "Group couldn't be created"
 msgstr "No s'ha pogut crear el grup"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2896
+#: ../plugins/gbf-am/gbf-am-project.c:2895
 msgid "Group couldn't be removed"
 msgstr "No s'ha pogut eliminar el grup"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3046
+#: ../plugins/gbf-am/gbf-am-project.c:3045
 msgid "Please specify target name"
 msgstr "Especifiqueu el nom de l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3060
+#: ../plugins/gbf-am/gbf-am-project.c:3059
 msgid "Target name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr ""
 "L'objectiu només pot contenir caràcters alfanumèrics i els caràcters «_», «-» "
 "o «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3069
+#: ../plugins/gbf-am/gbf-am-project.c:3068
 msgid "Shared library target name must be of the form 'libxxx.la'"
 msgstr ""
 "El nom de la biblioteca compartida objectiu ha de ser de la forma «libxxx.la»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3078
+#: ../plugins/gbf-am/gbf-am-project.c:3077
 msgid "Static library target name must be of the form 'libxxx.a'"
 msgstr ""
 "El nom de la biblioteca estàtica objectiu ha de ser de la forma «libxxx.a»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3090
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2985
+#: ../plugins/gbf-am/gbf-am-project.c:3089
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2984
 msgid "Target already exists"
 msgstr "Ja existeix l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3100
+#: ../plugins/gbf-am/gbf-am-project.c:3099
 msgid "General failure in target creation"
 msgstr "Problema general en crear l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3128
+#: ../plugins/gbf-am/gbf-am-project.c:3127
 msgid "Newly created target could not be identified"
 msgstr "No s'ha pogut identificar l'objectiu que s'acaba de crear"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3161
+#: ../plugins/gbf-am/gbf-am-project.c:3160
 msgid "Target couldn't be removed"
 msgstr "No s'ha pogut suprimir l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3185
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3079
+#: ../plugins/gbf-am/gbf-am-project.c:3184
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3078
 msgid "Static Library"
 msgstr "Biblioteca estàtica"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3187
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3081
+#: ../plugins/gbf-am/gbf-am-project.c:3186
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3080
 msgid "Shared Library"
 msgstr "Biblioteca compartida"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3189
+#: ../plugins/gbf-am/gbf-am-project.c:3188
 msgid "Header Files"
 msgstr "Fitxers de capçalera"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3191
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3083
+#: ../plugins/gbf-am/gbf-am-project.c:3190
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3082
 msgid "Man Documentation"
 msgstr "Documentació man"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3193
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3085
+#: ../plugins/gbf-am/gbf-am-project.c:3192
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3084
 msgid "Miscellaneous Data"
 msgstr "Dades diverses"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3197
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3089
+#: ../plugins/gbf-am/gbf-am-project.c:3196
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3088
 msgid "Script"
 msgstr "Script"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3199
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3091
+#: ../plugins/gbf-am/gbf-am-project.c:3198
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3090
 msgid "Info Documentation"
 msgstr "Documentació info"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3201
+#: ../plugins/gbf-am/gbf-am-project.c:3200
 msgid "Java Module"
 msgstr "Mòdul de Java"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3203
+#: ../plugins/gbf-am/gbf-am-project.c:3202
 msgid "Python Module"
 msgstr "Mòdul de Python"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3261
-#: ../plugins/gbf-am/gbf-am-project.c:3514
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3143
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3338
+#: ../plugins/gbf-am/gbf-am-project.c:3260
+#: ../plugins/gbf-am/gbf-am-project.c:3513
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3142
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3337
 msgid "Source doesn't exist"
 msgstr "No existeix la font"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3364
+#: ../plugins/gbf-am/gbf-am-project.c:3363
 msgid ""
 "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr ""
 "El nom del fitxer font només pot contenir caràcters alfanumèrics i els "
 "caràcters «_», «-» o «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3441
+#: ../plugins/gbf-am/gbf-am-project.c:3440
 msgid "Source file is already in given target"
 msgstr "El fitxer font ja és a l'objectiu especificat"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3458
+#: ../plugins/gbf-am/gbf-am-project.c:3457
 msgid "General failure in adding source file"
 msgstr "S'ha produït un problema en afegir el fitxer font"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3491
+#: ../plugins/gbf-am/gbf-am-project.c:3490
 msgid "Newly added source file could not be identified"
 msgstr "No s'ha pogut identificar el fitxer font que s'acaba de crear"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3522
+#: ../plugins/gbf-am/gbf-am-project.c:3521
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
 msgid "Source couldn't be removed"
 msgstr "No s'ha pogut eliminar la font"
 
+#: ../plugins/gbf-am/gbf-am-project.c:3707
 #: ../plugins/gbf-am/gbf-am-project.c:3708
-#: ../plugins/gbf-am/gbf-am-project.c:3709
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3449
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3450
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3451
 msgid "Project directory"
 msgstr "Directori del projecte"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:342
-#: ../plugins/gbf-am/gbf-am-properties.c:394
+#: ../plugins/gbf-am/gbf-am-properties.c:341
+#: ../plugins/gbf-am/gbf-am-properties.c:393
 msgid "Enter new module"
 msgstr "Introduïu el mòdul nou"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:430
-#: ../plugins/gbf-am/gbf-am-properties.c:923
+#: ../plugins/gbf-am/gbf-am-properties.c:434
+#: ../plugins/gbf-am/gbf-am-properties.c:930
 msgid "Module/Packages"
 msgstr "Mòdul/paquets"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:437
-#: ../plugins/gbf-am/gbf-am-properties.c:932
+#: ../plugins/gbf-am/gbf-am-properties.c:441
+#: ../plugins/gbf-am/gbf-am-properties.c:939
 msgid "Version"
 msgstr "Versió"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:523
+#: ../plugins/gbf-am/gbf-am-properties.c:527
 #, c-format
 msgid ""
 "Are you sure you want to remove module \"%s\" and all its associated "
@@ -3923,208 +4074,182 @@ msgid ""
 msgstr ""
 "Segur que voleu suprimir el mòdul «%s» i tots els seus paquets associats?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:525
+#: ../plugins/gbf-am/gbf-am-properties.c:529
 #, c-format
 msgid "Are you sure you want to remove package \"%s\"?"
 msgstr "Segur que voleu suprimir el paquet «%s»?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:583
-#: ../plugins/gbf-am/gbf-am-properties.c:665
+#: ../plugins/gbf-am/gbf-am-properties.c:587
+#: ../plugins/gbf-am/gbf-am-properties.c:669
 msgid "Enter new variable"
 msgstr "Introduïu la variable nova"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:696
+#: ../plugins/gbf-am/gbf-am-properties.c:700
 #, c-format
 msgid "Are you sure you want to remove variable \"%s\"?"
 msgstr "Segur que voleu suprimir la variable «%s»?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:847
+#: ../plugins/gbf-am/gbf-am-properties.c:854
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:177
 msgid "Project:"
 msgstr "Projecte:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:850
+#: ../plugins/gbf-am/gbf-am-properties.c:857
 msgid "Package name:"
 msgstr "Nom del paquet:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:853
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
+#: ../plugins/gbf-am/gbf-am-properties.c:860
+#: ../plugins/project-wizard/templates/translatable-strings.h:102
 msgid "Version:"
 msgstr "Versió:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:856
-msgid "Url:"
+#: ../plugins/gbf-am/gbf-am-properties.c:863
+#, fuzzy
+msgid "URI:"
 msgstr "URL:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1222
+#: ../plugins/gbf-am/gbf-am-properties.c:1229
 msgid "Use"
 msgstr "Ã?s"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1314
+#: ../plugins/gbf-am/gbf-am-properties.c:1321
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:244
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1317
+#: ../plugins/gbf-am/gbf-am-properties.c:1324
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1322
-#: ../plugins/gbf-am/gbf-am-properties.c:1412
+#: ../plugins/gbf-am/gbf-am-properties.c:1329
+#: ../plugins/gbf-am/gbf-am-properties.c:1419
 msgid "C compiler flags:"
 msgstr "Indicadors del compilador de C:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-am/gbf-am-properties.c:1331
 msgid "C preprocessor flags:"
 msgstr "Indicadors del preprocessador de C:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1326
+#: ../plugins/gbf-am/gbf-am-properties.c:1333
 msgid "C++ compiler flags:"
 msgstr "Indicadors del compilador de C++:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1328
+#: ../plugins/gbf-am/gbf-am-properties.c:1335
 msgid "gcj compiler flags (ahead-of-time):"
 msgstr "Indicadors del compilador gcj (ahead-of-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1330
+#: ../plugins/gbf-am/gbf-am-properties.c:1337
 msgid "Java compiler flags (just-in-time):"
 msgstr "Indicadors del compilador de Java (just-in-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1332
-#: ../plugins/gbf-am/gbf-am-properties.c:1420
+#: ../plugins/gbf-am/gbf-am-properties.c:1339
+#: ../plugins/gbf-am/gbf-am-properties.c:1427
 msgid "Fortran compiler flags:"
 msgstr "Indicadors del compilador de Fortran:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1335
+#: ../plugins/gbf-am/gbf-am-properties.c:1342
 msgid "Includes (deprecated):"
 msgstr "Inclusions (obsolet):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1346
+#: ../plugins/gbf-am/gbf-am-properties.c:1353
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:258
 msgid "Install directories:"
 msgstr "Directoris d'instal·lació:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1414
+#: ../plugins/gbf-am/gbf-am-properties.c:1421
 msgid "C preprocessor flags"
 msgstr "Indicadors del preprocessador de C"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1416
+#: ../plugins/gbf-am/gbf-am-properties.c:1423
 msgid "C++ compiler flags"
 msgstr "Indicadors del compilador de C++"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1418
+#: ../plugins/gbf-am/gbf-am-properties.c:1425
 msgid "gcj compiler flags (ahead-of-time)"
 msgstr "Indicadors del compilador gcj (ahead-of-time)"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1424
+#: ../plugins/gbf-am/gbf-am-properties.c:1431
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:410
 msgid "Linker flags:"
 msgstr "Indicadors de l'enllaçador:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1430
+#: ../plugins/gbf-am/gbf-am-properties.c:1437
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:416
 msgid "Libraries:"
 msgstr "Biblioteques:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1436
+#: ../plugins/gbf-am/gbf-am-properties.c:1443
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:422
 msgid "Dependencies:"
 msgstr "Dependències:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1439
+#: ../plugins/gbf-am/gbf-am-properties.c:1446
 msgid "Advanced options"
 msgstr "Opcions avançades"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1514
+#: ../plugins/gbf-am/gbf-am-properties.c:1521
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:347
 msgid "Target name:"
 msgstr "Nom de l'objectiu:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1523
+#: ../plugins/gbf-am/gbf-am-properties.c:1530
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:356
 msgid "Group:"
 msgstr "Grup:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1541
-#: ../plugins/gbf-am/gbf-am-properties.c:1557
+#: ../plugins/gbf-am/gbf-am-properties.c:1548
 #: ../plugins/gbf-am/gbf-am-properties.c:1564
+#: ../plugins/gbf-am/gbf-am-properties.c:1571
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:374
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:391
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:398
 msgid "Install directory:"
 msgstr "Directori d'instal·lació:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1576
-msgid "Advanced..."
-msgstr "Avançat..."
+#: ../plugins/gbf-am/gbf-am-properties.c:1583
+#, fuzzy
+msgid "Advancedâ?¦"
+msgstr "Avançat"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
 msgid "Invalid GbfMkfileConfigValue type"
 msgstr "El tipus «GbfMkfileConfigValue» no és vàlid"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2525
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2524
 msgid "Project doesn't exist"
 msgstr "No existeix el projecte"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2832
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2831
 msgid "Group coudn't be removed"
 msgstr "No s'ha pogut suprimir el grup"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2995
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3022
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2994
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3021
 msgid "Target couldn't be created"
 msgstr "No s'ha pogut crear l'objectiu"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3055
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3054
 msgid "Target coudn't be removed"
 msgstr "No s'ha pogut suprimir l'objectiu"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3253
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3252
 msgid "Source file must be inside the project directory"
 msgstr "El fitxer font ha de ser dins del directori del projecte"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3265
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3264
 msgid "Source is already in target"
 msgstr "La font ja és a l'objectiu"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3282
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3314
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3281
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3313
 msgid "Source couldn't be added"
 msgstr "No s'ha pogut afegir la font"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3346
-msgid "Source coudn't be removed"
-msgstr "No s'ha pogut suprimir la font"
-
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
 msgid "Includes:"
 msgstr "Inclusions:"
 
-#: ../plugins/gdb/anjuta-gdb.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:6
-msgid "Command Line Parameters"
-msgstr "Paràmetres de la línia d'ordres"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:12
-msgid "Enter a Hexa adress or select one in the data"
-msgstr "Introduïu una adreça en hexadecimal o seleccioneu-ne una en les dades"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:13
-msgid "Execute Program"
-msgstr "Executa el programa"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:22
-msgid "Run in Terminal"
-msgstr "Executa en un terminal"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:35
-msgid "_Pass:"
-msgstr "_Passa:"
-
 #. The %s argument is a program name, anjuta by example
 #: ../plugins/gdb/debugger.c:691
 #, c-format
@@ -4149,7 +4274,8 @@ msgstr ""
 "Assegureu-vos que l'Anjuta està instal·lat correctament."
 
 #: ../plugins/gdb/debugger.c:933
-msgid "Getting ready to start debugging session...\n"
+#, fuzzy
+msgid "Getting ready to start debugging sessionâ?¦\n"
 msgstr "S'està preparant l'inici de la sessió de depuració...\n"
 
 #: ../plugins/gdb/debugger.c:939
@@ -4228,8 +4354,8 @@ msgid "Program attached\n"
 msgstr "S'ha adjuntat el programa \n"
 
 #: ../plugins/gdb/debugger.c:1970
-#, c-format
-msgid "Attaching to process: %d...\n"
+#, fuzzy, c-format
+msgid "Attaching to process: %dâ?¦\n"
 msgstr "S'està adjuntant al procés: %d...\n"
 
 #: ../plugins/gdb/debugger.c:1996
@@ -4253,8 +4379,8 @@ msgid "Program detached\n"
 msgstr "El programa s'ha separat\n"
 
 #: ../plugins/gdb/debugger.c:2098
-#, c-format
-msgid "Detaching the process...\n"
+#, fuzzy, c-format
+msgid "Detaching the processâ?¦\n"
 msgstr "S'està separant el procés...\n"
 
 #: ../plugins/gdb/debugger.c:2119
@@ -4271,9 +4397,9 @@ msgid "Error whilst signaling the process."
 msgstr "Hi ha hagut un error en enviar el senyal al procés."
 
 #: ../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."
+"Failed to create FIFO file named %s. The program will run without a terminal."
 msgstr ""
 "No s'ha pogut crear el fitxer FIFO anomenat %s. S'executarà el programa "
 "sense terminal."
@@ -4282,363 +4408,489 @@ msgstr ""
 msgid "Cannot start terminal for debugging."
 msgstr "No es pot iniciar el terminal per a depurar."
 
-#: ../plugins/git/anjuta-git.glade.h:1
-msgid "<b>Bad revision:</b>"
-msgstr "<b>Revisió dolenta:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:2
-msgid "<b>Branch name:</b>"
-msgstr "<b>Nom de la branca:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:3
-msgid "<b>Branch to delete:</b>"
-msgstr "<b>Branca a suprimir:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:4
-msgid "<b>Branch to switch to:</b>"
-msgstr "<b>Branca on commutar:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:5
-msgid "<b>Branch:</b>"
-msgstr "<b>Branca:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:6
-#: ../plugins/subversion/anjuta-subversion.glade.h:2
-msgid "<b>Changes:</b>"
-msgstr "<b>Canvis:</b>"
-
-# Netscape_4.7->String:RESDLL.DLL
-#: ../plugins/git/anjuta-git.glade.h:7
-msgid "<b>Commit to revert:</b>"
-msgstr "<b>Publicació a desfer:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:8
-msgid "<b>Filters</b>"
-msgstr "<b>Filtres</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:9
-msgid "<b>Folder to create patches in:</b>"
-msgstr "<b>Carpeta on crear els pedaços:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:10
-msgid "<b>Generate patches relative to:</b>"
-msgstr "<b>Genera pedaços relatius a:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:11
-msgid "<b>Good revision:</b>"
-msgstr "<b>Revisió bona:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:12
-#: ../plugins/subversion/anjuta-subversion.glade.h:7
-msgid "<b>Log Message:</b>"
-msgstr "<b>Missatge de registre:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:13
-msgid "<b>Log message:</b>"
-msgstr "<b>Missatge de registre:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:14
-msgid "<b>Mode:</b>"
-msgstr "<b>Mode:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:16
-msgid "<b>Remote branch to rebase from:</b>"
-msgstr "<b>Branca remota a utilitzar com a base:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:17
-msgid "<b>Remote to delete:</b>"
-msgstr "<b>Ubicació remota a suprimir:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:18
-msgid "<b>Repository to pull from:</b>"
-msgstr "<b>Dipòsit des d'on estirar:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:19
-#, fuzzy
-msgid "<b>Repository to push to:</b>"
-msgstr "<b>Dipòsit des d'on estirar:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:20
-msgid "<b>Reset to:</b>"
-msgstr "<b>Reinicia a:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:21
-#: ../plugins/subversion/anjuta-subversion.glade.h:10
-msgid "<b>Revision:</b>"
-msgstr "<b>Revisió:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:22
-msgid "<b>Select Files to Check Out:</b>"
-msgstr "<b>Seleccioneu els fitxers a obtenir:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:23
-#: ../plugins/subversion/anjuta-subversion.glade.h:13
-msgid "<b>Select Files to Commit:</b>"
-msgstr "<b>Seleccioneu els fitxers a publicar:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:24
-msgid "<b>Select Files to Ignore:</b>"
-msgstr "<b>Seleccioneu els fitxers a ignorar:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:25
-#: ../plugins/subversion/anjuta-subversion.glade.h:14
-msgid "<b>Select Files to Mark as Resolved:</b>"
-msgstr "<b>Seleccioneu els fitxers a marcar com a resolts:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:26
-msgid "<b>Select Files to Unstage:</b>"
-msgstr "<b>Seleccioneu els fitxers a treure de l'índex:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:27
-msgid "<b>Select file to add:</b>"
-msgstr "<b>Seleccioneu el fitxer a afegir:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:28
-msgid "<b>Select file to remove:</b>"
-msgstr "<b>Seleccioneu el fitxer a suprimir:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:29
-msgid "<b>Tag name:</b>"
-msgstr "<b>Nom de l'etiqueta:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:30
-msgid "<b>URL:</b>"
-msgstr "<b>URL:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:31
-#: ../plugins/subversion/anjuta-subversion.glade.h:18
-msgid "<b>View the Log for File/Folder:</b>"
-msgstr "<b>Visualitza el registre per al fitxer/carpeta:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:32
+#: ../plugins/git/anjuta-git.ui.h:1
 msgid "Add File"
 msgstr "Afegeix un fitxer"
 
-#: ../plugins/git/anjuta-git.glade.h:33
+#: ../plugins/git/anjuta-git.ui.h:2
 msgid "Add Remote Branch"
 msgstr "Afegeix una branca 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.glade.h:35
-msgid "Add signed off by line"
+#: ../plugins/git/anjuta-git.ui.h:4
+#, fuzzy
+msgid "Add signed-off-by line"
 msgstr "Afegeix l'assignació per línia"
 
-#: ../plugins/git/anjuta-git.glade.h:36
+#: ../plugins/git/anjuta-git.ui.h:5
+msgid "Amend the previous commit"
+msgstr "Corregeix la publicació anterior"
+
+#: ../plugins/git/anjuta-git.ui.h:6
 msgid "Annotate this tag"
 msgstr "Anota aquesta 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.glade.h:38
+#: ../plugins/git/anjuta-git.ui.h:8
 msgid "Append fetch data"
 msgstr "Afegeix les dades de recollida"
 
+#: ../plugins/git/anjuta-git.ui.h:9
+msgid "Apply Stash"
+msgstr "Aplica el desat temporal"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
+msgid "Apply mailbox files"
+msgstr "Aplica els fitxers de bústia de correu"
+
+#: ../plugins/git/anjuta-git.ui.h:11
+msgid "Apply the selected stash"
+msgstr "Aplica el desat temporal seleccionat"
+
 #. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
-#: ../plugins/git/anjuta-git.glade.h:40
+#: ../plugins/git/anjuta-git.ui.h:13
 msgid "Author/Grep"
 msgstr "Autor/Grep"
 
-#: ../plugins/git/anjuta-git.glade.h:41
+#: ../plugins/git/anjuta-git.ui.h:14
 #: ../plugins/project-wizard/templates/translatable-strings.h:24
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../plugins/git/anjuta-git.glade.h:42
-msgid "Branch must be fully merged"
-msgstr "La branca s'ha de combinar completament"
+#: ../plugins/git/anjuta-git.ui.h:15
+msgid "Bad revision:"
+msgstr "Revisió errònia:"
+
+#: ../plugins/git/anjuta-git.ui.h:16
+msgid "Branch name:"
+msgstr "Nom de la branca:"
+
+#: ../plugins/git/anjuta-git.ui.h:17
+msgid "Branch to switch to:"
+msgstr "Branca on commutar:"
+
+#: ../plugins/git/anjuta-git.ui.h:18
+msgid "Branch:"
+msgstr "Branca:"
+
+#: ../plugins/git/anjuta-git.ui.h:19
+msgid "Branches"
+msgstr "Branques"
 
-#: ../plugins/git/anjuta-git.glade.h:43
+#: ../plugins/git/anjuta-git.ui.h:20
+msgid "Branches must be fully merged"
+msgstr "Les branques s'han d'haver combinat completament"
+
+#: ../plugins/git/anjuta-git.ui.h:21
+msgid "Branches to delete:"
+msgstr "Branques a suprimir:"
+
+#: ../plugins/git/anjuta-git.ui.h:23
+#: ../plugins/subversion/anjuta-subversion.ui.h:4
+msgid "Changes:"
+msgstr "Canvis:"
+
+#: ../plugins/git/anjuta-git.ui.h:24
 msgid "Check Out Files"
 msgstr "Obté els fitxers"
 
-#: ../plugins/git/anjuta-git.glade.h:44
+#: ../plugins/git/anjuta-git.ui.h:25
+msgid "Check out all local changes"
+msgstr "Obtén tots els canvis locals"
+
+#: ../plugins/git/anjuta-git.ui.h:26
 msgid "Check out the branch after it is created"
 msgstr "Obté la branca després de crear-la"
 
-#: ../plugins/git/anjuta-git.glade.h:45
-#: ../plugins/subversion/anjuta-subversion.glade.h:24
+#: ../plugins/git/anjuta-git.ui.h:27
+msgid "Cherry Pick"
+msgstr "Cherry Pick"
+
+#: ../plugins/git/anjuta-git.ui.h:28
+msgid "Clear all stashes"
+msgstr "Neteja tots els desats temporals"
+
+#: ../plugins/git/anjuta-git.ui.h:29
+msgid "Column 1"
+msgstr "Columna 1"
+
+#: ../plugins/git/anjuta-git.ui.h:30
+#: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "Publica els canvis"
 
-#: ../plugins/git/anjuta-git.glade.h:46
+# FIXME: s'hauria de trobar una traducció per a fast-forward (dpm) - combinacions d'avançament ràpid (tot i que no acaba d'abarcar el sentit de l'operació)?
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Commit on fast-forward merges"
-msgstr "Pública en combinacions ràpides"
+msgstr "Publica en fer combinacions fast-forward"
+
+# FIXME: s'hauria de trobar una traducció per a cherry-pick (dpm)
+#: ../plugins/git/anjuta-git.ui.h:32
+msgid "Commit to Cherry Pick:"
+msgstr "Publica al Cherry Pick:"
+
+# Netscape_4.7->String:RESDLL.DLL
+#: ../plugins/git/anjuta-git.ui.h:33
+msgid "Commit to revert:"
+msgstr "Publicació a desfer:"
 
-#: ../plugins/git/anjuta-git.glade.h:47
+#: ../plugins/git/anjuta-git.ui.h:34
 msgid "Create Branch"
 msgstr "Crea una branca"
 
-#: ../plugins/git/anjuta-git.glade.h:48
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Create Tag"
 msgstr "Crea una etiqueta"
 
-#: ../plugins/git/anjuta-git.glade.h:49
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Create patch series"
 msgstr "Crea una sèrie de pedaços"
 
-#: ../plugins/git/anjuta-git.glade.h:50 ../plugins/git/git-log-dialog.c:188
+#: ../plugins/git/anjuta-git.ui.h:37 ../plugins/git/git-log-dialog.c:189
 #: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/git/anjuta-git.glade.h:51
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Delete Branch"
 msgstr "Suprimeix la branca"
 
-#: ../plugins/git/anjuta-git.glade.h:52
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Delete Remote Branch"
 msgstr "Suprimeix la branca remota"
 
-#: ../plugins/git/anjuta-git.glade.h:53
+#: ../plugins/git/anjuta-git.ui.h:40
+msgid "Delete Tags"
+msgstr "Suprimeix les etiquetes"
+
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "No publiquis"
 
-#: ../plugins/git/anjuta-git.glade.h:54
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "Do not follow tags"
 msgstr "No segueixis les etiquetes"
 
-#: ../plugins/git/anjuta-git.glade.h:55
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:43
+msgid "Drop the selected stash"
+msgstr "Descarta el desat temporal seleccionat"
+
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "E-mail:"
-msgstr "Correu electrònic de l'autor:"
+msgstr "Correu electrònic:"
 
-#: ../plugins/git/anjuta-git.glade.h:56
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Fetch remote branches after creation"
 msgstr "Recull les branques remotes després de crear-les"
 
-#: ../plugins/git/anjuta-git.glade.h:57
-#: ../plugins/subversion/anjuta-subversion.glade.h:32
+#: ../plugins/git/anjuta-git.ui.h:46
+msgid "Filters"
+msgstr "Filtres"
+
+#: ../plugins/git/anjuta-git.ui.h:47
+msgid "Folder to create patches in:"
+msgstr "Carpeta on crear els pedaços:"
+
+#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "Força"
 
-#: ../plugins/git/anjuta-git.glade.h:59
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "From:"
 msgstr "Des de:"
 
-#: ../plugins/git/anjuta-git.glade.h:60
+#: ../plugins/git/anjuta-git.ui.h:51
+msgid "Generate patches relative to:"
+msgstr "Genera pedaços relatius a:"
+
+#: ../plugins/git/anjuta-git.ui.h:52
+msgid "Good revision:"
+msgstr "Revisió bona:"
+
+#: ../plugins/git/anjuta-git.ui.h:53
 msgid "Grep:"
 msgstr "Grep:"
 
-#: ../plugins/git/anjuta-git.glade.h:61
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Hard"
 msgstr "Dur"
 
-#: ../plugins/git/anjuta-git.glade.h:62
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Head"
 msgstr "Cap"
 
-#: ../plugins/git/anjuta-git.glade.h:63
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Ignore Files"
 msgstr "Fitxers ignorats"
 
-#: ../plugins/git/anjuta-git.glade.h:64
+#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/subversion/anjuta-subversion.ui.h:21
+msgid "Log Message:"
+msgstr "Missatge de registre:"
+
+#: ../plugins/git/anjuta-git.ui.h:60
+msgid "Mailbox file containing patches:"
+msgstr "Fitxer de bústia de correu que conté els pedaços:"
+
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Merge"
 msgstr "Combina"
 
-#: ../plugins/git/anjuta-git.glade.h:65
+#: ../plugins/git/anjuta-git.ui.h:62
 msgid "Mixed"
 msgstr "Barrejat"
 
-#: ../plugins/git/anjuta-git.glade.h:67
+#: ../plugins/git/anjuta-git.ui.h:63
+msgid "Mode:"
+msgstr "Mode:"
+
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Previous commit"
 msgstr "Publicació anterior"
 
-#: ../plugins/git/anjuta-git.glade.h:68
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Pull"
 msgstr "Estira"
 
-#: ../plugins/git/anjuta-git.glade.h:69
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Push"
-msgstr "Aixafar"
+msgstr "Empeny"
 
-#: ../plugins/git/anjuta-git.glade.h:70
-msgid "Push all refs"
-msgstr ""
+#: ../plugins/git/anjuta-git.ui.h:70
+msgid "Push all branches and tags"
+msgstr "Empeny totes les branques i etiquetes"
 
-#: ../plugins/git/anjuta-git.glade.h:71
-msgid "Push tags"
-msgstr ""
+#: ../plugins/git/anjuta-git.ui.h:71
+msgid "Push all tags"
+msgstr "Empeny totes les etiquetes"
 
-#: ../plugins/git/anjuta-git.glade.h:72
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Rebase"
 msgstr "Ajusta a la base"
 
-#: ../plugins/git/anjuta-git.glade.h:73
+#: ../plugins/git/anjuta-git.ui.h:73
+msgid "Remote"
+msgstr "Remota"
+
+#: ../plugins/git/anjuta-git.ui.h:74
+msgid "Remote branch to rebase from:"
+msgstr "Branca remota a utilitzar com a base:"
+
+#: ../plugins/git/anjuta-git.ui.h:75
+msgid "Remote to delete:"
+msgstr "Ubicació remota a suprimir:"
+
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Remove File"
 msgstr "Suprimeix un fitxer"
 
-#: ../plugins/git/anjuta-git.glade.h:74
+#: ../plugins/git/anjuta-git.ui.h:77
+msgid "Repository origin"
+msgstr "Origen del dipòsit"
+
+#: ../plugins/git/anjuta-git.ui.h:78
+msgid "Repository to pull from:"
+msgstr "Dipòsit des d'on estirar:"
+
+#: ../plugins/git/anjuta-git.ui.h:79
+msgid "Repository to push to:"
+msgstr "Dipòsit on empènyer:"
+
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Reset Tree"
 msgstr "Reinicia l'arbre"
 
-#: ../plugins/git/anjuta-git.glade.h:75
-#: ../plugins/subversion/anjuta-subversion.glade.h:44
-msgid "Retrieving status..."
+#: ../plugins/git/anjuta-git.ui.h:81
+msgid "Reset to:"
+msgstr "Reinicia a:"
+
+#: ../plugins/git/anjuta-git.ui.h:82
+msgid "Restore index"
+msgstr "Restaura l'arbre"
+
+#: ../plugins/git/anjuta-git.ui.h:83
+#: ../plugins/subversion/anjuta-subversion.ui.h:35
+#, fuzzy
+msgid "Retrieving statusâ?¦"
 msgstr "S'està obtenint l'estat..."
 
-#: ../plugins/git/anjuta-git.glade.h:76
+#: ../plugins/git/anjuta-git.ui.h:84
 msgid "Revert Commit"
 msgstr "Desfés la publicació"
 
-#: ../plugins/git/anjuta-git.glade.h:77
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revision/Tag:"
 msgstr "Revisió/etiqueta:"
 
-#: ../plugins/git/anjuta-git.glade.h:79
-msgid "Select A Folder"
-msgstr "Selecciona una carpeta"
+#: ../plugins/git/anjuta-git.ui.h:87
+msgid "Select Files to Check Out:"
+msgstr "Seleccioneu els fitxers a obtenir:"
+
+#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
+msgid "Select Files to Commit:"
+msgstr "Seleccioneu els fitxers a publicar:"
+
+#: ../plugins/git/anjuta-git.ui.h:89
+msgid "Select Files to Ignore:"
+msgstr "Seleccioneu els fitxers a ignorar:"
+
+#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
+msgid "Select Files to Mark as Resolved:"
+msgstr "Seleccioneu els fitxers a marcar com a resolts:"
+
+#: ../plugins/git/anjuta-git.ui.h:91
+msgid "Select Files to Unstage:"
+msgstr "Seleccioneu els fitxers a treure de l'índex:"
+
+#: ../plugins/git/anjuta-git.ui.h:92
+msgid "Select Mailbox File"
+msgstr "Seleccioneu el fitxer de bústia de correu"
+
+#: ../plugins/git/anjuta-git.ui.h:93
+#, fuzzy
+msgid "Select a Folder"
+msgstr "Seleccioneu una carpeta"
 
-#: ../plugins/git/anjuta-git.glade.h:80
-#: ../plugins/subversion/anjuta-subversion.glade.h:48
+#: ../plugins/git/anjuta-git.ui.h:94
+msgid "Select file to add:"
+msgstr "Seleccioneu el fitxer a afegir:"
+
+#: ../plugins/git/anjuta-git.ui.h:95
+msgid "Select file to remove:"
+msgstr "Seleccioneu el fitxer a suprimir:"
+
+#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
 msgid "Set Conflicts as Resolved"
 msgstr "Estableix els conflictes com a resolts"
 
-#: ../plugins/git/anjuta-git.glade.h:81
+#: ../plugins/git/anjuta-git.ui.h:97
+msgid "Show source revision in log message"
+msgstr "Mostra la revisió de la font al missatge de registre"
+
+#: ../plugins/git/anjuta-git.ui.h:98
+msgid "Show the contents of the selected stash in an editor"
+msgstr "Mostra el contingut del desat temporal seleccionat en un editor"
+
+#: ../plugins/git/anjuta-git.ui.h:99
+msgid "Sign this tag"
+msgstr "Signa aquesta etiqueta"
+
+#: ../plugins/git/anjuta-git.ui.h:100
 msgid "Soft"
 msgstr "Tou"
 
-#: ../plugins/git/anjuta-git.glade.h:82
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Squash"
 msgstr "Aixafar"
 
-#: ../plugins/git/anjuta-git.glade.h:83
+#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
+msgid "Stash"
+msgstr "Desa temporalment"
+
+#: ../plugins/git/anjuta-git.ui.h:103
+#, fuzzy
+msgid "Stash Message (Optional)"
+msgstr "<b>Missatge del desat temporal (opcional)</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:104
+msgid "Stash Uncommitted Changes"
+msgstr "Desa temporalment els canvis no publicats"
+
+#: ../plugins/git/anjuta-git.ui.h:105
+msgid "Stash indexed changes"
+msgstr "Desa temporalment els canvis indexats"
+
+#: ../plugins/git/anjuta-git.ui.h:106
+msgid "Stash the working tree's uncommitted changes"
+msgstr "Desa temporalment els canvis no publicats de l'arbre de treball"
+
+#: ../plugins/git/anjuta-git.ui.h:107
+#, fuzzy
+msgid "Stash to Apply"
+msgstr "<b>Desat temporal a aplicar</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:108
 msgid "Switch to Another Branch"
 msgstr "Commuta a una altra branca"
 
-#: ../plugins/git/anjuta-git.glade.h:84
+#: ../plugins/git/anjuta-git.ui.h:109
+msgid "Tag name:"
+msgstr "Nom de l'etiqueta:"
+
+#: ../plugins/git/anjuta-git.ui.h:110
 msgid "Tag/Commit"
 msgstr "Etiqueta/publicació"
 
-#: ../plugins/git/anjuta-git.glade.h:85
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+msgid "Tags"
+msgstr "Etiquetes"
+
+#: ../plugins/git/anjuta-git.ui.h:112
+msgid "Tags to delete:"
+msgstr "Etiquetes a suprimir:"
+
+#: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "Aquesta publicació finalitza una combinació fallida (utilitzeu -i)"
 
-#: ../plugins/git/anjuta-git.glade.h:87
+#: ../plugins/git/anjuta-git.ui.h:115
 msgid "To:"
 msgstr "A:"
 
-#: ../plugins/git/anjuta-git.glade.h:88
+#: ../plugins/git/anjuta-git.ui.h:116
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/git/anjuta-git.ui.h:117
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/git/anjuta-git.ui.h:118
 msgid "Unstage Files"
 msgstr "Treu fitxers de l'índex"
 
-#: ../plugins/git/anjuta-git.glade.h:89
+#: ../plugins/git/anjuta-git.ui.h:119
 msgid "Use a custom log message"
 msgstr "Utilitzeu un missatge de registre personalitzat"
 
-#: ../plugins/git/anjuta-git.glade.h:90
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:120
 msgid "Use custom author information:"
-msgstr "Autorització del dipòsit"
+msgstr "Utilitza informació personalitzada de l'autor:"
 
-#: ../plugins/git/anjuta-git.glade.h:91
+#: ../plugins/git/anjuta-git.ui.h:121
 msgid "View log"
 msgstr "Visualitza el registre"
 
+#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
+msgid "View the Log for File/Folder:"
+msgstr "Visualitza el registre per al fitxer/la carpeta:"
+
+#: ../plugins/git/anjuta-git.ui.h:124
+msgid "page 1"
+msgstr "pàgina 1"
+
+#: ../plugins/git/anjuta-git.ui.h:125
+msgid "page 2"
+msgstr "pàgina 2"
+
+#: ../plugins/git/anjuta-git.ui.h:126
+msgid "page 3"
+msgstr "pàgina 3"
+
 #: ../plugins/git/git-add-dialog.c:36
 msgid "Git: File staged for add."
 msgstr "Git: Fitxer desmuntat a afegir."
 
-#: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:62
+#: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:63
 msgid "Please select a file."
 msgstr "Seleccioneu un fitxer."
 
@@ -4648,7 +4900,7 @@ msgid "Git: Added remote branch \"%s\"."
 msgstr "Git: s'ha afegit la branca remota «%s»."
 
 #: ../plugins/git/git-add-remote-dialog.c:81
-#: ../plugins/git/git-create-branch-dialog.c:98
+#: ../plugins/git/git-create-branch-dialog.c:117
 msgid "Please enter a branch name."
 msgstr "Introduïu un nom de branca."
 
@@ -4658,12 +4910,18 @@ msgstr "Introduïu un URL."
 
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetching..."
+#, fuzzy
+msgid "Git: Fetchingâ?¦"
 msgstr "Git: s'està recollint..."
 
+#: ../plugins/git/git-apply-mailbox-dialog.c:45
+msgid "Please select a mailbox file."
+msgstr "Seleccioneu un fitxer de bústia de correu."
+
 #: ../plugins/git/git-bisect-dialog.c:54
-#: ../plugins/git/git-create-branch-dialog.c:89
-#: ../plugins/git/git-create-tag-dialog.c:99
+#: ../plugins/git/git-cherry-pick-dialog.c:52
+#: ../plugins/git/git-create-branch-dialog.c:99
+#: ../plugins/git/git-create-tag-dialog.c:102
 #: ../plugins/git/git-reset-dialog.c:57 ../plugins/git/git-revert-dialog.c:46
 #: ../plugins/subversion/subversion-copy-dialog.c:207
 #: ../plugins/subversion/subversion-switch-dialog.c:122
@@ -4682,15 +4940,13 @@ msgstr "Git: s'ha obtingut els fitxers."
 msgid "Git: Commit complete."
 msgstr "Git: s'ha completat la publicació."
 
-#: ../plugins/git/git-commit-dialog.c:100
-#, fuzzy
+#: ../plugins/git/git-commit-dialog.c:105
 msgid "Please enter the commit author's name."
-msgstr "Introduïu el primer camí."
+msgstr "Introduïu el nom de l'autor de la publicació."
 
-#: ../plugins/git/git-commit-dialog.c:110
-#, fuzzy
+#: ../plugins/git/git-commit-dialog.c:115
 msgid "Please enter the commit author's e-mail address."
-msgstr "Introduïu el primer camí."
+msgstr "Introduïu l'adreça de correu electrònic de l'autor de la publicació."
 
 #: ../plugins/git/git-create-branch-dialog.c:41
 #, c-format
@@ -4702,37 +4958,45 @@ msgstr "Git: s'ha creat la branca «%s»."
 msgid "Git: Created tag \"%s\"."
 msgstr "Git: s'ha creat l'etiqueta «%s»."
 
-#: ../plugins/git/git-create-tag-dialog.c:108
+#: ../plugins/git/git-create-tag-dialog.c:111
 msgid "Please enter a tag name."
 msgstr "Introduïu un nom d'etiqueta."
 
-#: ../plugins/git/git-delete-branch-dialog.c:41
-#, c-format
-msgid "Git: Deleted branch \"%s\"."
-msgstr "Git: s'ha suprimit la branca «%s»."
+#: ../plugins/git/git-delete-branch-dialog.c:37
+msgid "Git: Deleted selected branches."
+msgstr "Git: s'han suprimit les branques seleccionades."
+
+#: ../plugins/git/git-delete-branch-dialog.c:106
+msgid "Please select branches to delete"
+msgstr "Seleccioneu les branques a suprimir"
+
+#: ../plugins/git/git-delete-tag-dialog.c:37
+msgid "Git: Deleted selected tags."
+msgstr "Git: s'han suprimit les etiquetes seleccionades."
 
 #: ../plugins/git/git-fetch-dialog.c:40
 msgid "Git: Fetch complete."
 msgstr "Git: s'ha completat la recollida."
 
-#: ../plugins/git/git-log-dialog.c:151
+#: ../plugins/git/git-log-dialog.c:152
 msgid "Graph"
 msgstr "Graf"
 
-#: ../plugins/git/git-log-dialog.c:166
+#: ../plugins/git/git-log-dialog.c:167
 msgid "Short log"
 msgstr "Registre curt"
 
-#: ../plugins/git/git-log-dialog.c:177
+#: ../plugins/git/git-log-dialog.c:178
 #: ../plugins/subversion/subversion-log-dialog.c:132
 msgid "Author"
 msgstr "Autor"
 
-#: ../plugins/git/git-log-dialog.c:305
-msgid "Git: Retrieving log..."
+#: ../plugins/git/git-log-dialog.c:317
+#, fuzzy
+msgid "Git: Retrieving logâ?¦"
 msgstr "Git: s'està obtenint el registre..."
 
-#: ../plugins/git/git-log-dialog.c:344
+#: ../plugins/git/git-log-dialog.c:360
 #: ../plugins/subversion/subversion-add-dialog.c:65
 #: ../plugins/subversion/subversion-diff-dialog.c:116
 #: ../plugins/subversion/subversion-remove-dialog.c:98
@@ -4740,21 +5004,32 @@ msgstr "Git: s'està obtenint el registre..."
 msgid "Please enter a path."
 msgstr "Introduïu un camí."
 
-#: ../plugins/git/git-log-dialog.c:505
+# source\euro\euro.src string MESSAGES+2
+# Projecte_Open_Office_1.1 [wizards.po]
+#: ../plugins/git/git-log-dialog.c:399
+msgid "Select a file"
+msgstr "Seleccioneu un fitxer"
+
+#: ../plugins/git/git-log-dialog.c:546
 #, c-format
 msgid "<b>Branch:</b> %s"
 msgstr "<b>Branca:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:510
+#: ../plugins/git/git-log-dialog.c:551
 #, c-format
 msgid "<b>Tag:</b> %s"
 msgstr "<b>Etiqueta:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:515
+#: ../plugins/git/git-log-dialog.c:556
 #, c-format
 msgid "<b>Remote:</b> %s"
 msgstr "<b>Ubicació remota:</b> %s"
 
+#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:674
+#: ../plugins/git/plugin.c:867
+msgid "Branch"
+msgstr "Branca"
+
 #: ../plugins/git/git-merge-dialog.c:36
 msgid "Git: Merge complete."
 msgstr "Git: s'ha completat la combinació."
@@ -4763,11 +5038,36 @@ msgstr "Git: s'ha completat la combinació."
 msgid "Git: Pull complete."
 msgstr "Git: s'ha completat l'estirada."
 
-#: ../plugins/git/git-pull-dialog.c:77
+#. The "input widget" is the widget that should receive focus if the
+#. * user does not properly enter anything
+#: ../plugins/git/git-pull-dialog.c:124
+msgid "Please select a remote to pull from."
+msgstr "Introduïu la ubicació remota des d'on estirar."
+
+#: ../plugins/git/git-pull-dialog.c:142
 msgid "Please enter the URL of the repository to pull from."
 msgstr "Introduïu l'URL del dipòsit des d'on estirar."
 
-#: ../plugins/git/git-rebase-dialog.c:49
+#: ../plugins/git/git-push-dialog.c:36
+msgid "Git: Push complete."
+msgstr "Git: s'ha completat l'empenta."
+
+#. The "input widget" is the widget that should receive focus if the
+#. * user does not properly enter anything
+#: ../plugins/git/git-push-dialog.c:141
+msgid "Please select a remote to push to."
+msgstr "Seleccioneu una ubicació remota on empènyer."
+
+#: ../plugins/git/git-push-dialog.c:159
+msgid "Please enter the URL of the repository to push to."
+msgstr "Introduïu l'URL del dipòsit on empènyer."
+
+#: ../plugins/git/git-push-dialog.c:193
+#, fuzzy
+msgid "Git: Pushingâ?¦"
+msgstr "Git: s'està empenyent..."
+
+#: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
 msgstr "Git: s'està ajustant a la base"
 
@@ -4779,264 +5079,722 @@ msgstr "Git: s'ha suprimit el fitxer."
 msgid "Git: Resolve complete."
 msgstr "Git: s'ha completat la resolució."
 
+#: ../plugins/git/git-stash-widget.c:219
+msgid "Git: Stash dropped."
+msgstr "Git: s'ha descartat el desat temporal."
+
+#: ../plugins/git/git-stash-widget.c:275
+msgid "Git: All stashes cleared."
+msgstr "Git: s'han descartat tots els desats temporals."
+
 #: ../plugins/git/git-switch-dialog.c:36
 msgid "Git: Branch checkout complete."
 msgstr "Git: s'ha completat l'obtenció de la branca."
 
-#: ../plugins/git/git-ui-utils.c:94 ../plugins/git/git-ui-utils.c:99
+#: ../plugins/git/git-ui-utils.c:89 ../plugins/git/git-ui-utils.c:94
 #: ../plugins/git/git.plugin.in.h:1
 msgid "Git"
 msgstr "Git"
 
-#: ../plugins/git/git-ui-utils.c:438
+#: ../plugins/git/git-ui-utils.c:158
+msgid "There are no branches available."
+msgstr "No hi ha cap branca disponible."
+
+#: ../plugins/git/git-ui-utils.c:194
+msgid "Please select a stash"
+msgstr "Seleccioneu un desat temporal"
+
+#: ../plugins/git/git-ui-utils.c:604
+msgid "Git: Changes stored in a stash."
+msgstr "Git: s'han desat els canvis temporalment."
+
+#: ../plugins/git/git-ui-utils.c:620
+msgid "Git: Stashed changes applied."
+msgstr "Git: s'han aplicat els canvis desats temporalment."
+
+#: ../plugins/git/git-ui-utils.c:744
 msgid "Git: Diff complete."
 msgstr "Git: s'ha completat la diferència."
 
+#: ../plugins/git/git-ui-utils.c:760
+#, c-format
+msgid "Column %i"
+msgstr "Columna %i"
+
 #: ../plugins/git/git-unstage-dialog.c:36
 msgid "Git: Files unstaged."
 msgstr "Git: s'han tret els fitxers de l'índex."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:59 ../plugins/git/plugin.c:420
+#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
 msgid "_Git"
 msgstr "_Git"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:67 ../plugins/subversion/plugin.c:76
-msgid "_Commit..."
-msgstr "Publica els _canvis..."
+#: ../plugins/git/plugin.c:79
+msgid "_Changes"
+msgstr "_Canvis"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:75
-msgid "_Fetch"
-msgstr "_Recull"
+#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
+#, fuzzy
+msgid "_Commitâ?¦"
+msgstr "Publica els _canvis"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:89
+msgid "Commit changes to the local repository"
+msgstr "Publica els canvis al dipòsit local"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:83
-msgid "_Rebase"
-msgstr "_Ajusta a la base"
+#: ../plugins/git/plugin.c:95
+msgid "_Diff uncommitted changes"
+msgstr "Mostra la _diferència dels canvis no publicats"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:97
+msgid "Show uncommitted changes"
+msgstr "Mostra els canvis no publicats"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:91 ../plugins/git/plugin.c:195
-msgid "_Start..."
-msgstr "_Inicia..."
+#: ../plugins/git/plugin.c:103
+msgid "_Stash"
+msgstr "De_sa temporalment"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:99
-msgid "_Continue"
-msgstr "_Continua"
+#: ../plugins/git/plugin.c:111
+#, fuzzy
+msgid "_Stash uncommitted changesâ?¦"
+msgstr "De_sa temporalment els canvis no publicats..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:113
+msgid "Save uncommitted changes and re-apply them later"
+msgstr "Desa els canvis no publicats i torna a aplicar-los després"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:107
-msgid "_Skip"
-msgstr "_Omet"
+#: ../plugins/git/plugin.c:119
+#, fuzzy
+msgid "_Apply stashed changesâ?¦"
+msgstr "_Aplica els canvis desats temporalment..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:121
+msgid "Apply stashed changes to the working tree"
+msgstr "Aplica els canvis desats temporalment a l'arbre de treball"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:115
-msgid "_Abort"
-msgstr "_Interromp"
+#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
+#, fuzzy
+msgid "_View logâ?¦"
+msgstr "Visualitza el registre"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:129
+msgid "View change history"
+msgstr "Visualitza l'historial de canvis"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:123
-msgid "_Pull..."
-msgstr "_Estira..."
+#: ../plugins/git/plugin.c:135
+msgid "_Remote repository"
+msgstr "_Dipòsit remot"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:131
-msgid "_Unstage files..."
-msgstr "_Treu fitxers de l'índex..."
+#: ../plugins/git/plugin.c:143
+#, fuzzy
+msgid "_Pushâ?¦"
+msgstr "Empeny"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:145
+msgid "Push changes to a remote repository"
+msgstr "Empeny els canvis a un dipòsit remot"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:139
-msgid "_Check out files..."
-msgstr "_Obté els fitxers..."
+#: ../plugins/git/plugin.c:151
+#, fuzzy
+msgid "_Pullâ?¦"
+msgstr "Estira"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:153
+msgid "Update the working copy"
+msgstr "Actualitza la còpia de treball"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:147
-msgid "_Resolve conflicts..."
-msgstr "_Resol els conflictes..."
+#: ../plugins/git/plugin.c:159
+msgid "_Fetch"
+msgstr "_Recull"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:161
+msgid "Update remote branches"
+msgstr "Actualitza les branques remotes"
+
+# Mozilla 1.3->sidebar.files.label
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:155
-msgid "Create patch series..."
-msgstr "Crea una sèrie de pedaços..."
+#: ../plugins/git/plugin.c:167
+msgid "_Files"
+msgstr "_Fitxers"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:163 ../plugins/git/plugin.c:376
-msgid "_Reset tree..."
-msgstr "_Reinicia l'arbre..."
+#: ../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
+#, fuzzy
+msgid "_Addâ?¦"
+msgstr "_Afegeix"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:177
+msgid "Add files to the repository"
+msgstr "Afegeix els fitxers al dipòsit"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:171 ../plugins/git/plugin.c:384
-msgid "_Revert commit..."
-msgstr "_Desfés la publicació..."
+#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
+#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+#, fuzzy
+msgid "_Removeâ?¦"
+msgstr "_Suprimeix"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:185
+msgid "Remove files from the repository"
+msgstr "Suprimeix els fitxers del dipòsit"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:179
+#: ../plugins/git/plugin.c:191
 #, fuzzy
-msgid "_Branches"
-msgstr "Claus"
+msgid "_Ignoreâ?¦"
+msgstr "Ignorat"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:193
+msgid "Ignore files"
+msgstr "Fitxers ignorats"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:187
+#: ../plugins/git/plugin.c:199
 #, fuzzy
-msgid "Bisect"
-msgstr "_Biseca"
+msgid "_Check out filesâ?¦"
+msgstr "_Obtén els fitxers..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:201
+msgid "Revert uncommitted changes to files"
+msgstr "Desfés els canvis no publicats als fitxers"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:211
-msgid "_Good"
-msgstr "_Bona"
+#: ../plugins/git/plugin.c:207
+#, fuzzy
+msgid "_Unstage filesâ?¦"
+msgstr "_Treu fitxers de l'índex..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:209
+msgid "Remove files from the commit index"
+msgstr "Suprimeix els fitxers de l'índex de publicació"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:219
-msgid "_Bad"
-msgstr "_Dolenta"
+#: ../plugins/git/plugin.c:215
+#, fuzzy
+msgid "_Resolve conflictsâ?¦"
+msgstr "_Resol els conflictes..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:217
+msgid "Mark conflicted files as resolved"
+msgstr "Marca els fitxers conflictius com a resolts"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:227 ../plugins/git/plugin.c:428
-msgid "_View log..."
-msgstr "_Visualitza el registre..."
+#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
+msgid "Patches"
+msgstr "Pedaços"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:235 ../plugins/git/plugin.c:300
-#: ../plugins/git/plugin.c:436 ../plugins/subversion/plugin.c:60
-#: ../plugins/subversion/plugin.c:175
-msgid "_Add..."
-msgstr "_Afegeix..."
+#: ../plugins/git/plugin.c:231
+#, fuzzy
+msgid "Create patch seriesâ?¦"
+msgstr "Crea una sèrie de pedaços"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:233
+msgid "Generate patch files for submission upstream"
+msgstr "Genera fitxers de pedaç per a enviar al projecte original"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:243 ../plugins/git/plugin.c:444
-#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "_Suprimeix..."
+#: ../plugins/git/plugin.c:247
+#, fuzzy
+msgid "_Applyâ?¦"
+msgstr "_Aplica..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:249
+msgid "Start applying a patch series"
+msgstr "Comença a aplicar una sèrie de pedaços"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:251
-msgid "_Ignore..."
-msgstr "_Ignora..."
+#: ../plugins/git/plugin.c:255
+msgid "_Continue with resolved conflicts"
+msgstr "_Continua amb els conflictes resolts"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:257
+msgid "Continue applying a series after resolving conflicts"
+msgstr "Continua aplicant la sèrie després de resoldre els conflictes"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:260 ../plugins/git/plugin.c:360
-msgid "_Create branch..."
+#: ../plugins/git/plugin.c:263
+msgid "_Skip current patch"
+msgstr "_Omet el pedaç actual"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:265
+msgid "Skip the current patch in the series and continue"
+msgstr "Omet el pedaç actual de la sèrie i continua"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
+msgid "_Abort"
+msgstr "_Interromp"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:273
+msgid ""
+"Stop applying the series and return the repository to its original state"
+msgstr ""
+"Atura l'aplicació de la sèrie i retorna el dipòsit al seu estat inicial"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:279
+msgid "_Branches"
+msgstr "_Branques"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
+#, fuzzy
+msgid "_Create branchâ?¦"
 msgstr "_Crea una branca..."
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:289
+msgid "Create a branch"
+msgstr "Crea una branca"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:268
-msgid "_Delete branch..."
+#: ../plugins/git/plugin.c:295
+#, fuzzy
+msgid "_Delete branchâ?¦"
 msgstr "_Suprimeix una branca..."
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:297
+msgid "Delete branches"
+msgstr "Suprimeix branques"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:276
-msgid "_Switch to another branch..."
-msgstr "_Commuta a una altra branca..."
+#: ../plugins/git/plugin.c:303
+#, fuzzy
+msgid "_Switch to another branchâ?¦"
+msgstr "Commuta a una altra branca"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:305
+msgid "Switch to another branch"
+msgstr "Commuta a una altra branca"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:284
-msgid "_Merge..."
-msgstr "_Combina..."
+#: ../plugins/git/plugin.c:311
+#, fuzzy
+msgid "_Mergeâ?¦"
+msgstr "Combina"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:313
+msgid "Merge changes from another branch into the current one"
+msgstr "Combina els canvis d'una altra branca a l'actual"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:319
+msgid "_Rebase"
+msgstr "_Ajusta a la base"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:321
+msgid "Merge your changes with an upstream remote branch"
+msgstr "Combina els canvis amb una branca remota del projecte original"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
+#, fuzzy
+msgid "_Startâ?¦"
+msgstr "_Inicia..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:329
+msgid "Start a rebase"
+msgstr "Inicia un ajustament a la base"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:335
+msgid "_Continue"
+msgstr "_Continua"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:337
+msgid "Continue a rebase that stopped because of conflicts"
+msgstr "Continua un ajustament a la base que s'ha aturat per conflictes"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:343
+msgid "_Skip"
+msgstr "_Omet"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:345
+msgid "Skip the current conflicted commit and continue"
+msgstr "Omet la publicació conflictiva actual i continua"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:353
+msgid "Abort the rebase and put the repository in its original state"
+msgstr ""
+"Interromp l'ajustament de la base i deixa el dipòsit en el seu estat original"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:292
+#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
+#, fuzzy
+msgid "_Cherry pickâ?¦"
+msgstr "_Cherry pick..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:361
+msgid ""
+"Selectively merge individual changes from other branches into the current one"
+msgstr ""
+"Combina de manera selectiva els canvis individuals d'altres branques a "
+"l'actual"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:367
 msgid "_Remote branches"
 msgstr "Branques _remotes"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:377
+msgid "Add a remote branch"
+msgstr "Afegeix una branca remota"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:308
-msgid "_Delete..."
-msgstr "_Suprimeix..."
+#: ../plugins/git/plugin.c:383
+#, fuzzy
+msgid "_Deleteâ?¦"
+msgstr "Suprimeix"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:385
+msgid "Delete a remote branch"
+msgstr "Suprimeix una branca remota"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:316 ../plugins/git/plugin.c:368
-msgid "_Create tag..."
+#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
+#, fuzzy
+msgid "_Create tagâ?¦"
 msgstr "_Crea una etiqueta..."
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:401
+msgid "Create a tag"
+msgstr "Crea una etiqueta"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:324
-msgid "_Diff uncommitted changes"
-msgstr "Mostra la _diferència dels canvis no publicats"
+#: ../plugins/git/plugin.c:407
+#, fuzzy
+msgid "_Delete tagâ?¦"
+msgstr "Suprimeix les etiquetes"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:409
+msgid "Delete tags"
+msgstr "Suprimeix les etiquetes"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:415
+msgid "_Reset/Revert"
+msgstr "_Reinicia/desfés"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:332
+#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
 #, fuzzy
-msgid "_Push..."
-msgstr "_Estira..."
+msgid "_Reset treeâ?¦"
+msgstr "_Reinicia l'arbre..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:425
+msgid "Reset repository head to any past state"
+msgstr "Reinicia la capçalera del dipòsit a qualsevol estat anterior"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
+#, fuzzy
+msgid "_Revert commitâ?¦"
+msgstr "_Desfés una publicació..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:433
+msgid "Revert a commit"
+msgstr "Desfés una publicació"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:439
+msgid "Bisect"
+msgstr "Biseca"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:449
+msgid "Start a bisect operation"
+msgstr "Inicia una operació de bisecció"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:457
+msgid "Stop the bisect and bring the tree back to normal"
+msgstr "Atura la bisecció i retorna l'arbre a l'estat normal"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:463
+msgid "_Good"
+msgstr "_Bona"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:465
+msgid "Mark the current head revision as good"
+msgstr "Marca la revisió de la capçalera actual com a bona"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:344
+#: ../plugins/git/plugin.c:471
+msgid "_Bad"
+msgstr "_Dolenta"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:473
+msgid "Mark the current head revision as bad"
+msgstr "Marca la revisió de la capçalera actual com a dolenta"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:479
+msgid "_Initialize repository"
+msgstr "_Inicialitza un dipòsit"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:481
+msgid "Create a new git repository or reinitialize an existing one"
+msgstr "Crea un dipòsit de Git nou o torna a inicialitzar-ne un d'existent"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:491
 msgid "_Show commit diff"
 msgstr "_Mostra la diferència de la publicació"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:493
+msgid "Show changes introduced by this commit"
+msgstr "Mostra els canvis introduïts en aquesta publicació"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:352
+#: ../plugins/git/plugin.c:499
 msgid "_View selected revision"
 msgstr "_Visualitza la revisió seleccionada"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:501
+msgid "View a copy of this file at this revision"
+msgstr "Visualitza una còpia d'aquest fitxer en aquesta revisió"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:509
+msgid "Create a branch with the selected revision as its head"
+msgstr "Crea una branca amb la revisió seleccionada com a capçalera"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:517
+msgid "Create a tag at this revision"
+msgstr "Crea una etiqueta d'aquesta revisió"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:525
+msgid "Reset repository head to this revision"
+msgstr "Reinicia la capçalera del dipòsit a aquesta revisió"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:533
+msgid "Revert this commit"
+msgstr "Desfés aquesta publicació"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:541
+msgid "Merge this commit into the current branch"
+msgstr "Combina aquesta publicació amb la branca actual"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:392
+#: ../plugins/git/plugin.c:547
 msgid "_Bisect"
 msgstr "_Biseca"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:400
+#: ../plugins/git/plugin.c:555
 msgid "_Set good revision"
 msgstr "_Estableix com a revisió bona"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:557
+msgid "Mark this revision as good"
+msgstr "Marca aquesta revisió com a bona"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:408
+#: ../plugins/git/plugin.c:563
 msgid "_Set bad revision"
 msgstr "_Estableix com a revisió dolenta"
 
-#: ../plugins/git/plugin.c:598
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:565
+msgid "Mark this revision as bad"
+msgstr "Marca aquesta revisió com a dolenta"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:585
+msgid "View changes to this file or folder"
+msgstr "Visualitza els canvis en aquest fitxer o carpeta"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:593
+msgid "Add this file or folder to the repository"
+msgstr "Afegeix aquest fitxer o carpeta al dipòsit"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:601
+msgid "Remove this file or folder from the repository"
+msgstr "Suprimeix aquest fitxer o carpeta del dipòsit"
+
+#: ../plugins/git/plugin.c:766
+msgid "Top level git menu item"
+msgstr "Element de nivell superior del menú del Git"
+
+#: ../plugins/git/plugin.c:774
 msgid "Git operations"
 msgstr "Operacions del Git"
 
-#: ../plugins/git/plugin.c:603
+#: ../plugins/git/plugin.c:779
 msgid "Git log operations"
 msgstr "Operacions del registre del Git"
 
-#: ../plugins/git/plugin.c:608
+#: ../plugins/git/plugin.c:784
 msgid "Git FM operations"
 msgstr "Operacions FM del Git"
 
-#: ../plugins/git/plugin.c:623
+#: ../plugins/git/plugin.c:799
 msgid "Git Log"
 msgstr "Registre del Git"
 
@@ -5052,50 +5810,45 @@ msgstr "<b>Gestiona les associacions</b>"
 msgid "<b>New association</b>"
 msgstr "<b>Associació nova</b>"
 
-#: ../plugins/glade/anjuta-glade.glade.h:4
+#. Link a file with a widget
+#: ../plugins/glade/anjuta-glade.glade.h:5
 msgid "Associate"
 msgstr "Associa"
 
-#: ../plugins/glade/anjuta-glade.glade.h:5
+#: ../plugins/glade/anjuta-glade.glade.h:6
 msgid "Automatically add resources"
 msgstr "Afegeix recursos automàticament"
 
-#: ../plugins/glade/anjuta-glade.glade.h:6 ../plugins/glade/plugin.c:755
+#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:763
+#: ../plugins/glade/plugin.c:3094
 msgid "Designer"
 msgstr "Dissenyador"
 
-#: ../plugins/glade/anjuta-glade.glade.h:7
+#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3096
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "Editor"
 
-#: ../plugins/glade/anjuta-glade.glade.h:8
+#: ../plugins/glade/anjuta-glade.glade.h:9
 msgid "Insert handler on edit"
 msgstr "Insereix un gestor en editar"
 
-#: ../plugins/glade/anjuta-glade.glade.h:9
+#: ../plugins/glade/anjuta-glade.glade.h:10
 msgid "Position type"
 msgstr "Tipus de posició"
 
-#: ../plugins/glade/anjuta-glade.glade.h:10
+#: ../plugins/glade/anjuta-glade.glade.h:11
 msgid "Separated designer layout"
 msgstr "Format del dissenyador separat"
 
-#: ../plugins/glade/anjuta-glade.glade.h:11
+#: ../plugins/glade/anjuta-glade.glade.h:12
 msgid "Special regexp"
 msgstr "Expressió regular especial"
 
-#: ../plugins/glade/anjuta-glade.glade.h:12
+#: ../plugins/glade/anjuta-glade.glade.h:13
 msgid "Widget name"
 msgstr "Nom del giny"
 
-#: ../plugins/glade/anjuta-glade.glade.h:13
-msgid "on_widget_signal"
-msgstr "on_widget_signal"
-
-#: ../plugins/glade/anjuta-glade.glade.h:14
-msgid "widget_signal_cb"
-msgstr "widget_signal_cb"
-
 #: ../plugins/glade/designer-associations-item.c:243
 #, c-format
 msgid "Association item has no designer"
@@ -5126,208 +5879,238 @@ msgstr "el valor de la propietat %s no és vàlid"
 msgid "Association item filename has no path"
 msgstr "El nom de fitxer de l'element d'associació no té camí"
 
-#: ../plugins/glade/plugin.c:847
-#, c-format
-msgid "No associations initialized, nothing to save"
+#: ../plugins/glade/plugin.c:855
+#, fuzzy, c-format
+msgid "No associations initialized: nothing to save"
 msgstr "No s'ha inicialitzat cap associació, no hi ha res a desar"
 
-#: ../plugins/glade/plugin.c:854
+#: ../plugins/glade/plugin.c:862
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
 msgstr ""
 "No s'han pogut desar les associacions perquè no s'ha establert el projecte "
 "arrel"
 
-#: ../plugins/glade/plugin.c:876
+#: ../plugins/glade/plugin.c:884
 #, c-format
 msgid "Failed to save associations"
 msgstr "No s'han pogut desar les associacions"
 
-#: ../plugins/glade/plugin.c:1360
+#. iptCurrent:
+#: ../plugins/glade/plugin.c:1196
+msgid "Current"
+msgstr "Actual"
+
+#. iptBeforeEnd:
+#: ../plugins/glade/plugin.c:1197
+msgid "Before end"
+msgstr "Abans del final"
+
+#. iptAfterBegin:
+#: ../plugins/glade/plugin.c:1198
+msgid "After begin"
+msgstr "Després de l'inici"
+
+#. ipEOF:
+#: ../plugins/glade/plugin.c:1199
+msgid "End of file"
+msgstr "Final del fitxer"
+
+#: ../plugins/glade/plugin.c:1368
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "No s'ha pogut inspeccionar la senyal"
 
-#: ../plugins/glade/plugin.c:1382
+#: ../plugins/glade/plugin.c:1390
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "El llenguatge Python no és compatible encara"
 
-#: ../plugins/glade/plugin.c:1395
+#: ../plugins/glade/plugin.c:1403
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "El llenguatge Vala no és compatible encara"
 
-#: ../plugins/glade/plugin.c:1954
+#: ../plugins/glade/plugin.c:1962
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "No hi ha cap editor associat per al dissenyador"
 
-#: ../plugins/glade/plugin.c:1972
-#, c-format
-msgid "Unknown language of the editor \"%s\""
-msgstr "El llenguatge de l'editor «%s» no és conegut"
+#: ../plugins/glade/plugin.c:1980
+#, fuzzy, c-format
+msgid "Unknown editor language \"%s\""
+msgstr "Error desconegut en el mòdul %s"
 
-#: ../plugins/glade/plugin.c:2039 ../plugins/glade/plugin.c:2116
-#: ../plugins/glade/plugin.c:2241
+#: ../plugins/glade/plugin.c:2047 ../plugins/glade/plugin.c:2124
+#: ../plugins/glade/plugin.c:2249
 #, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "S'ha produït un error en afegir un gestor d'estub nou: %s"
 
-#: ../plugins/glade/plugin.c:2046 ../plugins/glade/plugin.c:2130
-msgid "Couldn't find a signal information"
+#: ../plugins/glade/plugin.c:2054 ../plugins/glade/plugin.c:2138
+#, fuzzy
+msgid "Couldn't find signal information"
 msgstr "No s'ha pogut trobar una senyal d'informació"
 
-#: ../plugins/glade/plugin.c:2073
+#: ../plugins/glade/plugin.c:2081
 msgid "Error while adding a new handler stub: No current editor"
 msgstr ""
 "S'ha produït un error en afegir un gestor d'estub nou: Sense editor actual"
 
-#: ../plugins/glade/plugin.c:2244
+#: ../plugins/glade/plugin.c:2254
 #, c-format
 msgid ""
-"To avoid this messages turn off \"Insert handler on edit\" flag in "
-"Preferences->Glade GUI Designer"
+"To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
 msgstr ""
-"Per a evitar aquests missatges desactiveu l'indicador «Insereix un gestor en "
-"editar» a Preferències->Dissenyador d'IGU Glade"
+"Per a evitar aquests missatges desactiveu l'indicador «%s» a Preferències-"
+">Dissenyador d'IGU Glade"
 
-#: ../plugins/glade/plugin.c:2380
+#: ../plugins/glade/plugin.c:2324
+msgid "Couldn't find an associated document"
+msgstr "No s'ha pogut trobar un document associat"
+
+#: ../plugins/glade/plugin.c:2390
 msgid "Those documents are already associated"
 msgstr "Aquests documents ja estan associats"
 
-#: ../plugins/glade/plugin.c:2418
+#: ../plugins/glade/plugin.c:2428
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "No es pot llegir el fitxer: %s."
 
-#: ../plugins/glade/plugin.c:3676
+#: ../plugins/glade/plugin.c:3095
+msgid "Top level widget"
+msgstr "Giny de nivell superior"
+
+#: ../plugins/glade/plugin.c:3686
 msgid "Couldn't find a default signal name"
 msgstr "No s'ha pogut trobar un nom de senyal predeterminat"
 
-#: ../plugins/glade/plugin.c:3886
+#: ../plugins/glade/plugin.c:3896
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "El projecte %s no té ginys obsolets o desajustos entre versions."
 
-#: ../plugins/glade/plugin.c:3903
+#: ../plugins/glade/plugin.c:3913
 msgid "There is no Glade project"
 msgstr "No hi ha cap projecte del Glade"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3989
+#: ../plugins/glade/plugin.c:3999
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:3997 ../plugins/glade/plugin.c:3999
+#: ../plugins/glade/plugin.c:4007 ../plugins/glade/plugin.c:4009
 msgid "Switch between designer/code"
 msgstr "Commuta entre dissenyador/codi"
 
-#: ../plugins/glade/plugin.c:4005 ../plugins/glade/plugin.c:4007
+#: ../plugins/glade/plugin.c:4015 ../plugins/glade/plugin.c:4017
 msgid "Insert handler stub"
 msgstr "Insereix un gestor d'estub"
 
-#: ../plugins/glade/plugin.c:4013 ../plugins/glade/plugin.c:4015
+#: ../plugins/glade/plugin.c:4023 ../plugins/glade/plugin.c:4025
 msgid "Insert handler stub, autoposition"
 msgstr "Insereix un gestor d'estub, posiciona automàticament"
 
-#: ../plugins/glade/plugin.c:4021
+#: ../plugins/glade/plugin.c:4031
 msgid "Associate last designer and last editor"
 msgstr "Associa l'últim dissenyador i l'últim editor"
 
-#: ../plugins/glade/plugin.c:4023
+#: ../plugins/glade/plugin.c:4033
 msgid "Associate last designer and editor"
 msgstr "Associa l'últim dissenyador i l'editor"
 
-#: ../plugins/glade/plugin.c:4029 ../plugins/glade/plugin.c:4031
-msgid "Associations dialog..."
+#: ../plugins/glade/plugin.c:4039 ../plugins/glade/plugin.c:4041
+#, fuzzy
+msgid "Associations dialogâ?¦"
 msgstr "Diàleg d'associacions..."
 
-#: ../plugins/glade/plugin.c:4037
-msgid "Versioning..."
+#: ../plugins/glade/plugin.c:4047
+#, fuzzy
+msgid "Versioningâ?¦"
 msgstr "Versionat..."
 
-#: ../plugins/glade/plugin.c:4039
+#: ../plugins/glade/plugin.c:4049
 msgid "Switch between library versions and check deprecations"
 msgstr ""
 "Commuta entre les versions de les biblioteques i comprova les obsolescències"
 
-#: ../plugins/glade/plugin.c:4045 ../plugins/glade/plugin.c:4047
+#: ../plugins/glade/plugin.c:4055 ../plugins/glade/plugin.c:4057
 msgid "Set as default resource target"
 msgstr "Estableix com a objectiu de recursos predeterminat"
 
-#: ../plugins/glade/plugin.c:4055
+#: ../plugins/glade/plugin.c:4065
 msgid "Current default target"
 msgstr "Objectiu actual predeterminat"
 
-#: ../plugins/glade/plugin.c:4063
+#: ../plugins/glade/plugin.c:4073
 msgid "Close the current file"
 msgstr "Tanca el fitxer actual"
 
-#: ../plugins/glade/plugin.c:4071
+#: ../plugins/glade/plugin.c:4081
 msgid "Save the current file"
 msgstr "Desa el fitxer actual"
 
-#: ../plugins/glade/plugin.c:4087
+#: ../plugins/glade/plugin.c:4097
 msgid "Redo the last action"
 msgstr "Refés l'última acció"
 
-#: ../plugins/glade/plugin.c:4095
+#: ../plugins/glade/plugin.c:4105
 msgid "Cut the selection"
 msgstr "Retalla la selecció"
 
-#: ../plugins/glade/plugin.c:4103
+#: ../plugins/glade/plugin.c:4113
 msgid "Copy the selection"
 msgstr "Copia la selecció"
 
-#: ../plugins/glade/plugin.c:4111
+#: ../plugins/glade/plugin.c:4121
 msgid "Paste the clipboard"
 msgstr "Enganxa el porta-retalls"
 
-#: ../plugins/glade/plugin.c:4119
+#: ../plugins/glade/plugin.c:4129
 msgid "Delete the selection"
 msgstr "Suprimeix la selecció"
 
-#: ../plugins/glade/plugin.c:4297
+#: ../plugins/glade/plugin.c:4307
 msgid "Glade designer operations"
 msgstr "Operacions del dissenyador Glade"
 
-#: ../plugins/glade/plugin.c:4397
+#: ../plugins/glade/plugin.c:4407
 msgid "Go back in undo history"
 msgstr "Vés enrere a l'historial de desfer"
 
-#: ../plugins/glade/plugin.c:4399
+#: ../plugins/glade/plugin.c:4409
 msgid "Go forward in undo history"
 msgstr "Vés endavant a l'historial de desfer"
 
-#: ../plugins/glade/plugin.c:4421
+#: ../plugins/glade/plugin.c:4431
 msgid "Glade Clipboard"
 msgstr "Porta-retalls del Glade"
 
-#: ../plugins/glade/plugin.c:4426
+#: ../plugins/glade/plugin.c:4436
 msgid "Widgets"
 msgstr "Ginys"
 
-#: ../plugins/glade/plugin.c:4431
+#: ../plugins/glade/plugin.c:4441
 msgid "Palette"
 msgstr "Paleta"
 
-#: ../plugins/glade/plugin.c:4685
+#: ../plugins/glade/plugin.c:4695
 #, c-format
 msgid "Not local file: %s"
 msgstr "No és un fitxer local: %s"
 
-#: ../plugins/glade/plugin.c:4706
+#: ../plugins/glade/plugin.c:4716
 #, c-format
 msgid "Could not open %s"
 msgstr "No s'ha pogut obrir %s"
 
-#: ../plugins/glade/plugin.c:4757
+#: ../plugins/glade/plugin.c:4767
 msgid "Could not create a new glade project."
 msgstr "No s'ha pogut crear un projecte nou del Glade."
 
-#: ../plugins/glade/plugin.c:5027 ../plugins/glade/plugin.c:5052
+#: ../plugins/glade/plugin.c:5029 ../plugins/glade/plugin.c:5054
 msgid "Glade GUI Designer"
 msgstr "Dissenyador d'IGU Glade"
 
@@ -5339,8 +6122,9 @@ msgstr "S'ha desat el projecte «%s» de Glade"
 
 #: ../plugins/glade/anjuta-design-document.c:379
 #: ../plugins/glade/anjuta-design-document.c:406
-msgid "Invalid glade file name"
-msgstr "El nom de fitxer Glade no és vàlid"
+#, fuzzy
+msgid "Invalid Glade file name"
+msgstr "El nom del fitxer Glade no és vàlid"
 
 #: ../plugins/gtodo/add_edit_item.c:99
 msgid "You need to select a to do item before you can edit it"
@@ -5360,13 +6144,12 @@ msgid "Summary:"
 msgstr "Resum:"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172
-#: ../plugins/macro/anjuta-macro.glade.h:4
+#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
 msgid "Category:"
 msgstr "Categoria:"
 
 #: ../plugins/gtodo/add_edit_item.c:193 ../plugins/gtodo/add_edit_item.c:472
-#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:75
+#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:76
 msgid "Edit Categories"
 msgstr "Edita les categories"
 
@@ -5402,8 +6185,8 @@ msgstr "iniciat:"
 #: ../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 ""
 
 #: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
@@ -5411,30 +6194,27 @@ msgid "stopped:"
 msgstr "aturat:"
 
 #: ../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 to-do item before you can remove it"
 msgstr "Heu de seleccionar un element per fer abans de suprimir-lo"
 
 #: ../plugins/gtodo/callback.c:20
-msgid "Are you sure you want to remove the selected todo item?"
-msgstr "Segur que voleu suprimir l'element per fer?"
-
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
-msgid "Remove"
-msgstr "Suprimeix"
+#, fuzzy
+msgid "Are you sure you want to remove the selected to-do item?"
+msgstr "Segur que voleu suprimir-lo?"
 
 #: ../plugins/gtodo/callback.c:98
-#, c-format
-msgid "Are you sure you want to remove all the completed todo items?"
-msgstr "Segur que voleu suprimir tots els elements per fer completats?"
+#, fuzzy, c-format
+msgid "Are you sure you want to remove all the completed to-do items?"
+msgstr "Segur que voleu suprimir tots els elements completats?"
 
 #: ../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\"?"
+"Are you sure you want to remove all the completed to-do items in the "
+"category \"%s\"?"
 msgstr ""
-"Segur que voleu suprimir tots els elements per fer completats de la "
-"categoria «%s»?"
+"Segur que voleu suprimir tots els elements  completats de la categoria «%s»?"
 
 #: ../plugins/gtodo/export.c:47
 msgid "Export task list"
@@ -5493,59 +6273,59 @@ msgstr "Data de venciment"
 msgid "Summary"
 msgstr "Resum"
 
-#: ../plugins/gtodo/libgtodo.c:609
+#: ../plugins/gtodo/libgtodo.c:603
 #, c-format
 msgid "No permission to read the file."
 msgstr "No teniu permís per a llegir el fitxer."
 
-#: ../plugins/gtodo/libgtodo.c:624
+#: ../plugins/gtodo/libgtodo.c:618
 #, c-format
 msgid "Failed to read file"
 msgstr "No s'ha pogut llegir el fitxer"
 
-#: ../plugins/gtodo/libgtodo.c:632 ../plugins/gtodo/libgtodo.c:643
-#, c-format
-msgid "Failed to parse xml structure"
+#: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
+#, fuzzy, c-format
+msgid "Failed to parse XML structure"
 msgstr "No s'ha pogut analitzar l'estructura xml"
 
-#: ../plugins/gtodo/libgtodo.c:652
+#: ../plugins/gtodo/libgtodo.c:646
 #, c-format
 msgid "File is not a valid gtodo file"
 msgstr "El fitxer no és un fitxer vàlid del Gtodo"
 
 #
-#: ../plugins/gtodo/libgtodo.c:668
+#: ../plugins/gtodo/libgtodo.c:662
 msgid "Personal"
 msgstr "Personal"
 
-#: ../plugins/gtodo/libgtodo.c:670
+#: ../plugins/gtodo/libgtodo.c:664
 msgid "Business"
 msgstr "Negocis"
 
-#: ../plugins/gtodo/libgtodo.c:672
+#: ../plugins/gtodo/libgtodo.c:666
 msgid "Unfiled"
 msgstr "Sense emplenar"
 
-#: ../plugins/gtodo/libgtodo.c:761
+#: ../plugins/gtodo/libgtodo.c:755
 #, c-format
 msgid "No Gtodo Client to save."
 msgstr "No hi ha cap client Gtodo per a desar."
 
-#: ../plugins/gtodo/libgtodo.c:852
+#: ../plugins/gtodo/libgtodo.c:846
 #, c-format
 msgid "No filename supplied."
 msgstr "No s'ha proporcionat cap nom de fitxer."
 
 #. create a priority string
-#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:129
+#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:130
 msgid "Low"
 msgstr "Baixa"
 
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:130
+#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:131
 msgid "Medium"
 msgstr "Mitjana"
 
-#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:131
+#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:132
 msgid "High"
 msgstr "Alta"
 
@@ -5588,8 +6368,9 @@ msgid "Hide _Completed Items"
 msgstr "Oculta elements _completats"
 
 #: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed todo items"
-msgstr "Oculta els elements per fer completats"
+#, fuzzy
+msgid "Hide completed to-do items"
+msgstr "Oculta els elements completats"
 
 #: ../plugins/gtodo/plugin.c:83
 msgid "Hide Items Past _Due Date"
@@ -5608,11 +6389,13 @@ msgid "Hide items without an end date"
 msgstr "Oculta els elements sense data de venciment"
 
 #: ../plugins/gtodo/plugin.c:122
-msgid "Tasks manager"
+#, fuzzy
+msgid "Task manager"
 msgstr "Gestor de tasques"
 
 #: ../plugins/gtodo/plugin.c:128
-msgid "Tasks manager view"
+#, fuzzy
+msgid "Task manager view"
 msgstr "Visualitzador del gestor de tasques"
 
 #: ../plugins/gtodo/plugin.c:134
@@ -5620,11 +6403,13 @@ msgid "Tasks"
 msgstr "Tasques"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "Todo Manager"
+#, fuzzy
+msgid "To-do Manager"
 msgstr "Gestor de la llista per fer"
 
 #: ../plugins/gtodo/preferences.c:21
-msgid "Todo List Preferences"
+#, fuzzy
+msgid "To-do List Preferences"
 msgstr "Preferències de la llista de tasques per fer"
 
 #: ../plugins/gtodo/preferences.c:84
@@ -5674,11 +6459,13 @@ msgstr[0] "Elements que venceran d'aquí %i dia"
 msgstr[1] "Elements que venceran d'aquí %i dies"
 
 #: ../plugins/gtodo/preferences.c:168
-msgid "Misc"
-msgstr "Miscel·lània"
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "Dades diverses"
 
 #: ../plugins/gtodo/preferences.c:171
-msgid "Auto purge completed items"
+#, fuzzy
+msgid "Auto-purge completed items"
 msgstr "Elimina automàticament els elements completats"
 
 #. Translators: First part of the sentence "Purge items after %d days"
@@ -5692,7 +6479,8 @@ msgid "days."
 msgstr "dies."
 
 #: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
-msgid "Auto Purge"
+#, fuzzy
+msgid "Auto-Purge"
 msgstr "Eliminació automàtica"
 
 #: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
@@ -5700,48 +6488,52 @@ msgid "Notification"
 msgstr "Notificació"
 
 #: ../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 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] ""
 "Habilita la notificació dels elements per fer quan vencin en %i minut"
 msgstr[1] ""
 "Habilita la notificació dels elements per fer quan vencin en %i minuts"
 
-#: ../plugins/gtodo/tasklists.c:9
+#: ../plugins/gtodo/tasklists.c:10
 msgid "Open a Task List"
 msgstr "Obre una llista de tasques"
 
-#: ../plugins/gtodo/tasklists.c:34
+#: ../plugins/gtodo/tasklists.c:35
 msgid "Create a Task List"
 msgstr "Crea una llista de tasques"
 
-#: ../plugins/gtodo/todo_db.c:164
+#: ../plugins/gtodo/todo_db.c:165
 msgid "No Date"
 msgstr "Sense data"
 
-#: ../plugins/macro/anjuta-macro.glade.h:1
-msgid "<b>Macro details:</b>"
+#: ../plugins/macro/anjuta-macro.ui.h:2
+msgid "Edit&#x2026;"
+msgstr ""
+
+#: ../plugins/macro/anjuta-macro.ui.h:3
+#, fuzzy
+msgid "Macro details:"
 msgstr "<b>Detalls de la macro:</b>"
 
-#: ../plugins/macro/anjuta-macro.glade.h:2
-msgid "<b>Macro text:</b>"
+#: ../plugins/macro/anjuta-macro.ui.h:4
+#, fuzzy
+msgid "Macro text:"
 msgstr "<b>Text de la macro:</b>"
 
-#: ../plugins/macro/anjuta-macro.glade.h:3
-msgid "<b>Macros:</b>"
-msgstr "<b>Macros:</b>"
-
-#: ../plugins/macro/anjuta-macro.glade.h:5
-msgid "Edit..."
-msgstr "Edita..."
+#: ../plugins/macro/anjuta-macro.ui.h:5
+#, fuzzy
+msgid "Macros:"
+msgstr "Macros"
 
-#: ../plugins/macro/anjuta-macro.glade.h:7
+#: ../plugins/macro/anjuta-macro.ui.h:7
 msgid "Shortcut:"
 msgstr "Drecera:"
 
 #: ../plugins/macro/macro-actions.c:127
-msgid "Press macro shortcut..."
+#, fuzzy
+msgid "Press macro shortcutâ?¦"
 msgstr "Premeu la drecera per a la macro..."
 
 #: ../plugins/macro/macro-actions.c:134
@@ -5756,7 +6548,7 @@ msgstr "Macros de l'Anjuta"
 msgid "My macros"
 msgstr "Les meves macros"
 
-#: ../plugins/macro/macro-dialog.c:141
+#: ../plugins/macro/macro-dialog.c:145
 #, c-format
 msgid ""
 "Name:\t %s\n"
@@ -5767,15 +6559,15 @@ msgstr ""
 "Categoria:\t %s\n"
 "Drecera:\t %c\n"
 
-#: ../plugins/macro/macro-dialog.c:264
+#: ../plugins/macro/macro-dialog.c:276
 msgid "Insert"
 msgstr "Insereix"
 
-#: ../plugins/macro/macro-dialog.c:267
+#: ../plugins/macro/macro-dialog.c:279
 msgid "Insert macro"
 msgstr "Insereix una macro"
 
-#: ../plugins/macro/macro-edit.c:204
+#: ../plugins/macro/macro-edit.c:211
 msgid "Add/Edit macro"
 msgstr "Afegeix/edita una macro"
 
@@ -5794,7 +6586,8 @@ msgid "Macros"
 msgstr "Macros"
 
 #: ../plugins/macro/plugin.c:42
-msgid "_Insert Macro..."
+#, fuzzy
+msgid "_Insert Macroâ?¦"
 msgstr "_Insereix una macro..."
 
 #: ../plugins/macro/plugin.c:44
@@ -5802,7 +6595,8 @@ msgid "Insert a macro using a shortcut"
 msgstr "Insereix una macro que fa servir una drecera de teclat"
 
 #: ../plugins/macro/plugin.c:49
-msgid "_Add Macro..."
+#, fuzzy
+msgid "_Add Macroâ?¦"
 msgstr "_Afegeix una macro..."
 
 #: ../plugins/macro/plugin.c:51
@@ -5810,8 +6604,9 @@ msgid "Add a macro"
 msgstr "Afegeix una macro"
 
 #: ../plugins/macro/plugin.c:56
-msgid "Macros..."
-msgstr "Macros..."
+#, fuzzy
+msgid "Macrosâ?¦"
+msgstr "Macros"
 
 #: ../plugins/macro/plugin.c:58
 msgid "Add/Edit/Remove macros"
@@ -5821,70 +6616,84 @@ msgstr "Afegeix/edita/suprimeix macros"
 msgid "Macro operations"
 msgstr "Operacions de macro"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:1
-msgid "<b>Indicators</b>"
-msgstr "<b>Indicadors</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:2
-msgid "<b>Message colors</b>"
-msgstr "<b>Colors dels missatges</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:3
-msgid "<b>Messages options</b>"
-msgstr "<b>Opcions dels missatges</b>"
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
+msgid "Diagonal"
+msgstr "Diagonal"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:4
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
 msgid "Error message indicator style:"
 msgstr "Estil de l'indicador de missatge d'error:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:5
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Errors:"
 msgstr "Errors:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+#, fuzzy
+msgid "Indicators"
+msgstr "<b>Indicadors</b>"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+#, fuzzy
+msgid "Message colors"
+msgstr "<b>Colors dels missatges</b>"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:9
+#, fuzzy
+msgid "Messages options"
+msgstr "<b>Opcions dels missatges</b>"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Normal message indicator style:"
 msgstr "Estil de l'indicador de missatge normal:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:7
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
 msgid "Number of first characters to show:"
 msgstr "Quantitat de caràcters inicials que s'han de mostrar:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
 msgid "Number of last characters to show:"
 msgstr "Quantitat de caràcters finals que s'han de mostrar:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:9
-msgid "Tabs position:"
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+msgid "Strike-Out"
+msgstr "Ratllat"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#, fuzzy
+msgid "Tab position:"
 msgstr "Posició de les pestanyes:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:14
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
 msgid "Truncate long messages"
 msgstr "Redueix missatges llargs"
 
-#. Error/Warning indication style in editor
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:16
-msgid ""
-"Underline-Plain\n"
-"Underline-Squiggle\n"
-"Underline-TT\n"
-"Diagonal\n"
-"Strike-Out"
-msgstr ""
-"Subratllat de línia recta\n"
-"Subratllat de línies mogudes\n"
-"Subratllat-TT\n"
-"Diagonal\n"
-"Ratllat"
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
+msgid "Underline-Plain"
+msgstr "Subratllat de línia recta"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:21
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:22
+msgid "Underline-Squiggle"
+msgstr "Subratllat de línies mogudes"
+
+#. text style in editor, TT is for typewriter text
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:24
+msgid "Underline-TT"
+msgstr "Subratllat-TT"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:25
 msgid "Warning message indicator style:"
 msgstr "Estil d'indicador de missatge d'avís:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:22
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:26
 msgid "Warnings:"
 msgstr "Avisos:"
 
-#: ../plugins/message-view/anjuta-msgman.c:71
+#: ../plugins/message-view/anjuta-msgman.c:99
 msgid "Close all message tabs"
 msgstr "Tanca totes les pestanyes de missatges"
 
@@ -5909,8 +6718,8 @@ msgid "Icon"
 msgstr "Icona"
 
 #: ../plugins/message-view/message-view.c:583
-#: ../plugins/message-view/plugin.c:325 ../plugins/message-view/plugin.c:439
-#: ../plugins/message-view/plugin.c:451
+#: ../plugins/message-view/plugin.c:324 ../plugins/message-view/plugin.c:333
+#: ../plugins/message-view/plugin.c:453 ../plugins/message-view/plugin.c:465
 msgid "Messages"
 msgstr "Missatges"
 
@@ -5983,44 +6792,43 @@ msgstr "Desa el missatge"
 msgid "Next/Previous Message"
 msgstr "Missatge anterior/següent"
 
-#: ../plugins/patch/patch-plugin.c:88
+#: ../plugins/patch/patch-plugin.c:94
 msgid "File/Directory to patch"
 msgstr "Fitxer/directori on aplicar el pedaç"
 
-#: ../plugins/patch/patch-plugin.c:91
+#: ../plugins/patch/patch-plugin.c:97
 msgid "Patch file"
 msgstr "Fitxer amb el pedaç"
 
-#: ../plugins/patch/patch-plugin.c:111
-msgid "Patches"
-msgstr "Pedaços"
-
-#: ../plugins/patch/patch-plugin.c:159 ../plugins/patch/patch-plugin.glade.h:3
+#: ../plugins/patch/patch-plugin.c:166 ../plugins/patch/patch-plugin.ui.h:3
 msgid "Patch"
 msgstr "Aplica un pedaç"
 
-#: ../plugins/patch/patch-plugin.c:174
+#: ../plugins/patch/patch-plugin.c:186
 msgid "Please select the directory where the patch should be applied"
 msgstr "Seleccioneu el directori on s'aplicarà el pedaç"
 
-#: ../plugins/patch/patch-plugin.c:185
+#: ../plugins/patch/patch-plugin.c:197
 #, c-format
 msgid "Patching %s using %s\n"
 msgstr "S'està aplicant el pedaç a %s fent servir %s\n"
 
-#: ../plugins/patch/patch-plugin.c:194
-msgid "Patching...\n"
-msgstr "S'està aplicant un pedaç...\n"
+#: ../plugins/patch/patch-plugin.c:209
+#, fuzzy
+msgid "Patchingâ?¦\n"
+msgstr "Aplicant pedaços...\n"
 
-#: ../plugins/patch/patch-plugin.c:204
-msgid "Patching..."
-msgstr "S'està aplicant un pedaç..."
+#: ../plugins/patch/patch-plugin.c:219
+#, fuzzy
+msgid "Patchingâ?¦"
+msgstr "Aplicant pedaços..."
 
-#: ../plugins/patch/patch-plugin.c:209
-msgid "There are unfinished jobs, please wait until they are finished."
+#: ../plugins/patch/patch-plugin.c:224
+#, fuzzy
+msgid "There are unfinished jobs: please wait until they are finished."
 msgstr "Hi ha tasques sense finalitzar, espereu fins que hagin finalitzat."
 
-#: ../plugins/patch/patch-plugin.c:251
+#: ../plugins/patch/patch-plugin.c:266
 msgid ""
 "Patch failed.\n"
 "Please review the failure messages.\n"
@@ -6030,24 +6838,24 @@ msgstr ""
 "Reviseu els missatges d'error.\n"
 "Examineu i suprimiu els fitxers rebutjats.\n"
 
-#: ../plugins/patch/patch-plugin.c:257
+#: ../plugins/patch/patch-plugin.c:272
 msgid "Patching complete"
 msgstr "S'ha completat l'aplicació del pedaç"
 
-#: ../plugins/patch/patch-plugin.glade.h:1
-#: ../plugins/subversion/anjuta-subversion.glade.h:31
+#: ../plugins/patch/patch-plugin.ui.h:1
+#: ../plugins/subversion/anjuta-subversion.ui.h:14
 msgid "Dry run"
 msgstr "Execució bruta"
 
-#: ../plugins/patch/patch-plugin.glade.h:2
+#: ../plugins/patch/patch-plugin.ui.h:2
 msgid "File/Directory to patch:"
 msgstr "Fitxer/directori on aplicar el pedaç:"
 
-#: ../plugins/patch/patch-plugin.glade.h:4
+#: ../plugins/patch/patch-plugin.ui.h:4
 msgid "Patch file:"
 msgstr "Fitxer pedaç:"
 
-#: ../plugins/patch/patch-plugin.glade.h:5
+#: ../plugins/patch/patch-plugin.ui.h:5
 msgid "Patch level:"
 msgstr "Nivell del pedaç:"
 
@@ -6060,21 +6868,23 @@ msgstr "_Eines"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
-msgid "_Patch..."
-msgstr "_Pedaç..."
+#, fuzzy
+msgid "_Patchâ?¦"
+msgstr "Aplica un pedaç"
 
 #: ../plugins/patch/plugin.c:92
 msgid "Patch files/directories"
 msgstr "Aplica un pedaç a fitxers/directoris"
 
 #: ../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."
+"template to use. Please make sure your version of Anjuta is up-to-date."
 msgstr ""
-"No s'ha pogut generar el fitxer de projecte. No es pot trobar una plantilla "
-"de projecte apropiada per a utilitzar. Assegureu-vos que la versió de "
-"l'Anjuta és recent."
+"No s'ha pogut generar el fitxer del projecte. No s'ha pogut trobar una "
+"plantilla de projecte adequada. Assegureu-vos que teniu l'última versió de "
+"l'Anjuta."
 
 #: ../plugins/project-import/plugin.c:86
 #, c-format
@@ -6082,119 +6892,116 @@ msgid "A file named \"%s\" already exists. Do you want to replace it?"
 msgstr "Ja existeix un fitxer anomenat «%s». Voleu sobreescriure'l?"
 
 #: ../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."
+"A file named \"%s\" cannot be written: %s. Check if you have write access to "
+"the project directory."
 msgstr ""
 "No es pot escriure el fitxer «%s»: %s. Comproveu que teniu accés per a "
 "escriure al directori del projecte."
 
 #: ../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 "
+"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 s'ha pogut trobar un rerefons de projecte vàlid per al directori donat (%"
 "s). Seleccioneu un directori diferent, o proveu d'actualitzar-vos a una "
-"versió recent de l'Anjuta."
+"versió més recent de l'Anjuta."
 
 #: ../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\""
+"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
 msgstr ""
+"No s'ha pogut obtenir l'URI proporcionat «%s», l'error retornat ha sigut: «%s»"
 
-#: ../plugins/project-import/project-import.glade.h:1
-#, fuzzy
-msgid "<b>Import options</b>"
-msgstr "<b>Opcions d'impressió</b>"
-
-#: ../plugins/project-import/project-import.glade.h:2
-#, fuzzy
-msgid "<b>Project name</b>"
-msgstr "<b>Predeterminats del projecte</b>"
-
-#: ../plugins/project-import/project-import.glade.h:3
-#: ../plugins/project-wizard/templates/translatable-strings.h:33
-#: ../plugins/subversion/anjuta-subversion.glade.h:26
+#: ../plugins/project-import/project-import.ui.h:1
+#: ../plugins/project-wizard/templates/translatable-strings.h:34
+#: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "Destinació:"
 
-#: ../plugins/project-import/project-import.glade.h:4
-#, fuzzy
+#: ../plugins/project-import/project-import.ui.h:2
 msgid "Import from folder"
-msgstr "Importa un projecte"
+msgstr "Importa des d'una carpeta"
 
-#: ../plugins/project-import/project-import.glade.h:5
-#, fuzzy
+#: ../plugins/project-import/project-import.ui.h:3
 msgid "Import from version control system"
-msgstr "Connector d'un sistema de control de versions"
+msgstr "Importa des d'un sistema de control de versions"
 
-#: ../plugins/project-import/project-import.glade.h:6
+#: ../plugins/project-import/project-import.ui.h:4
 #, fuzzy
+msgid "Import options"
+msgstr "<b>Opcions d'importació</b>"
+
+#: ../plugins/project-import/project-import.ui.h:5
 msgid "Location:"
-msgstr "_Ubicació:"
+msgstr "Ubicació:"
 
-#: ../plugins/project-import/project-import-dialog.c:269
+#: ../plugins/project-import/project-import.ui.h:6
 #, fuzzy
+msgid "Project name"
+msgstr "Nom del projecte:"
+
+#: ../plugins/project-import/project-import-dialog.c:292
 msgid "Import project"
 msgstr "Importa un projecte"
 
-#: ../plugins/project-import/project-import-dialog.c:273
-#, fuzzy
+#: ../plugins/project-import/project-import-dialog.c:296
 msgid "Import"
-msgstr "CVS: importa"
+msgstr "Importa"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:1
+#: ../plugins/project-manager/create_dialogs.ui.h:1
 msgid "Add Source"
 msgstr "Afegeix el fitxer font"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:2
+#: ../plugins/project-manager/create_dialogs.ui.h:2
 msgid "New Group"
 msgstr "Grup nou"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:3
+#: ../plugins/project-manager/create_dialogs.ui.h:3
 msgid "New Target"
 msgstr "Objectiu nou"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:4
+#: ../plugins/project-manager/create_dialogs.ui.h:4
 msgid "Select the _target for the new source files:"
 msgstr "Selecciona l'_objectiu per als fitxers font nous:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:5
+#: ../plugins/project-manager/create_dialogs.ui.h:5
 msgid "Source files:"
 msgstr "Fitxers font:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:6
+#: ../plugins/project-manager/create_dialogs.ui.h:6
 msgid "Specify _where to create the group:"
 msgstr "Especifica _on s'ha de crear el grup:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:7
+#: ../plugins/project-manager/create_dialogs.ui.h:7
 msgid "Specify _where to create the target:"
 msgstr "Especifiqueu _on s'ha de crear l'objectiu:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:8
+#: ../plugins/project-manager/create_dialogs.ui.h:8
 msgid "Target _name:"
 msgstr "_Nom de l'objectiu:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:9
+#: ../plugins/project-manager/create_dialogs.ui.h:9
 msgid "Target _type:"
 msgstr "_Tipus de l'objectiu:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:10
+#: ../plugins/project-manager/create_dialogs.ui.h:10
 msgid "TargetTypes"
 msgstr "TipusObjectiu"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:11
+#: ../plugins/project-manager/create_dialogs.ui.h:11
 msgid "_Group name:"
 msgstr "_Nom del grup:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:12
-msgid "_Select file to add..."
-msgstr "_Seleccioneu un fitxer a afegir..."
+#: ../plugins/project-manager/create_dialogs.ui.h:12
+#, fuzzy
+msgid "_Select file to addâ?¦"
+msgstr "Seleccioneu el fitxer a afegir:"
 
 #: ../plugins/project-manager/gbf-project-model.c:233
 #: ../plugins/project-manager/plugin.c:1301
@@ -6212,38 +7019,38 @@ msgstr "Objecte GbfProject"
 msgid "No project loaded"
 msgstr "No s'ha carregat cap projecte"
 
-#: ../plugins/project-manager/gbf-project-util.c:81
-msgid "Couldn't load glade file"
-msgstr "No s'ha pogut carregar el fitxer glade"
-
-#: ../plugins/project-manager/gbf-project-util.c:260
-#: ../plugins/project-manager/gbf-project-util.c:268
-msgid "Can not add group"
+#: ../plugins/project-manager/gbf-project-util.c:236
+#: ../plugins/project-manager/gbf-project-util.c:244
+#, fuzzy
+msgid "Cannot add group"
 msgstr "No es pot afegir el grup"
 
-#: ../plugins/project-manager/gbf-project-util.c:269
+#: ../plugins/project-manager/gbf-project-util.c:245
 msgid "No parent group selected"
 msgstr "No s'ha seleccionat cap grup pare"
 
-#: ../plugins/project-manager/gbf-project-util.c:441
-#: ../plugins/project-manager/gbf-project-util.c:450
-msgid "Can not add target"
+#: ../plugins/project-manager/gbf-project-util.c:417
+#: ../plugins/project-manager/gbf-project-util.c:426
+#, fuzzy
+msgid "Cannot add target"
 msgstr "No es pot afegir l'objectiu"
 
-#: ../plugins/project-manager/gbf-project-util.c:451
+#: ../plugins/project-manager/gbf-project-util.c:427
 msgid "No group selected"
 msgstr "No s'ha seleccionat cap grup"
 
-#: ../plugins/project-manager/gbf-project-util.c:556
-msgid "Select sources..."
+#: ../plugins/project-manager/gbf-project-util.c:532
+#, fuzzy
+msgid "Select sourcesâ?¦"
 msgstr "Seleccioneu els fitxers font..."
 
-#: ../plugins/project-manager/gbf-project-util.c:796
-#: ../plugins/project-manager/gbf-project-util.c:803
-msgid "Can not add source files"
+#: ../plugins/project-manager/gbf-project-util.c:772
+#: ../plugins/project-manager/gbf-project-util.c:779
+#, fuzzy
+msgid "Cannot add source files"
 msgstr "No es poden afegir els fitxers font"
 
-#: ../plugins/project-manager/gbf-project-util.c:804
+#: ../plugins/project-manager/gbf-project-util.c:780
 msgid "No target has been selected"
 msgstr "No s'ha seleccionat cap objectiu"
 
@@ -6264,33 +7071,40 @@ msgstr "Propietats del grup"
 msgid "No properties available for this target"
 msgstr "No hi ha propietats disponibles per a aquest objectiu"
 
+#: ../plugins/project-manager/plugin.c:478
+#, fuzzy
+msgid "Refreshing symbol treeâ?¦"
+msgstr "Actualitza l'arbre del gestor de fitxers"
+
 #: ../plugins/project-manager/plugin.c:485
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "No es pot actualitzar el projecte: %s"
 
 #: ../plugins/project-manager/plugin.c:663
+#, fuzzy
 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 ""
 "Segur que voleu suprimir el grup següent del projecte?\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."
+"The group will not be deleted from the file system."
 msgstr ""
 "Grup: %s\n"
 "\n"
 "No se suprimirà el grup del sistema de fitxers."
 
 #: ../plugins/project-manager/plugin.c:667
+#, fuzzy
 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 ""
 "Segur que voleu suprimir l'objectiu següent del projecte?\n"
@@ -6302,19 +7116,20 @@ msgid "Target: %s"
 msgstr "Objectiu: %s"
 
 #: ../plugins/project-manager/plugin.c:671
+#, fuzzy
 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 ""
 "Segur que voleu suprimir el fitxer de codi següent del projecte?\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."
+"The source file will not be deleted from the file system."
 msgstr ""
 "Font: %s\n"
 "\n"
@@ -6352,8 +7167,9 @@ msgid "Refresh project manager tree"
 msgstr "Actualitza l'arbre del gestor de projectes"
 
 #: ../plugins/project-manager/plugin.c:836
-msgid "Add _Group..."
-msgstr "Afegeix un _grup..."
+#, fuzzy
+msgid "Add _Groupâ?¦"
+msgstr "Afegeix un _grup"
 
 #: ../plugins/project-manager/plugin.c:836
 #: ../plugins/project-manager/plugin.c:870
@@ -6361,8 +7177,9 @@ msgid "Add a group to project"
 msgstr "Afegeix un grup al projecte"
 
 #: ../plugins/project-manager/plugin.c:841
-msgid "Add _Target..."
-msgstr "Afegeix un _objectiu..."
+#, fuzzy
+msgid "Add _Targetâ?¦"
+msgstr "Afegeix un _objectiu"
 
 #: ../plugins/project-manager/plugin.c:841
 #: ../plugins/project-manager/plugin.c:875
@@ -6370,8 +7187,9 @@ msgid "Add a target to project"
 msgstr "Afegeix un objectiu al projecte"
 
 #: ../plugins/project-manager/plugin.c:846
-msgid "Add _Source File..."
-msgstr "Afegeix un fitxer de _codi..."
+#, fuzzy
+msgid "Add _Source Fileâ?¦"
+msgstr "Afegeix un fitxer de _codi"
 
 #: ../plugins/project-manager/plugin.c:846
 #: ../plugins/project-manager/plugin.c:865
@@ -6392,8 +7210,9 @@ msgid "Properties of group/target/source"
 msgstr "Propietats del grup/objecte/font"
 
 #: ../plugins/project-manager/plugin.c:865
-msgid "_Add To Project"
-msgstr "_Afegeix al projecte"
+#, fuzzy
+msgid "_Add to Project"
+msgstr "Afegeix al projecte"
 
 #: ../plugins/project-manager/plugin.c:870
 msgid "Add _Group"
@@ -6421,7 +7240,8 @@ msgid "Loading project: %s"
 msgstr "S'està carregant el projecte: %s"
 
 #: ../plugins/project-manager/plugin.c:1267
-msgid "Created project view..."
+#, fuzzy
+msgid "Created project viewâ?¦"
 msgstr "S'ha creat la visualització del projecte..."
 
 #: ../plugins/project-manager/plugin.c:1280
@@ -6447,7 +7267,8 @@ msgid "Project manager popup actions"
 msgstr "Accions emergents del gestor de projectes"
 
 #: ../plugins/project-manager/plugin.c:2641
-msgid "Initializing Project..."
+#, fuzzy
+msgid "Initializing Projectâ?¦"
 msgstr "S'està inicialitzant el projecte..."
 
 #: ../plugins/project-manager/plugin.c:2644
@@ -6455,7 +7276,8 @@ msgid "Project Loaded"
 msgstr "S'ha carregat el projecte"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
-msgid "<b>Details</b>"
+#, fuzzy
+msgid "Details"
 msgstr "<b>Detalls</b>"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:2
@@ -6463,11 +7285,6 @@ msgstr "<b>Detalls</b>"
 msgid "Error"
 msgstr "Error"
 
-#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:3
-#, fuzzy
-msgid "Select project type"
-msgstr "Seleccioneu un directori de projecte"
-
 #: ../plugins/project-wizard/druid.c:139 ../plugins/project-wizard/druid.c:143
 msgid "Warning"
 msgstr "Avís"
@@ -6491,12 +7308,12 @@ msgstr ""
 msgid "Project Type: %s\n"
 msgstr "Tipus de projecte: %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 es pot trobar cap plantilla de projecte a %s"
 
-#: ../plugins/project-wizard/druid.c:575
+#: ../plugins/project-wizard/druid.c:578
 #, c-format
 msgid ""
 "\n"
@@ -6505,22 +7322,21 @@ msgstr ""
 "\n"
 "El camp «%s» és obligatori. Introduïu-lo."
 
-#: ../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 "
+"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 camp «%s» ha de començar amb una lletra, un dígit o una ratlla baixa i "
-"només pot contenir lletres, dígits, ratlles baixes, guions i punts. Arregleu-"
-"lo."
+"només pot contenir lletres, dígits, ratlles baixes, guions i punts."
 
-#: ../plugins/project-wizard/druid.c:595
+#: ../plugins/project-wizard/druid.c:598
 #, c-format
 msgid "Unknown error."
 msgstr "Error desconegut."
 
-#: ../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 "
@@ -6529,20 +7345,20 @@ msgstr ""
 "Ja existeix el directori «%s». Pot fallar la creació del projecte si no es "
 "poden escriure alguns fitxers. Voleu 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 "Ja existeix el fitxer «%s». Voleu sobreescriure'l?"
 
-#: ../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 dubtosa"
 
-#: ../plugins/project-wizard/druid.c:776
+#: ../plugins/project-wizard/druid.c:779
 #, c-format
 msgid ""
 "\n"
@@ -6551,7 +7367,7 @@ msgstr ""
 "\n"
 "Programes que falten: %s."
 
-#: ../plugins/project-wizard/druid.c:787
+#: ../plugins/project-wizard/druid.c:790
 #, c-format
 msgid ""
 "\n"
@@ -6560,7 +7376,7 @@ msgstr ""
 "\n"
 "Paquets que falten: %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 "
@@ -6570,27 +7386,28 @@ msgstr ""
 "necessiten per a muntar aquest projecte. Assegureu-vos que estan instal·lats "
 "adequadament abans de generar el projecte.\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."
+"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 ""
 "Generalment els programes que falten són part d'alguna distribució de "
-"paquets i els podeu cercar en el Gestor d'aplicacions. De manera similar, "
+"paquets i els podeu cercar en el Gestor d'aplicacions. De la mateixa manera, "
 "els paquets de desenvolupament estan continguts en paquets especials que "
 "proporciona la distribució per a permetre el desenvolupament de projectes "
 "basats en aquests. Normalment aquests finalitzen amb el sufix -dev o -devel "
 "en el nom del paquet i es poden trobar en cercar en el Gestor d'aplicacions."
 
-#: ../plugins/project-wizard/druid.c:809
+#: ../plugins/project-wizard/druid.c:812
 msgid "Missing components"
 msgstr "Components que manquen"
 
-#: ../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 ""
@@ -6611,18 +7428,18 @@ msgid "Skipping %s: file already exists"
 msgstr "S'ignorarà %s: ja existeix el fitxer"
 
 #: ../plugins/project-wizard/install.c:503
-#, c-format
-msgid "Creating %s ... Fail to create directory"
+#, fuzzy, c-format
+msgid "Creating %s â?¦ Failed to create directory"
 msgstr "S'està creant %s... No s'ha pogut crear el directori"
 
 #: ../plugins/project-wizard/install.c:519
-#, c-format
-msgid "Creating %s (using AutoGen)... %s"
+#, fuzzy, c-format
+msgid "Creating %s (using AutoGen)â?¦ %s"
 msgstr "S'està creant %s (fent servir AutoGen)... %s"
 
 #: ../plugins/project-wizard/install.c:524
-#, c-format
-msgid "Creating %s ... %s"
+#, fuzzy, c-format
+msgid "Creating %s â?¦ %s"
 msgstr "S'està creant %s ... %s"
 
 #. The %s is a name of a unix command line, by example
@@ -6636,33 +7453,39 @@ msgstr "S'està executant: %s"
 msgid "New Project Assistant"
 msgstr "Auxiliar de projecte nou"
 
-#: ../plugins/project-wizard/property.c:289
-#: ../plugins/project-wizard/property.c:341
+#: ../plugins/project-wizard/property.c:288
+#: ../plugins/project-wizard/property.c:401
 msgid "No"
 msgstr "No"
 
-#: ../plugins/project-wizard/property.c:300
+#: ../plugins/project-wizard/property.c:299
 msgid "Select directory"
 msgstr "Seleccioneu el directori"
 
 # source\euro\euro.src string MESSAGES+2
 # Projecte_Open_Office_1.1 [wizards.po]
-#: ../plugins/project-wizard/property.c:308
+#: ../plugins/project-wizard/property.c:307
 msgid "Select file"
 msgstr "Seleccioneu un fitxer"
 
+#: ../plugins/project-wizard/property.c:359 ../plugins/tools/editor.c:522
+msgid "Select an Image File"
+msgstr "Seleccioneu un fitxer d'imatge"
+
 #: ../plugins/project-wizard/property.c:384
+#: ../plugins/project-wizard/property.c:474 ../plugins/tools/editor.c:556
+#: ../plugins/tools/editor.c:703
+msgid "Choose Icon"
+msgstr "Escolliu una icona"
+
+#: ../plugins/project-wizard/property.c:444
 msgid "Choose directory"
 msgstr "Escolliu un directori"
 
-#: ../plugins/project-wizard/property.c:388
+#: ../plugins/project-wizard/property.c:448
 msgid "Choose file"
 msgstr "Escolliu un fitxer"
 
-#: ../plugins/project-wizard/property.c:403
-msgid "Icon choice"
-msgstr "Selecció de la icona"
-
 #: ../plugins/project-wizard/templates/translatable-strings.h:1
 msgid "A GNOME applet project"
 msgstr "Un projecte de miniaplicació del GNOME"
@@ -6688,7 +7511,8 @@ msgid "A generic Xlib project"
 msgstr "Un projecte genèric d'Xlib"
 
 #: ../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"
 msgstr ""
 "Un projecte genèric de Java utilitzant la gestió de projectes de l'automake"
 
@@ -6697,8 +7521,9 @@ msgid "A generic minimal and flat project"
 msgstr "Un projecte genèric mínim"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:9
+#, fuzzy
 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 projecte genèric compilat en Java nadiu utilitzant el compilador de Java "
 "de GNU (gcj)"
@@ -6708,12 +7533,14 @@ msgid "A generic project"
 msgstr "Un projecte genèric"
 
 #: ../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"
 msgstr ""
 "Un projecte genèric de Python utilitzant la gestió de projectes de l'automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:12
-msgid "A generic wx Widgets project"
+#, fuzzy
+msgid "A generic wxWidgets project"
 msgstr "Un projecte genèric de wx Widgets"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:13
@@ -6777,8 +7604,9 @@ msgid "Berkeley Software Distribution License (BSD)"
 msgstr "Llicència de distribució de programari Berkeley (BSD)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:27
+#, fuzzy
 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 ""
 "Separats per una coma, els altres connectors dels quals depèn aquest "
@@ -6794,86 +7622,92 @@ msgid "Configure external packages:"
 msgstr "Configura els paquets externs:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:30
-msgid "Create a template glade interface file"
-msgstr "Crea un fitxer de plantilla d'interfície Glade"
+#, fuzzy
+msgid "Create GtkBuilder interface file"
+msgstr "Crea un fitxer d'interfície GTK Builder"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:31
-msgid "Create glade interface file"
-msgstr "Crea un fitxer d'interfície Glade"
+#: ../plugins/project-wizard/templates/translatable-strings.h:32
+#, fuzzy
+msgid "Create a template GtkBuilder interface file"
+msgstr "Crea un fitxer de plantilla d'interfície GTK Builder"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:34
+#: ../plugins/project-wizard/templates/translatable-strings.h:35
 msgid "Display description of the applet"
 msgstr "Mostra la descripció de la miniaplicació"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:35
+#: ../plugins/project-wizard/templates/translatable-strings.h:36
 msgid "Display description of the plugin"
 msgstr "Mostra la descripció del connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:36
+#: ../plugins/project-wizard/templates/translatable-strings.h:37
 msgid "Display title of the applet"
 msgstr "Mostra el títol de la miniaplicació"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:37
+#: ../plugins/project-wizard/templates/translatable-strings.h:38
 msgid "Display title of the plugin"
 msgstr "Mostra el títol del connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:38
+#: ../plugins/project-wizard/templates/translatable-strings.h:39
 msgid "Django Project"
 msgstr "Projecte Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:39
+#: ../plugins/project-wizard/templates/translatable-strings.h:40
 msgid "Django Project information"
 msgstr "Informació del projecte Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:40
+#: ../plugins/project-wizard/templates/translatable-strings.h:41
 msgid "Email address:"
 msgstr "Adreça de correu electrònic:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:41
+#: ../plugins/project-wizard/templates/translatable-strings.h:42
 msgid "GCJ needs to know which class contains the main() function"
 msgstr "El GCJ necessita saber quina classe conté la funció main()"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:42
+#: ../plugins/project-wizard/templates/translatable-strings.h:43
 msgid "GNOME Applet"
 msgstr "Miniaplicació del GNOME"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:43
+#: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GTK+"
 msgstr "GTK+"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
+#: ../plugins/project-wizard/templates/translatable-strings.h:45
 msgid "GTKmm"
 msgstr "GTKmm"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
+#: ../plugins/project-wizard/templates/translatable-strings.h:46
 msgid "General Project Information"
 msgstr "Informació general del projecte"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:47
+#: ../plugins/project-wizard/templates/translatable-strings.h:48
 msgid "Generic"
 msgstr "Genèric"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
+#: ../plugins/project-wizard/templates/translatable-strings.h:49
 msgid "Generic (Minimal)"
 msgstr "Genèric (mínim)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
+#: ../plugins/project-wizard/templates/translatable-strings.h:50
 msgid "Generic C++"
 msgstr "C++ genèric"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
-msgid "Generic gcj compiled java"
+#: ../plugins/project-wizard/templates/translatable-strings.h:51
+#, fuzzy
+msgid "Generic gcj compiled Java"
 msgstr "Java genèric compilat amb gcj"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
-msgid "Generic java (automake)"
+#: ../plugins/project-wizard/templates/translatable-strings.h:52
+#, fuzzy
+msgid "Generic Java (automake)"
 msgstr "Java genèric (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
-msgid "Generic python (automake)"
+#: ../plugins/project-wizard/templates/translatable-strings.h:53
+#, fuzzy
+msgid "Generic Python (automake)"
 msgstr "Python genèric (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
+#: ../plugins/project-wizard/templates/translatable-strings.h:54
 msgid ""
 "Give a package name that your project require. You may also mention what is "
 "the required version of the package. For example, 'libgnomeui-2.0' or "
@@ -6883,251 +7717,253 @@ msgstr ""
 "és la versió necessària del paquet. Per exemple, «libgnomeui-2.0» o "
 "«libgnomeui-2.0 >= 2.2.0»"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
+#: ../plugins/project-wizard/templates/translatable-strings.h:55
 msgid "Icon File:"
 msgstr "Fitxer de la icona:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
+#: ../plugins/project-wizard/templates/translatable-strings.h:56
 msgid "Icon file for the plugin"
 msgstr "Fitxer de la icona per al connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
+#: ../plugins/project-wizard/templates/translatable-strings.h:57
 msgid "Implement plugin interfaces"
 msgstr "Implementa les interfícies del connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
+#: ../plugins/project-wizard/templates/translatable-strings.h:58
 msgid "Interface implemented by the plugin"
 msgstr "Interfície implementada pel connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
+#: ../plugins/project-wizard/templates/translatable-strings.h:59
 msgid "Interface:"
 msgstr "Interfície:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:60
+#: ../plugins/project-wizard/templates/translatable-strings.h:61
 msgid "License"
 msgstr "Llicència"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
+#: ../plugins/project-wizard/templates/translatable-strings.h:62
 msgid "Main Class:"
 msgstr "Classe principal:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
+#: ../plugins/project-wizard/templates/translatable-strings.h:63
 msgid "Main class"
 msgstr "Classe principal"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
+#: ../plugins/project-wizard/templates/translatable-strings.h:64
 msgid "Makefile project"
 msgstr "Projecte makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
+#: ../plugins/project-wizard/templates/translatable-strings.h:65
 msgid "Makefile-based project"
 msgstr "Projecte basat en el makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
+#: ../plugins/project-wizard/templates/translatable-strings.h:66
 msgid "Mininum SDL version required"
 msgstr "Versió mínima necessària de l'SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
+#: ../plugins/project-wizard/templates/translatable-strings.h:67
 msgid "Name of the value to watch"
 msgstr "Nom del valor a vigilar"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
+#: ../plugins/project-wizard/templates/translatable-strings.h:68
 msgid "No license"
 msgstr "Sense llicència"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
+#: ../plugins/project-wizard/templates/translatable-strings.h:69
 msgid "Options for project build system"
 msgstr "Opcions per al sistema de muntatge del projecte"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
+#: ../plugins/project-wizard/templates/translatable-strings.h:70
 msgid "Plugin Class Name:"
 msgstr "Nom de la classe del connector:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
+#: ../plugins/project-wizard/templates/translatable-strings.h:71
 msgid "Plugin Dependencies:"
 msgstr "Dependències del connector:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
+#: ../plugins/project-wizard/templates/translatable-strings.h:72
 msgid "Plugin Description:"
 msgstr "Descripció del connector:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
+#: ../plugins/project-wizard/templates/translatable-strings.h:73
 msgid "Plugin Title:"
 msgstr "Títol del connector:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
+#: ../plugins/project-wizard/templates/translatable-strings.h:74
 msgid "Plugin class name"
 msgstr "Nom de la classe del connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
-msgid "Plugin has menus or/and toolbars"
+#: ../plugins/project-wizard/templates/translatable-strings.h:75
+#, fuzzy
+msgid "Plugin has menus and/or toolbars"
 msgstr "El connector té menús i/o barres d'eines"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
+#: ../plugins/project-wizard/templates/translatable-strings.h:76
 msgid "Plugin interfaces to implement"
 msgstr "Interfícies del connector a implementar"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
+#: ../plugins/project-wizard/templates/translatable-strings.h:77
 msgid "Project Name:"
 msgstr "Nom del projecte:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
-msgid "Project directory, output file etc."
+#: ../plugins/project-wizard/templates/translatable-strings.h:78
+#, fuzzy
+msgid "Project directory, output file, etc."
 msgstr "Directori del projecte, fitxer de sortida, etc."
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
+#: ../plugins/project-wizard/templates/translatable-strings.h:79
 msgid "Project directory:"
 msgstr "Directori del projecte:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
+#: ../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.)"
+"project build target (executable, library, etc.)"
 msgstr ""
 "El nom del projecte no pot contenir espais perquè serà el nom del projecte "
 "objectiu a muntar (executable, biblioteca, etc.)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
+#: ../plugins/project-wizard/templates/translatable-strings.h:81
 msgid "Project name:"
 msgstr "Nom del projecte:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
+#: ../plugins/project-wizard/templates/translatable-strings.h:82
 msgid "Project options"
 msgstr "Opcions del projecte"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
-msgid "Python webproject using Django Web Framework"
+#: ../plugins/project-wizard/templates/translatable-strings.h:83
+#, fuzzy
+msgid "Python web project using Django Web Framework"
 msgstr "Projecte web Python que utilitza l'entorn de treball web Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
+#: ../plugins/project-wizard/templates/translatable-strings.h:84
 msgid "Require Package:"
 msgstr "Necessita el paquet:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
+#: ../plugins/project-wizard/templates/translatable-strings.h:85
 msgid "Require SDL version:"
 msgstr "Necessita la versió SDL:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
+#: ../plugins/project-wizard/templates/translatable-strings.h:86
 msgid "Require SDL_gfx library"
 msgstr "Necessita la biblioteca SDL_gfx"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
+#: ../plugins/project-wizard/templates/translatable-strings.h:87
 msgid "Require SDL_gfx:"
 msgstr "Necessita la SDL_gfx:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
+#: ../plugins/project-wizard/templates/translatable-strings.h:88
 msgid "Require SDL_image library"
 msgstr "Necessita la biblioteca SDL_image"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
+#: ../plugins/project-wizard/templates/translatable-strings.h:89
 msgid "Require SDL_image:"
 msgstr "Necessita la SDL_image:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
+#: ../plugins/project-wizard/templates/translatable-strings.h:90
 msgid "Require SDL_mixer library"
 msgstr "Necessita la biblioteca SDL_mixer"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
+#: ../plugins/project-wizard/templates/translatable-strings.h:91
 msgid "Require SDL_mixer:"
 msgstr "Necessita la SDL_mixer:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
+#: ../plugins/project-wizard/templates/translatable-strings.h:92
 msgid "Require SDL_net library"
 msgstr "Necessita la biblioteca SDL_net"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
+#: ../plugins/project-wizard/templates/translatable-strings.h:93
 msgid "Require SDL_net:"
 msgstr "Necessita el SDL_net:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
+#: ../plugins/project-wizard/templates/translatable-strings.h:94
 msgid "Require SDL_ttf library"
 msgstr "Necessita la biblioteca SDL_ttf"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
+#: ../plugins/project-wizard/templates/translatable-strings.h:95
 msgid "Require SDL_ttf:"
 msgstr "Necessita la SDL_ttf:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
+#: ../plugins/project-wizard/templates/translatable-strings.h:96
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
+#: ../plugins/project-wizard/templates/translatable-strings.h:97
 msgid "Select code license"
 msgstr "Selecciona la llicència del codi"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
+#: ../plugins/project-wizard/templates/translatable-strings.h:98
 msgid "Shell values to watch"
 msgstr "Valors de l'intèrpret d'ordres a vigilar"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
+#: ../plugins/project-wizard/templates/translatable-strings.h:99
 msgid "Use pkg-config to add library support from other packages"
 msgstr ""
 "Utilitzeu el pkg-config per a afegir compatibilitat per a biblioteques des "
 "d'altres paquets"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
+#: ../plugins/project-wizard/templates/translatable-strings.h:100
 msgid "Value Name:"
 msgstr "Nom del valor:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
+#: ../plugins/project-wizard/templates/translatable-strings.h:101
 msgid "Values to watch"
 msgstr "Valors a vigilar"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:102
+#: ../plugins/project-wizard/templates/translatable-strings.h:103
 msgid "Whether the plugin has menus or toolbars"
 msgstr "Si el connector té menú o barres d'eines"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
-msgid "Wx Widgets"
-msgstr "Wx Widgets"
-
 #: ../plugins/project-wizard/templates/translatable-strings.h:104
+#, fuzzy
+msgid "wxWidgets"
+msgstr "Ginys"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:105
 msgid "Xlib"
 msgstr "Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:105
+#: ../plugins/project-wizard/templates/translatable-strings.h:106
 msgid "Xlib dock"
 msgstr "Acoblador Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
-msgid "gtk-doc is used to compile API documentations for GObject based classes"
+#: ../plugins/project-wizard/templates/translatable-strings.h:107
+#, fuzzy
+msgid "gtk-doc is used to compile API documentation for GObject-based classes"
 msgstr ""
 "El gtk-doc s'utilitza per a compilar la documentació de l'API per a les "
 "classes basades en GObject"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:107
+#: ../plugins/project-wizard/templates/translatable-strings.h:108
 msgid "project name"
 msgstr "nom del projecte"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:2
+#: ../plugins/run-program/anjuta-run-program.ui.h:2
 msgid "Choose a working directory"
 msgstr "Escolliu un directori de treball"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:3
+#: ../plugins/run-program/anjuta-run-program.ui.h:3
 msgid "Environment Variables:"
 msgstr "Variables d'entorn:"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:4
+#: ../plugins/run-program/anjuta-run-program.ui.h:4
 msgid "Program Parameters"
 msgstr "Paràmetres del programa"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:5
+#: ../plugins/run-program/anjuta-run-program.ui.h:5
 msgid "Program:"
 msgstr "Programa:"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:6
-msgid "Run In Terminal"
+#: ../plugins/run-program/anjuta-run-program.ui.h:6
+#, fuzzy
+msgid "Run in Terminal"
 msgstr "Executa en un terminal"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:7
+#: ../plugins/run-program/anjuta-run-program.ui.h:7
 msgid "Working Directory:"
 msgstr "Directori de treball:"
 
-#: ../plugins/run-program/execute.c:76
-#, c-format
-msgid "Program '%s' does not exist"
-msgstr "No existeix el programa «%s»"
-
 #. Only local directory are supported
 #: ../plugins/run-program/execute.c:107
 #, c-format
@@ -7138,12 +7974,12 @@ msgstr "El directori del programa «%s» no és local"
 msgid "Load Target to run"
 msgstr "Carrega l'objectiu a executar"
 
-#: ../plugins/run-program/parameters.c:732
-#: ../plugins/search/search_preferences.c:534
-msgid "Name"
-msgstr "Nom"
+#: ../plugins/run-program/parameters.c:616
+#, c-format
+msgid "Missing file %s"
+msgstr "Falta el fitxer %s"
 
-#: ../plugins/run-program/plugin.c:177
+#: ../plugins/run-program/plugin.c:191
 msgid ""
 "The program is running.\n"
 "Do you want to restart it?"
@@ -7153,219 +7989,196 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/run-program/plugin.c:215
+#: ../plugins/run-program/plugin.c:229
 msgid "_Run"
 msgstr "_Executa"
 
-#: ../plugins/run-program/plugin.c:223
+#: ../plugins/run-program/plugin.c:237
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in.h:3
 msgid "Execute"
 msgstr "Executa"
 
-#: ../plugins/run-program/plugin.c:225
+#: ../plugins/run-program/plugin.c:239
 msgid "Run program without debugger"
 msgstr "Executa el programa sense depurador"
 
-#: ../plugins/run-program/plugin.c:231
+#: ../plugins/run-program/plugin.c:245
 msgid "Stop Program"
 msgstr "Atura el programa"
 
-#: ../plugins/run-program/plugin.c:233
+#: ../plugins/run-program/plugin.c:247
 msgid "Kill program"
 msgstr "Mata el programa"
 
-#: ../plugins/run-program/plugin.c:239
-msgid "Program Parameters..."
-msgstr "Paràmetres del programa..."
+#: ../plugins/run-program/plugin.c:253
+#, fuzzy
+msgid "Program Parametersâ?¦"
+msgstr "Paràmetres del programa"
 
-#: ../plugins/run-program/plugin.c:241
-msgid "Set current program, arguments and so on"
+#: ../plugins/run-program/plugin.c:255
+#, fuzzy
+msgid "Set current program, arguments, etc."
 msgstr "Estableix el programa actual, els arguments i altres paràmetres"
 
-#: ../plugins/run-program/plugin.c:266
+#: ../plugins/run-program/plugin.c:280
 msgid "Run operations"
 msgstr "Executa les operacions"
 
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:1
-msgid "<b>Scratchbox Options</b>\n"
-msgstr "<b>Opcions de l'Scratchbox</b>\n"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:3
-msgid "Scratchbox directory:"
-msgstr "Directori de l'Scratchbox:"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:4
-msgid "Scratchbox target:"
-msgstr "Objectiu de l'Scratchbox:"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:5
-msgid "Scratchbox version:"
-msgstr "Versió de l'Scratchbox:"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:6
-msgid "Select Scratchbox Folder"
-msgstr "Seleccioneu la carpeta de l'Scratchbox"
-
-#: ../plugins/scratchbox/plugin.c:458 ../plugins/scratchbox/plugin.c:480
-msgid "Scratchbox"
-msgstr "Scratchbox"
-
-#. Public functions
-#. *---------------------------------------------------------------------------
-#: ../plugins/search/anjuta-search.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Accions</b>"
-
-#: ../plugins/search/anjuta-search.glade.h:2
-msgid "<b>File Filter</b>"
-msgstr "<b>Filtre de fitxers</b>"
-
-#: ../plugins/search/anjuta-search.glade.h:4
-msgid "<b>Parameters</b>"
-msgstr "<b>Paràmetres</b>"
-
-#: ../plugins/search/anjuta-search.glade.h:5
-msgid "<b>Scope</b>"
-msgstr "<b>Abast</b>"
-
-#. User can select variables that contain lists of files, so this is a combined noun
-#: ../plugins/search/anjuta-search.glade.h:7
-msgid "<b>Search variable</b>"
-msgstr "<b>Variable de cerca</b>"
+#: ../plugins/search/anjuta-search.ui.h:1
+#, fuzzy
+msgid "Actions"
+msgstr "Acció"
 
-#: ../plugins/search/anjuta-search.glade.h:8
-#: ../plugins/search/search-replace.c:93
+#: ../plugins/search/anjuta-search.ui.h:2
+#: ../plugins/search/search-replace.c:92
 msgid "Backward"
 msgstr "Endarrere"
 
-#: ../plugins/search/anjuta-search.glade.h:9
+#: ../plugins/search/anjuta-search.ui.h:3
 msgid "Basic Search & Replace"
 msgstr "Cerca i reemplaçament bàsic"
 
-#: ../plugins/search/anjuta-search.glade.h:10
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Directories:"
 msgstr "Escolliu els directoris:"
 
-#: ../plugins/search/anjuta-search.glade.h:11
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "Choose Files:"
 msgstr "Escolliu els fitxers:"
 
-#: ../plugins/search/anjuta-search.glade.h:12
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "Expand regex back references"
 msgstr "Expandeix les referències d'expressions regulars"
 
-#: ../plugins/search/anjuta-search.glade.h:13
+#: ../plugins/search/anjuta-search.ui.h:7
+#, fuzzy
+msgid "File Filter"
+msgstr "<b>Filtre de fitxers</b>"
+
+#: ../plugins/search/anjuta-search.ui.h:8
 msgid "Find & Replace"
 msgstr "Cerca i reemplaça"
 
-#: ../plugins/search/anjuta-search.glade.h:14
-#: ../plugins/search/search-replace.c:92
+#: ../plugins/search/anjuta-search.ui.h:9
+#: ../plugins/search/search-replace.c:91
 msgid "Forward"
 msgstr "Endavant"
 
 #. the order of these matters - it must match the order of the corresponding
 #. radio buttons on another page
-#: ../plugins/search/anjuta-search.glade.h:15
-#: ../plugins/search/search-replace.c:91
+#: ../plugins/search/anjuta-search.ui.h:10
+#: ../plugins/search/search-replace.c:90
 msgid "Full Buffer"
 msgstr "Memòria intermèdia completa"
 
-#: ../plugins/search/anjuta-search.glade.h:16
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Greedy matching"
 msgstr "Cerca voraç"
 
-#: ../plugins/search/anjuta-search.glade.h:17
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Ignore Binary Files"
 msgstr "Ignora els fitxers binaris"
 
-#: ../plugins/search/anjuta-search.glade.h:18
+#: ../plugins/search/anjuta-search.ui.h:13
 msgid "Ignore Directories:"
 msgstr "Ignora els directoris:"
 
-#: ../plugins/search/anjuta-search.glade.h:19
+#: ../plugins/search/anjuta-search.ui.h:14
 msgid "Ignore Files:"
 msgstr "Ignora els fitxers:"
 
-#: ../plugins/search/anjuta-search.glade.h:20
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Ignore Hidden Directories"
 msgstr "Ignora els directoris ocults"
 
-#: ../plugins/search/anjuta-search.glade.h:21
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Ignore Hidden Files"
 msgstr "Ignora els fitxers ocults"
 
-#: ../plugins/search/anjuta-search.glade.h:22
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Match at start of word"
 msgstr "Concorda al començament de la paraula"
 
-#: ../plugins/search/anjuta-search.glade.h:24
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Match complete lines"
 msgstr "Concorda amb línies senceres"
 
-#: ../plugins/search/anjuta-search.glade.h:25
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Match complete words"
 msgstr "Concorda amb paraules senceres"
 
-#: ../plugins/search/anjuta-search.glade.h:26
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "Maximum Actions"
 msgstr "Accions màximes"
 
-#: ../plugins/search/anjuta-search.glade.h:27
+#: ../plugins/search/anjuta-search.ui.h:22
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../plugins/search/anjuta-search.glade.h:28
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "New Name:"
 msgstr "Nom nou:"
 
-#: ../plugins/search/anjuta-search.glade.h:29
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "No Limit"
 msgstr "Cap límit"
 
-#: ../plugins/search/anjuta-search.glade.h:30
+#: ../plugins/search/anjuta-search.ui.h:26
+#, fuzzy
+msgid "Parameters"
+msgstr "Paràmetres:"
+
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Regular expression"
 msgstr "Expressió regular"
 
-#: ../plugins/search/anjuta-search.glade.h:31
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Replace With:"
 msgstr "Reemplaça amb:"
 
-#: ../plugins/search/anjuta-search.glade.h:32
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Search Action:"
 msgstr "Acció de la cerca:"
 
-#: ../plugins/search/anjuta-search.glade.h:33
+#: ../plugins/search/anjuta-search.ui.h:31
 msgid "Search Direction:"
 msgstr "Direcció de la cerca:"
 
 #. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.glade.h:35
+#: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search Expression"
 msgstr "Expressió a cercar"
 
 #. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.glade.h:37
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search Expression:"
 msgstr "Expressió a cercar:"
 
-#: ../plugins/search/anjuta-search.glade.h:38
+#: ../plugins/search/anjuta-search.ui.h:36
 msgid "Search In:"
 msgstr "Cerca a:"
 
-#: ../plugins/search/anjuta-search.glade.h:39
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search Recursively"
 msgstr "Cerca recursiva"
 
-#: ../plugins/search/anjuta-search.glade.h:40
+#: ../plugins/search/anjuta-search.ui.h:38
 msgid "Search Target"
 msgstr "Objectiu de la cerca"
 
-#: ../plugins/search/anjuta-search.glade.h:41
+#. User can select variables that contain lists of files, so this is a combined noun
+#: ../plugins/search/anjuta-search.ui.h:40
+#, fuzzy
+msgid "Search variable"
+msgstr "<b>Variable de cerca</b>"
+
+#: ../plugins/search/anjuta-search.ui.h:41
 msgid "Setting"
 msgstr "Paràmetres"
 
 #: ../plugins/search/plugin.c:68
-msgid "_Find..."
+#, fuzzy
+msgid "_Findâ?¦"
 msgstr "Ce_rca..."
 
 #: ../plugins/search/plugin.c:69
@@ -7385,7 +8198,8 @@ msgid "Find _Previous"
 msgstr "_Troba l'anterior"
 
 #: ../plugins/search/plugin.c:78
-msgid "Find and R_eplace..."
+#, fuzzy
+msgid "Find and R_eplaceâ?¦"
 msgstr "C_erca i reemplaça..."
 
 #: ../plugins/search/plugin.c:80
@@ -7399,7 +8213,8 @@ msgid "Search and Replace"
 msgstr "Cerca i reemplaça"
 
 #: ../plugins/search/plugin.c:85
-msgid "Fin_d in Files..."
+#, fuzzy
+msgid "Fin_d in Filesâ?¦"
 msgstr "Cerca a fit_xers..."
 
 #: ../plugins/search/plugin.c:86
@@ -7407,123 +8222,125 @@ msgid "Search for a string in multiple files or directories"
 msgstr "Cerca una cadena a múltiples fitxers o directoris"
 
 #: ../plugins/search/plugin.c:102
-msgid "Searching..."
-msgstr "S'està cercant..."
+#, fuzzy
+msgid "Searchingâ?¦"
+msgstr "S'està cercant"
 
 #: ../plugins/search/search_preferences.c:44
 msgid "Basic Search"
 msgstr "Cerca bàsica"
 
-#: ../plugins/search/search-replace.c:98
+#: ../plugins/search/search-replace.c:97
 msgid "Current Buffer"
 msgstr "Memòria intermèdia actual"
 
-#: ../plugins/search/search-replace.c:99
+#: ../plugins/search/search-replace.c:98
 msgid "Current Selection"
 msgstr "Selecció actual"
 
-#: ../plugins/search/search-replace.c:100
+#: ../plugins/search/search-replace.c:99
 msgid "Current Block"
 msgstr "Bloc actual"
 
-#: ../plugins/search/search-replace.c:101
+#: ../plugins/search/search-replace.c:100
 msgid "Current Function"
 msgstr "Funció actual"
 
-#: ../plugins/search/search-replace.c:102
+#: ../plugins/search/search-replace.c:101
 msgid "All Open Buffers"
 msgstr "Totes les memòries intermèdies obertes"
 
-#: ../plugins/search/search-replace.c:103
+#: ../plugins/search/search-replace.c:102
 msgid "All Project Files"
 msgstr "Tots els fitxers del projecte"
 
 #. {SR_VARIABLE, N_("Specify File List")},
-#: ../plugins/search/search-replace.c:105
+#: ../plugins/search/search-replace.c:104
 msgid "Specify File Patterns"
 msgstr "Especifica els patrons de fitxer"
 
-#: ../plugins/search/search-replace.c:110
+#: ../plugins/search/search-replace.c:109
 msgid "Select next match"
 msgstr "Selecciona la concordança següent"
 
-#: ../plugins/search/search-replace.c:111
+#: ../plugins/search/search-replace.c:110
 msgid "Bookmark all matched lines"
 msgstr "Marca totes les línies amb concordances"
 
-#: ../plugins/search/search-replace.c:112
+#: ../plugins/search/search-replace.c:111
 msgid "Mark all matches"
 msgstr "Marca totes les concordances"
 
-#: ../plugins/search/search-replace.c:113
+#: ../plugins/search/search-replace.c:112
 msgid "List matches in find pane"
 msgstr "Llista les concordances en la subfinestra de cerca"
 
-#: ../plugins/search/search-replace.c:114
+#: ../plugins/search/search-replace.c:113
 msgid "Replace next match"
 msgstr "Reemplaça la concordança següent"
 
-#: ../plugins/search/search-replace.c:115
+#: ../plugins/search/search-replace.c:114
 msgid "Replace all matches"
 msgstr "Reemplaça totes les concordances"
 
 #. Avoid space in translated string
-#: ../plugins/search/search-replace.c:320
+#: ../plugins/search/search-replace.c:319
 msgid "Find:"
 msgstr "Cerca:"
 
-#: ../plugins/search/search-replace.c:502
+#: ../plugins/search/search-replace.c:501
 msgid "Replace"
 msgstr "Reemplaça"
 
-#: ../plugins/search/search-replace.c:631
+#: ../plugins/search/search-replace.c:630
 msgid "Search complete"
 msgstr "S'ha completat la cerca"
 
-#: ../plugins/search/search-replace.c:1038
-#: ../plugins/search/search-replace.c:1722
+#: ../plugins/search/search-replace.c:1044
+#: ../plugins/search/search-replace.c:1731
 msgid "Replace All"
 msgstr "Reemplaça'ls tots"
 
-#: ../plugins/search/search-replace.c:1077
+#: ../plugins/search/search-replace.c:1083
 #, c-format
 msgid "The match \"%s\" was not found. Wrap search around the document?"
 msgstr "No s'ha trobat «%s». Voleu començar la cerca des del principi?"
 
-#: ../plugins/search/search-replace.c:1097
+#: ../plugins/search/search-replace.c:1103
 #, c-format
 msgid "The match \"%s\" was not found."
 msgstr "No s'ha trobat «%s»."
 
-#: ../plugins/search/search-replace.c:1112
+#: ../plugins/search/search-replace.c:1118
 msgid "The maximum number of results has been reached."
 msgstr "S'ha obtingut el nombre màxim de resultats."
 
-#: ../plugins/search/search-replace.c:1125
+#: ../plugins/search/search-replace.c:1131
 #, c-format
 msgid "%d match has been replaced."
 msgid_plural "%d matches have been replaced."
 msgstr[0] "s'ha reemplaçat %d concordança."
 msgstr[1] "s'han reemplaçat %d concordances."
 
-#: ../plugins/search/search-replace.c:1291
-msgid "Unable to build user interface for Search And Replace"
+#: ../plugins/search/search-replace.c:1298
+#, fuzzy
+msgid "Unable to build user interface for Search and Replace"
 msgstr "No es pot muntar la interfície d'usuari per a cercar i reemplaçar"
 
 #: ../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"
+"The file \"%s\" on the disk is more recent than the current buffer.\n"
 "Do you want to reload it?"
 msgstr ""
-"La còpia del fitxer «%s» al disc és més nova que la carregada a la memòria "
-"intermèdia.\n"
+"�s més nova la còpia del fitxer «%s» al disc que\n"
+"no pas la carregada a la memòria intermèdia.\n"
 "Voleu tornar-lo a carregar?"
 
 #: ../plugins/sourceview/sourceview.c:401
-#, c-format
+#, fuzzy, c-format
 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 ""
 "S'ha suprimit el fitxer «%s» del disc.\n"
@@ -7536,8 +8353,8 @@ msgid "Could not open %s: %s"
 msgstr "No s'ha pogut obrir %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?"
 msgstr "El fitxer «%s» només és de lectura. El voleu editar igualment?"
 
 #. Could not open <filename>: <error message>
@@ -7546,13 +8363,13 @@ msgstr "El fitxer «%s» només és de lectura. El voleu editar igualment?"
 msgid "Could not save %s: %s"
 msgstr "No s'ha pogut desar %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 s'ha pogut desar el fitxer perquè encara no se n'ha especificat el nom"
 
-#: ../plugins/sourceview/sourceview-io.c:504
+#: ../plugins/sourceview/sourceview-io.c:503
 #, c-format
 msgid "New file %d"
 msgstr "Fitxer nou %d"
@@ -7561,6 +8378,96 @@ msgstr "Fitxer nou %d"
 msgid "Preparing pages for printing"
 msgstr "S'estan preparant les pàgines per a imprimir"
 
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:1
+msgid "Color scheme:"
+msgstr "Esquema de colors:"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:2
+msgid "Create backup files"
+msgstr "Crea fitxers de còpia de seguretat"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
+msgid "Font"
+msgstr "Tipus de lletra"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
+msgid "Font:"
+msgstr "Tipus de lletra:"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
+msgid "Highlight current line"
+msgstr "Ressalta la línia actual"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
+msgid "Highlight matching brackets"
+msgstr "Ressalta les claus i parèntesis concordants"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
+msgid "Highlight syntax"
+msgstr "Ressaltat de sintaxi"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
+msgid "Indentation and auto-format options"
+msgstr "Opcions de sagnat i de format automàtic"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
+#, fuzzy
+msgid "Print line numbers"
+msgstr "Imprimeix els números de línia"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+msgid "Print options"
+msgstr "Opcions d'impressió"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
+msgid "Print page footer"
+msgstr "Imprimeix el peu de pàgina"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
+msgid "Print page header"
+msgstr "Imprimeix la capçalera de pàgina"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
+msgid "Printing"
+msgstr "Impressió"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
+msgid "Right margin position in characters"
+msgstr "Posició del marge dret en caràcters"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
+msgid "Show line numbers"
+msgstr "Mostra els números de línia"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
+msgid "Show marks"
+msgstr "Mostra els marcadors"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+msgid "Show right margin"
+msgstr "Mostra el marge dret"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
+msgid "Tab size in spaces:"
+msgstr "Mida de tabulació en espais:"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+msgid "Use tabs for indentation"
+msgstr "Utilitza el tabulador per sagnar"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
+msgid "Use theme font"
+msgstr "Utilitza el tipus de lletra del tema"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
+#: ../src/anjuta-app.c:493 ../src/anjuta-app.c:498
+msgid "View"
+msgstr "Visualitza"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
+msgid "Wrap long lines to fit on paper"
+msgstr "Ajusta les línies llargues a l'amplada del paper"
+
 #: ../plugins/starter/plugin.c:50 ../plugins/starter/starter.c:344
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
@@ -7587,162 +8494,176 @@ msgid "Anjuta Manual"
 msgstr "Manual de l'Anjuta"
 
 #: ../plugins/starter/starter.c:481
-msgid "Gnome Online API Documentation"
+#, fuzzy
+msgid "GNOME Online API Documentation"
 msgstr "Documentació en línia de l'API del GNOME"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:1
-msgid "<b>Branch/Tag URL:</b>"
-msgstr "<b>URL de la branca/etiqueta:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:3
-msgid "<b>End Revision:</b>"
-msgstr "<b>Revisió final:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:4
-msgid "<b>File or directory to diff:</b>"
-msgstr "<b>Fitxer o directori d'on obtenir les diferències:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:5
-msgid "<b>File/URL to Remove:</b>"
-msgstr "<b>Fitxer/URL a suprimir:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:6
-msgid "<b>First Path:</b>"
-msgstr "<b>Primer camí:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:11
-msgid "<b>Second Path:</b>"
-msgstr "<b>Segon camí:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:12
-msgid "<b>Select Changes to Revert:</b>"
-msgstr "<b>Seleccioneu els canvis a desfer:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:15
-msgid "<b>Source/Destination Paths:</b>"
-msgstr "<b>Camins font/destinació:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:16
-msgid "<b>Start Revision:</b>"
-msgstr "<b>Revisió inicial:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:17
-msgid "<b>Subversion Options</b>"
-msgstr "<b>Opcions del Subversion</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:19
-msgid "<b>Working Copy Path:</b>"
-msgstr "<b>Camí de la còpia de treball:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:20
+#: ../plugins/subversion/anjuta-subversion.ui.h:1
 msgid "Add file/directory"
 msgstr "Afegeix el fitxer/directori"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:25
+#: ../plugins/subversion/anjuta-subversion.ui.h:2
+msgid "Branch/Tag URL:"
+msgstr "URL de la branca/etiqueta:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:8
 msgid "Copy files/folders"
 msgstr "Copia els fitxers/carpetes"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:27
+#: ../plugins/subversion/anjuta-subversion.ui.h:10
 msgid "Diff Selected Revisions"
 msgstr "Diferències entre les revisions seleccionades"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:28
+#: ../plugins/subversion/anjuta-subversion.ui.h:11
 msgid "Diff file/directory"
 msgstr "Diferències entre fitxers/directoris"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:29
+#: ../plugins/subversion/anjuta-subversion.ui.h:12
 msgid "Diff to Previous"
 msgstr "Diferència amb l'anterior"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:33
+#: ../plugins/subversion/anjuta-subversion.ui.h:15
+msgid "End Revision:"
+msgstr "Revisió final:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:16
+msgid "File or directory to diff:"
+msgstr "Fitxer o directori d'on obtenir les diferències:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:17
+msgid "File/URL to Remove:"
+msgstr "Fitxer/URL a suprimir:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:18
+msgid "First Path:"
+msgstr "Primer camí:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:20
 msgid "Ignore ancestry"
 msgstr "Ignora els ancestrals"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:34
+#: ../plugins/subversion/anjuta-subversion.ui.h:22
 msgid "Merge changes into working copy"
 msgstr "Combina els canvis amb la còpia de treball"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:35
+#: ../plugins/subversion/anjuta-subversion.ui.h:25
 msgid "Other Revision:"
 msgstr "Una altra revisió:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:37
+#: ../plugins/subversion/anjuta-subversion.ui.h:27
+msgid "Previous Commit Messages:"
+msgstr "Missatges de publicació anteriors:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:28
 msgid "Realm:"
 msgstr "Regne:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:38
+#: ../plugins/subversion/anjuta-subversion.ui.h:29
 msgid "Recurse"
 msgstr "Recursivament"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:39
+#: ../plugins/subversion/anjuta-subversion.ui.h:30
 msgid "Remember Password"
 msgstr "Recorda la contrasenya"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:31
 msgid "Remember this decision"
 msgstr "Recorda aquesta decisió"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:41
+#: ../plugins/subversion/anjuta-subversion.ui.h:32
 msgid "Remove file/directory"
 msgstr "Suprimeix el fitxer/directori"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:42
+#: ../plugins/subversion/anjuta-subversion.ui.h:33
 msgid "Repository Head"
 msgstr "Cap del dipòsit"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:43
+#: ../plugins/subversion/anjuta-subversion.ui.h:34
 msgid "Repository authorization"
 msgstr "Autorització del dipòsit"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:45
+#: ../plugins/subversion/anjuta-subversion.ui.h:36
+#, fuzzy
+msgid "Retrieving status��"
+msgstr "S'està obtenint l'estat..."
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:37
 msgid "Revert Changes"
 msgstr "Desfés els canvis"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:47
+#: ../plugins/subversion/anjuta-subversion.ui.h:39
 msgid "Save open files before diffing"
 msgstr "Desa els fitxers oberts abans de diferenciar"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:40
+msgid "Second Path:"
+msgstr "Segon camí:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:41
+msgid "Select Changes to Revert:"
+msgstr "Seleccioneu els canvis a desfer:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:45
+msgid "Source/Destination Paths:"
+msgstr "Camins font/destinació:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:46
 msgid "Source:"
 msgstr "Font:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:50
+#: ../plugins/subversion/anjuta-subversion.ui.h:47
+msgid "Start Revision:"
+msgstr "Revisió inicial:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:48
+msgid "Subversion Options"
+msgstr "Opcions del Subversion"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:49
 msgid "Subversion Preferences"
 msgstr "Preferències del Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:50
 msgid "Switch to branch/tag"
 msgstr "Commuta a la branca/etiqueta"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:52
+#: ../plugins/subversion/anjuta-subversion.ui.h:51
 msgid "Trust server"
 msgstr "Confieu en el servidor"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:52
 msgid "Update file/directory"
 msgstr "Actualitza el fitxer/directori"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:54
+#: ../plugins/subversion/anjuta-subversion.ui.h:53
 msgid "Use first path"
 msgstr "Utilitza el primer camí"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:57
+#: ../plugins/subversion/anjuta-subversion.ui.h:54
+msgid "Use previous message"
+msgstr "Utilitza el missatge anterior"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:57
 msgid "View Log"
 msgstr "Visualitza el registre"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:58
+#: ../plugins/subversion/anjuta-subversion.ui.h:58
 msgid "View Selected Revision"
 msgstr "Visualitza la revisió seleccionada"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:59
+#: ../plugins/subversion/anjuta-subversion.ui.h:60
 msgid "Whole Project"
 msgstr "Tot el projecte"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:61
+#: ../plugins/subversion/anjuta-subversion.ui.h:62
 msgid "Working Copy"
 msgstr "Còpia de treball"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:62
+#: ../plugins/subversion/anjuta-subversion.ui.h:63
+msgid "Working Copy Path:"
+msgstr "Camí de la còpia de treball:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
 msgstr "regne"
 
@@ -7773,7 +8694,8 @@ msgstr "Publiqueu els canvis a l'arbre subversion"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
-msgid "_Revert..."
+#, fuzzy
+msgid "_Revertâ?¦"
 msgstr "_Desfés..."
 
 #. Display label
@@ -7785,7 +8707,8 @@ msgstr "Desfés els canvis a la còpia de treball."
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
-msgid "_Resolve Conflicts..."
+#, fuzzy
+msgid "_Resolve Conflictsâ?¦"
 msgstr "_Resol els conflictes..."
 
 #. Display label
@@ -7797,19 +8720,22 @@ msgstr "Resol els conflictes en la còpia de treball."
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
-msgid "_Update..."
-msgstr "Act_ualitza..."
+#, fuzzy
+msgid "_Updateâ?¦"
+msgstr "Act_ualitza"
 
 #. 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 "Syncronize your local copy with the Subversion tree"
 msgstr "Sincronitzeu la còpia local amb l'arbre del Subversion"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:108
-msgid "Copy Files/Folders..."
+#, fuzzy
+msgid "Copy Files/Foldersâ?¦"
 msgstr "Copia fitxers/carpetes..."
 
 #. Display label
@@ -7821,7 +8747,8 @@ msgstr "Copia els fitxers/carpetes del dipòsit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:116
-msgid "Switch to a Branch/Tag..."
+#, fuzzy
+msgid "Switch to a Branch/Tagâ?¦"
 msgstr "Commuta a una branca/etiqueta"
 
 #. Display label
@@ -7833,8 +8760,9 @@ msgstr "Commuta la còpia local a una branca o etiqueta del dipòsit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
-msgid "Merge..."
-msgstr "Combina..."
+#, fuzzy
+msgid "Mergeâ?¦"
+msgstr "Combina"
 
 #. Display label
 #. short-cut
@@ -7845,8 +8773,9 @@ msgstr "Combina els canvis amb la còpia de treball"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
-msgid "_View Log..."
-msgstr "_Visualitza el registre..."
+#, fuzzy
+msgid "_View Logâ?¦"
+msgstr "Visualitza el registre"
 
 #. Display label
 #. short-cut
@@ -7857,8 +8786,9 @@ msgstr "Visualitza l'historial del fitxer"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
-msgid "_Diff..."
-msgstr "_Diferències..."
+#, fuzzy
+msgid "_Diffâ?¦"
+msgstr "_Diferències"
 
 #. Display label
 #. short-cut
@@ -7869,24 +8799,26 @@ msgstr "Feu les diferències de l'arbre local amb el del dipòsit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:199
-msgid "Copy..."
-msgstr "Copia..."
+#, fuzzy
+msgid "Copyâ?¦"
+msgstr "_Copia"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:207
-msgid "Diff..."
-msgstr "Diferències..."
+#, fuzzy
+msgid "Diffâ?¦"
+msgstr "Diferència"
 
-#: ../plugins/subversion/plugin.c:454
+#: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
 msgstr "Operacions del Subversion"
 
-#: ../plugins/subversion/plugin.c:460
+#: ../plugins/subversion/plugin.c:494
 msgid "Subversion popup operations"
 msgstr "Operacions emergents del Subversion"
 
-#: ../plugins/subversion/plugin.c:488
+#: ../plugins/subversion/plugin.c:526
 msgid "Subversion Log"
 msgstr "Registre del Subversion"
 
@@ -7898,8 +8830,9 @@ msgstr "Subversion: s'afegirà el fitxer en la publicació següent."
 msgid "Subversion: Commit complete."
 msgstr "Subversion: publicació completa."
 
-#: ../plugins/subversion/subversion-commit-dialog.c:93
-msgid "Subversion: Committing changes to the repository..."
+#: ../plugins/subversion/subversion-commit-dialog.c:123
+#, fuzzy
+msgid "Subversion: Committing changes to the repositoryâ?¦"
 msgstr "Subversion: s'estan publicant els canvis al dipòsit..."
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
@@ -7921,8 +8854,9 @@ msgstr "[Cap/còpia de treball]"
 #: ../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..."
-msgstr "Subversion: s'està obtenint la diferència..."
+#, fuzzy
+msgid "Subversion: Retrieving diffâ?¦"
+msgstr "Subversion: s'està obtenint les diferències..."
 
 #: ../plugins/subversion/subversion-log-dialog.c:119
 msgid "Diff"
@@ -7937,7 +8871,8 @@ msgid "Short Log"
 msgstr "Registre curt"
 
 #: ../plugins/subversion/subversion-log-dialog.c:257
-msgid "Subversion: Retrieving log..."
+#, fuzzy
+msgid "Subversion: Retrieving logâ?¦"
 msgstr "Subversion: s'està obtenint el registre..."
 
 #: ../plugins/subversion/subversion-log-dialog.c:309
@@ -7945,7 +8880,8 @@ msgid "Subversion: File retrieved."
 msgstr "Subversion: fitxer obtingut."
 
 #: ../plugins/subversion/subversion-log-dialog.c:351
-msgid "Subversion: Retrieving file..."
+#, fuzzy
+msgid "Subversion: Retrieving fileâ?¦"
 msgstr "Subversion: s'està obtenint el fitxer..."
 
 #: ../plugins/subversion/subversion-merge-dialog.c:38
@@ -8007,83 +8943,83 @@ msgstr "Subversion: s'ha completat la diferència."
 msgid "Subversion: Update complete."
 msgstr "Subversion: s'ha completat l'actualització."
 
-#: ../plugins/subversion/svn-command.c:145
-#: ../plugins/subversion/svn-command.c:201
+#: ../plugins/subversion/svn-command.c:158
+#: ../plugins/subversion/svn-command.c:225
 msgid "Authentication canceled"
 msgstr "S'ha cancel·lat l'autenticació"
 
-#: ../plugins/subversion/svn-command.c:174
+#: ../plugins/subversion/svn-command.c:198
 msgid "Hostname:"
 msgstr "Nom de l'ordinador:"
 
-#: ../plugins/subversion/svn-command.c:175
+#: ../plugins/subversion/svn-command.c:199
 msgid "Fingerprint:"
 msgstr "Empremta:"
 
-#: ../plugins/subversion/svn-command.c:176
+#: ../plugins/subversion/svn-command.c:200
 msgid "Valid from:"
 msgstr "Vàlid des de:"
 
-#: ../plugins/subversion/svn-command.c:177
+#: ../plugins/subversion/svn-command.c:201
 msgid "Valid until:"
 msgstr "Vàlid fins:"
 
-#: ../plugins/subversion/svn-command.c:178
+#: ../plugins/subversion/svn-command.c:202
 msgid "Issuer DN:"
 msgstr "DN de l'emissor:"
 
-#: ../plugins/subversion/svn-command.c:179
+#: ../plugins/subversion/svn-command.c:203
 msgid "DER certificate:"
 msgstr "Certificat DER:"
 
-#: ../plugins/subversion/svn-command.c:326
-#: ../plugins/subversion/svn-command.c:342
+#: ../plugins/subversion/svn-command.c:350
+#: ../plugins/subversion/svn-command.c:366
 #, c-format
 msgid "Deleted: %s"
 msgstr "S'ha suprimit: %s"
 
-#: ../plugins/subversion/svn-command.c:329
-#: ../plugins/subversion/svn-command.c:348
+#: ../plugins/subversion/svn-command.c:353
+#: ../plugins/subversion/svn-command.c:372
 #, c-format
 msgid "Added: %s"
 msgstr "S'ha afegit: %s"
 
-#: ../plugins/subversion/svn-command.c:339
+#: ../plugins/subversion/svn-command.c:363
 #, c-format
 msgid "Resolved: %s"
 msgstr "S'ha resolt: %s"
 
-#: ../plugins/subversion/svn-command.c:345
+#: ../plugins/subversion/svn-command.c:369
 #, c-format
 msgid "Updated: %s"
 msgstr "S'ha actualitzat: %s"
 
-#: ../plugins/subversion/svn-command.c:351
+#: ../plugins/subversion/svn-command.c:375
 #, c-format
 msgid "Externally Updated: %s"
 msgstr "S'ha actualitzat externament: %s"
 
-#: ../plugins/subversion/svn-command.c:385
+#: ../plugins/subversion/svn-command.c:409
 #, c-format
 msgid "Modified: %s"
 msgstr "S'ha modificat: %s"
 
-#: ../plugins/subversion/svn-command.c:388
+#: ../plugins/subversion/svn-command.c:412
 #, c-format
 msgid "Merged: %s"
 msgstr "S'ha combinat: %s"
 
-#: ../plugins/subversion/svn-command.c:391
+#: ../plugins/subversion/svn-command.c:415
 #, c-format
 msgid "Conflicted: %s"
 msgstr "Amb conflictes: %s"
 
-#: ../plugins/subversion/svn-command.c:395
+#: ../plugins/subversion/svn-command.c:419
 #, c-format
 msgid "Missing: %s"
 msgstr "Falta: %s"
 
-#: ../plugins/subversion/svn-command.c:398
+#: ../plugins/subversion/svn-command.c:422
 #, c-format
 msgid "Obstructed: %s"
 msgstr "Obstruït: %s"
@@ -8093,252 +9029,267 @@ msgid "Tag De_claration"
 msgstr "De_claració d'etiqueta"
 
 #: ../plugins/symbol-db/plugin.c:315
-msgid "Goto symbol declaration"
+#, fuzzy
+msgid "Go to symbol declaration"
 msgstr "Vés a la declaració del símbol"
 
-#: ../plugins/symbol-db/plugin.c:321
-#, fuzzy
+#. Translators: Go to the line where the tag is implemented
+#: ../plugins/symbol-db/plugin.c:322
 msgid "Tag _Implementation"
-msgstr "_Definició d'etiqueta"
-
-#: ../plugins/symbol-db/plugin.c:323
-msgid "Goto symbol definition"
-msgstr "Vés a la definició del símbol"
+msgstr "_Implementació d'etiqueta"
 
-#: ../plugins/symbol-db/plugin.c:330
+#: ../plugins/symbol-db/plugin.c:324
 #, fuzzy
-msgid "_Find Symbol..."
-msgstr "Ce_rca..."
+msgid "Go to symbol definition"
+msgstr "Vés a la definició del símbol"
 
 #: ../plugins/symbol-db/plugin.c:331
 #, fuzzy
+msgid "_Find Symbolâ?¦"
+msgstr "Cerca un símbol"
+
+#: ../plugins/symbol-db/plugin.c:332
 msgid "Find Symbol"
-msgstr "Símbol"
+msgstr "Cerca un símbol"
 
-#: ../plugins/symbol-db/plugin.c:1110
-#, c-format
-msgid "%s: Generating inheritances..."
-msgstr ""
+#: ../plugins/symbol-db/plugin.c:1170
+#, fuzzy, c-format
+msgid "%s: Generating inheritancesâ?¦"
+msgstr "%s: S'estan generant les herències..."
 
-#: ../plugins/symbol-db/plugin.c:1115
+#: ../plugins/symbol-db/plugin.c:1175
 #, c-format
 msgid "%s: %d files scanned out of %d"
-msgstr ""
+msgstr "%s: %d fitxers analitzats de %d"
 
-#: ../plugins/symbol-db/plugin.c:1146
-#, c-format
-msgid "Generating inheritances..."
-msgstr ""
+#: ../plugins/symbol-db/plugin.c:1206
+#, fuzzy, c-format
+msgid "Generating inheritancesâ?¦"
+msgstr "S'estan generant les herències..."
 
-#: ../plugins/symbol-db/plugin.c:1148
+#: ../plugins/symbol-db/plugin.c:1208
 #, c-format
 msgid "%d files scanned out of %d"
-msgstr ""
+msgstr "%d fitxers analitzats de %d"
 
-#: ../plugins/symbol-db/plugin.c:1908
-msgid "Populating symbols' db..."
+#: ../plugins/symbol-db/plugin.c:1968
+#, fuzzy
+msgid "Populating symbol databaseâ?¦"
 msgstr "S'està creant la base de dades de símbols..."
 
-#: ../plugins/symbol-db/plugin.c:2228
-msgid "Local"
-msgstr "Local"
-
-#: ../plugins/symbol-db/plugin.c:2254
-msgid "Global"
-msgstr "Global"
-
-#: ../plugins/symbol-db/plugin.c:2311
+#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
 msgid "Symbols"
 msgstr "Símbols"
 
-#: ../plugins/symbol-db/plugin.c:2319
-#, fuzzy
+#: ../plugins/symbol-db/plugin.c:2489
 msgid "SymbolDb popup actions"
-msgstr "Accions emergents del navegador de símbols"
+msgstr "Accions emergents de la base de dades de símbols"
 
-#: ../plugins/symbol-db/plugin.c:2327
-#, fuzzy
+#: ../plugins/symbol-db/plugin.c:2497
 msgid "SymbolDb menu actions"
-msgstr "Accions del navegador de símbols"
+msgstr "Accions del menú de la base de dades de símbols"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:272
+#: ../plugins/symbol-db/symbol-db-prefs.c:275
 msgid "Package is not parseable"
 msgstr "No es pot analitzar el paquet"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:369
-#: ../plugins/symbol-db/symbol-db-prefs.c:510
+#: ../plugins/symbol-db/symbol-db-prefs.c:374
+#: ../plugins/symbol-db/symbol-db-prefs.c:522
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:1
 msgid "Symbol Database"
 msgstr "Base de dades de símbols"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:459
+#: ../plugins/symbol-db/symbol-db-prefs.c:471
 msgid "API Tags"
 msgstr "Etiquetes de l'API"
 
-#: ../plugins/symbol-db/symbol-db-system.c:805
+#: ../plugins/symbol-db/symbol-db-system.c:807
 msgid "Resuming glb scan."
 msgstr "S'està reprenent l'escaneig glb."
 
-#: ../plugins/symbol-db/symbol-db-view-locals.c:294
-#: ../plugins/symbol-db/symbol-db-view.c:1426
+#: ../plugins/symbol-db/symbol-db-view-locals.c:326
+#: ../plugins/symbol-db/symbol-db-view.c:1413
 msgid "Symbol"
 msgstr "Símbol"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:1
-msgid "<b>Available API tags</b>"
-msgstr "<b>Etiquetes de l'API disponibles</b>"
+#: ../plugins/symbol-db/symbol-db-view.c:799
+#, fuzzy
+msgid "Loadingâ?¦"
+msgstr "S'està carregant..."
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:3
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
 msgid "Automatically scan project's packages"
 msgstr "Escaneja automàticament els paquets del projecte"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:4
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
 msgid "Automatically update symbols without saving file"
 msgstr "Actualitza automàticament els símbols sense desar el fitxer"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:5
-msgid "Checking if package is parseable..."
-msgstr "S'està comprovant si es pot analitzar el paquet..."
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
+#, fuzzy
+msgid ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by the user."
+msgstr ""
+"Actualitza automàticament els símbols dels fitxers sense desar-los. "
+"L'actualització succeeix després de 10 segons si l'usuari no prem cap tecla."
+
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
+#, fuzzy
+msgid "Available API tags"
+msgstr "<b>Etiquetes de l'API disponibles</b>"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:6
-msgid "Ctags executable:"
-msgstr "Fitxer executable del ctags:"
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
+#, fuzzy
+msgid "Checking if package is parseableâ?¦"
+msgstr "S'està comprovant si es pot analitzar el paquet..."
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:7
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "Escaneja en paral·lel el projecte i els símbols globals"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:1
-msgid "<b>Terminal options</b>"
-msgstr "<b>Opcions del terminal</b>"
+#: ../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)"
+msgstr ""
+"Aquesta opció habilita els paquets predeterminats que calen al projecte que "
+"heu obert, per exemple la Glib i la Gtk+ si creeu un projecte GTK+ (pot "
+"caldre més treball de la CPU)"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:2
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
+#, fuzzy
 msgid ""
-"Default\n"
-"\n"
+"This option means that the global system packages will be scanned "
+"simultaneously with the project's ones"
 msgstr ""
-"Predeterminat\n"
-"\n"
+"Aquesta opció significa que els paquets globals del sistema s'analitzaran al "
+"mateix moment que els del projecte"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:5
-msgid "Use GNOME terminal profile:"
-msgstr "Utilitza el perfil de terminal del GNOME:"
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
+#, fuzzy
+msgid "Terminal options"
+msgstr "operacions del terminal"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:6
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:3
+#, fuzzy
+msgid "Use GNOME Terminal profile:"
+msgstr "Utilitza el perfil del terminal del GNOME:"
+
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:4
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "Fes servir el perfil actual del terminal del GNOME"
 
-#: ../plugins/terminal/terminal.c:701
+#: ../plugins/terminal/terminal.c:739
 msgid "terminal operations"
 msgstr "operacions del terminal"
 
-#: ../plugins/terminal/terminal.c:719 ../plugins/terminal/terminal.c:877
-#: ../plugins/terminal/terminal.c:930
+#: ../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.glade.h:1
-msgid "<b>Tools</b>"
-msgstr "<b>Eines</b>"
-
-#: ../plugins/tools/anjuta-tools.glade.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:2
 msgid "Command:"
 msgstr "Ordre:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:4
+#: ../plugins/tools/anjuta-tools.ui.h:3
 msgid "Edit as script"
 msgstr "Edita com a script"
 
-#: ../plugins/tools/anjuta-tools.glade.h:5
+#: ../plugins/tools/anjuta-tools.ui.h:4
 msgid "Edit command as script in Anjuta on close"
 msgstr "Editeu l'ordre com un script de l'Anjuta en tancar"
 
-#: ../plugins/tools/anjuta-tools.glade.h:8
+#: ../plugins/tools/anjuta-tools.ui.h:7
 msgid "Parameters:"
 msgstr "Paràmetres:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:10
+#: ../plugins/tools/anjuta-tools.ui.h:9
 msgid "Save all files"
 msgstr "Desa tots els fitxers"
 
-#: ../plugins/tools/anjuta-tools.glade.h:11
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Short cut:"
 msgstr "Drecera:"
 
 #. This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:13
+#: ../plugins/tools/anjuta-tools.ui.h:12
 msgid "Standard error:"
 msgstr "Error estàndard:"
 
 #. This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:15
+#: ../plugins/tools/anjuta-tools.ui.h:14
 msgid "Standard input:"
 msgstr "Entrada estàndard:"
 
 #. This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:17
+#: ../plugins/tools/anjuta-tools.ui.h:16
 msgid "Standard output:"
 msgstr "Sortida estàndard:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:18
+#: ../plugins/tools/anjuta-tools.ui.h:17
 msgid "Tool Editor"
 msgstr "Editor d'eines"
 
-#: ../plugins/tools/anjuta-tools.glade.h:19
+#: ../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 "Eines"
+
+#: ../plugins/tools/anjuta-tools.ui.h:19
 msgid "Variable list"
 msgstr "Llista de variables"
 
-#: ../plugins/tools/anjuta-tools.glade.h:20
+#: ../plugins/tools/anjuta-tools.ui.h:20
 msgid "Working directory:"
 msgstr "Directori de treball:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:21
-msgid "_Variable..."
-msgstr "_Variable..."
+#: ../plugins/tools/anjuta-tools.ui.h:21
+#, fuzzy
+msgid "_Variableâ?¦"
+msgstr "Variable"
 
-#: ../plugins/tools/dialog.c:176
+#: ../plugins/tools/dialog.c:177
 #, c-format
 msgid "Are you sure you want to delete the '%s' tool?"
 msgstr "Segur que voleu suprimir l'eina «%s»?"
 
-#: ../plugins/tools/dialog.c:335
+#: ../plugins/tools/dialog.c:343
 msgid "Tool"
 msgstr "Eina"
 
-#: ../plugins/tools/editor.c:309
+#: ../plugins/tools/editor.c:316
 msgid "ask at runtime"
 msgstr "demana-ho en temps d'execució"
 
-#: ../plugins/tools/editor.c:314
+#: ../plugins/tools/editor.c:321
 msgid "undefined"
 msgstr "sense definir"
 
-#: ../plugins/tools/editor.c:448
-msgid "Unable to build user interface for tool variable"
-msgstr "No es pot muntar la interfície d'usuari per a la variable de l'eina"
-
-#: ../plugins/tools/editor.c:464
+#: ../plugins/tools/editor.c:471
 msgid "Meaning"
 msgstr "Significat"
 
-#: ../plugins/tools/editor.c:564
+#: ../plugins/tools/editor.c:619
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: ../plugins/tools/editor.c:730
+#: ../plugins/tools/editor.c:791
 msgid "You must provide a tool name!"
 msgstr "Heu de proporcionar un nom d'eina"
 
-#: ../plugins/tools/editor.c:738
+#: ../plugins/tools/editor.c:799
 msgid "You must provide a tool command!"
 msgstr "Heu de proporcionar una ordre d'eina"
 
-#: ../plugins/tools/editor.c:746
+#: ../plugins/tools/editor.c:807
 msgid "A tool with the same name already exists!"
 msgstr "Ja existeix una eina amb aquest nom"
 
-#: ../plugins/tools/editor.c:763
+#: ../plugins/tools/editor.c:824
 msgid ""
 "The shortcut is already used by another component in Anjuta. Do you want to "
 "keep it anyway?"
@@ -8346,19 +9297,16 @@ msgstr ""
 "Un altre component de l'Anjuta està fent servir aquesta drecera. Voleu "
 "conservar-la igualment?"
 
-#: ../plugins/tools/editor.c:847
+#: ../plugins/tools/editor.c:908
 msgid "Unable to edit script"
 msgstr "No es pot editar l'script"
 
-#: ../plugins/tools/editor.c:983
-msgid "New accelerator..."
+#: ../plugins/tools/editor.c:1044
+#, fuzzy
+msgid "New acceleratorâ?¦"
 msgstr "Accelerador nou..."
 
-#: ../plugins/tools/editor.c:1053
-msgid "Unable to build user interface for tool editor"
-msgstr "No es pot muntar la interfície d'usuari per a l'editor d'eines"
-
-#: ../plugins/tools/execute.c:315
+#: ../plugins/tools/execute.c:314
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
@@ -8367,7 +9315,7 @@ msgstr "S'està obrint %s"
 #. * like "My tools (output)". It's used to name the message
 #. * pane where the output of the tool is send to
 #.
-#: ../plugins/tools/execute.c:410
+#: ../plugins/tools/execute.c:409
 msgid "(output)"
 msgstr "(sortida)"
 
@@ -8375,30 +9323,32 @@ msgstr "(sortida)"
 #. * like "My tools (error)". It's used to name the message
 #. * pane where the errors of the tool is send to
 #.
-#: ../plugins/tools/execute.c:418
+#: ../plugins/tools/execute.c:417
 msgid "(error)"
 msgstr "(error)"
 
 #. Display the name of the command
-#: ../plugins/tools/execute.c:470
-#, c-format
-msgid "Running command: %s...\n"
+#: ../plugins/tools/execute.c:469
+#, fuzzy, c-format
+msgid "Running command: %sâ?¦\n"
 msgstr "S'està executant l'ordre: %s...\n"
 
-#: ../plugins/tools/execute.c:510
+#: ../plugins/tools/execute.c:509
 #, c-format
 msgid "Completed unsuccessfully with status code %d\n"
 msgstr "No s'ha completat correctament, codi d'estat: %d\n"
 
-#: ../plugins/tools/execute.c:630
-msgid "Unable to create a buffer, command aborted"
+#: ../plugins/tools/execute.c:629
+#, fuzzy
+msgid "Unable to create a buffer: command aborted"
 msgstr "No es pot crear la memòria intermèdia. S'ha anul·lat l'ordre"
 
-#: ../plugins/tools/execute.c:642
-msgid "No document currently open, command aborted"
+#: ../plugins/tools/execute.c:641
+#, fuzzy
+msgid "No document currently open: command aborted"
 msgstr "No hi ha cap document obert. S'ha anul·lat l'ordre"
 
-#: ../plugins/tools/execute.c:1020
+#: ../plugins/tools/execute.c:1019
 #, c-format
 msgid "Unable to open input file %s, command aborted"
 msgstr "No es pot obrir el fitxer d'entrada %s. S'ha anul·lat l'ordre"
@@ -8425,10 +9375,104 @@ msgstr "No es pot obrir %s per a escriure"
 msgid "Tool operations"
 msgstr "Operacions d'eina"
 
-#: ../plugins/tools/plugin.c:252 ../plugins/tools/plugin.c:259
-#: ../plugins/tools/anjuta-tools.plugin.in.h:1
-msgid "Tools"
-msgstr "Eines"
+#: ../plugins/tools/variable.c:84
+msgid "Project root URI"
+msgstr "URI arrel del projecte"
+
+#: ../plugins/tools/variable.c:85
+msgid "Project root path"
+msgstr "Camí arrel del projecte"
+
+#: ../plugins/tools/variable.c:86
+msgid "Selected URI in the file manager plugin"
+msgstr "URI seleccionat al connector del gestor de fitxers"
+
+#: ../plugins/tools/variable.c:87
+msgid "Selected directory in the file manager plugin"
+msgstr "Directori seleccionat al connector del gestor de fitxers"
+
+#: ../plugins/tools/variable.c:88
+msgid "Selected full file name in the file manager plugin"
+msgstr "Nom de fitxer complet seleccionat al connector del gestor de fitxers"
+
+#: ../plugins/tools/variable.c:89
+msgid "Selected full file name without extension in the file manager plugin"
+msgstr ""
+"Nom de fitxer complet sense l'extensió seleccionat al connector del gestor "
+"de fitxers"
+
+#: ../plugins/tools/variable.c:90
+msgid "Selected file name in the file manager plugin"
+msgstr "Nom de fitxer seleccionat al connector del gestor de fitxers"
+
+#: ../plugins/tools/variable.c:91
+msgid "Selected file name without extension in the file manager plugin"
+msgstr ""
+"Nom de fitxer sense l'extensió seleccionat al connector del gestor de fitxers"
+
+#: ../plugins/tools/variable.c:92
+msgid "Selected file's extension in the file manager plugin"
+msgstr "Extensió de fitxer seleccionada al connector del gestor de fitxers"
+
+#: ../plugins/tools/variable.c:93
+msgid "Selected URI in the project manager plugin"
+msgstr "URI seleccionat al connector del gestor de projectes"
+
+#: ../plugins/tools/variable.c:94
+msgid "Selected directory in the project manager plugin"
+msgstr "Directori seleccionat al connector del gestor de projectes"
+
+#: ../plugins/tools/variable.c:95
+msgid "Selected full file name in the project manager plugin"
+msgstr "Nom de fitxer complet seleccionat al connector del gestor de projectes"
+
+#: ../plugins/tools/variable.c:96
+msgid "Selected full file name without extension in the project manager plugin"
+msgstr ""
+"Nom de fitxer complet sense l'extensió seleccionat al connector del gestor "
+"de projectes"
+
+#: ../plugins/tools/variable.c:97
+msgid "Selected file name in the project manager plugin"
+msgstr "Nom de fitxer seleccionat al connector del gestor de projectes"
+
+#: ../plugins/tools/variable.c:98
+msgid "Selected file name without extension in the project manager plugin"
+msgstr ""
+"Nom de fitxer sense l'extensió seleccionat al connector del gestor de "
+"projectes"
+
+#: ../plugins/tools/variable.c:99
+msgid "Selected file extension in the project manager plugin"
+msgstr "Extensió de fitxer seleccionada al connector del gestor de projectes"
+
+#: ../plugins/tools/variable.c:100
+msgid "Currently edited file name"
+msgstr "Nom del fitxer editat actualment"
+
+#: ../plugins/tools/variable.c:101
+msgid "Currently edited file name without extension"
+msgstr "Nom sense l'extensió del fitxer editat actualment"
+
+#: ../plugins/tools/variable.c:102
+msgid "Currently edited file directory"
+msgstr "Directori del fitxer editat actualment"
+
+#: ../plugins/tools/variable.c:103
+msgid "Currently selected text in editor"
+msgstr "Selecció actual en l'editor"
+
+#: ../plugins/tools/variable.c:104
+msgid "Current word in editor"
+msgstr "Paraula actual en l'editor"
+
+#: ../plugins/tools/variable.c:105
+msgid "Current line in editor"
+msgstr "Línia actual en l'editor"
+
+#: ../plugins/tools/variable.c:106
+msgid "Ask the user to get additional parameters"
+msgstr "Demana a l'usuari per obtenir paràmetres addicionals"
 
 #: ../plugins/tools/variable.c:493
 msgid "Command line parameters"
@@ -8455,7 +9499,8 @@ msgid "Replace buffer"
 msgstr "Reemplaça la memòria intermèdia"
 
 #: ../plugins/tools/tool.c:86
-msgid "Insert in buffer"
+#, fuzzy
+msgid "Insert into buffer"
 msgstr "Insereix en la memòria intermèdia"
 
 #: ../plugins/tools/tool.c:87
@@ -8495,84 +9540,11 @@ msgstr "Cadena"
 msgid "Copyright (c) Naba Kumar"
 msgstr "Copyright (c) Naba Kumar"
 
-#: ../src/anjuta.c:428
-msgid "Loaded Session..."
+#: ../src/anjuta.c:424
+#, fuzzy
+msgid "Loaded Sessionâ?¦"
 msgstr "S'ha carregat la sessió..."
 
-#: ../src/anjuta.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Aparença</b>"
-
-#: ../src/anjuta.glade.h:2
-msgid "<b>Project Defaults</b>"
-msgstr "<b>Predeterminats del projecte</b>"
-
-#: ../src/anjuta.glade.h:3
-msgid "<b>Session</b>"
-msgstr "<b>Sessió</b>"
-
-#: ../src/anjuta.glade.h:4
-msgid ""
-"Default\n"
-"Text below icons\n"
-"Text beside icons\n"
-"Icons only\n"
-"Text only"
-msgstr ""
-"Predeterminat\n"
-"Text sota les icones\n"
-"Text al costat de les icones\n"
-"Només icones\n"
-"Només text"
-
-#: ../src/anjuta.glade.h:9
-msgid "Default project directory:"
-msgstr "Directori predeterminat del projecte:"
-
-#: ../src/anjuta.glade.h:10
-msgid "Developer email address:"
-msgstr "Correu electrònic del desenvolupador:"
-
-#: ../src/anjuta.glade.h:11
-msgid "Developer name:"
-msgstr "Nom del desenvolupador:"
-
-#: ../src/anjuta.glade.h:12
-msgid "Do not load last project and files on startup"
-msgstr "En iniciar, no carreguis ni l'últim projecte ni els últims fitxers"
-
-#: ../src/anjuta.glade.h:13
-msgid "Do not load last session on startup"
-msgstr "En iniciar, no carreguis l'última sessió"
-
-#. Style of the buttons/tabs used to select docked windows in anjuta
-#: ../src/anjuta.glade.h:15
-msgid "Dock switcher style:"
-msgstr "Estil del canviador acoblable:"
-
-#: ../src/anjuta.glade.h:17
-msgid "Select projects directory"
-msgstr "Seleccioneu el directori dels projectes"
-
-#: ../src/anjuta.glade.h:18
-msgid ""
-"Text\n"
-"Icons\n"
-"Text + Icons\n"
-"Gnome toolbar setting\n"
-"Tabs"
-msgstr ""
-"Text\n"
-"Icones\n"
-"Text i icones\n"
-"Preferències de la barra d'eines del GNOME\n"
-"Pestanyes"
-
-#. translators: translate the same as in gnome-control-center
-#: ../src/anjuta.glade.h:24
-msgid "Toolbar button labels:"
-msgstr "Etiquetes dels botons de la barra d'eines:"
-
 #: ../src/anjuta-actions.h:23
 msgid "_File"
 msgstr "_Fitxer"
@@ -8704,26 +9676,23 @@ msgid "About External _Plugins"
 msgstr "_Quant als connectors externs"
 
 #: ../src/anjuta-actions.h:96
-msgid "About third party Anjuta plugins"
+#, fuzzy
+msgid "About third-party Anjuta plugins"
 msgstr "Quant als connectors externs de l'Anjuta"
 
-#: ../src/anjuta-app.c:426
+#: ../src/anjuta-app.c:489
 msgid "Edit"
 msgstr "Edita"
 
-#: ../src/anjuta-app.c:430 ../src/anjuta-app.c:435
-msgid "View"
-msgstr "Visualitza"
-
-#: ../src/anjuta-app.c:663
+#: ../src/anjuta-app.c:734
 msgid "Installed plugins"
 msgstr "Connectors instal·lats"
 
-#: ../src/anjuta-app.c:667
+#: ../src/anjuta-app.c:738
 msgid "Shortcuts"
 msgstr "Dreceres"
 
-#: ../src/anjuta-app.c:739
+#: ../src/anjuta-app.c:810
 #, c-format
 msgid "Value doesn't exist"
 msgstr "No existeix el valor"
@@ -8739,11 +9708,13 @@ msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "AMPLADAxALÃ?ADA+DESPLAÃ?AMENTX+DESPLAÃ?AMENTY"
 
 #: ../src/main.c:70
-msgid "Do not show the splashscreen"
+#, fuzzy
+msgid "Do not show the splash screen"
 msgstr "No mostris la pantalla d'inici"
 
 #: ../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 an existing instance"
 msgstr ""
 "Inicia una instància nova en comptes d'obrir el fitxer en una d'existent"
 
@@ -8756,7 +9727,8 @@ msgid "Do not open last project and files on startup"
 msgstr "No s'obrirà l'últim projecte i fitxers al iniciar"
 
 #: ../src/main.c:94
-msgid "Shutdown anjuta properly releasing all resources (for debugging)"
+#, fuzzy
+msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr ""
 "Surt de l'Anjuta i allibera'n adequadament tots els recursos (per a depurar)"
 
@@ -8764,111 +9736,203 @@ msgstr ""
 msgid "- Integrated Development Environment"
 msgstr "- Entorn integrat de desenvolupament"
 
-#: ../src/main.c:216
+#: ../src/main.c:232
 msgid "Anjuta"
 msgstr "Anjuta"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:1
-msgid "<b>Autocompletion (C/C++/Java only)</b>"
-msgstr "<b>Compleció automàtica (només C/C++/Java)</b>"
+#: ../src/preferences.ui.h:1
+msgid "Appearance"
+msgstr "Aparença"
+
+#: ../src/preferences.ui.h:3
+msgid "Default project directory:"
+msgstr "Directori predeterminat del projecte:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:2
-msgid "<b>Calltips</b>"
-msgstr "<b>Etiquetes de les funcions</b>"
+#: ../src/preferences.ui.h:4
+msgid "Developer email address:"
+msgstr "Correu electrònic del desenvolupador:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:3
-msgid "<b>Indentation parameters</b>"
-msgstr "<b>Paràmetres de sagnat</b>"
+#: ../src/preferences.ui.h:5
+msgid "Developer name:"
+msgstr "Nom del desenvolupador:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:4
-msgid "<b>Smart Indentation</b>"
-msgstr "<b>Sagnat intel·ligent</b>"
+#: ../src/preferences.ui.h:6
+msgid "Do not load last project and files on startup"
+msgstr "En iniciar, no carreguis ni l'últim projecte ni els últims fitxers"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:5
+#: ../src/preferences.ui.h:7
+msgid "Do not load last session on startup"
+msgstr "En iniciar, no carreguis l'última sessió"
+
+#. Style of the buttons/tabs used to select docked windows in anjuta
+#: ../src/preferences.ui.h:9
+msgid "Dock switcher style:"
+msgstr "Estil del canviador acoblable:"
+
+#: ../src/preferences.ui.h:10
+#, fuzzy
+msgid "GNOME toolbar setting"
+msgstr "Preferències de la barra d'eines del GNOME"
+
+#: ../src/preferences.ui.h:12
+msgid "Icons"
+msgstr "Icones"
+
+#: ../src/preferences.ui.h:13
+msgid "Icons only"
+msgstr "Només icones"
+
+#: ../src/preferences.ui.h:14
+msgid "Project Defaults"
+msgstr "Predeterminats del projecte"
+
+#: ../src/preferences.ui.h:15
+#, fuzzy
+msgid "Select project directory"
+msgstr "Seleccioneu el directori dels projectes"
+
+#: ../src/preferences.ui.h:16
+msgid "Session"
+msgstr "Sessió"
+
+#: ../src/preferences.ui.h:17
+msgid "Tabs"
+msgstr "Pestanyes"
+
+#: ../src/preferences.ui.h:19
+msgid "Text + Icons"
+msgstr "Text i icones"
+
+#: ../src/preferences.ui.h:20
+msgid "Text below icons"
+msgstr "Text sota les icones"
+
+#: ../src/preferences.ui.h:21
+msgid "Text beside icons"
+msgstr "Text al costat de les icones"
+
+#: ../src/preferences.ui.h:22
+msgid "Text only"
+msgstr "Només text"
+
+#. translators: translate the same as in gnome-control-center
+#: ../src/preferences.ui.h:24
+msgid "Toolbar button labels:"
+msgstr "Etiquetes dels botons de la barra d'eines:"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
+msgid "Do not display warning if not using a Debug configuration"
+msgstr ""
+"No mostris els avisos si no s'està utilitzant una configuració de depuració"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "Afegeix «(» després de la crida de completa automàticament de la funció"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:6
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
 msgid "Add a space after function call autocompletion"
 msgstr ""
 "Afegeix un espai després de la crida de completa automàticament de la funció"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:7
-msgid "Autocomplete"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
+#, fuzzy
+msgid "Auto-complete"
 msgstr "Completa automàticament"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:8
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
+msgid "Autocompletion (C/C++/Java only)"
+msgstr "Compleció automàtica (només C/C++/Java)"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
 msgid "Autocompletion pop up choices"
 msgstr "Diàleg emergent amb alternatives per la compleció automàtica"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Brace indentation size in spaces:"
 msgstr "Mida del sagnat de les claus en espais:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:10
-msgid "Enable adaptive indentation"
-msgstr "Habilita el sagnat adaptable"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+msgid "Calltips"
+msgstr "Etiquetes de les funcions"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
 msgid "Enable code completion"
 msgstr "Habilita la compleció de codi"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable smart brace completion"
 msgstr "Habilita la compleció intel·ligent de les claus/parèntesis"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Enable smart indentation"
 msgstr "Habilita el sagnat intel·ligent"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:14
-msgid "Pressing tab indents"
-msgstr "Premeu el tabulador per a incrementar el sagnat"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+msgid "Indent:"
+msgstr "Sagnat:"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+msgid "Indentation parameters"
+msgstr "Paràmetres de sagnat"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+msgid "Line up parentheses"
+msgstr "Alinea els parèntesis"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#, fuzzy
+msgid "Parenthesis indentation"
+msgstr "Sagnat dels parèntesis"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Show calltips"
 msgstr "Mostra les etiquetes de les funcions"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Smart Indentation"
 msgstr "Sagnat intel·ligent"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 msgid "Statement indentation size in spaces:"
 msgstr "Mida del sagnat de la sentència en espais:"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1900
-msgid "_AutoComplete"
+#: ../plugins/language-support-cpp-java/plugin.c:1921
+#, fuzzy
+msgid "_Auto-Complete"
 msgstr "Completa _automàticament"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1901
-msgid "AutoComplete the current word"
+#: ../plugins/language-support-cpp-java/plugin.c:1922
+#, fuzzy
+msgid "Auto-complete the current word"
 msgstr "Completa automàticament la paraula actual"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1907
-msgid "Auto Indent"
+#: ../plugins/language-support-cpp-java/plugin.c:1928
+#, fuzzy
+msgid "Auto-Indent"
 msgstr "Sagnat automàtic"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1908
-msgid "Auto indent current line or selection based on indentation settings"
+#: ../plugins/language-support-cpp-java/plugin.c:1929
+#, fuzzy
+msgid "Auto-indent current line or selection based on indentation settings"
 msgstr ""
-"Sagnat automàtic de la línia actual o selecció basada en la configuració del "
-"sagnat"
+"Sagnat automàtic de la línia actual o la selecció basada en la configuració "
+"del sagnat"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1913
+#: ../plugins/language-support-cpp-java/plugin.c:1934
 msgid "Swap .h/.c"
 msgstr "Alterna capçalera/codi"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1914
-msgid "Swap c header and source files"
+#: ../plugins/language-support-cpp-java/plugin.c:1935
+#, fuzzy
+msgid "Swap C header and source files"
 msgstr "Alterna entre el fitxer de capçalera de C i els fitxers de codi"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1957
+#: ../plugins/language-support-cpp-java/plugin.c:1978
 msgid "C++/Java Assistance"
 msgstr "Assistència per a C++/Java"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2045
-#: ../plugins/language-support-cpp-java/plugin.c:2054
+#: ../plugins/language-support-cpp-java/plugin.c:2071
+#: ../plugins/language-support-cpp-java/plugin.c:2080
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
@@ -8977,23 +10041,27 @@ msgid "CVS Plugin"
 msgstr "Connector CVS"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
-msgid "Import an existing autotools project to anjuta"
-msgstr "Importa un projecte existent de les autotools a l'Anjuta"
+#, fuzzy
+msgid "Import an existing autotools project to Anjuta"
+msgstr "Importa un projecte existent d'autotools a l'Anjuta"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:2
-msgid "Project From Existing Sources"
-msgstr "Projecte des de fonts existents"
-
-#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
 msgid "Project Import Assistant"
 msgstr "Auxiliar per a importar un projecte"
 
+#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
+#, fuzzy
+msgid "Project from Existing Sources"
+msgstr "Projecte des de fonts existents"
+
 #: ../plugins/sourceview/sourceview.plugin.in.h:1
-msgid "GtkSourceview editor"
-msgstr "Editor GtkSourceview"
+#, fuzzy
+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"
 msgstr "L'editor predeterminat basat en el GtkSourceview"
 
 #: ../plugins/starter/anjuta-starter.plugin.in.h:2
@@ -9005,9 +10073,10 @@ msgid "C++ and Java support Plugin"
 msgstr "Connector per a admetre C++ i 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."
 msgstr ""
-"Connector per a admetre C++ i Java per a completar el codi, sagnat "
+"Connector per a permetre la compleció de codi C++ i Java, el sagnat "
 "automàtic, etc."
 
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:2
@@ -9030,10 +10099,6 @@ msgstr "Connector de l'Anjuta de generador de classes"
 msgid "C++/GObject Class"
 msgstr "Classe C++/GObject"
 
-#: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
-msgid "Class Generator"
-msgstr "Generador de classes"
-
 #: ../plugins/project-manager/anjuta-project-manager.plugin.in.h:1
 msgid "Project Manager"
 msgstr "Gestor de projectes"
@@ -9043,8 +10108,8 @@ msgid "Project Manager Plugin for Anjuta."
 msgstr "Connector del gestor de projectes per a l'Anjuta."
 
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:2
-msgid "Symbol Database Plugin for Anjuta (unstable)."
-msgstr "Connector de la base de dades de símbols per a l'Anjuta (inestable)."
+msgid "Symbol Database Plugin for Anjuta."
+msgstr "Base de dades de símbols per a l'Anjuta."
 
 #: ../plugins/message-view/anjuta-message-manager.plugin.in.h:1
 msgid "Manages messages from external apps"
@@ -9095,24 +10160,334 @@ msgstr "Rerefons de les autotools"
 msgid "Autotools backend for project manager"
 msgstr "Rerefons de les autotools per al gestor de projectes"
 
+#~ msgid "Up to date"
+#~ msgstr "Actualitzat"
+
+#~ msgid "<b>Build</b>"
+#~ msgstr "<b>Munta</b>"
+
+#~ msgid "<b>Configuration:</b>"
+#~ msgstr "<b>Configuració:</b>"
+
+#~ msgid "<b>Install</b>"
+#~ msgstr "<b>Instal·la</b>"
+
+#~ msgid "Program '%s' does not exists"
+#~ msgstr "No existeix el programa «%s»"
+
+#~ msgid "C_onfigure Project..."
+#~ msgstr "C_onfigura el projecte..."
+
+#~ msgid "<b>CVS Options</b>"
+#~ msgstr "<b>Opcions del CVS</b>"
+
+#~ msgid "<b>Options:</b>"
+#~ msgstr "<b>Opcions:</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Opcions</b>"
+
+#~ msgid "<b>Repository: </b>"
+#~ msgstr "<b>Dipòsit: </b>"
+
+#~ msgid "<b>Debugger:</b>"
+#~ msgstr "<b>Depurador:</b>"
+
+#~ msgid "Debugger Command..."
+#~ msgstr "Ordre del depurador..."
+
+#~ msgid "Pid"
+#~ msgstr "Identificador de procés"
+
+#~ msgid "Id"
+#~ msgstr "Id"
+
+#~ msgid "Ins_pect/Evaluate..."
+#~ msgstr "Ins_pecciona/avalua..."
+
+#~ msgid "Add Watch..."
+#~ msgstr "Afegeix la vigilància..."
+
+#~ msgid "_Print..."
+#~ msgstr "_Imprimeix..."
+
 #~ msgid "recent menu label|_%d. %s"
 #~ msgstr "_%d. %s"
 
 #~ msgid "recent menu label|%d. %s"
 #~ msgstr "%d. %s"
 
+#~ msgid "_Open..."
+#~ msgstr "_Obre..."
+
+#~ msgid "Url:"
+#~ msgstr "URL:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Avançat..."
+
+#~ msgid "Source coudn't be removed"
+#~ msgstr "No s'ha pogut suprimir la font"
+
+#~ msgid "<b>Tags</b>"
+#~ msgstr "<b>Etiquetes</b>"
+
+#~ msgid "Add signed off by line"
+#~ msgstr "Afegeix l'assignació per línia"
+
+#~ msgid "_Commit..."
+#~ msgstr "Publica els _canvis..."
+
+#~ msgid "_View log..."
+#~ msgstr "_Visualitza el registre..."
+
+#~ msgid "_Push..."
+#~ msgstr "_Empeny..."
+
+#~ msgid "_Pull..."
+#~ msgstr "_Estira..."
+
+#~ msgid "_Add..."
+#~ msgstr "_Afegeix..."
+
+#~ msgid "_Remove..."
+#~ msgstr "_Suprimeix..."
+
+#~ msgid "_Ignore..."
+#~ msgstr "_Ignora..."
+
+#~ msgid "Create patch series..."
+#~ msgstr "Crea una sèrie de pedaços..."
+
+#~ msgid "_Switch to another branch..."
+#~ msgstr "_Commuta a una altra branca..."
+
+#~ msgid "_Merge..."
+#~ msgstr "_Combina..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Suprimeix..."
+
+#~ msgid "_Delete tag..."
+#~ msgstr "_Suprimeix una etiqueta..."
+
+#~ msgid "Unknown language of the editor \"%s\""
+#~ msgstr "El llenguatge de l'editor «%s» no és conegut"
+
+#~ msgid "n/a"
+#~ msgstr "n/d"
+
+#~ msgid "Misc"
+#~ msgstr "Miscel·lània"
+
+#~ msgid "<b>Macros:</b>"
+#~ msgstr "<b>Macros:</b>"
+
+#~ msgid "Edit..."
+#~ msgstr "Edita..."
+
+#~ msgid "Macros..."
+#~ msgstr "Macros..."
+
+#~ msgid "_Patch..."
+#~ msgstr "_Pedaç..."
+
+#~ msgid "<b>Project name</b>"
+#~ msgstr "<b>Nom del projecte</b>"
+
+#~ msgid "_Select file to add..."
+#~ msgstr "_Seleccioneu un fitxer a afegir..."
+
+#~ msgid "Add _Group..."
+#~ msgstr "Afegeix un _grup..."
+
+#~ msgid "Add _Target..."
+#~ msgstr "Afegeix un _objectiu..."
+
+#~ msgid "Add _Source File..."
+#~ msgstr "Afegeix un fitxer de _codi..."
+
+#~ msgid "_Add To Project"
+#~ msgstr "_Afegeix al projecte"
+
+#~ msgid "Select project type"
+#~ msgstr "Seleccioneu el tipus de projecte"
+
+#~ msgid "Create a template gtk builder interface file"
+#~ msgstr "Crea un fitxer de plantilla d'interfície GTK Builder"
+
+#~ msgid "Wx Widgets"
+#~ msgstr "Wx Widgets"
+
+#~ msgid "Run In Terminal"
+#~ msgstr "Executa en un terminal"
+
+#~ msgid "Program Parameters..."
+#~ msgstr "Paràmetres del programa..."
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Accions</b>"
+
+#~ msgid "<b>Parameters</b>"
+#~ msgstr "<b>Paràmetres</b>"
+
+#~ msgid "<b>Scope</b>"
+#~ msgstr "<b>Abast</b>"
+
+#~ msgid "Searching..."
+#~ msgstr "S'està cercant..."
+
+#~ msgid "_Update..."
+#~ msgstr "Act_ualitza..."
+
+#~ msgid "Merge..."
+#~ msgstr "Combina..."
+
+#~ msgid "_View Log..."
+#~ msgstr "_Visualitza el registre..."
+
+#~ msgid "_Diff..."
+#~ msgstr "_Diferències..."
+
+#~ msgid "Copy..."
+#~ msgstr "Copia..."
+
+#~ msgid "Diff..."
+#~ msgstr "Diferències..."
+
+#~ msgid "_Find Symbol..."
+#~ msgstr "Ce_rca un símbol..."
+
+#~ msgid "<b>Global</b>"
+#~ msgstr "<b>Global</b>"
+
+#~ msgid "<b>Terminal options</b>"
+#~ msgstr "<b>Opcions del terminal</b>"
+
+#~ msgid "<b>Tools</b>"
+#~ msgstr "<b>Eines</b>"
+
+#~ msgid "_Variable..."
+#~ msgstr "_Variable..."
+
+#~ msgid "GtkSourceview editor"
+#~ msgstr "Editor GtkSourceview"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "gtk-execute"
+#~ msgstr "gtk-execute"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Command Line Parameters"
+#~ msgstr "Paràmetres de la línia d'ordres"
+
+#~ msgid "Enter a Hexa adress or select one in the data"
+#~ msgstr ""
+#~ "Introduïu una adreça en hexadecimal o seleccioneu-ne una en les dades"
+
+#~ msgid "Execute Program"
+#~ msgstr "Executa el programa"
+
+#~ msgid "_Pass:"
+#~ msgstr "_Passa:"
+
+#~ msgid "on_widget_signal"
+#~ msgstr "on_widget_signal"
+
+#~ msgid "widget_signal_cb"
+#~ msgstr "widget_signal_cb"
+
+#~ msgid "Ctags executable:"
+#~ msgstr "Fitxer executable del ctags:"
+
+#~ msgid "Enable adaptive indentation"
+#~ msgstr "Habilita el sagnat adaptable"
+
+#~ msgid "Pressing tab indents"
+#~ msgstr "Premeu el tabulador per a incrementar el sagnat"
+
+#~ msgid "Unable to build user interface for tool variable"
+#~ msgstr "No es pot muntar la interfície d'usuari per a la variable de l'eina"
+
+#~ msgid "Unable to build user interface for tool editor"
+#~ msgstr "No es pot muntar la interfície d'usuari per a l'editor d'eines"
+
 #~ msgid "Fixed data-view"
 #~ msgstr "Visualització de dades fixa"
 
-#~ msgid "Update the graph"
-#~ msgstr "Actualitza el graf"
-
 #~ msgid "Inheritance Graph"
 #~ msgstr "Graf d'herències"
 
+#~ msgid ""
+#~ "General Public License (GPL)\n"
+#~ "Lesser General Public License (LGPL)\n"
+#~ "No License"
+#~ msgstr ""
+#~ "Llicència pública general de (GPL)\n"
+#~ "Llicència pública general menor (LGPL)\n"
+#~ "Sense llicència"
+
 #~ msgid "Directory"
 #~ msgstr "Directori"
 
+#~ msgid ""
+#~ "Top\n"
+#~ "Bottom\n"
+#~ "Left\n"
+#~ "Right"
+#~ msgstr ""
+#~ "Superior\n"
+#~ "Inferior\n"
+#~ "Esquerra\n"
+#~ "Dreta"
+
+#~ msgid "<b>Bad revision:</b>"
+#~ msgstr "<b>Revisió dolenta:</b>"
+
+#~ msgid "<b>Changes:</b>"
+#~ msgstr "<b>Canvis:</b>"
+
+#~ msgid "<b>Filters</b>"
+#~ msgstr "<b>Filtres</b>"
+
+#~ msgid "<b>Log Message:</b>"
+#~ msgstr "<b>Missatge de registre:</b>"
+
+#~ msgid "<b>Log message:</b>"
+#~ msgstr "<b>Missatge de registre:</b>"
+
+#~ msgid "<b>Mode:</b>"
+#~ msgstr "<b>Mode:</b>"
+
+#~ msgid "<b>Revision:</b>"
+#~ msgstr "<b>Revisió:</b>"
+
+#~ msgid "<b>Select file to add:</b>"
+#~ msgstr "<b>Seleccioneu el fitxer a afegir:</b>"
+
+#~ msgid "<b>Tag name:</b>"
+#~ msgstr "<b>Nom de l'etiqueta:</b>"
+
+#~ msgid "<b>URL:</b>"
+#~ msgstr "<b>URL:</b>"
+
+#~ msgid ""
+#~ "Underline-Plain\n"
+#~ "Underline-Squiggle\n"
+#~ "Underline-TT\n"
+#~ "Diagonal\n"
+#~ "Strike-Out"
+#~ msgstr ""
+#~ "Subratllat de línia recta\n"
+#~ "Subratllat de línies mogudes\n"
+#~ "Subratllat-TT\n"
+#~ "Diagonal\n"
+#~ "Ratllat"
+
 #~ msgid "No message details"
 #~ msgstr "Cap detall dels missatges"
 
@@ -9125,9 +10500,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Children"
 #~ msgstr "Fills"
 
-#~ msgid "Calls"
-#~ msgstr "Crides"
-
 #~ msgid "% Time"
 #~ msgstr "% temps"
 
@@ -9173,9 +10545,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Refresh"
 #~ msgstr "Actualitza"
 
-#~ msgid "Delete Data"
-#~ msgstr "Suprimeix les dades"
-
 #~ msgid "Application Performance Profiler"
 #~ msgstr "Rendiment de la mètrica de rendiment de l'aplicació"
 
@@ -9292,11 +10661,11 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "<b>Enter the base path of your project:</b>"
 #~ msgstr "<b>Introduïu el camí base del projecte:</b>"
 
-#~ msgid "Project to Import"
-#~ msgstr "Projecte a importar"
+#~ msgid "Couldn't load glade file"
+#~ msgstr "No s'ha pogut carregar el fitxer glade"
 
-#~ msgid "Confirmation"
-#~ msgstr "Confirmació"
+#~ msgid "Icon choice"
+#~ msgstr "Selecció de la icona"
 
 #~ msgid "A generic GNOME project"
 #~ msgstr "Un projecte genèric del GNOME"
@@ -9430,9 +10799,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Fold style:"
 #~ msgstr "Estil de plegat:"
 
-#~ msgid "Font:"
-#~ msgstr "Tipus de lletra:"
-
 #~ msgid "Fonts and colors for editor"
 #~ msgstr "Tipus de lletra i colors per a l'editor"
 
@@ -9466,9 +10832,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Margin Marker visible"
 #~ msgstr "Visualitza el marge del marcatge"
 
-#~ msgid "Mode:"
-#~ msgstr "Mode:"
-
 #~ msgid "Monochrome"
 #~ msgstr "Monocolor"
 
@@ -9489,9 +10852,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Pressing tab inserts indentation"
 #~ msgstr "Premeu el tabulador per a inserir un sagnat"
 
-#~ msgid "Printing"
-#~ msgstr "Impressió"
-
 #~ msgid "Select highlight style to edit:"
 #~ msgstr "Seleccioneu l'estil de ressaltat que voleu editar:"
 
@@ -9504,18 +10864,12 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Strip trailling spaces on file save"
 #~ msgstr "Suprimeix els espais al final de línia en desar el fitxer"
 
-#~ msgid "Tab size in spaces:"
-#~ msgstr "Mida de tabulació en espais:"
-
 #~ msgid "Underlined"
 #~ msgstr "Subratllat"
 
 #~ msgid "Use default"
 #~ msgstr "Fes servir els predeterminats"
 
-#~ msgid "Use tabs for indentation"
-#~ msgstr "Utilitza el tabulador per sagnar"
-
 #~ msgid "View EOL chars"
 #~ msgstr "Visualitza els caràcters de final de línia"
 
@@ -9631,59 +10985,39 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ "Es poden produir comportaments incorrectes o inestabilitats.\n"
 #~ "L'Anjuta farà servir les opcions predeterminades (més limitades)"
 
-#~ msgid "<b>Color scheme:</b>"
-#~ msgstr "<b>Esquema de colors:</b>"
-
-#~ msgid "<b>Font:</b>"
-#~ msgstr "<b>Tipus de lletra:</b>"
-
-#~ msgid "<b>Indentation and auto-format options</b>"
-#~ msgstr "<b>Opcions de sagnat i de format automàtic</b>"
-
-#~ msgid "<b>View</b>"
-#~ msgstr "<b>Visualitza</b>"
-
-#~ msgid "Create backup files"
-#~ msgstr "Crea fitxers de còpia de seguretat"
-
-#~ msgid "Font"
-#~ msgstr "Tipus de lletra"
+#~ msgid "<b>Scratchbox Options</b>\n"
+#~ msgstr "<b>Opcions de l'Scratchbox</b>\n"
 
-#~ msgid "Highlight current line"
-#~ msgstr "Ressalta la línia actual"
+#~ msgid "Scratchbox directory:"
+#~ msgstr "Directori de l'Scratchbox:"
 
-#~ msgid "Highlight matching brackets"
-#~ msgstr "Ressalta les claus i parèntesis concordants"
+#~ msgid "Scratchbox target:"
+#~ msgstr "Objectiu de l'Scratchbox:"
 
-#~ msgid "Highlight syntax"
-#~ msgstr "Ressaltat de sintaxi"
+#~ msgid "Scratchbox version:"
+#~ msgstr "Versió de l'Scratchbox:"
 
-#~ msgid "Print Linenumbers"
-#~ msgstr "Imprimeix els números de línia"
+#~ msgid "Scratchbox"
+#~ msgstr "Scratchbox"
 
-#~ msgid "Print page footer"
-#~ msgstr "Imprimeix el peu de pàgina"
-
-#~ msgid "Print page header"
-#~ msgstr "Imprimeix la capçalera de pàgina"
-
-#~ msgid "Right margin position in characters"
-#~ msgstr "Posició del marge dret en caràcters"
-
-#~ msgid "Show line numbers"
-#~ msgstr "Mostra els números de línia"
+#~ msgid "<b>Font:</b>"
+#~ msgstr "<b>Tipus de lletra:</b>"
 
-#~ msgid "Show marks"
-#~ msgstr "Mostra els marcadors"
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Visualitza</b>"
 
-#~ msgid "Show right margin"
-#~ msgstr "Mostra el marge dret"
+#~ msgid "<b>End Revision:</b>"
+#~ msgstr "<b>Revisió final:</b>"
 
-#~ msgid "Use theme font"
-#~ msgstr "Utilitza el tipus de lletra del tema"
+#~ msgid "<b>Subversion Options</b>"
+#~ msgstr "<b>Opcions del Subversion</b>"
 
-#~ msgid "Wrap long lines to fit on paper"
-#~ msgstr "Ajusta les línies llargues a l'amplada del paper"
+#~ msgid ""
+#~ "Default\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Predeterminat\n"
+#~ "\n"
 
 #~ msgid "<b>Program to test:</b>"
 #~ msgstr "<b>Programa a provar:</b>"
@@ -9706,9 +11040,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Select Valgrind Target"
 #~ msgstr "Seleccioneu l'objectiu del Valgrind"
 
-#~ msgid "Options"
-#~ msgstr "Opcions"
-
 #~ msgid "Select debugging target"
 #~ msgstr "Seleccioneu l'objecte a depurar"
 
@@ -9949,6 +11280,41 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "You have not set a suppressions file in your settings."
 #~ msgstr "No heu establert cap fitxer de supressions en la configuració."
 
+#~ msgid "<b>Session</b>"
+#~ msgstr "<b>Sessió</b>"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "Text below icons\n"
+#~ "Text beside icons\n"
+#~ "Icons only\n"
+#~ "Text only"
+#~ msgstr ""
+#~ "Predeterminat\n"
+#~ "Text sota les icones\n"
+#~ "Text al costat de les icones\n"
+#~ "Només icones\n"
+#~ "Només text"
+
+#~ msgid ""
+#~ "Text\n"
+#~ "Icons\n"
+#~ "Text + Icons\n"
+#~ "Gnome toolbar setting\n"
+#~ "Tabs"
+#~ msgstr ""
+#~ "Text\n"
+#~ "Icones\n"
+#~ "Text i icones\n"
+#~ "Preferències de la barra d'eines del GNOME\n"
+#~ "Pestanyes"
+
+#~ msgid "<b>Calltips</b>"
+#~ msgstr "<b>Etiquetes de les funcions</b>"
+
+#~ msgid "<b>Smart Indentation</b>"
+#~ msgstr "<b>Sagnat intel·ligent</b>"
+
 #~ msgid "A graph painter for the inheritance of the classes."
 #~ msgstr "Un dibuixador de grafs per a l'herència de les classes."
 
@@ -9988,9 +11354,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Cut"
 #~ msgstr "Retalla"
 
-#~ msgid "Copy"
-#~ msgstr "Copia"
-
 #~ msgid "Paste"
 #~ msgstr "Enganxa"
 
@@ -10003,15 +11366,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Select the text in the matching braces"
 #~ msgstr "Selecciona el text entre les claus de codi corresponents"
 
-#~ msgid ""
-#~ "The file '%s' on the disk is more recent than\n"
-#~ "the current buffer.\n"
-#~ "Do you want to reload it?"
-#~ msgstr ""
-#~ "�s més nova la còpia del fitxer «%s» al disc que\n"
-#~ "no pas la carregada a la memòria intermèdia.\n"
-#~ "Voleu tornar-lo a carregar?"
-
 #~ msgid "Removed"
 #~ msgstr "Suprimit"
 
@@ -10204,9 +11558,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "No file details"
 #~ msgstr "Sense detalls del fitxer"
 
-#~ msgid "<b>Available API tags:</b>"
-#~ msgstr "<b>Etiquetes de l'API disponibles:</b>"
-
 #~ msgid "<b>Create API tags:</b>"
 #~ msgstr "<b>Crea etiquetes de l'API:</b>"
 
@@ -10237,9 +11588,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Find usage of symbol in project"
 #~ msgstr "Troba l'ús del símbol al projecte"
 
-#~ msgid "Refresh symbol browser tree"
-#~ msgstr "Actualitza l'arbre del navegador de símbols"
-
 #~ msgid "Created symbols..."
 #~ msgstr "Símbols creats..."
 
@@ -10337,9 +11685,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Could not set file permissions %s: %s."
 #~ msgstr "No es poden establir els permisos del fitxer %s: %s."
 
-#~ msgid "Refresh file manager tree"
-#~ msgstr "Actualitza l'arbre del gestor de fitxers"
-
 #~ msgid "No properties available for this group"
 #~ msgstr "No hi ha propietats disponibles per a aquest grup"
 
@@ -10349,9 +11694,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Unsaved Document %d"
 #~ msgstr "Document sense desar %d"
 
-#~ msgid "Loading"
-#~ msgstr "S'està carregant"
-
 #~ msgid "Saving..."
 #~ msgstr "S'està desant..."
 
@@ -10463,9 +11805,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Next mesg"
 #~ msgstr "Missatge següent"
 
-#~ msgid "Prev bookmark"
-#~ msgstr "Adreça d'interès anterior"
-
 #~ msgid "Next bookmark"
 #~ msgstr "Adreça d'interès següent"
 
@@ -10520,9 +11859,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Go"
 #~ msgstr "Vés a"
 
-#~ msgid "Tags"
-#~ msgstr "Etiquetes"
-
 #~ msgid "Find Usage"
 #~ msgstr "Ã?s de la cerca"
 
@@ -10559,9 +11895,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Enb"
 #~ msgstr "Habilitat"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Times"
 #~ msgstr "Vegades"
 
@@ -10805,15 +12138,9 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "<b>Comments</b>"
 #~ msgstr "<b>Comentaris</b>"
 
-#~ msgid "<b>Declarations</b>"
-#~ msgstr "<b>Declaracions</b>"
-
 #~ msgid "<b>Statements</b>"
 #~ msgstr "<b>Sentències</b>"
 
-#~ msgid "After Declarations"
-#~ msgstr "Després de les declaracions"
-
 #~ msgid "After Procedures"
 #~ msgstr "Després dels procediments"
 
@@ -10882,9 +12209,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgstr ""
 #~ "Mostra la sortida de sagnat d'acord amb els paràmetres seleccionats."
 
-#~ msgid "First Column"
-#~ msgstr "Primera columna"
-
 #~ msgid ""
 #~ "Foece a space between an 'if' and the following parenthesis (default)."
 #~ msgstr ""
@@ -11149,9 +12473,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "C_Custom_Indent"
 #~ msgstr "C_sagnat_personalitzat"
 
-#~ msgid "Changelog"
-#~ msgstr "ChangeLog"
-
 #~ msgid "Copyright"
 #~ msgstr "Copyright"
 
@@ -11314,9 +12635,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Commit postfix"
 #~ msgstr "Publica els postfix"
 
-#~ msgid "Blame revision"
-#~ msgstr "Rebutja la revisió"
-
 #~ msgid "Unknown notification"
 #~ msgstr "Notificació desconeguda"
 
@@ -11582,18 +12900,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Do_n't save"
 #~ msgstr "_No ho desis"
 
-#~ msgid "Bottom"
-#~ msgstr "Inferior"
-
-#~ msgid "Left"
-#~ msgstr "Esquerra"
-
-#~ msgid "Right"
-#~ msgstr "Dreta"
-
-#~ msgid "Top"
-#~ msgstr "Principi"
-
 #~ msgid "%d"
 #~ msgstr "%d"
 
@@ -11640,24 +12946,9 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Clos_e"
 #~ msgstr "_Tanca"
 
-#~ msgid "Diagonal"
-#~ msgstr "Diagonal"
-
 #~ msgid "Information:"
 #~ msgstr "Informació:"
 
-#~ msgid "Strike-Out"
-#~ msgstr "Ratllat"
-
-#~ msgid "Underline Plain"
-#~ msgstr "Subratllat de línia recta"
-
-#~ msgid "Underline Squiggle"
-#~ msgstr "Subratllat de línies mogudes"
-
-#~ msgid "Underline-TT"
-#~ msgstr "Subratllat-TT"
-
 #~ msgid "Failed to load project %s: %s"
 #~ msgstr "No es pot carregar el projecte %s: %s"
 
@@ -11962,9 +13253,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Error in writing files"
 #~ msgstr "S'ha produït un error en escriure fitxers"
 
-#~ msgid "Parameters"
-#~ msgstr "Paràmetres"
-
 #~ msgid "Set debugger parameters"
 #~ msgstr "Establiu els paràmetres del depurador"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]