[anjuta] Updated British English translation



commit 7f04fb0c538b62e7b0b3079ded7c74b9de6f75d1
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Sep 11 18:16:00 2009 +0100

    Updated British English translation

 po/en_GB.po | 7504 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 4086 insertions(+), 3418 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index cf07b5d..826e753 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,15 +3,16 @@
 # Andy Piper <andy piper freeuk com>
 # Christian Neumair <chris gnome-de org> 2002, 2003.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
-#
+# Bruce Cowan <bcowan fastmail co uk>, 2009.
+# Philip Withnall <philip tecnocode co uk>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Anjuta 1.20\n"
+"Project-Id-Version: anjuta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 07:16+0000\n"
-"PO-Revision-Date: 2009-02-23 07:26+0000\n"
-"Last-Translator: David Lodge <dave cirt net>\n"
-"Language-Team: English/GB <en_GB li org>\n"
+"POT-Creation-Date: 2009-09-11 17:28+0100\n"
+"PO-Revision-Date: 2009-09-11 18:13+0100\n"
+"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"Language-Team: British English <en li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +26,7 @@ msgstr "Anjuta IDE"
 msgid "Develop software in an integrated development environment"
 msgstr "Develop software in an integrated development environment"
 
-#: ../anjuta.desktop.in.in.h:3 ../src/about.c:187 ../src/main.c:174
+#: ../anjuta.desktop.in.in.h:3 ../src/about.c:204
 msgid "Integrated Development Environment"
 msgstr "Integrated Development Environment"
 
@@ -185,26 +186,26 @@ msgstr "Vietnamese"
 msgid "Thai"
 msgstr "Thai"
 
-#: ../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 "Unknown"
 
-#: ../libanjuta/anjuta-launcher.c:1147 ../libanjuta/resources.c:267
-#: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:280
+#: ../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 "Cannot execute command: \"%s\""
 
-#: ../libanjuta/anjuta-launcher.c:1148
+#: ../libanjuta/anjuta-launcher.c:1155
 msgid "execvp failed"
 msgstr "execvp failed"
 
-#: ../libanjuta/anjuta-plugin.c:327 ../libanjuta/anjuta-plugin-manager.c:2306
+#: ../libanjuta/anjuta-plugin.c:327 ../libanjuta/anjuta-plugin-manager.c:2310
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
@@ -214,8 +215,8 @@ msgstr "Anjuta shell that will contain the plugin"
 
 #: ../libanjuta/anjuta-plugin-manager.c:733
 #, c-format
-msgid "Plugin '%s' do not want to be deactivated"
-msgstr "Plugin '%s' do not want to be deactivated"
+msgid "Plugin '%s' does not want to be deactivated"
+msgstr "Plugin '%s' does not want to be deactivated"
 
 #: ../libanjuta/anjuta-plugin-manager.c:764
 #, c-format
@@ -231,7 +232,7 @@ msgstr ""
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
-#: ../plugins/symbol-db/symbol-db-prefs.c:520
+#: ../plugins/symbol-db/symbol-db-prefs.c:463
 msgid "Load"
 msgstr "Load"
 
@@ -240,13 +241,13 @@ msgstr "Load"
 msgid "Available Plugins"
 msgstr "Available Plugins"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:659
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:736
 msgid "Preferred plugins"
 msgstr "Preferred plugins"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1150
 msgid "Only show user activatable plugins"
-msgstr "Only show user activatable plugins"
+msgstr "Only show user-activatable plugins"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1197
 msgid ""
@@ -276,52 +277,52 @@ msgstr "Please select a plugin to activate"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1372
 #, c-format
-msgid "No plugin able to load other plugins in %s"
-msgstr "No plugin able to load other plugins in %s"
+msgid "No plugin is able to load other plugins in %s"
+msgstr "No plugin is able to load other plugins in %s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1960
 msgid "Remember this selection"
 msgstr "Remember this selection"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2287
+#: ../libanjuta/anjuta-plugin-manager.c:2291
 msgid "Profiles"
 msgstr "Profiles"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2288
+#: ../libanjuta/anjuta-plugin-manager.c:2292
 msgid "Current stack of profiles"
 msgstr "Current stack of profiles"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2293
+#: ../libanjuta/anjuta-plugin-manager.c:2297
 msgid "Available plugins"
 msgstr "Available plugins"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2294
+#: ../libanjuta/anjuta-plugin-manager.c:2298
 msgid "Currently available plugins found in plugin paths"
 msgstr "Currently available plugins found in plugin paths"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2300
+#: ../libanjuta/anjuta-plugin-manager.c:2304
 msgid "Activated plugins"
 msgstr "Activated plugins"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2301
+#: ../libanjuta/anjuta-plugin-manager.c:2305
 msgid "Currently activated plugins"
 msgstr "Currently activated plugins"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2307
-msgid "Anjuta shell for which the plugins are"
-msgstr "Anjuta shell for which the plugins are"
+#: ../libanjuta/anjuta-plugin-manager.c:2311
+msgid "Anjuta shell for which the plugins are made"
+msgstr "Anjuta shell for which the plugins are made"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2315
+#: ../libanjuta/anjuta-plugin-manager.c:2319
 msgid "Anjuta Status"
 msgstr "Anjuta Status"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2316
+#: ../libanjuta/anjuta-plugin-manager.c:2320
 msgid "Anjuta status to use in loading and unloading of plugins"
 msgstr "Anjuta status to use in loading and unloading of plugins"
 
 #. DEBUG_PRINT ("Icon: %s", icon_path);
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-plugin-manager.c:2476
+#: ../libanjuta/anjuta-plugin-manager.c:2480
 msgid "Loaded:"
 msgstr "Loaded:"
 
@@ -367,7 +368,7 @@ msgid ""
 "Failed to read '%s': XML parse error. Invalid or corrupted anjuta plugins "
 "profile."
 msgstr ""
-"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."
 
 #. <Pluginname>: Install it from <some location on the web>
@@ -385,7 +386,7 @@ msgstr ""
 "Failed to read '%s': Following mandatory plugins are missing:\n"
 "%s"
 
-#: ../libanjuta/anjuta-preferences.c:1456
+#: ../libanjuta/anjuta-preferences.c:1534
 msgid ""
 "Are you sure you want to reset the preferences to\n"
 "their default settings?"
@@ -395,22 +396,20 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1460 ../plugins/git/plugin.c:194
+#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:455
 msgid "_Reset"
 msgstr "_Reset"
 
 #: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:230 ../plugins/gtodo/mcategory.c:36
+#: ../plugins/gtodo/interface.c:229 ../plugins/gtodo/mcategory.c:36
 msgid "Category"
 msgstr "Category"
 
 #. 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
-#: ../plugins/profiler/profiler.glade.h:15
-#: ../plugins/valgrind/vggeneralprefs.c:172 ../src/anjuta.glade.h:16
-#: ../src/anjuta-app.c:646
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4 ../src/anjuta-app.c:723
+#: ../src/preferences.ui.h:10
 msgid "General"
 msgstr "General"
 
@@ -472,11 +471,11 @@ msgid "Shortcut"
 msgstr "Shortcut"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:363
+#: ../libanjuta/anjuta-utils.c:355
 msgid "System:"
 msgstr "System:"
 
-#: ../libanjuta/anjuta-utils.c:501
+#: ../libanjuta/anjuta-utils.c:493
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -485,50 +484,75 @@ msgstr ""
 "The \"%s\" utility is not installed.\n"
 "Please install it."
 
-#: ../libanjuta/anjuta-utils.c:941 ../libanjuta/anjuta-utils.c:945
+#. Try xterm
+#: ../libanjuta/anjuta-utils.c:986
+msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgstr "Cannot find a terminal; using xterm, even if it may not work"
+
+#: ../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 "Cannot execute command: %s (using shell %s)\n"
 
-#: ../libanjuta/anjuta-utils.c:1577
+#: ../libanjuta/anjuta-utils.c:1690
 msgid ""
 "Unable to display help. Please make sure Anjuta documentation package is "
 "install. It can be downloaded from http://anjuta.org";
 msgstr ""
-"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 "
+"install. It can be downloaded from 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 "Unable to load user interface file: %s"
+
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:92
 #: ../plugins/file-manager/file-view.c:65
 msgid "Modified"
 msgstr "Modified"
 
-#: ../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 "Added"
 
-#: ../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 "Deleted"
 
-#: ../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 "Conflicted"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:308
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:105
+msgid "Up to date"
+msgstr "Up-to-date"
+
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:109
+#: ../plugins/file-manager/file-view.c:75
+msgid "Locked"
+msgstr "Locked"
+
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:112
 #: ../plugins/file-manager/file-view.c:77
 msgid "Missing"
 msgstr "Missing"
 
-#: ../libanjuta/anjuta-vcs-status-tree-view.c:312
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:115
 #: ../plugins/file-manager/file-view.c:79
 msgid "Unversioned"
 msgstr "Unversioned"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:218
+#: ../libanjuta/anjuta-vcs-status-tree-view.c:119
+#: ../plugins/file-manager/file-view.c:81
+msgid "Ignored"
+msgstr "Ignored"
+
+#: ../libanjuta/cell-renderer-captioned-image.c:218 ../src/preferences.ui.h:18
 msgid "Text"
 msgstr "Text"
 
@@ -544,8 +568,8 @@ msgstr "Pixbuf Object"
 msgid "The pixbuf to render."
 msgstr "The pixbuf to render."
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3020
-#: ../plugins/glade/plugin.c:3055
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3041
+#: ../plugins/glade/plugin.c:3076
 #, c-format
 msgid "Widget not found: %s"
 msgstr "Widget not found: %s"
@@ -555,134 +579,133 @@ msgstr "Widget not found: %s"
 msgid "Could not find application pixmap file: %s"
 msgstr "Could not find application pixmap file: %s"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:1
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
 msgid "<b>Build</b>"
 msgstr "<b>Build</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:2
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:2
 msgid "<b>Configuration:</b>"
 msgstr "<b>Configuration:</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:3
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:3
 msgid "<b>Install</b>"
 msgstr "<b>Install</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:4
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:4
 msgid "<b>Regenerate project</b>"
 msgstr "<b>Regenerate project</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:5
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:5
 msgid "<b>Select Program to run:</b>"
 msgstr "<b>Select Program to run:</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:6
+#: ../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:7
 msgid "Build Directory:"
 msgstr "Build Directory:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:8
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Configure Options:"
 msgstr "Configure Options:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
 msgid "Configure Project"
 msgstr "Configure Project"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:10
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
 msgid "Continue on errors"
 msgstr "Continue on errors"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:11
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
 msgid "Highlight message locations in editor"
 msgstr "Highlight message locations in editor"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:12
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
 msgid "Install as root:"
 msgstr "Install as root:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:13
-#: ../plugins/tools/anjuta-tools.glade.h:8
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
+#: ../plugins/tools/anjuta-tools.ui.h:9
 msgid "Run in terminal"
 msgstr "Run in terminal"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:14
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
 msgid "Run several commands at a time:"
 msgstr "Run several commands at a time:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:15
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
 msgid "Select Program"
 msgstr "Select Program"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:16
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:16
 msgid "Select a build directory"
 msgstr "Select a build directory"
 
-#: ../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 "Translate messages"
 
-#: ../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:2 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "Default"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/build-basic-autotools/configuration-list.c:62
-#: ../plugins/gdb/utilities.c:295 ../plugins/profiler/plugin.c:739
+#: ../plugins/build-basic-autotools/configuration-list.c:63
+#: ../plugins/gdb/utilities.c:297
 msgid "Debug"
 msgstr "Debug"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:63
+#: ../plugins/build-basic-autotools/configuration-list.c:64
 msgid "Profiling"
 msgstr "Profiling"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:64
+#: ../plugins/build-basic-autotools/configuration-list.c:65
 msgid "Optimized"
 msgstr "Optimised"
 
-#: ../plugins/build-basic-autotools/executer.c:74
+#: ../plugins/build-basic-autotools/executer.c:72
 msgid "No executables in this project!"
 msgstr "No executables in this project!"
 
-#: ../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 "Program"
 
-#: ../plugins/build-basic-autotools/executer.c:253
+#: ../plugins/build-basic-autotools/executer.c:255
 msgid "No file or project currently opened."
 msgstr "No file or project currently opened."
 
 #. 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 "Program '%s' is not a local file"
 
-#: ../plugins/build-basic-autotools/executer.c:308
-#: ../plugins/scratchbox/plugin.c:213
+#: ../plugins/build-basic-autotools/executer.c:310
 #, c-format
 msgid "Program '%s' does not exists"
-msgstr "Program '%s' does not exists"
+msgstr "Program '%s' does not exist"
 
-#: ../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 "Program '%s' does not have execution permission"
 
-#: ../plugins/build-basic-autotools/executer.c:348
+#: ../plugins/build-basic-autotools/executer.c:350
 msgid "No executable for this file."
 msgstr "No executable for this file."
 
-#: ../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 "Executable '%s' is not up-to-date."
@@ -692,11 +715,11 @@ msgstr "Executable '%s' is not up-to-date."
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:154
+#: ../plugins/build-basic-autotools/plugin.c:167
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:155
+#: ../plugins/build-basic-autotools/plugin.c:168
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 
@@ -705,268 +728,283 @@ msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:163
+#: ../plugins/build-basic-autotools/plugin.c:176
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:164
+#: ../plugins/build-basic-autotools/plugin.c:177
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:710
+#: ../plugins/build-basic-autotools/plugin.c:827
 #, c-format
 msgid "Entering: %s"
 msgstr "Entering: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:746
+#: ../plugins/build-basic-autotools/plugin.c:863
 #, c-format
 msgid "Leaving: %s"
 msgstr "Leaving: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:779
-#: ../plugins/tools/execute.c:329
+#: ../plugins/build-basic-autotools/plugin.c:896
+#: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "warning:"
 
-#: ../plugins/build-basic-autotools/plugin.c:896
+#: ../plugins/build-basic-autotools/plugin.c:902
+#: ../plugins/tools/execute.c:335
+msgid "error:"
+msgstr "error:"
+
+#: ../plugins/build-basic-autotools/plugin.c:1019
 #, c-format
 msgid "Command exited with status %d"
 msgstr "Command exited with status %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:906
+#: ../plugins/build-basic-autotools/plugin.c:1029
+#: ../plugins/build-basic-autotools/plugin.c:1505
 #, c-format
 msgid "Command canceled by user"
 msgstr "Command cancelled by user"
 
-#: ../plugins/build-basic-autotools/plugin.c:911
+#: ../plugins/build-basic-autotools/plugin.c:1034
 #, c-format
 msgid "Command aborted by user"
 msgstr "Command aborted by user"
 
-#: ../plugins/build-basic-autotools/plugin.c:916
+#: ../plugins/build-basic-autotools/plugin.c:1039
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "Command terminated with signal %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:924
+#: ../plugins/build-basic-autotools/plugin.c:1047
 msgid "Command terminated for an unknown reason"
 msgstr "Command terminated for an unknown reason"
 
-#: ../plugins/build-basic-autotools/plugin.c:940
+#: ../plugins/build-basic-autotools/plugin.c:1065
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "Total time taken: %lu secs\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:945
+#: ../plugins/build-basic-autotools/plugin.c:1072
 msgid "Completed unsuccessfully\n"
 msgstr "Completed unsuccessfully\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:950
-#: ../plugins/tools/execute.c:515
+#: ../plugins/build-basic-autotools/plugin.c:1080
+#: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "Completed successfully\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:996
+#: ../plugins/build-basic-autotools/plugin.c:1168
 #, c-format
 msgid "Build %d: %s"
 msgstr "Build %d: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:1565
+#. 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 ""
+"Before using this new configuration, the default one needs to be removed. Do "
+"you want to do that ?"
+
+#: ../plugins/build-basic-autotools/plugin.c:1802
 #, c-format
 msgid "Can not compile \"%s\": No compile rule defined for this file type."
-msgstr "Can not compile \"%s\": No compile rule defined for this file type."
+msgstr "Cannot compile \"%s\": No compile rule defined for this file type."
 
-#: ../plugins/build-basic-autotools/plugin.c:1636
+#: ../plugins/build-basic-autotools/plugin.c:1928
 #, c-format
 msgid "Can not configure project: Missing configure script in %s."
 msgstr "Cannot configure project: Missing configure script in %s."
 
-#: ../plugins/build-basic-autotools/plugin.c:2019
-#: ../plugins/build-basic-autotools/plugin.c:2093
-#: ../plugins/build-basic-autotools/plugin.c:2103
-#: ../plugins/build-basic-autotools/plugin.c:2121
-#: ../plugins/build-basic-autotools/plugin.c:2131
-#: ../plugins/build-basic-autotools/plugin.c:2259
+#: ../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 "_Build"
 
-#: ../plugins/build-basic-autotools/plugin.c:2023
+#: ../plugins/build-basic-autotools/plugin.c:2398
 msgid "_Build Project"
 msgstr "_Build Project"
 
-#: ../plugins/build-basic-autotools/plugin.c:2024
+#: ../plugins/build-basic-autotools/plugin.c:2399
 msgid "Build whole project"
 msgstr "Build whole project"
 
-#: ../plugins/build-basic-autotools/plugin.c:2029
+#: ../plugins/build-basic-autotools/plugin.c:2404
 msgid "_Install Project"
 msgstr "_Install Project"
 
-#: ../plugins/build-basic-autotools/plugin.c:2030
+#: ../plugins/build-basic-autotools/plugin.c:2405
 msgid "Install whole project"
 msgstr "Install whole project"
 
-#: ../plugins/build-basic-autotools/plugin.c:2035
+#: ../plugins/build-basic-autotools/plugin.c:2410
 msgid "_Clean Project"
 msgstr "_Clean Project"
 
-#: ../plugins/build-basic-autotools/plugin.c:2036
+#: ../plugins/build-basic-autotools/plugin.c:2411
 msgid "Clean whole project"
 msgstr "Clean whole project"
 
-#: ../plugins/build-basic-autotools/plugin.c:2041
+#: ../plugins/build-basic-autotools/plugin.c:2416
 msgid "C_onfigure Project..."
-msgstr "C_onfigure Project..."
+msgstr "C_onfigure Projectâ?¦"
 
-#: ../plugins/build-basic-autotools/plugin.c:2042
+#: ../plugins/build-basic-autotools/plugin.c:2417
 msgid "Configure project"
 msgstr "Configure project"
 
-#: ../plugins/build-basic-autotools/plugin.c:2047
+#: ../plugins/build-basic-autotools/plugin.c:2422
 msgid "Build _Tarball"
 msgstr "Build _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2048
+#: ../plugins/build-basic-autotools/plugin.c:2423
 msgid "Build project tarball distribution"
 msgstr "Build project tarball distribution"
 
-#: ../plugins/build-basic-autotools/plugin.c:2053
+#: ../plugins/build-basic-autotools/plugin.c:2428
 msgid "_Build Module"
 msgstr "_Build Module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2054
+#: ../plugins/build-basic-autotools/plugin.c:2429
 msgid "Build module associated with current file"
 msgstr "Build module associated with current file"
 
-#: ../plugins/build-basic-autotools/plugin.c:2059
+#: ../plugins/build-basic-autotools/plugin.c:2434
 msgid "_Install Module"
 msgstr "_Install Module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2060
+#: ../plugins/build-basic-autotools/plugin.c:2435
 msgid "Install module associated with current file"
 msgstr "Install module associated with current file"
 
-#: ../plugins/build-basic-autotools/plugin.c:2065
+#: ../plugins/build-basic-autotools/plugin.c:2440
 msgid "_Clean Module"
 msgstr "_Clean Module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2066
+#: ../plugins/build-basic-autotools/plugin.c:2441
 msgid "Clean module associated with current file"
 msgstr "Clean module associated with current file"
 
-#: ../plugins/build-basic-autotools/plugin.c:2071
+#: ../plugins/build-basic-autotools/plugin.c:2446
 msgid "Co_mpile File"
 msgstr "Co_mpile File"
 
-#: ../plugins/build-basic-autotools/plugin.c:2072
+#: ../plugins/build-basic-autotools/plugin.c:2447
 msgid "Compile current editor file"
 msgstr "Compile current editor file"
 
-#: ../plugins/build-basic-autotools/plugin.c:2077
+#: ../plugins/build-basic-autotools/plugin.c:2452
 msgid "Select Configuration"
 msgstr "Select Configuration"
 
-#: ../plugins/build-basic-autotools/plugin.c:2078
+#: ../plugins/build-basic-autotools/plugin.c:2453
 msgid "Select current configuration"
 msgstr "Select current configuration"
 
-#: ../plugins/build-basic-autotools/plugin.c:2083
+#: ../plugins/build-basic-autotools/plugin.c:2458
 msgid "Remove Configuration"
 msgstr "Remove Configuration"
 
-#: ../plugins/build-basic-autotools/plugin.c:2084
+#: ../plugins/build-basic-autotools/plugin.c:2459
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr ""
 "Clean project (distclean) and remove configuration directory if possible"
 
-#: ../plugins/build-basic-autotools/plugin.c:2097
-#: ../plugins/build-basic-autotools/plugin.c:2125
+#: ../plugins/build-basic-autotools/plugin.c:2472
+#: ../plugins/build-basic-autotools/plugin.c:2500
 msgid "_Compile"
 msgstr "_Compile"
 
-#: ../plugins/build-basic-autotools/plugin.c:2098
-#: ../plugins/build-basic-autotools/plugin.c:2126
+#: ../plugins/build-basic-autotools/plugin.c:2473
+#: ../plugins/build-basic-autotools/plugin.c:2501
 msgid "Compile file"
 msgstr "Compile file"
 
-#: ../plugins/build-basic-autotools/plugin.c:2104
-#: ../plugins/build-basic-autotools/plugin.c:2132
+#: ../plugins/build-basic-autotools/plugin.c:2479
+#: ../plugins/build-basic-autotools/plugin.c:2507
 msgid "Build module"
 msgstr "Build module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2109
-#: ../plugins/build-basic-autotools/plugin.c:2137
-#: ../plugins/build-basic-autotools/plugin.c:2266
+#: ../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 "_Install"
 
-#: ../plugins/build-basic-autotools/plugin.c:2110
-#: ../plugins/build-basic-autotools/plugin.c:2138
+#: ../plugins/build-basic-autotools/plugin.c:2485
+#: ../plugins/build-basic-autotools/plugin.c:2513
 msgid "Install module"
 msgstr "Install module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2115
-#: ../plugins/build-basic-autotools/plugin.c:2143
-#: ../plugins/build-basic-autotools/plugin.c:2273
+#: ../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 "_Clean"
 
-#: ../plugins/build-basic-autotools/plugin.c:2116
-#: ../plugins/build-basic-autotools/plugin.c:2144
+#: ../plugins/build-basic-autotools/plugin.c:2491
+#: ../plugins/build-basic-autotools/plugin.c:2519
 msgid "Clean module"
 msgstr "Clean module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2149
+#: ../plugins/build-basic-autotools/plugin.c:2524
 msgid "_Cancel command"
 msgstr "_Cancel command"
 
-#: ../plugins/build-basic-autotools/plugin.c:2150
+#: ../plugins/build-basic-autotools/plugin.c:2525
 msgid "Cancel build command"
 msgstr "Cancel build command"
 
-#: ../plugins/build-basic-autotools/plugin.c:2259
+#: ../plugins/build-basic-autotools/plugin.c:2563
 #, c-format
 msgid "_Build (%s)"
 msgstr "_Build (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2266
+#: ../plugins/build-basic-autotools/plugin.c:2570
 #, c-format
 msgid "_Install (%s)"
 msgstr "_Install (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2273
+#: ../plugins/build-basic-autotools/plugin.c:2577
 #, c-format
 msgid "_Clean (%s)"
 msgstr "_Clean (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2281
+#: ../plugins/build-basic-autotools/plugin.c:2585
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "Co_mpile (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2281
+#: ../plugins/build-basic-autotools/plugin.c:2585
 #, c-format
 msgid "Co_mpile"
 msgstr "Co_mpile"
 
-#: ../plugins/build-basic-autotools/plugin.c:2794
+#: ../plugins/build-basic-autotools/plugin.c:3121
 msgid "Build commands"
 msgstr "Build commands"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:2803
+#: ../plugins/build-basic-autotools/plugin.c:3130
 msgid "Build popup commands"
 msgstr "Build popup commands"
 
-#: ../plugins/build-basic-autotools/plugin.c:3160
-#: ../plugins/build-basic-autotools/plugin.c:3178
+#: ../plugins/build-basic-autotools/plugin.c:3512
+#: ../plugins/build-basic-autotools/plugin.c:3520
 msgid "Build Autotools"
 msgstr "Build Autotools"
 
@@ -974,137 +1012,141 @@ msgstr "Build Autotools"
 msgid "Command aborted"
 msgstr "Command aborted"
 
-#. create the check menuitem
-#: ../plugins/class-inheritance/class-inherit.c:199
-msgid "Fixed data-view"
-msgstr "Fixed data-view"
-
-#: ../plugins/class-inheritance/class-inherit.c:1099
-#: ../plugins/debug-manager/sharedlib.c:144
-#: ../plugins/debug-manager/signals.c:330
-msgid "Update"
-msgstr "Update"
-
-#: ../plugins/class-inheritance/class-inherit.c:1100
-msgid "Update the graph"
-msgstr "Update the graph"
-
-#: ../plugins/class-inheritance/plugin.c:114
-msgid "Inheritance Graph"
-msgstr "Inheritance Graph"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:1
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
 msgid "<b>Class Elements</b>"
 msgstr "<b>Class Elements</b>"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:2
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "<b>General Class Properties</b>"
 msgstr "<b>General Class Properties</b>"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:3
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Project"
 msgstr "Add to Project"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Add to Repository"
 msgstr "Add to Repository"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:5
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author Email:"
-msgstr "Author E-mail:"
+msgstr "Author E-mail Address:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author Name:"
 msgstr "Author Name:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Author/Date-Time"
 msgstr "Author/Date-Time"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Author/Date/Time"
 msgstr "Author/Date/Time"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
 msgid "Base Class Inheritance:"
 msgstr "Base Class Inheritance:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Base Class:"
 msgstr "Base Class:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 msgid "Class Function Prefix:"
 msgstr "Class Function Prefix:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
+#: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
+msgid "Class Generator"
+msgstr "Class Generator"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
 msgid "Class Name:"
 msgstr "Class Name:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Class Options:"
 msgstr "Class Options:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "Create"
 msgstr "Create"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
 msgid "GObject Class\t"
 msgstr "GObject Class\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
 msgid "GObject Prefix and Type:"
 msgstr "GObject Prefix and Type:"
 
-#: ../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 ""
-"General Public Licence (GPL)\n"
-"Lesser General Public Licence (LGPL)\n"
-"No Licence"
+#: ../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 "General Public Licence (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 "Generic C++ Class"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:21
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "Header File:"
 msgstr "Header File:"
 
-#: ../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 "Inline the declaration and implementation"
 
-#: ../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 "Lesser General Public Licence (LGPL)"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
 msgid "License:"
 msgstr "Licence:"
 
-#: ../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 "Member Functions/Variables"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:25
-#: ../plugins/glade/plugin.c:4418
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
+msgid "No License"
+msgstr "No Licence"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/glade/plugin.c:4446
 msgid "Properties"
 msgstr "Properties"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
 msgid "Signals"
 msgstr "Signals"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "Source File:"
 msgstr "Source File:"
 
-#: ../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 "Source/Header Headings:"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
+msgid "private"
+msgstr "private"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
+msgid "protected"
+msgstr "protected"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
+msgid "public"
+msgstr "public"
+
 #: ../plugins/class-gen/generator.c:132
 #, c-format
 msgid "Header or source file has not been created"
@@ -1127,46 +1169,99 @@ msgstr "File to which the processed template will be written"
 msgid "Failed to write autogen definition file"
 msgstr "Failed to write autogen definition file"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1053
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1040
 msgid ""
 "Could not find autogen version 5, please install the autogen package. You "
 "can get it from http://autogen.sourceforge.net";
 msgstr ""
 "Could not find autogen version 5, please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net";
+"can get it from http://autogen.sourceforge.net.";
 
-#: ../plugins/class-gen/plugin.c:269 ../plugins/class-gen/plugin.c:427
+#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:412
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "Failed to execute autogen: %s"
 
-#: ../plugins/class-gen/window.c:816
+#: ../plugins/class-gen/window.c:94
+msgid "Guess from type"
+msgstr "Guess from type"
+
+#: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+msgid "Scope"
+msgstr "Scope"
+
+#: ../plugins/class-gen/window.c:500
+msgid "Implementation"
+msgstr "Implementation"
+
+#: ../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 "Type"
+
+#: ../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 "Name"
+
+#: ../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 "Nick"
+
+#: ../plugins/class-gen/window.c:522
+msgid "Blurb"
+msgstr "Blurb"
+
+#: ../plugins/class-gen/window.c:523
+msgid "GType"
+msgstr "GType"
+
+#: ../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 "Flags"
+
+#: ../plugins/class-gen/window.c:537
+msgid "Marshaller"
+msgstr "Marshaller"
+
+#: ../plugins/class-gen/window.c:818
 msgid "XML description of the user interface"
 msgstr "XML description of the user interface"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:1
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
 msgid "<b>CVS Options</b>"
 msgstr "<b>CVS Options</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:2
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:2
 msgid "<b>Module Details:</b>"
 msgstr "<b>Module Details:</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:3
-#: ../plugins/git/anjuta-git.glade.h:15
-#: ../plugins/subversion/anjuta-subversion.glade.h:8
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:3
 msgid "<b>Options:</b>"
 msgstr "<b>Options:</b>"
 
-#: ../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/sourceview/anjuta-editor-sourceview.glade.h:4
-#: ../plugins/subversion/anjuta-subversion.glade.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
+#: ../plugins/git/anjuta-git.ui.h:1 ../plugins/search/anjuta-search.ui.h:3
 msgid "<b>Options</b>"
 msgstr "<b>Options</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:5
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
 msgid ""
 "<b>Please note: </b>\n"
 "\n"
@@ -1176,266 +1271,274 @@ msgid ""
 msgstr ""
 "<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>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:8
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
 msgid "<b>Repository: </b>"
-msgstr "<b>Repository: </b>"
+msgstr "<b>Repository:</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
 msgid "Be verbose"
 msgstr "Be verbose"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:10
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:27
+#: ../plugins/subversion/anjuta-subversion.ui.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:2
+msgid "Browse..."
+msgstr "Browseâ?¦"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
 msgid "CVS Preferences"
 msgstr "CVS Preferences"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:11
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
 msgid "CVS: Add file/directory"
 msgstr "CVS: Add file/directory"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:12
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
 msgid "CVS: Commit file/directory"
 msgstr "CVS: Commit file/directory"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:13
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
 msgid "CVS: Diff file/directory"
 msgstr "CVS: Diff file/directory"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:14
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
 msgid "CVS: Import"
 msgstr "CVS: Import"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:15
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
 msgid "CVS: Log file/directory"
 msgstr "CVS: Log file/directory"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:16
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
 msgid "CVS: Remove file/directory"
 msgstr "CVS: Remove file/directory"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:17
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
 msgid "CVS: Status"
 msgstr "CVS: Status"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:18
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
 msgid "CVS: Status from file/directory"
 msgstr "CVS: Status from file/directory"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:19
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
 msgid "CVS: Update file/directory"
 msgstr "CVS: Update file/directory"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:20
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
 msgid "CVSROOT:"
 msgstr "CVSROOT:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:21
-#: ../plugins/subversion/anjuta-subversion.glade.h:22
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
+#: ../plugins/subversion/anjuta-subversion.ui.h:5
 msgid "Choose file or directory to add:"
 msgstr "Choose file or directory to add:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:22
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
 msgid "Choose file or directory to commit:"
 msgstr "Choose file or directory to commit:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
 msgid "Choose file or directory to diff:"
 msgstr "Choose file or directory to diff:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:24
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
 msgid "Choose file or directory to get log:"
-msgstr "Choose file or directory to get log:"
+msgstr "Choose file or directory to get the log for:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:25
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
 msgid "Choose file or directory to get the status from:"
 msgstr "Choose file or directory to get the status from:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:26
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
 msgid "Choose file or directory to remove:"
 msgstr "Choose file or directory to remove:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:27
-#: ../plugins/subversion/anjuta-subversion.glade.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
+#: ../plugins/subversion/anjuta-subversion.ui.h:6
 msgid "Choose file or directory to update:"
 msgstr "Choose file or directory to update:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:28
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
 msgid "Compression Level (0=off, 10=max):"
 msgstr "Compression Level (0=off, 10=max):"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:29
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "Create new directories"
 msgstr "Create new directories"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
 msgid "Delete empty directories"
 msgstr "Delete empty directories"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:31
-#: ../plugins/subversion/anjuta-subversion.glade.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/subversion/anjuta-subversion.ui.h:13
 msgid "Do not act recursively"
 msgstr "Do not act recursively"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:32
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+msgid "Extern (rsh)"
+msgstr "Extern (rsh)"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
 msgid "File is binary"
 msgstr "File is binary"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:33
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
 msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ignore .cvsrc file (recommended)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:34
-msgid ""
-"Local\n"
-"Extern (rsh)\n"
-"Password server (pserver)\n"
-msgstr ""
-"Local\n"
-"Extern (rsh)\n"
-"Password server (pserver)\n"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
+#: ../plugins/git/anjuta-git.ui.h:62 ../plugins/symbol-db/plugin.c:2333
+#: ../plugins/symbol-db/plugin.c:2397
+msgid "Local"
+msgstr "Local"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:38
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:64
 msgid "Log message:"
 msgstr "Log message:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:39
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
 msgid "Module name:"
 msgstr "Module name:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:40
-#: ../plugins/subversion/anjuta-subversion.glade.h:36
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
+msgid "Password server (pserver)"
+msgstr "Password server (pserver)"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:26
 msgid "Password:"
 msgstr "Password:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:41
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
+msgid "Patch-Style diff"
+msgstr "Patch-Style diff"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
 msgid "Path to \"cvs\" command"
 msgstr "Path to \"cvs\" command"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:42
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
 msgid "Project root directory:"
 msgstr "Project root directory:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:43
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
 msgid "Release tag:"
 msgstr "Release tag:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:44
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:45
 msgid "Reset sticky tags"
 msgstr "Reset sticky tags"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:45
-#: ../plugins/git/anjuta-git.glade.h:72
-#: ../plugins/subversion/anjuta-subversion.glade.h:46
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:91
+#: ../plugins/subversion/anjuta-subversion.ui.h:37
 msgid "Revision:"
 msgstr "Revision:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:46
-msgid ""
-"Standard diff\n"
-"Patch-Style diff"
-msgstr ""
-"Standard diff\n"
-"Patch-Style diff"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:47
+msgid "Standard diff"
+msgstr "Standard diff"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:48
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:48
 msgid "Unified format instead of context format"
 msgstr "Unified format instead of context format"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:49
-#: ../plugins/subversion/anjuta-subversion.glade.h:55
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:54
 msgid "Use revision/tag:"
 msgstr "Use revision/tag:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:50
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:50
 msgid "Use revision:"
 msgstr "Use revision:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:51
-#: ../plugins/subversion/anjuta-subversion.glade.h:56
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:55
 msgid "Username:"
 msgstr "Username:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:52
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:52
 msgid "Vendor tag:"
 msgstr "Vendor tag:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:53
-#: ../plugins/git/anjuta-git.glade.h:85
-#: ../plugins/subversion/anjuta-subversion.glade.h:60
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
+#: ../plugins/git/anjuta-git.ui.h:125
+#: ../plugins/subversion/anjuta-subversion.ui.h:60
 msgid "Whole project"
 msgstr "Whole project"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:47
+#: ../plugins/cvs-plugin/cvs-callbacks.c:46
 msgid "Please enter a filename!"
 msgstr "Please enter a filename!"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:60
+#: ../plugins/cvs-plugin/cvs-callbacks.c:59
 #, c-format
 msgid "Please fill field: %s"
 msgstr "Please fill field: %s"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:80
+#: ../plugins/cvs-plugin/cvs-callbacks.c:78
 msgid "CVS command is running! Please wait until it is finished!"
 msgstr "CVS command is running! Please wait until it is finished!"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:154
+#: ../plugins/cvs-plugin/cvs-callbacks.c:152
 msgid "Unable to delete file"
 msgstr "Unable to delete file"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:246
-#: ../plugins/git/git-commit-dialog.c:68
-#: ../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 "Are you sure that you want to pass an empty log message?"
 
-#: ../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 "Module"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:442
+#: ../plugins/cvs-plugin/cvs-callbacks.c:441
 msgid "Vendor"
 msgstr "Vendor"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:445
+#: ../plugins/cvs-plugin/cvs-callbacks.c:444
 msgid "Release"
 msgstr "Release"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:449
-msgid "Directory"
-msgstr "Directory"
-
 #: ../plugins/cvs-plugin/cvs-callbacks.c:460
 msgid "Are you sure that you do not want a log message?"
 msgstr "Are you sure that you do not want a log message?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:125
 msgid "CVS command failed - See above for details"
-msgstr "CVS command failed - See above for details"
+msgstr "CVS command failed. See above for details"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:130
 #, c-format
 msgid "CVS command successful! - Time taken: %ld second"
 msgid_plural "CVS command successful! - Time taken: %ld seconds"
-msgstr[0] "CVS command successful! - Time taken: %ld second"
-msgstr[1] "CVS command successful! - Time taken: %ld seconds"
+msgstr[0] "CVS command successful! Time taken: %ld second"
+msgstr[1] "CVS command successful! Time taken: %ld seconds"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:221
 msgid "CVS command is running - please wait until it finishes!"
-msgstr "CVS command is running - please wait until it finishes!"
+msgstr "CVS command is running â?? please wait until it finishes!"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
-#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:462
-#: ../plugins/cvs-plugin/plugin.c:469
+#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:467
+#: ../plugins/cvs-plugin/plugin.c:474
 msgid "CVS"
 msgstr "CVS"
 
@@ -1484,8 +1587,7 @@ msgstr "Commit your changes to the CVS tree"
 #. 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 "_Update"
 
@@ -1493,7 +1595,7 @@ msgstr "_Update"
 #. short-cut
 #: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
 msgid "Sync your local copy with the CVS tree"
-msgstr "Sync your local copy with the CVS tree"
+msgstr "Syncronise your local copy with the CVS tree"
 
 #. Action name
 #. Stock icon, if any
@@ -1551,404 +1653,390 @@ msgstr "CVS operations"
 msgid "CVS popup operations"
 msgstr "CVS popup operations"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:1
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
 msgid "<b>Debugger:</b>"
 msgstr "<b>Debugger:</b>"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:2
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:2
 msgid "<b>Remote debugging</b>"
 msgstr "<b>Remote debugging</b>"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:3
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:3
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
+"program not using the Debug configuration ?</span>\n"
+"\n"
+"When optimizations are enabled, the debugger cannot always identify the "
+"source code corresponding to the instructions, some commands can perform in "
+"a strange way, especially steps."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
+"program not using the Debug configuration ?</span>\n"
+"\n"
+"When optimisations 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."
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Add Watch"
 msgstr "Add Watch"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
 msgid "Address:"
 msgstr "Address:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:5
-#: ../plugins/gdb/anjuta-gdb.glade.h:2
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
 msgid "Attach to process"
 msgstr "Attach to process"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:6
-#: ../plugins/gdb/anjuta-gdb.glade.h:3
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
 msgid "Breakpoint properties"
 msgstr "Breakpoint properties"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:7
-#: ../plugins/debug-manager/breakpoints.c:1976
-#: ../plugins/gdb/anjuta-gdb.glade.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
+#: ../plugins/debug-manager/breakpoints.c:1980
 msgid "Breakpoints"
 msgstr "Breakpoints"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:8
-#: ../plugins/gdb/anjuta-gdb.glade.h:5
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
 msgid "CPU Registers"
 msgstr "CPU Registers"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Change Watch"
 msgstr "Change Watch"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Connect to remote target"
 msgstr "Connect to remote target"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:11
-#: ../plugins/gdb/anjuta-gdb.glade.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
 msgid "Debugger command"
 msgstr "Debugger command"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:12
-#: ../plugins/gdb/anjuta-gdb.glade.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
 msgid "Debugger command:"
 msgstr "Debugger command:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:13
-#: ../plugins/gdb/anjuta-gdb.glade.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
 #: ../plugins/project-wizard/templates/translatable-strings.h:33
 msgid "Description:"
 msgstr "Description:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Disable"
 msgstr "Disable"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:15
-#: ../plugins/gdb/anjuta-gdb.glade.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
 msgid "Display process _tree"
 msgstr "Display process _tree"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:16
-#: ../plugins/gdb/anjuta-gdb.glade.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
+msgid "Do not show again"
+msgstr "Do not show again"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
 msgid "Enable _all"
 msgstr "Enable _all"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Enter an address in hexadecimal or select one in the data"
 msgstr "Enter an address in hexadecimal or select one in the data"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:18
-#: ../plugins/gdb/anjuta-gdb.glade.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
 msgid "Hide process para_meters"
 msgstr "Hide process para_meters"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:19
-#: ../plugins/gdb/anjuta-gdb.glade.h:15
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
 msgid "Inspect"
 msgstr "Inspect"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
 msgid "Inspect/Evaluate"
 msgstr "Inspect/Evaluate"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:21
-#: ../plugins/debug-manager/plugin.c:925
-#: ../plugins/debug-manager/plugin.c:1025 ../plugins/gdb/anjuta-gdb.glade.h:16
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/plugin.c:945
+#: ../plugins/debug-manager/plugin.c:1045
 msgid "Kernel Signals"
 msgstr "Kernel Signals"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:22
-#: ../plugins/debug-manager/breakpoints.c:1903
-#: ../plugins/gdb/anjuta-gdb.glade.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
+#: ../plugins/debug-manager/breakpoints.c:1907
 msgid "Location"
 msgstr "Location"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:23
-#: ../plugins/debug-manager/memory.c:178 ../plugins/gdb/anjuta-gdb.glade.h:18
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
+#: ../plugins/debug-manager/memory.c:180
 msgid "Memory"
 msgstr "Memory"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:24
-#: ../plugins/gdb/anjuta-gdb.glade.h:19
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
 msgid "Pass:"
 msgstr "Pass:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 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:30
 msgid "Print:"
 msgstr "Print:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:27
-#: ../plugins/gdb/anjuta-gdb.glade.h:21
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
 msgid "Program Interrupt"
 msgstr "Program Interrupt"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:28
-#: ../plugins/gdb/anjuta-gdb.glade.h:23
+#: ../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 "Select one directory"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:34
 msgid "Serial Line Connection"
 msgstr "Serial Line Connection"
 
-#: ../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 "Set Signal Property"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:32
-#: ../plugins/debug-manager/sharedlib.c:215
-#: ../plugins/gdb/anjuta-gdb.glade.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:36
+#: ../plugins/debug-manager/sharedlib.c:214
 msgid "Shared libraries"
 msgstr "Shared libraries"
 
-#: ../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 "Signal:"
 
-#: ../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 "Source Directories"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:35
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:39
 msgid "Start Debugger"
 msgstr "Start Debugger"
 
-#: ../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 "Stop:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:37
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:41
 msgid "TCP/IP Connection"
 msgstr "TCP/IP Connection"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:38
-#: ../plugins/gdb/anjuta-gdb.glade.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
 #: ../plugins/project-wizard/property.c:286
 msgid "Yes"
 msgstr "Yes"
 
-#: ../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 "_Attach"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:40
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:44
 msgid "_Automatic update"
 msgstr "_Automatic update"
 
-#: ../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 "_Condition:"
 
-#: ../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 "_Disable all"
 
-#: ../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 "_Hide paths"
 
-#: ../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 "_Location:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:45
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:49
 msgid "_Name:"
 msgstr "_Name:"
 
 #. 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 "_Pass count:"
 
-#: ../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 "_Process to attach to:"
 
-#: ../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 "_Remove all"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:51
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:55
 msgid "_Value:"
 msgstr "_Value:"
 
-#: ../plugins/debug-manager/breakpoints.c:1669
+#: ../plugins/debug-manager/breakpoints.c:1673
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "Are you sure you want to delete all the breakpoints?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1766
+#: ../plugins/debug-manager/breakpoints.c:1770
 msgid "_Breakpoints"
 msgstr "_Breakpoints"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1774
+#: ../plugins/debug-manager/breakpoints.c:1778
 msgid "Toggle Breakpoint"
 msgstr "Toggle Breakpoint"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1776
+#: ../plugins/debug-manager/breakpoints.c:1780
 msgid "Toggle breakpoint at the current location"
 msgstr "Toggle breakpoint at the current location"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1782
+#: ../plugins/debug-manager/breakpoints.c:1786
 msgid "Add Breakpoint..."
-msgstr "Add Breakpoint..."
+msgstr "Add Breakpointâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1784
+#: ../plugins/debug-manager/breakpoints.c:1788
 msgid "Add a breakpoint"
 msgstr "Add a breakpoint"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1790
+#: ../plugins/debug-manager/breakpoints.c:1794
 msgid "Remove Breakpoint"
 msgstr "Remove Breakpoint"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1792
+#: ../plugins/debug-manager/breakpoints.c:1796
 msgid "Remove a breakpoint"
 msgstr "Remove a breakpoint"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1798
+#: ../plugins/debug-manager/breakpoints.c:1802
 msgid "Edit Breakpoint"
 msgstr "Edit Breakpoint"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1800
+#: ../plugins/debug-manager/breakpoints.c:1804
 msgid "Edit breakpoint properties"
 msgstr "Edit breakpoint properties"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1806
-#: ../plugins/debug-manager/breakpoints.c:1877
+#: ../plugins/debug-manager/breakpoints.c:1810
+#: ../plugins/debug-manager/breakpoints.c:1881
 msgid "Enable Breakpoint"
 msgstr "Enable Breakpoint"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1808
-#: ../plugins/debug-manager/breakpoints.c:1878
+#: ../plugins/debug-manager/breakpoints.c:1812
+#: ../plugins/debug-manager/breakpoints.c:1882
 msgid "Enable a breakpoint"
 msgstr "Enable a breakpoint"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1814
+#: ../plugins/debug-manager/breakpoints.c:1818
 msgid "Disable All Breakpoints"
 msgstr "Disable All Breakpoints"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1816
+#: ../plugins/debug-manager/breakpoints.c:1820
 msgid "Deactivate all breakpoints"
 msgstr "Deactivate all breakpoints"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1822
+#: ../plugins/debug-manager/breakpoints.c:1826
 msgid "R_emove All Breakpoints"
 msgstr "R_emove All Breakpoints"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1824
+#: ../plugins/debug-manager/breakpoints.c:1828
 msgid "Remove all breakpoints"
 msgstr "Remove all breakpoints"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1833
+#: ../plugins/debug-manager/breakpoints.c:1837
 msgid "Jump to Breakpoint"
 msgstr "Jump to Breakpoint"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1835
+#: ../plugins/debug-manager/breakpoints.c:1839
 msgid "Jump to breakpoint location"
 msgstr "Jump to breakpoint location"
 
-#: ../plugins/debug-manager/breakpoints.c:1872
+#: ../plugins/debug-manager/breakpoints.c:1876
 msgid "Disable Breakpoint"
 msgstr "Disable Breakpoint"
 
-#: ../plugins/debug-manager/breakpoints.c:1873
+#: ../plugins/debug-manager/breakpoints.c:1877
 msgid "Disable a breakpoint"
 msgstr "Disable a breakpoint"
 
-#: ../plugins/debug-manager/breakpoints.c:1903
-#: ../plugins/tools/anjuta-tools.glade.h:5
+#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../plugins/debug-manager/breakpoints.c:1903
-#: ../plugins/debug-manager/stack_trace.c:666
-#: ../plugins/debug-manager/threads.c:480
+#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/stack_trace.c:667
+#: ../plugins/debug-manager/threads.c:481
 msgid "Address"
 msgstr "Address"
 
-#: ../plugins/debug-manager/breakpoints.c:1903
-#: ../plugins/debug-manager/debug_tree.c:126
-msgid "Type"
-msgstr "Type"
-
-#: ../plugins/debug-manager/breakpoints.c:1904
+#: ../plugins/debug-manager/breakpoints.c:1908
 msgid "Condition"
 msgstr "Condition"
 
-#: ../plugins/debug-manager/breakpoints.c:1904
+#: ../plugins/debug-manager/breakpoints.c:1908
 msgid "Pass count"
 msgstr "Pass count"
 
-#: ../plugins/debug-manager/breakpoints.c:1904
+#: ../plugins/debug-manager/breakpoints.c:1908
 msgid "State"
 msgstr "State"
 
-#: ../plugins/debug-manager/breakpoints.c:1953
-#: ../plugins/debug-manager/breakpoints.c:1959
+#: ../plugins/debug-manager/breakpoints.c:1957
+#: ../plugins/debug-manager/breakpoints.c:1963
 msgid "Breakpoint operations"
 msgstr "Breakpoint operations"
 
 #. create goto menu_item.
-#: ../plugins/debug-manager/data_view.c:383
-#: ../plugins/debug-manager/sparse_view.c:491
+#: ../plugins/debug-manager/data_view.c:390
+#: ../plugins/debug-manager/sparse_view.c:498
 msgid "_Goto address"
-msgstr "_Goto address"
+msgstr "_Go to address"
 
 #: ../plugins/debug-manager/debug_tree.c:126
-#: ../plugins/gbf-am/gbf-am-properties.c:964 ../plugins/tools/editor.c:454
+#: ../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:720 ../plugins/tools/editor.c:460
+#: ../plugins/gbf-am/gbf-am-properties.c:981
+#: ../plugins/run-program/parameters.c:758 ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "Value"
 
@@ -1957,12 +2045,11 @@ msgid "Disassembly"
 msgstr "Disassembly"
 
 #: ../plugins/debug-manager/info.c:52 ../plugins/debug-manager/info.c:101
-#: ../plugins/project-wizard/druid.c:136
+#: ../plugins/project-wizard/druid.c:135
 msgid "Information"
 msgstr "Information"
 
 #: ../plugins/debug-manager/info.c:127
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:48
 msgid "Lines"
 msgstr "Lines"
 
@@ -1971,236 +2058,237 @@ msgstr "Lines"
 msgid "Locals"
 msgstr "Locals"
 
-#: ../plugins/debug-manager/plugin.c:312
+#: ../plugins/debug-manager/plugin.c:315
 msgid "Debugger Log"
 msgstr "Debugger Log"
 
-#: ../plugins/debug-manager/plugin.c:386 ../plugins/debug-manager/plugin.c:406
-#: ../plugins/debug-manager/plugin.c:426 ../plugins/debug-manager/plugin.c:448
-#: ../plugins/debug-manager/plugin.c:482 ../plugins/debug-manager/plugin.c:517
+#: ../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 "Debugger"
 
-#: ../plugins/debug-manager/plugin.c:386
+#: ../plugins/debug-manager/plugin.c:389
 msgid "Started"
 msgstr "Started"
 
-#: ../plugins/debug-manager/plugin.c:406
+#: ../plugins/debug-manager/plugin.c:409
 msgid "Loaded"
 msgstr "Loaded"
 
-#: ../plugins/debug-manager/plugin.c:426
+#: ../plugins/debug-manager/plugin.c:429
 msgid "Running..."
-msgstr "Running..."
+msgstr "Runningâ?¦"
 
-#: ../plugins/debug-manager/plugin.c:448
+#: ../plugins/debug-manager/plugin.c:451
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../plugins/debug-manager/plugin.c:482
+#: ../plugins/debug-manager/plugin.c:485
 msgid "Unloaded"
 msgstr "Unloaded"
 
-#: ../plugins/debug-manager/plugin.c:523
+#: ../plugins/debug-manager/plugin.c:529
 #, c-format
 msgid "Debugger terminated with error %d: %s\n"
 msgstr "Debugger terminated with error %d: %s\n"
 
-#: ../plugins/debug-manager/plugin.c:536
+#: ../plugins/debug-manager/plugin.c:542
 #, c-format
 msgid "Program has received signal: %s\n"
 msgstr "Program has received signal: %s\n"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:809 ../plugins/valgrind/plugin.c:438
+#: ../plugins/debug-manager/plugin.c:829
 msgid "_Debug"
 msgstr "_Debug"
 
-#: ../plugins/debug-manager/plugin.c:817
+#: ../plugins/debug-manager/plugin.c:837
 msgid "_Start Debugger"
 msgstr "_Start Debugger"
 
-#: ../plugins/debug-manager/plugin.c:825
+#: ../plugins/debug-manager/plugin.c:845
 msgid "_Debug Program"
 msgstr "_Debug Program"
 
-#: ../plugins/debug-manager/plugin.c:827
+#: ../plugins/debug-manager/plugin.c:847
 msgid "Start debugger and load the program"
 msgstr "Start debugger and load the program"
 
-#: ../plugins/debug-manager/plugin.c:833
+#: ../plugins/debug-manager/plugin.c:853
 msgid "_Debug Process..."
-msgstr "_Debug Process..."
+msgstr "_Debug Processâ?¦"
 
-#: ../plugins/debug-manager/plugin.c:835
+#: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
 msgstr "Start debugger and attach to a running program"
 
-#: ../plugins/debug-manager/plugin.c:841
+#: ../plugins/debug-manager/plugin.c:861
 msgid "Debug _Remote Target..."
-msgstr "Debug _Remote Target..."
+msgstr "Debug _Remote Targetâ?¦"
 
-#: ../plugins/debug-manager/plugin.c:843
+#: ../plugins/debug-manager/plugin.c:863
 msgid "Connect to a remote debugging target"
 msgstr "Connect to a remote debugging target"
 
-#: ../plugins/debug-manager/plugin.c:849
+#: ../plugins/debug-manager/plugin.c:869
 msgid "Stop Debugger"
 msgstr "Stop Debugger"
 
-#: ../plugins/debug-manager/plugin.c:851
+#: ../plugins/debug-manager/plugin.c:871
 msgid "Say goodbye to the debugger"
 msgstr "Say goodbye to the debugger"
 
-#: ../plugins/debug-manager/plugin.c:857
+#: ../plugins/debug-manager/plugin.c:877
 msgid "Add source paths..."
-msgstr "Add source paths..."
+msgstr "Add source pathsâ?¦"
 
-#: ../plugins/debug-manager/plugin.c:859
+#: ../plugins/debug-manager/plugin.c:879
 msgid "Add additional source paths"
 msgstr "Add additional source paths"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:869 ../plugins/debug-manager/plugin.c:977
+#: ../plugins/debug-manager/plugin.c:889 ../plugins/debug-manager/plugin.c:997
 msgid "Debugger Command..."
-msgstr "Debugger Command..."
+msgstr "Debugger Commandâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:871 ../plugins/debug-manager/plugin.c:979
+#: ../plugins/debug-manager/plugin.c:891 ../plugins/debug-manager/plugin.c:999
 msgid "Custom debugger command"
 msgstr "Custom debugger command"
 
-#: ../plugins/debug-manager/plugin.c:877 ../plugins/debug-manager/plugin.c:985
+#: ../plugins/debug-manager/plugin.c:897
+#: ../plugins/debug-manager/plugin.c:1005
 msgid "_Info"
 msgstr "_Info"
 
-#: ../plugins/debug-manager/plugin.c:885
+#: ../plugins/debug-manager/plugin.c:905
 msgid "Info _Target Files"
 msgstr "Info _Target Files"
 
-#: ../plugins/debug-manager/plugin.c:887
+#: ../plugins/debug-manager/plugin.c:907
 msgid "Display information on the files the debugger is active with"
 msgstr "Display information on the files the debugger is active with"
 
-#: ../plugins/debug-manager/plugin.c:893
+#: ../plugins/debug-manager/plugin.c:913
 msgid "Info _Program"
 msgstr "Info _Program"
 
-#: ../plugins/debug-manager/plugin.c:895
+#: ../plugins/debug-manager/plugin.c:915
 msgid "Display information on the execution status of the program"
 msgstr "Display information on the execution status of the program"
 
-#: ../plugins/debug-manager/plugin.c:901
+#: ../plugins/debug-manager/plugin.c:921
 msgid "Info _Kernel User Struct"
 msgstr "Info _Kernel User Struct"
 
-#: ../plugins/debug-manager/plugin.c:903
+#: ../plugins/debug-manager/plugin.c:923
 msgid "Display the contents of kernel 'struct user' for current child"
 msgstr "Display the contents of kernel 'struct user' for current child"
 
-#: ../plugins/debug-manager/plugin.c:917
-#: ../plugins/debug-manager/plugin.c:1017
+#: ../plugins/debug-manager/plugin.c:937
+#: ../plugins/debug-manager/plugin.c:1037
 msgid "Shared Libraries"
 msgstr "Shared Libraries"
 
-#: ../plugins/debug-manager/plugin.c:919
-#: ../plugins/debug-manager/plugin.c:1019
+#: ../plugins/debug-manager/plugin.c:939
+#: ../plugins/debug-manager/plugin.c:1039
 msgid "Show shared libraries mappings"
-msgstr "Show shared libraries mappings"
+msgstr "Show shared libraries' mappings"
 
-#: ../plugins/debug-manager/plugin.c:927
-#: ../plugins/debug-manager/plugin.c:1027
+#: ../plugins/debug-manager/plugin.c:947
+#: ../plugins/debug-manager/plugin.c:1047
 msgid "Show kernel signals"
 msgstr "Show kernel signals"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:937
+#: ../plugins/debug-manager/plugin.c:957
 msgid "Run/_Continue"
 msgstr "Run/_Continue"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:939
+#: ../plugins/debug-manager/plugin.c:959
 msgid "Continue the execution of the program"
 msgstr "Continue the execution of the program"
 
-#: ../plugins/debug-manager/plugin.c:945
+#: ../plugins/debug-manager/plugin.c:965
 msgid "Step _In"
 msgstr "Step _In"
 
-#: ../plugins/debug-manager/plugin.c:947
+#: ../plugins/debug-manager/plugin.c:967
 msgid "Single step into function"
 msgstr "Single step into function"
 
-#: ../plugins/debug-manager/plugin.c:953
+#: ../plugins/debug-manager/plugin.c:973
 msgid "Step O_ver"
 msgstr "Step O_ver"
 
-#: ../plugins/debug-manager/plugin.c:955
+#: ../plugins/debug-manager/plugin.c:975
 msgid "Single step over function"
 msgstr "Single step over function"
 
-#: ../plugins/debug-manager/plugin.c:961
+#: ../plugins/debug-manager/plugin.c:981
 msgid "Step _Out"
 msgstr "Step _Out"
 
-#: ../plugins/debug-manager/plugin.c:963
+#: ../plugins/debug-manager/plugin.c:983
 msgid "Single step out of the function"
-msgstr "Single step out of the function"
+msgstr "Single step out of function"
 
-#: ../plugins/debug-manager/plugin.c:969
+#: ../plugins/debug-manager/plugin.c:989
 msgid "_Run to Cursor"
 msgstr "_Run to Cursor"
 
-#: ../plugins/debug-manager/plugin.c:971
+#: ../plugins/debug-manager/plugin.c:991
 msgid "Run to the cursor"
 msgstr "Run to the cursor"
 
-#: ../plugins/debug-manager/plugin.c:993
+#: ../plugins/debug-manager/plugin.c:1013
 msgid "Info _Global Variables"
 msgstr "Info _Global Variables"
 
-#: ../plugins/debug-manager/plugin.c:995
+#: ../plugins/debug-manager/plugin.c:1015
 msgid "Display all global and static variables of the program"
 msgstr "Display all global and static variables of the program"
 
-#: ../plugins/debug-manager/plugin.c:1001
+#: ../plugins/debug-manager/plugin.c:1021
 msgid "Info _Current Frame"
 msgstr "Info _Current Frame"
 
-#: ../plugins/debug-manager/plugin.c:1003
+#: ../plugins/debug-manager/plugin.c:1023
 msgid "Display information about the current frame of execution"
 msgstr "Display information about the current frame of execution"
 
-#: ../plugins/debug-manager/plugin.c:1009
+#: ../plugins/debug-manager/plugin.c:1029
 msgid "Info Function _Arguments"
 msgstr "Info Function _Arguments"
 
-#: ../plugins/debug-manager/plugin.c:1011
+#: ../plugins/debug-manager/plugin.c:1031
 msgid "Display function arguments of the current frame"
 msgstr "Display function arguments of the current frame"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:1037
+#: ../plugins/debug-manager/plugin.c:1057
 msgid "Pa_use Program"
 msgstr "Pa_use Program"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:1039
+#: ../plugins/debug-manager/plugin.c:1059
 msgid "Pauses the execution of the program"
 msgstr "Pauses the execution of the program"
 
-#: ../plugins/debug-manager/plugin.c:1079
-#: ../plugins/debug-manager/plugin.c:1085
-#: ../plugins/debug-manager/plugin.c:1091
-#: ../plugins/debug-manager/plugin.c:1097
+#: ../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 "Debugger operations"
 
@@ -2208,8 +2296,7 @@ msgstr "Debugger operations"
 #, c-format
 msgid ""
 "Unable to find one debugger plugin supporting a target with %s mime type"
-msgstr ""
-"Unable to find one debugger plugin supporting a target with %s mime type"
+msgstr "Unable to find a debugger plugin supporting a target with %s MIME type"
 
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
@@ -2219,18 +2306,20 @@ msgstr "Register"
 msgid "Registers"
 msgstr "Registers"
 
+#: ../plugins/debug-manager/sharedlib.c:144
+#: ../plugins/debug-manager/signals.c:332
+msgid "Update"
+msgstr "Update"
+
 #: ../plugins/debug-manager/sharedlib.c:166
-#: ../plugins/valgrind/vgrule-editor.c:138
 msgid "Shared Object"
 msgstr "Shared Object"
 
-#: ../plugins/debug-manager/sharedlib.c:173
-#: ../plugins/git/anjuta-git.glade.h:56
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:54
 msgid "From"
 msgstr "From"
 
-#: ../plugins/debug-manager/sharedlib.c:180
-#: ../plugins/git/anjuta-git.glade.h:80
+#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:116
 msgid "To"
 msgstr "To"
 
@@ -2238,161 +2327,149 @@ msgstr "To"
 msgid "Symbols read"
 msgstr "Symbols read"
 
-#: ../plugins/debug-manager/sharedlib.c:339
+#: ../plugins/debug-manager/sharedlib.c:338
 msgid "Shared library operations"
 msgstr "Shared library operations"
 
-#: ../plugins/debug-manager/signals.c:289
+#: ../plugins/debug-manager/signals.c:291
 msgid "Signal"
 msgstr "Signal"
 
-#: ../plugins/debug-manager/signals.c:295
+#: ../plugins/debug-manager/signals.c:297
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/debug-manager/signals.c:296
+#: ../plugins/debug-manager/signals.c:298
 msgid "Print"
 msgstr "Print"
 
-#: ../plugins/debug-manager/signals.c:297
+#: ../plugins/debug-manager/signals.c:299
 msgid "Pass"
 msgstr "Pass"
 
-#: ../plugins/debug-manager/signals.c:300
+#: ../plugins/debug-manager/signals.c:302
 msgid "Description"
 msgstr "Description"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/signals.c:319
+#: ../plugins/debug-manager/signals.c:321
 msgid "Send to process"
 msgstr "Send to process"
 
-#: ../plugins/debug-manager/signals.c:353
+#: ../plugins/debug-manager/signals.c:355
 msgid "Kernel signals"
 msgstr "Kernel signals"
 
-#: ../plugins/debug-manager/signals.c:472
-#: ../plugins/debug-manager/signals.c:478
+#: ../plugins/debug-manager/signals.c:474
+#: ../plugins/debug-manager/signals.c:480
 msgid "Signal operations"
 msgstr "Signal operations"
 
-#: ../plugins/debug-manager/sparse_view.c:1195
+#: ../plugins/debug-manager/sparse_view.c:1202
 msgid "Show Line Numbers"
 msgstr "Show Line Numbers"
 
-#: ../plugins/debug-manager/sparse_view.c:1196
+#: ../plugins/debug-manager/sparse_view.c:1203
 msgid "Whether to display line numbers"
 msgstr "Whether to display line numbers"
 
-#: ../plugins/debug-manager/sparse_view.c:1203
+#: ../plugins/debug-manager/sparse_view.c:1210
 msgid "Show Line Markers"
 msgstr "Show Line Markers"
 
-#: ../plugins/debug-manager/sparse_view.c:1204
+#: ../plugins/debug-manager/sparse_view.c:1211
 msgid "Whether to display line marker pixbufs"
 msgstr "Whether to display line marker pixbufs"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/stack_trace.c:553
+#: ../plugins/debug-manager/stack_trace.c:554
 msgid "Set current frame"
 msgstr "Set current frame"
 
-#: ../plugins/debug-manager/stack_trace.c:561
-#: ../plugins/debug-manager/threads.c:389
+#: ../plugins/debug-manager/stack_trace.c:562
+#: ../plugins/debug-manager/threads.c:390
 msgid "View Source"
 msgstr "View Source"
 
-#: ../plugins/debug-manager/stack_trace.c:599
-#: ../plugins/debug-manager/threads.c:425
+#: ../plugins/debug-manager/stack_trace.c:600
+#: ../plugins/debug-manager/threads.c:426
 msgid "Active"
 msgstr "Active"
 
-#: ../plugins/debug-manager/stack_trace.c:610
+#: ../plugins/debug-manager/stack_trace.c:611
 msgid "Frame"
 msgstr "Frame"
 
 #. Register actions
-#: ../plugins/debug-manager/stack_trace.c:630
-#: ../plugins/debug-manager/threads.c:450 ../plugins/tools/tool.c:100
-#: ../src/anjuta-app.c:422
+#: ../plugins/debug-manager/stack_trace.c:631
+#: ../plugins/debug-manager/threads.c:451 ../plugins/tools/tool.c:100
+#: ../src/anjuta-app.c:485
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "File"
 
-#: ../plugins/debug-manager/stack_trace.c:641
-#: ../plugins/debug-manager/threads.c:459
+#: ../plugins/debug-manager/stack_trace.c:642
+#: ../plugins/debug-manager/threads.c:460
 #: ../plugins/document-manager/plugin.c:921
 msgid "Line"
 msgstr "Line"
 
-#: ../plugins/debug-manager/stack_trace.c:652
-#: ../plugins/debug-manager/threads.c:468
-#: ../plugins/valgrind/vgrule-editor.c:133
+#: ../plugins/debug-manager/stack_trace.c:653
+#: ../plugins/debug-manager/threads.c:469
 msgid "Function"
 msgstr "Function"
 
-#: ../plugins/debug-manager/stack_trace.c:678
-msgid "Arguments"
-msgstr "Arguments"
-
-#: ../plugins/debug-manager/stack_trace.c:702
+#: ../plugins/debug-manager/stack_trace.c:703
 msgid "Stack"
 msgstr "Stack"
 
-#: ../plugins/debug-manager/stack_trace.c:769
+#: ../plugins/debug-manager/stack_trace.c:770
 msgid "Stack frame operations"
 msgstr "Stack frame operations"
 
-#: ../plugins/debug-manager/start.c:96
+#: ../plugins/debug-manager/start.c:98
 msgid "Pid"
-msgstr "Pid"
+msgstr "PID"
 
-#: ../plugins/debug-manager/start.c:96
+#: ../plugins/debug-manager/start.c:98
 msgid "User"
 msgstr "User"
 
-#: ../plugins/debug-manager/start.c:96
-#: ../plugins/profiler/gprof-call-graph-view.c:344
+#: ../plugins/debug-manager/start.c:98
 msgid "Time"
 msgstr "Time"
 
-#: ../plugins/debug-manager/start.c:96
+#: ../plugins/debug-manager/start.c:98
 msgid "Command"
 msgstr "Command"
 
-#: ../plugins/debug-manager/start.c:620
+#: ../plugins/debug-manager/start.c:627
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "Unable to execute: %s."
 
-#: ../plugins/debug-manager/start.c:634
+#: ../plugins/debug-manager/start.c:641
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "Unable to open the file: %s\n"
 
-#: ../plugins/debug-manager/start.c:912
+#: ../plugins/debug-manager/start.c:965
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "Unable to open %s. Debugger cannot start."
 
-#: ../plugins/debug-manager/start.c:922
+#: ../plugins/debug-manager/start.c:975
 #, c-format
 msgid "Unable to detect mime-type of %s. Debugger cannot start."
 msgstr "Unable to detect MIME type of %s. Debugger cannot start."
 
-#: ../plugins/debug-manager/start.c:1058 ../plugins/debug-manager/start.c:1250
-#: ../plugins/run-program/parameters.c:600
-#, c-format
-msgid "Missing file %s"
-msgstr "Missing file %s"
-
-#: ../plugins/debug-manager/start.c:1271
+#: ../plugins/debug-manager/start.c:1336
 msgid "Path"
 msgstr "Path"
 
-#: ../plugins/debug-manager/start.c:1319 ../plugins/gdb/debugger.c:1694
+#: ../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?"
@@ -2402,69 +2479,69 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/threads.c:381
+#: ../plugins/debug-manager/threads.c:382
 msgid "Set current thread"
 msgstr "Set current thread"
 
-#: ../plugins/debug-manager/threads.c:435
+#: ../plugins/debug-manager/threads.c:436
 msgid "Id"
-msgstr "Id"
+msgstr "ID"
 
-#: ../plugins/debug-manager/threads.c:505
+#: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
 msgstr "Thread"
 
-#: ../plugins/debug-manager/threads.c:615
+#: ../plugins/debug-manager/threads.c:616
 msgid "Thread operations"
 msgstr "Thread operations"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:377
+#: ../plugins/debug-manager/watch.c:372
 msgid "Ins_pect/Evaluate..."
-msgstr "Ins_pect/Evaluate..."
+msgstr "Ins_pect/Evaluateâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/watch.c:379
+#: ../plugins/debug-manager/watch.c:374
 msgid "Inspect or evaluate an expression or variable"
 msgstr "Inspect or evaluate an expression or variable"
 
-#: ../plugins/debug-manager/watch.c:385
+#: ../plugins/debug-manager/watch.c:380
 msgid "Add Watch..."
-msgstr "Add Watch..."
+msgstr "Add Watchâ?¦"
 
-#: ../plugins/debug-manager/watch.c:393
+#: ../plugins/debug-manager/watch.c:388
 msgid "Remove Watch"
 msgstr "Remove Watch"
 
-#: ../plugins/debug-manager/watch.c:401
+#: ../plugins/debug-manager/watch.c:396
 msgid "Update Watch"
 msgstr "Update Watch"
 
-#: ../plugins/debug-manager/watch.c:409
+#: ../plugins/debug-manager/watch.c:404
 msgid "Change Value"
 msgstr "Change Value"
 
-#: ../plugins/debug-manager/watch.c:417
+#: ../plugins/debug-manager/watch.c:412
 msgid "Update all"
 msgstr "Update all"
 
-#: ../plugins/debug-manager/watch.c:425
+#: ../plugins/debug-manager/watch.c:420
 msgid "Remove all"
 msgstr "Remove all"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:436
+#: ../plugins/debug-manager/watch.c:431
 msgid "Automatic update"
 msgstr "Automatic update"
 
-#: ../plugins/debug-manager/watch.c:462 ../plugins/debug-manager/watch.c:468
+#: ../plugins/debug-manager/watch.c:457 ../plugins/debug-manager/watch.c:463
 msgid "Watch operations"
 msgstr "Watch operations"
 
-#: ../plugins/debug-manager/watch.c:540
+#: ../plugins/debug-manager/watch.c:535
 msgid "Watches"
 msgstr "Watches"
 
@@ -2473,9 +2550,9 @@ msgid "Search Help:"
 msgstr "Search Help:"
 
 #: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:236
-#: ../plugins/message-view/plugin.c:76
+#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:309
 msgid "_Goto"
-msgstr "_Goto"
+msgstr "_Go to"
 
 #: ../plugins/devhelp/plugin.c:231
 msgid "_API Reference"
@@ -2501,34 +2578,36 @@ msgstr "_Search Help"
 msgid "Search for a term in help"
 msgstr "Search for a term in help"
 
-#: ../plugins/devhelp/plugin.c:325
+#: ../plugins/devhelp/plugin.c:358
 msgid "Help operations"
 msgstr "Help operations"
 
-#: ../plugins/devhelp/plugin.c:355
-msgid "Online"
-msgstr "Online"
-
-#: ../plugins/devhelp/plugin.c:396
+#: ../plugins/devhelp/plugin.c:368
 msgid "Contents"
 msgstr "Contents"
 
-#: ../plugins/devhelp/plugin.c:398 ../plugins/search/search-replace.c:1036
-#: ../plugins/search/search-replace.c:1709
-#: ../plugins/search/search-replace.c:1716
-#: ../plugins/search/search-replace.c:1728
-#: ../plugins/search/search-replace.c:2055
+#: ../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 "Search"
 
-#: ../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 "Help"
 
-#: ../plugins/devhelp/plugin.c:424
+#: ../plugins/devhelp/plugin.c:405 ../plugins/devhelp/plugin.c:500
 msgid "Help display"
 msgstr "Help display"
 
+#: ../plugins/devhelp/plugin.c:422
+msgid "Online"
+msgstr "Online"
+
 #: ../plugins/document-manager/action-callbacks.c:276
 #, c-format
 msgid ""
@@ -2542,32 +2621,40 @@ msgstr ""
 msgid "_Reload"
 msgstr "_Reload"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:282
+#: ../plugins/document-manager/anjuta-bookmarks.c:235
+msgid "Add bookmark"
+msgstr "Add bookmark"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:241
+msgid "Remove bookmark"
+msgstr "Remove bookmark"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:255
+#: ../plugins/document-manager/anjuta-bookmarks.c:300
 #: ../plugins/document-manager/plugin.c:411
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../plugins/document-manager/anjuta-docman.c:399
+#: ../plugins/document-manager/anjuta-docman.c:400
 msgid "Close file"
 msgstr "Close file"
 
-#: ../plugins/document-manager/anjuta-docman.c:447
+#: ../plugins/document-manager/anjuta-docman.c:448
 msgid "Path:"
 msgstr "Path:"
 
-#: ../plugins/document-manager/anjuta-docman.c:564
-#: ../plugins/file-loader/plugin.c:555 ../plugins/file-loader/plugin.c:853
-#: ../plugins/file-loader/plugin.c:863 ../plugins/file-loader/plugin.c:876
+#: ../plugins/document-manager/anjuta-docman.c:565
+#: ../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 "Open file"
 
-#: ../plugins/document-manager/anjuta-docman.c:583
-#: ../plugins/message-view/message-view.c:103
+#: ../plugins/document-manager/anjuta-docman.c:584
+#: ../plugins/message-view/message-view.c:94
 msgid "Save file as"
 msgstr "Save file as"
 
-#: ../plugins/document-manager/anjuta-docman.c:664
-#: ../plugins/valgrind/plugin.c:376
+#: ../plugins/document-manager/anjuta-docman.c:665
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -2576,67 +2663,73 @@ msgstr ""
 "The file '%s' already exists.\n"
 "Do you want to replace it with the one you are saving?"
 
-#: ../plugins/document-manager/anjuta-docman.c:673
-#: ../plugins/valgrind/plugin.c:384
+#: ../plugins/document-manager/anjuta-docman.c:674
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../plugins/document-manager/anjuta-docman.c:1391
+#: ../plugins/document-manager/anjuta-docman.c:1392
 msgid "[read-only]"
 msgstr "[read-only]"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:1
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:1
 msgid "<b>Autosave</b>"
 msgstr "<b>Autosave</b>"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:2
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:2
 msgid "<b>Editor tabs</b>"
 msgstr "<b>Editor tabs</b>"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:3
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
+msgid "Bottom"
+msgstr "Bottom"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
 msgid "Do not show tabs"
 msgstr "Do not show tabs"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:4
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:5
 msgid "Enable files autosave"
 msgstr "Enable files autosave"
 
-#: ../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:8
+msgid "Left"
+msgstr "Left"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:7
 msgid "Position:"
 msgstr "Position:"
 
-#: ../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:12
+msgid "Right"
+msgstr "Right"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:9
 msgid "Save files interval in minutes"
 msgstr "Save files interval in minutes"
 
-#: ../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 "Save session interval in minutes"
 
-#: ../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 "Sorted by most recent use"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:9
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:12
 msgid "Sorted in alphabetical order"
 msgstr "Sorted in alphabetical order"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:10
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:13
 msgid "Sorted in opening order"
 msgstr "Sorted in opening order"
 
-#: ../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 ""
-"Top\n"
-"Bottom\n"
-"Left\n"
-"Right"
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:14
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+msgid "Top"
+msgstr "Top"
 
 #: ../plugins/document-manager/plugin.c:147
 msgid "_Save"
@@ -2648,7 +2741,7 @@ msgstr "Save current file"
 
 #: ../plugins/document-manager/plugin.c:149
 msgid "Save _As..."
-msgstr "Save _As..."
+msgstr "Save _Asâ?¦"
 
 #: ../plugins/document-manager/plugin.c:150
 msgid "Save the current file with a different name"
@@ -2692,7 +2785,7 @@ msgstr "Recent _Files"
 
 #: ../plugins/document-manager/plugin.c:168
 msgid "_Print..."
-msgstr "_Print..."
+msgstr "_Printâ?¦"
 
 #: ../plugins/document-manager/plugin.c:169
 msgid "Print the current file"
@@ -2704,7 +2797,7 @@ msgstr "_Print Preview"
 
 #: ../plugins/document-manager/plugin.c:177
 msgid "Preview the current file in print-format"
-msgstr "Preview the current file in print-format"
+msgstr "Preview the current file in print format"
 
 #: ../plugins/document-manager/plugin.c:182
 msgid "_Transform"
@@ -2758,7 +2851,7 @@ msgstr "Convert EOL to Majority EOL"
 #: ../plugins/document-manager/plugin.c:199
 msgid "Convert End Of Line characters to majority of the EOL found in the file"
 msgstr ""
-"Convert End Of Line characters to majority of the EOL found in the file"
+"Convert End Of Line characters to the most common EOL found in the file"
 
 #: ../plugins/document-manager/plugin.c:204
 msgid "_Select"
@@ -2819,7 +2912,7 @@ msgstr "Stream comment the selected text"
 #. menu title
 #: ../plugins/document-manager/plugin.c:237
 msgid "_Line Number..."
-msgstr "_Line Number..."
+msgstr "_Line Numberâ?¦"
 
 #: ../plugins/document-manager/plugin.c:238
 msgid "Go to a particular line in the editor"
@@ -2885,9 +2978,9 @@ msgstr "Quick _ReSearch"
 msgid "Repeat quick search"
 msgstr "Repeat quick search"
 
-#: ../plugins/document-manager/plugin.c:268 ../plugins/gtodo/interface.c:169
-#: ../plugins/valgrind/vgrule-list.c:406 ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1893
+#: ../plugins/document-manager/plugin.c:268 ../plugins/gtodo/interface.c:168
+#: ../src/anjuta-actions.h:30
+#: ../plugins/language-support-cpp-java/plugin.c:1915
 msgid "_Edit"
 msgstr "_Edit"
 
@@ -2916,7 +3009,7 @@ msgstr "Remove current view of the document"
 msgid "U_ndo"
 msgstr "U_ndo"
 
-#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4064
+#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4089
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
@@ -2938,8 +3031,7 @@ msgstr "Cut the selected text from the editor to the clipboard"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:540
-#: ../plugins/valgrind/vgdefaultview.c:1167
+#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:554
 msgid "_Copy"
 msgstr "_Copy"
 
@@ -2947,8 +3039,7 @@ msgstr "_Copy"
 msgid "Copy the selected text to the clipboard"
 msgstr "Copy the selected text to the clipboard"
 
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:548
-#: ../plugins/valgrind/vgdefaultview.c:1168
+#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:562
 msgid "_Paste"
 msgstr "_Paste"
 
@@ -3166,9 +3257,9 @@ msgid "Simple searching"
 msgstr "Simple searching"
 
 #: ../plugins/document-manager/plugin.c:410
-#: ../plugins/document-manager/plugin.c:1714
-#: ../plugins/document-manager/plugin.c:2126
-#: ../plugins/document-manager/plugin.c:2136
+#: ../plugins/document-manager/plugin.c:1713
+#: ../plugins/document-manager/plugin.c:2130
+#: ../plugins/document-manager/plugin.c:2140
 msgid "Documents"
 msgstr "Documents"
 
@@ -3220,22 +3311,22 @@ msgstr "Autosave failed for %s"
 msgid "Autosave completed"
 msgstr "Autosave completed"
 
-#: ../plugins/document-manager/search-box.c:382
+#: ../plugins/document-manager/search-box.c:383
 #, c-format
 msgid "Search for \"%s\" reached end and was continued on top."
-msgstr "Search for \"%s\" reached end and was continued on top."
+msgstr "Search for \"%s\" reached the end and was continued at the top."
 
-#: ../plugins/document-manager/search-box.c:388
+#: ../plugins/document-manager/search-box.c:389
 #, c-format
 msgid ""
 "Search for \"%s\" reached end and was continued on top but no new match was "
 "found."
 msgstr ""
-"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."
 
-#: ../plugins/document-manager/search-box.c:445
-#: ../plugins/search/anjuta-search.glade.h:23
+#: ../plugins/document-manager/search-box.c:446
+#: ../plugins/search/anjuta-search.ui.h:22
 msgid "Match case"
 msgstr "Match case"
 
@@ -3257,7 +3348,7 @@ msgstr "No items found"
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:726
 #, c-format
 msgid "No recently used resource found with URI `%s'"
-msgstr "No recently-used resource found with URI `%s'"
+msgstr "No recently-used resource found with URI '%s'"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:750
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:758
@@ -3296,18 +3387,18 @@ msgstr "_%d. %s"
 msgid "recent menu label|%d. %s"
 msgstr "%d. %s"
 
-#: ../plugins/file-loader/plugin.c:114
+#: ../plugins/file-loader/plugin.c:116
 #, c-format
 msgid ""
 "Can not open \"%s\".\n"
 "\n"
 "%s"
 msgstr ""
-"Can not open \"%s\".\n"
+"Cannot open \"%s\".\n"
 "\n"
 "%s"
 
-#: ../plugins/file-loader/plugin.c:211
+#: ../plugins/file-loader/plugin.c:257
 #, c-format
 msgid ""
 "<b>Cannot open \"%s\"</b>.\n"
@@ -3328,253 +3419,246 @@ msgstr ""
 "\n"
 "You may choose to try opening it with the following plugins or applications."
 
-#: ../plugins/file-loader/plugin.c:233
+#: ../plugins/file-loader/plugin.c:280
 msgid "Open with:"
 msgstr "Open with:"
 
 #. Document manager plugin
-#: ../plugins/file-loader/plugin.c:241
+#: ../plugins/file-loader/plugin.c:286
 #: ../plugins/document-manager/anjuta-document-manager.plugin.in.h:1
 msgid "Document Manager"
 msgstr "Document Manager"
 
-#: ../plugins/file-loader/plugin.c:461 ../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 "All files"
 
-#: ../plugins/file-loader/plugin.c:466
+#: ../plugins/file-loader/plugin.c:502
 msgid "Anjuta Projects"
 msgstr "Anjuta Projects"
 
-#: ../plugins/file-loader/plugin.c:472
+#: ../plugins/file-loader/plugin.c:508
 msgid "C/C++ source files"
 msgstr "C/C++ source files"
 
-#: ../plugins/file-loader/plugin.c:484
+#: ../plugins/file-loader/plugin.c:520
 msgid "C# source files"
 msgstr "C# source files"
 
-#: ../plugins/file-loader/plugin.c:490
+#: ../plugins/file-loader/plugin.c:526
 msgid "Java source files"
 msgstr "Java source files"
 
-#: ../plugins/file-loader/plugin.c:496
+#: ../plugins/file-loader/plugin.c:532
 msgid "Pascal source files"
 msgstr "Pascal source files"
 
-#: ../plugins/file-loader/plugin.c:501
+#: ../plugins/file-loader/plugin.c:537
 msgid "PHP source files"
 msgstr "PHP source files"
 
-#: ../plugins/file-loader/plugin.c:508
+#: ../plugins/file-loader/plugin.c:544
 msgid "Perl source files"
 msgstr "Perl source files"
 
-#: ../plugins/file-loader/plugin.c:514
+#: ../plugins/file-loader/plugin.c:550
 msgid "Python source files"
 msgstr "Python source files"
 
-#: ../plugins/file-loader/plugin.c:519
+#: ../plugins/file-loader/plugin.c:555
 msgid "Hyper text markup files"
-msgstr "Hyper text markup files"
+msgstr "Hypertext markup files"
 
-#: ../plugins/file-loader/plugin.c:528
+#: ../plugins/file-loader/plugin.c:564
 msgid "Shell scripts files"
-msgstr "Shell scripts files"
+msgstr "Shell script files"
 
-#: ../plugins/file-loader/plugin.c:533
+#: ../plugins/file-loader/plugin.c:569
 msgid "Makefiles"
 msgstr "Makefiles"
 
-#: ../plugins/file-loader/plugin.c:539
+#: ../plugins/file-loader/plugin.c:575
 msgid "Lua files"
 msgstr "Lua files"
 
-#: ../plugins/file-loader/plugin.c:544
+#: ../plugins/file-loader/plugin.c:580
 msgid "Diff files"
 msgstr "Diff files"
 
-#: ../plugins/file-loader/plugin.c:782
+#: ../plugins/file-loader/plugin.c:823
 #, c-format
 msgid "Failed to activate plugin: %s"
 msgstr "Failed to activate plugin: %s"
 
-#: ../plugins/file-loader/plugin.c:843
+#: ../plugins/file-loader/plugin.c:884
 msgid "_New"
 msgstr "_New"
 
-#: ../plugins/file-loader/plugin.c:845
+#: ../plugins/file-loader/plugin.c:886
 msgid "New empty file"
 msgstr "New empty file"
 
-#: ../plugins/file-loader/plugin.c:851
+#: ../plugins/file-loader/plugin.c:892
 msgid "_Open..."
-msgstr "_Open..."
+msgstr "_Openâ?¦"
 
-#: ../plugins/file-loader/plugin.c:862 ../plugins/file-loader/plugin.c:875
+#: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
 msgstr "_Open"
 
-#: ../plugins/file-loader/plugin.c:869 ../plugins/file-loader/plugin.c:882
+#: ../plugins/file-loader/plugin.c:910 ../plugins/file-loader/plugin.c:923
 msgid "Open _With"
 msgstr "Open _With"
 
-#: ../plugins/file-loader/plugin.c:870 ../plugins/file-loader/plugin.c:883
+#: ../plugins/file-loader/plugin.c:911 ../plugins/file-loader/plugin.c:924
 msgid "Open with"
 msgstr "Open with"
 
-#: ../plugins/file-loader/plugin.c:1204 ../plugins/file-loader/plugin.c:1210
+#: ../plugins/file-loader/plugin.c:1245 ../plugins/file-loader/plugin.c:1251
 #: ../plugins/file-loader/anjuta-loader.plugin.in.h:1
 msgid "File Loader"
 msgstr "File Loader"
 
-#: ../plugins/file-loader/plugin.c:1214
+#: ../plugins/file-loader/plugin.c:1255
 msgid "New"
 msgstr "New"
 
-#: ../plugins/file-loader/plugin.c:1215
+#: ../plugins/file-loader/plugin.c:1256
 msgid "New file, project and project components."
 msgstr "New file, project and project components."
 
-#: ../plugins/file-loader/plugin.c:1222 ../plugins/file-loader/plugin.c:1262
+#: ../plugins/file-loader/plugin.c:1263 ../plugins/file-loader/plugin.c:1303
 msgid "Open"
 msgstr "Open"
 
-#: ../plugins/file-loader/plugin.c:1226
+#: ../plugins/file-loader/plugin.c:1267
 msgid "Open _Recent"
 msgstr "Open _Recent"
 
-#: ../plugins/file-loader/plugin.c:1227 ../plugins/file-loader/plugin.c:1264
+#: ../plugins/file-loader/plugin.c:1268 ../plugins/file-loader/plugin.c:1305
 msgid "Open recent file"
 msgstr "Open recent file"
 
-#: ../plugins/file-loader/plugin.c:1233
+#: ../plugins/file-loader/plugin.c:1274
 msgid "Open recent files"
 msgstr "Open recent files"
 
-#: ../plugins/file-loader/plugin.c:1263
+#: ../plugins/file-loader/plugin.c:1304
 msgid "Open a file"
 msgstr "Open a file"
 
-#: ../plugins/file-loader/plugin.c:1372 ../plugins/file-loader/plugin.c:1374
+#: ../plugins/file-loader/plugin.c:1420 ../plugins/file-loader/plugin.c:1422
 #, c-format
 msgid "File not found"
 msgstr "File not found"
 
 #. %s is name of file that will be opened
-#: ../plugins/file-loader/plugin.c:1393
+#: ../plugins/file-loader/plugin.c:1441
 #, c-format
 msgid "Please select a plugin to open <b>%s</b>."
 msgstr "Please select a plugin to open <b>%s</b>."
 
-#: ../plugins/file-loader/plugin.c:1397
+#: ../plugins/file-loader/plugin.c:1445
 msgid "Open With"
 msgstr "Open With"
 
-#: ../plugins/file-manager/file-manager.glade.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>Filter</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 "Choose Directory to show if no project is open"
 
-#: ../plugins/file-manager/file-manager.glade.h:4
+#: ../plugins/file-manager/file-manager.ui.h:2
 msgid "Do not show backup files"
 msgstr "Do not show backup files"
 
-#: ../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 "Do not show binary files (.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 "Do not show hidden files"
 
-#: ../plugins/file-manager/file-manager.glade.h:7
+#: ../plugins/file-manager/file-manager.ui.h:5
 msgid "Do not show unversioned files"
 msgstr "Do not show unversioned files"
 
-#: ../plugins/file-manager/file-manager.glade.h:8
+#: ../plugins/file-manager/file-manager.ui.h:6
+msgid "Filter"
+msgstr "Filter"
+
+#: ../plugins/file-manager/file-manager.ui.h:7
+#: ../plugins/symbol-db/plugin.c:2334 ../plugins/symbol-db/plugin.c:2423
+msgid "Global"
+msgstr "Global"
+
+#: ../plugins/file-manager/file-manager.ui.h:8
 msgid "Root directory if no project is open:"
 msgstr "Root directory if no project is open:"
 
 #: ../plugins/file-manager/file-model.c:119
+#: ../plugins/symbol-db/symbol-db-view.c:799
 msgid "Loading..."
-msgstr "Loading..."
+msgstr "Loadingâ?¦"
 
 #: ../plugins/file-manager/file-view.c:73
 msgid "Up-to-date"
 msgstr "Up-to-date"
 
-#: ../plugins/file-manager/file-view.c:75
-msgid "Locked"
-msgstr "Locked"
-
-#: ../plugins/file-manager/file-view.c:81
-msgid "Ignored"
-msgstr "Ignored"
-
-#: ../plugins/file-manager/file-view.c:484
+#: ../plugins/file-manager/file-view.c:510
 msgid "Filename"
 msgstr "Filename"
 
-#: ../plugins/file-manager/file-view.c:564
+#: ../plugins/file-manager/file-view.c:590
 msgid "Base uri"
 msgstr "Base URI"
 
-#: ../plugins/file-manager/file-view.c:565
+#: ../plugins/file-manager/file-view.c:591
 msgid "Uri of the top-most path displayed"
 msgstr "URI of the top-most path displayed"
 
-#: ../plugins/file-manager/plugin.c:75
+#: ../plugins/file-manager/plugin.c:74
 msgid "_Rename"
 msgstr "_Rename"
 
-#: ../plugins/file-manager/plugin.c:75
+#: ../plugins/file-manager/plugin.c:74
 msgid "Rename file or directory"
 msgstr "Rename file or directory"
 
-#: ../plugins/file-manager/plugin.c:285
+#: ../plugins/file-manager/plugin.c:294
 msgid "File manager popup actions"
 msgstr "File manager popup actions"
 
-#: ../plugins/file-manager/plugin.c:318
+#: ../plugins/file-manager/plugin.c:327
 msgid "Files"
 msgstr "Files"
 
-#: ../plugins/file-manager/plugin.c:442 ../plugins/file-manager/plugin.c:451
+#: ../plugins/file-manager/plugin.c:456 ../plugins/file-manager/plugin.c:465
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "File Manager"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:1
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:1
 msgid "<b>File Information</b>"
 msgstr "<b>File Information</b>"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:3
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add License Information"
 msgstr "Add Licence Information"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
 msgid "Add to project"
 msgstr "Add to project"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:5
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
 msgid "Add to repository"
 msgstr "Add to repository"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:6
 msgid "Create corresponding header file"
 msgstr "Create corresponding header file"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
 msgid ""
 "Enter the File name.\n"
 "The extension will be added according to the type."
@@ -3582,78 +3666,68 @@ msgstr ""
 "Enter the File name.\n"
 "The extension will be added according to the type."
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:10
-#: ../plugins/macro/anjuta-macro.glade.h:6
-#: ../plugins/tools/anjuta-tools.glade.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:69 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:7
 msgid "Name:"
 msgstr "Name:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:11
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
 #: ../plugins/starter/starter.c:404
 msgid "New File"
 msgstr "New File"
 
-#: ../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 "Type:"
 
-#: ../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 "Use Template for the Header file"
 
-#: ../plugins/file-wizard/file.c:80
+#: ../plugins/file-wizard/file.c:83
 msgid "C Source File"
 msgstr "C Source File"
 
-#: ../plugins/file-wizard/file.c:81
+#: ../plugins/file-wizard/file.c:84
 msgid "C/C++ Header File"
 msgstr "C/C++ Header File"
 
-#: ../plugins/file-wizard/file.c:82
+#: ../plugins/file-wizard/file.c:85
 msgid "C++ Source File"
 msgstr "C++ Source File"
 
-#: ../plugins/file-wizard/file.c:83
+#: ../plugins/file-wizard/file.c:86
 msgid "C# Source File"
 msgstr "C# Source File"
 
-#: ../plugins/file-wizard/file.c:84
+#: ../plugins/file-wizard/file.c:87
 msgid "Java Source File"
 msgstr "Java Source File"
 
-#: ../plugins/file-wizard/file.c:85
+#: ../plugins/file-wizard/file.c:88
 msgid "Perl Source File"
 msgstr "Perl Source File"
 
-#: ../plugins/file-wizard/file.c:86
+#: ../plugins/file-wizard/file.c:89
 msgid "Python Source File"
 msgstr "Python Source File"
 
-#: ../plugins/file-wizard/file.c:87
+#: ../plugins/file-wizard/file.c:90
 msgid "Shell Script File"
 msgstr "Shell Script File"
 
-#: ../plugins/file-wizard/file.c:88
+#: ../plugins/file-wizard/file.c:91
 msgid "Other"
 msgstr "Other"
 
-#: ../plugins/file-wizard/file.c:99
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
-msgid "General Public License (GPL)"
-msgstr "General Public Licence (GPL)"
-
-#: ../plugins/file-wizard/file.c:100
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
-msgid "Lesser General Public License (LGPL)"
-msgstr "Lesser General Public Licence (LGPL)"
-
-#: ../plugins/file-wizard/file.c:101
+#: ../plugins/file-wizard/file.c:104
 msgid "BSD Public License"
 msgstr "BSD Public Licence"
 
-#: ../plugins/file-wizard/file.c:167
+#: ../plugins/file-wizard/file.c:182
 msgid "Unable to build user interface for New File"
 msgstr "Unable to build user interface for New File"
 
@@ -3661,248 +3735,248 @@ msgstr "Unable to build user interface for New File"
 msgid "Invalid GbfAmConfigValue type"
 msgstr "Invalid GbfAmConfigValue type"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:1
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
 msgid "<b>Select Package to add:</b>"
 msgstr "<b>Select Package to add:</b>"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:2
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _Package"
 msgstr "Add _Package"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
 msgid "Add _module"
 msgstr "Add _module"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:5
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
 msgid "Packages"
 msgstr "Packages"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:6
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
 msgid "Select package"
 msgstr "Select package"
 
-#: ../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 "Group doesn't exist"
 
-#: ../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 "Target doesn't exist"
 
-#: ../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:3295
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3356
+#: ../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 "Unable to update project"
 
-#: ../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 "Invalid or remote path (only local paths supported)"
 
-#: ../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 "Project doesn't exist or invalid path"
 
-#: ../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 "Malformed project"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2792
+#: ../plugins/gbf-am/gbf-am-project.c:2791
 msgid "Please specify group name"
 msgstr "Please specify group name"
 
-#: ../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 "Group name can only contain alphanumeric, '_', '-' or '.' characters"
 
-#: ../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 "Parent group doesn't exist"
 
-#: ../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 "Group already exists"
 
-#: ../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 "Group couldn't be created"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2896
+#: ../plugins/gbf-am/gbf-am-project.c:2895
 msgid "Group couldn't be removed"
 msgstr "Group couldn't be removed"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3046
+#: ../plugins/gbf-am/gbf-am-project.c:3045
 msgid "Please specify target name"
 msgstr "Please specify target name"
 
-#: ../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 "Target name can only contain alphanumeric, '_', '-' or '.' characters"
 
-#: ../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 "Shared library target name must be of the form '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 "Static library target name must be of the form '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 "Target already exists"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3100
+#: ../plugins/gbf-am/gbf-am-project.c:3099
 msgid "General failure in target creation"
 msgstr "General failure in target creation"
 
-#: ../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 "Newly-created target could not be identified"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3161
+#: ../plugins/gbf-am/gbf-am-project.c:3160
 msgid "Target couldn't be removed"
 msgstr "Target could not be removed"
 
-#: ../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 "Static Library"
 
-#: ../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 "Shared Library"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3189
+#: ../plugins/gbf-am/gbf-am-project.c:3188
 msgid "Header Files"
 msgstr "Header Files"
 
-#: ../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 "Man Documentation"
 
-#: ../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 "Miscellaneous Data"
 
-#: ../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 "Info Documentation"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3201
+#: ../plugins/gbf-am/gbf-am-project.c:3200
 msgid "Java Module"
 msgstr "Java Module"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3203
+#: ../plugins/gbf-am/gbf-am-project.c:3202
 msgid "Python Module"
 msgstr "Python Module"
 
-#: ../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:3333
+#: ../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 "Source doesn't exist"
 
-#: ../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 ""
 "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 
-#: ../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 "Source file is already in given target"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3458
+#: ../plugins/gbf-am/gbf-am-project.c:3457
 msgid "General failure in adding source file"
 msgstr "General failure in adding source file"
 
-#: ../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 "Newly-added source file could not be identified"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3522
+#: ../plugins/gbf-am/gbf-am-project.c:3521
 msgid "Source couldn't be removed"
 msgstr "Source could not be removed"
 
+#: ../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:3445
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3446
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3449
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3450
 msgid "Project directory"
 msgstr "Project directory"
 
-#: ../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 "Enter new module"
 
-#: ../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 "Module/Packages"
 
-#: ../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 "Version"
 
-#: ../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 "
@@ -3911,221 +3985,197 @@ msgstr ""
 "Are you sure you want to remove module \"%s\" and all its associated "
 "packages?"
 
-#: ../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 "Are you sure you want to remove package \"%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 "Enter new variable"
 
-#: ../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 "Are you sure you want to remove 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 "Project:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:850
+#: ../plugins/gbf-am/gbf-am-properties.c:857
 msgid "Package name:"
 msgstr "Package name:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:853
-#: ../plugins/project-wizard/templates/translatable-strings.h:105
+#: ../plugins/gbf-am/gbf-am-properties.c:860
+#: ../plugins/project-wizard/templates/translatable-strings.h:102
 msgid "Version:"
 msgstr "Version:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:856
+#: ../plugins/gbf-am/gbf-am-properties.c:863
 msgid "Url:"
 msgstr "URL:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1222
+#: ../plugins/gbf-am/gbf-am-properties.c:1229
 msgid "Use"
 msgstr "Use"
 
-#: ../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 "Group name:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1317
+#: ../plugins/gbf-am/gbf-am-properties.c:1324
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../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 "C compiler flags:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-am/gbf-am-properties.c:1331
 msgid "C preprocessor flags:"
 msgstr "C preprocessor flags:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1326
+#: ../plugins/gbf-am/gbf-am-properties.c:1333
 msgid "C++ compiler flags:"
 msgstr "C++ compiler flags:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1328
+#: ../plugins/gbf-am/gbf-am-properties.c:1335
 msgid "gcj compiler flags (ahead-of-time):"
 msgstr "gcj compiler flags (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 "Java compiler flags (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 "Fortran compiler flags:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1335
+#: ../plugins/gbf-am/gbf-am-properties.c:1342
 msgid "Includes (deprecated):"
 msgstr "Includes (deprecated):"
 
-#: ../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 "Install directories:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1414
+#: ../plugins/gbf-am/gbf-am-properties.c:1421
 msgid "C preprocessor flags"
 msgstr "C preprocessor flags"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1416
+#: ../plugins/gbf-am/gbf-am-properties.c:1423
 msgid "C++ compiler flags"
 msgstr "C++ compiler flags"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1418
+#: ../plugins/gbf-am/gbf-am-properties.c:1425
 msgid "gcj compiler flags (ahead-of-time)"
 msgstr "gcj compiler flags (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 "Linker flags:"
 
-#: ../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 "Libraries:"
 
-#: ../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 "Dependencies:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1439
+#: ../plugins/gbf-am/gbf-am-properties.c:1446
 msgid "Advanced options"
 msgstr "Advanced options"
 
-#: ../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 "Target name:"
 
-#: ../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 "Group:"
 
-#: ../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 "Install directory:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1576
+#: ../plugins/gbf-am/gbf-am-properties.c:1583
 msgid "Advanced..."
-msgstr "Advanced..."
+msgstr "Advancedâ?¦"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
 msgid "Invalid GbfMkfileConfigValue type"
 msgstr "Invalid GbfMkfileConfigValue type"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2525
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2524
 msgid "Project doesn't exist"
 msgstr "Project doesn't exist"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2832
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2831
 msgid "Group coudn't be removed"
 msgstr "Group coudn't be removed"
 
-#: ../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 "Target couldn't be created"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3055
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3054
 msgid "Target coudn't be removed"
 msgstr "Target coudn't be removed"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3248
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3252
 msgid "Source file must be inside the project directory"
 msgstr "Source file must be inside the project directory"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3260
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3264
 msgid "Source is already in target"
 msgstr "Source is already in target"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3277
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3309
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3281
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3313
 msgid "Source couldn't be added"
 msgstr "Source couldn't be added"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3341
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
 msgid "Source coudn't be removed"
-msgstr "Source coudn't be removed"
+msgstr "Source couldn't be removed"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
 msgid "Includes:"
 msgstr "Includes:"
 
-#: ../plugins/gdb/anjuta-gdb.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:6
-msgid "Command Line Parameters"
-msgstr "Command Line Parameters"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:12
-msgid "Enter a Hexa adress or select one in the data"
-msgstr "Enter a Hexa adress or select one in the data"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:13
-msgid "Execute Program"
-msgstr "Execute Program"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:22
-msgid "Run in Terminal"
-msgstr "Run in Terminal"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:35
-msgid "_Pass:"
-msgstr "_Pass:"
-
 #. The %s argument is a program name, anjuta by example
-#: ../plugins/gdb/debugger.c:690
+#: ../plugins/gdb/debugger.c:691
 #, c-format
 msgid "Loading Executable: %s\n"
 msgstr "Loading Executable: %s\n"
 
 #. The %s argument is a file name
-#: ../plugins/gdb/debugger.c:721
+#: ../plugins/gdb/debugger.c:722
 #, c-format
 msgid "Loading Core: %s\n"
 msgstr "Loading Core: %s\n"
 
-#: ../plugins/gdb/debugger.c:799
+#: ../plugins/gdb/debugger.c:804
 #, c-format
 msgid ""
 "Unable to find: %s.\n"
@@ -4136,58 +4186,58 @@ msgstr ""
 "Unable to initialise debugger.\n"
 "Make sure Anjuta is installed correctly."
 
-#: ../plugins/gdb/debugger.c:928
+#: ../plugins/gdb/debugger.c:933
 msgid "Getting ready to start debugging session...\n"
-msgstr "Getting ready to start debugging session...\n"
+msgstr "Getting ready to start debugging sessionâ?¦\n"
 
-#: ../plugins/gdb/debugger.c:934
+#: ../plugins/gdb/debugger.c:939
 msgid "Loading Executable: "
 msgstr "Loading Executable: "
 
-#: ../plugins/gdb/debugger.c:943
+#: ../plugins/gdb/debugger.c:948
 msgid "No executable specified.\n"
 msgstr "No executable specified.\n"
 
-#: ../plugins/gdb/debugger.c:946
+#: ../plugins/gdb/debugger.c:951
 msgid "Open an executable or attach to a process to start debugging.\n"
 msgstr "Open an executable or attach to a process to start debugging.\n"
 
-#: ../plugins/gdb/debugger.c:955
+#: ../plugins/gdb/debugger.c:960
 msgid "There was an error whilst launching the debugger.\n"
 msgstr "There was an error whilst launching the debugger.\n"
 
-#: ../plugins/gdb/debugger.c:959
+#: ../plugins/gdb/debugger.c:964
 msgid "Make sure 'gdb' is installed on the system.\n"
 msgstr "Make sure 'gdb' is installed on the system.\n"
 
-#: ../plugins/gdb/debugger.c:1250
+#: ../plugins/gdb/debugger.c:1255
 msgid "Program exited normally\n"
 msgstr "Program exited normally\n"
 
-#: ../plugins/gdb/debugger.c:1261
+#: ../plugins/gdb/debugger.c:1266
 #, c-format
 msgid "Program exited with error code %s\n"
 msgstr "Program exited with error code %s\n"
 
 #. The program has reached one breakpoint and will stop
-#: ../plugins/gdb/debugger.c:1276
+#: ../plugins/gdb/debugger.c:1281
 #, c-format
 msgid "Breakpoint number %s hit\n"
 msgstr "Breakpoint number %s hit\n"
 
-#: ../plugins/gdb/debugger.c:1285
+#: ../plugins/gdb/debugger.c:1290
 msgid "Function finished\n"
 msgstr "Function finished\n"
 
-#: ../plugins/gdb/debugger.c:1291
+#: ../plugins/gdb/debugger.c:1296
 msgid "Stepping finished\n"
 msgstr "Stepping finished\n"
 
-#: ../plugins/gdb/debugger.c:1297
+#: ../plugins/gdb/debugger.c:1302
 msgid "Location reached\n"
 msgstr "Location reached\n"
 
-#: ../plugins/gdb/debugger.c:1691
+#: ../plugins/gdb/debugger.c:1696
 msgid ""
 "The program is attached.\n"
 "Do you still want to stop the debugger?"
@@ -4197,7 +4247,7 @@ msgstr ""
 
 #. The %s argument is an error message returned by gdb.
 #. * It is something like, "No such file or directory"
-#: ../plugins/gdb/debugger.c:1852
+#: ../plugins/gdb/debugger.c:1857
 #, c-format
 msgid ""
 "Unable to connect to remote target, %s\n"
@@ -4206,20 +4256,20 @@ msgstr ""
 "Unable to connect to remote target, %s\n"
 "Do you want to try again?"
 
-#: ../plugins/gdb/debugger.c:1870
+#: ../plugins/gdb/debugger.c:1875
 msgid "Debugger connected\n"
 msgstr "Debugger connected\n"
 
-#: ../plugins/gdb/debugger.c:1944
+#: ../plugins/gdb/debugger.c:1949
 msgid "Program attached\n"
 msgstr "Program attached\n"
 
-#: ../plugins/gdb/debugger.c:1965
+#: ../plugins/gdb/debugger.c:1970
 #, c-format
 msgid "Attaching to process: %d...\n"
-msgstr "Attaching to process: %d...\n"
+msgstr "Attaching to process: %dâ?¦\n"
 
-#: ../plugins/gdb/debugger.c:1991
+#: ../plugins/gdb/debugger.c:1996
 msgid ""
 "A process is already running.\n"
 "Would you like to terminate it and attach the new process?"
@@ -4227,375 +4277,535 @@ msgstr ""
 "A process is already running.\n"
 "Would you like to terminate it and attach the new process?"
 
-#: ../plugins/gdb/debugger.c:2008
+#: ../plugins/gdb/debugger.c:2013
 msgid "Anjuta is unable to attach to itself."
 msgstr "Anjuta is unable to attach to itself."
 
-#: ../plugins/gdb/debugger.c:2058
+#: ../plugins/gdb/debugger.c:2063
 msgid "Program terminated\n"
 msgstr "Program terminated\n"
 
-#: ../plugins/gdb/debugger.c:2073
+#: ../plugins/gdb/debugger.c:2078
 msgid "Program detached\n"
 msgstr "Program detached\n"
 
-#: ../plugins/gdb/debugger.c:2093
+#: ../plugins/gdb/debugger.c:2098
 #, c-format
 msgid "Detaching the process...\n"
-msgstr "Detaching the process...\n"
+msgstr "Detaching the processâ?¦\n"
 
-#: ../plugins/gdb/debugger.c:2114
+#: ../plugins/gdb/debugger.c:2119
 msgid "Interrupting the process\n"
 msgstr "Interrupting the process\n"
 
-#: ../plugins/gdb/debugger.c:3905
+#: ../plugins/gdb/debugger.c:3910
 #, c-format
 msgid "Sending signal %s to the process: %d"
 msgstr "Sending signal %s to the process: %d"
 
-#: ../plugins/gdb/debugger.c:3931
+#: ../plugins/gdb/debugger.c:3936
 msgid "Error whilst signaling the process."
 msgstr "Error whilst signalling the process."
 
-#: ../plugins/gdb/plugin.c:108
+#: ../plugins/gdb/plugin.c:112
 #, c-format
 msgid ""
 "Failed to create fifo file named %s. The program will run without a terminal."
 msgstr ""
 "Failed to create FIFO file named %s. The program will run without a terminal."
 
-#: ../plugins/gdb/plugin.c:194
+#: ../plugins/gdb/plugin.c:198
 msgid "Cannot start terminal for debugging."
 msgstr "Cannot start terminal for debugging."
 
-#: ../plugins/git/anjuta-git.glade.h:1
-msgid "<b>Bad revision:</b>"
-msgstr "<b>Bad revision:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:2
-msgid "<b>Branch name:</b>"
-msgstr "<b>Branch name:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:3
-msgid "<b>Branch to delete:</b>"
-msgstr "<b>Branch to delete:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:4
-msgid "<b>Branch to switch to:</b>"
-msgstr "<b>Branch to switch to:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:5
-msgid "<b>Branch:</b>"
-msgstr "<b>Branch:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:6
-#: ../plugins/subversion/anjuta-subversion.glade.h:2
-msgid "<b>Changes:</b>"
-msgstr "<b>Changes:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:7
-msgid "<b>Commit to revert:</b>"
-msgstr "<b>Commit to revert:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:8
-msgid "<b>Filters</b>"
-msgstr "<b>Filters</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:9
-msgid "<b>Folder to create patches in:</b>"
-msgstr "<b>Folder in which to create patches:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:10
-msgid "<b>Generate patches relative to:</b>"
-msgstr "<b>Generate patches relative to:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:11
-msgid "<b>Good revision:</b>"
-msgstr "<b>Good revision:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:12
-#: ../plugins/subversion/anjuta-subversion.glade.h:7
-msgid "<b>Log Message:</b>"
-msgstr "<b>Log Message:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:13
-msgid "<b>Log message:</b>"
-msgstr "<b>Log message:</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>Remote branch from which to rebase:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:17
-msgid "<b>Remote to delete:</b>"
-msgstr "<b>Remote to delete:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:18
-msgid "<b>Repository to pull from:</b>"
-msgstr "<b>Repository from which to pull:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:19
-msgid "<b>Reset to:</b>"
-msgstr "<b>Reset to:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:20
-#: ../plugins/subversion/anjuta-subversion.glade.h:10
-msgid "<b>Revision:</b>"
-msgstr "<b>Revision:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:21
-msgid "<b>Select Files to Check Out:</b>"
-msgstr "<b>Select Files to Check Out:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:22
-#: ../plugins/subversion/anjuta-subversion.glade.h:13
-msgid "<b>Select Files to Commit:</b>"
-msgstr "<b>Select Files to Commit:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:23
-msgid "<b>Select Files to Ignore:</b>"
-msgstr "<b>Select Files to Ignore:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:24
-#: ../plugins/subversion/anjuta-subversion.glade.h:14
-msgid "<b>Select Files to Mark as Resolved:</b>"
-msgstr "<b>Select Files to Mark as Resolved:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:25
-msgid "<b>Select Files to Unstage:</b>"
-msgstr "<b>Select Files to Unstage:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:26
-msgid "<b>Select file to add:</b>"
-msgstr "<b>Select file to add:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:27
-msgid "<b>Select file to remove:</b>"
-msgstr "<b>Select file to remove:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:28
-msgid "<b>Tag name:</b>"
-msgstr "<b>Tag name:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:29
-msgid "<b>URL:</b>"
-msgstr "<b>URL:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:30
-#: ../plugins/subversion/anjuta-subversion.glade.h:18
-msgid "<b>View the Log for File/Folder:</b>"
-msgstr "<b>View the Log for File/Folder:</b>"
-
-#: ../plugins/git/anjuta-git.glade.h:31
+#: ../plugins/git/anjuta-git.ui.h:2
+msgid "<b>Stash Message (Optional)</b>"
+msgstr "<b>Stash Message (Optional)</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:3
+msgid "<b>Stash to Apply</b>"
+msgstr "<b>Stash to Apply</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:4
+msgid "<b>Tags</b>"
+msgstr "<b>Tags</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:5
 msgid "Add File"
 msgstr "Add File"
 
-#: ../plugins/git/anjuta-git.glade.h:32
+#: ../plugins/git/anjuta-git.ui.h:6
 msgid "Add Remote Branch"
 msgstr "Add Remote Branch"
 
 #. 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:34
+#: ../plugins/git/anjuta-git.ui.h:8
 msgid "Add signed off by line"
-msgstr "Add signed off by line"
+msgstr "Add signed-off-by line"
+
+#: ../plugins/git/anjuta-git.ui.h:9
+msgid "Add signed-off by line"
+msgstr "Add signed-off-by line"
 
-#: ../plugins/git/anjuta-git.glade.h:35
+#: ../plugins/git/anjuta-git.ui.h:10
+msgid "Amend the previous commit"
+msgstr "Amend the previous commit"
+
+#: ../plugins/git/anjuta-git.ui.h:11
 msgid "Annotate this tag"
 msgstr "Annotate this tag"
 
 #. 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:37
+#: ../plugins/git/anjuta-git.ui.h:13
 msgid "Append fetch data"
 msgstr "Append fetch data"
 
+#: ../plugins/git/anjuta-git.ui.h:14
+msgid "Apply Stash"
+msgstr "Apply Stash"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:15 ../plugins/git/plugin.c:239
+msgid "Apply mailbox files"
+msgstr "Apply mailbox files"
+
+#: ../plugins/git/anjuta-git.ui.h:16
+msgid "Apply the selected stash"
+msgstr "Apply the selected stash"
+
 #. "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:39
+#: ../plugins/git/anjuta-git.ui.h:18
 msgid "Author/Grep"
 msgstr "Author/Grep"
 
-#: ../plugins/git/anjuta-git.glade.h:40
-#: ../plugins/project-wizard/templates/translatable-strings.h:25
+#: ../plugins/git/anjuta-git.ui.h:19
+#: ../plugins/project-wizard/templates/translatable-strings.h:24
 msgid "Author:"
 msgstr "Author:"
 
-#: ../plugins/git/anjuta-git.glade.h:41
-msgid "Branch must be fully merged"
-msgstr "Branch must be fully merged"
+#: ../plugins/git/anjuta-git.ui.h:20
+msgid "Bad revision:"
+msgstr "Bad revision:"
+
+#: ../plugins/git/anjuta-git.ui.h:21
+msgid "Branch name:"
+msgstr "Branch name:"
+
+#: ../plugins/git/anjuta-git.ui.h:22
+msgid "Branch to switch to:"
+msgstr "Branch to switch to:"
 
-#: ../plugins/git/anjuta-git.glade.h:42
+#: ../plugins/git/anjuta-git.ui.h:23
+msgid "Branch:"
+msgstr "Branch:"
+
+#: ../plugins/git/anjuta-git.ui.h:24
+msgid "Branches"
+msgstr "Branches"
+
+#: ../plugins/git/anjuta-git.ui.h:25
+msgid "Branches must be fully merged"
+msgstr "Branches must be fully merged"
+
+#: ../plugins/git/anjuta-git.ui.h:26
+msgid "Branches to delete:"
+msgstr "Branches to delete:"
+
+#: ../plugins/git/anjuta-git.ui.h:28
+#: ../plugins/subversion/anjuta-subversion.ui.h:4
+msgid "Changes:"
+msgstr "Changes:"
+
+#: ../plugins/git/anjuta-git.ui.h:29
 msgid "Check Out Files"
 msgstr "Check Out Files"
 
-#: ../plugins/git/anjuta-git.glade.h:43
+#: ../plugins/git/anjuta-git.ui.h:30
+msgid "Check out all local changes"
+msgstr "Check out all local changes"
+
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Check out the branch after it is created"
 msgstr "Check out the branch after it is created"
 
-#: ../plugins/git/anjuta-git.glade.h:44
-#: ../plugins/subversion/anjuta-subversion.glade.h:24
+#: ../plugins/git/anjuta-git.ui.h:32
+msgid "Cherry Pick"
+msgstr "Cherry Pick"
+
+#: ../plugins/git/anjuta-git.ui.h:33
+msgid "Clear all stashes"
+msgstr "Clear all stashes"
+
+#: ../plugins/git/anjuta-git.ui.h:34
+msgid "Column 1"
+msgstr "Column 1"
+
+#: ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "Commit Changes"
 
-#: ../plugins/git/anjuta-git.glade.h:45
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Commit on fast-forward merges"
 msgstr "Commit on fast-forward merges"
 
-#: ../plugins/git/anjuta-git.glade.h:46
+#: ../plugins/git/anjuta-git.ui.h:37
+msgid "Commit to Cherry Pick:"
+msgstr "Commit to Cherry Pick:"
+
+#: ../plugins/git/anjuta-git.ui.h:38
+msgid "Commit to revert:"
+msgstr "Commit to revert:"
+
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Create Branch"
 msgstr "Create Branch"
 
-#: ../plugins/git/anjuta-git.glade.h:47
+#: ../plugins/git/anjuta-git.ui.h:40
 msgid "Create Tag"
 msgstr "Create Tag"
 
-#: ../plugins/git/anjuta-git.glade.h:48
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Create patch series"
 msgstr "Create patch series"
 
-#: ../plugins/git/anjuta-git.glade.h:49 ../plugins/git/git-log-dialog.c:188
-#: ../plugins/subversion/subversion-log-dialog.c:139
+#: ../plugins/git/anjuta-git.ui.h:42 ../plugins/git/git-log-dialog.c:189
+#: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "Date"
 
-#: ../plugins/git/anjuta-git.glade.h:50
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Delete Branch"
 msgstr "Delete Branch"
 
-#: ../plugins/git/anjuta-git.glade.h:51
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "Delete Remote Branch"
 msgstr "Delete Remote Branch"
 
-#: ../plugins/git/anjuta-git.glade.h:52
+#: ../plugins/git/anjuta-git.ui.h:45
+msgid "Delete Tags"
+msgstr "Delete Tags"
+
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Do not commit"
 msgstr "Do not commit"
 
-#: ../plugins/git/anjuta-git.glade.h:53
+#: ../plugins/git/anjuta-git.ui.h:47
 msgid "Do not follow tags"
 msgstr "Do not follow tags"
 
-#: ../plugins/git/anjuta-git.glade.h:54
+#: ../plugins/git/anjuta-git.ui.h:48
+msgid "Drop the selected stash"
+msgstr "Drop the selected stash"
+
+#: ../plugins/git/anjuta-git.ui.h:49
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "Fetch remote branches after creation"
 msgstr "Fetch remote branches after creation"
 
-#: ../plugins/git/anjuta-git.glade.h:55
-#: ../plugins/subversion/anjuta-subversion.glade.h:32
+#: ../plugins/git/anjuta-git.ui.h:51
+msgid "Filters"
+msgstr "Filters"
+
+#: ../plugins/git/anjuta-git.ui.h:52
+msgid "Folder to create patches in:"
+msgstr "Folder to create patches in:"
+
+#: ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "Force"
 
-#: ../plugins/git/anjuta-git.glade.h:57
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "From:"
 msgstr "From:"
 
-#: ../plugins/git/anjuta-git.glade.h:58
+#: ../plugins/git/anjuta-git.ui.h:56
+msgid "Generate patches relative to:"
+msgstr "Generate patches relative to:"
+
+#: ../plugins/git/anjuta-git.ui.h:57
+msgid "Good revision:"
+msgstr "Good revision:"
+
+#: ../plugins/git/anjuta-git.ui.h:58
 msgid "Grep:"
 msgstr "Grep:"
 
-#: ../plugins/git/anjuta-git.glade.h:59
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Hard"
 msgstr "Hard"
 
-#: ../plugins/git/anjuta-git.glade.h:60
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Head"
 msgstr "Head"
 
-#: ../plugins/git/anjuta-git.glade.h:61
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Ignore Files"
 msgstr "Ignore Files"
 
-#: ../plugins/git/anjuta-git.glade.h:62
+#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/subversion/anjuta-subversion.ui.h:21
+msgid "Log Message:"
+msgstr "Log Message:"
+
+#: ../plugins/git/anjuta-git.ui.h:65
+msgid "Mailbox file containing patches:"
+msgstr "Mailbox file containing patches:"
+
+#: ../plugins/git/anjuta-git.ui.h:66
 msgid "Merge"
 msgstr "Merge"
 
-#: ../plugins/git/anjuta-git.glade.h:63
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Mixed"
 msgstr "Mixed"
 
-#: ../plugins/git/anjuta-git.glade.h:64
+#: ../plugins/git/anjuta-git.ui.h:68
+msgid "Mode:"
+msgstr "Mode:"
+
+#: ../plugins/git/anjuta-git.ui.h:70 ../plugins/glade/plugin.c:3097
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
+#: ../plugins/subversion/anjuta-subversion.ui.h:23
+msgid "Options"
+msgstr "Options"
+
+#: ../plugins/git/anjuta-git.ui.h:71
+#: ../plugins/subversion/anjuta-subversion.ui.h:24
+msgid "Options:"
+msgstr "Options:"
+
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Previous commit"
 msgstr "Previous commit"
 
-#: ../plugins/git/anjuta-git.glade.h:65
+#: ../plugins/git/anjuta-git.ui.h:73
 msgid "Pull"
 msgstr "Pull"
 
-#: ../plugins/git/anjuta-git.glade.h:66
+#: ../plugins/git/anjuta-git.ui.h:74
+msgid "Push"
+msgstr "Push"
+
+#: ../plugins/git/anjuta-git.ui.h:75
+msgid "Push all branches and tags"
+msgstr "Push all branches and tags"
+
+#: ../plugins/git/anjuta-git.ui.h:76
+msgid "Push all tags"
+msgstr "Push all tags"
+
+#: ../plugins/git/anjuta-git.ui.h:77
 msgid "Rebase"
 msgstr "Rebase"
 
-#: ../plugins/git/anjuta-git.glade.h:67
+#: ../plugins/git/anjuta-git.ui.h:78
+msgid "Remote"
+msgstr "Remote"
+
+#: ../plugins/git/anjuta-git.ui.h:79
+msgid "Remote branch to rebase from:"
+msgstr "Remote branch to rebase from:"
+
+#: ../plugins/git/anjuta-git.ui.h:80
+msgid "Remote to delete:"
+msgstr "Remote to delete:"
+
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Remove File"
 msgstr "Remove File"
 
-#: ../plugins/git/anjuta-git.glade.h:68
+#: ../plugins/git/anjuta-git.ui.h:82
+msgid "Repository origin"
+msgstr "Repository origin"
+
+#: ../plugins/git/anjuta-git.ui.h:83
+msgid "Repository to pull from:"
+msgstr "Repository to pull from:"
+
+#: ../plugins/git/anjuta-git.ui.h:84
+msgid "Repository to push to:"
+msgstr "Repository to push to:"
+
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Reset Tree"
 msgstr "Reset Tree"
 
-#: ../plugins/git/anjuta-git.glade.h:69
-#: ../plugins/subversion/anjuta-subversion.glade.h:44
+#: ../plugins/git/anjuta-git.ui.h:86
+msgid "Reset to:"
+msgstr "Reset to:"
+
+#: ../plugins/git/anjuta-git.ui.h:87
+msgid "Restore index"
+msgstr "Restore index"
+
+#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/subversion/anjuta-subversion.ui.h:35
 msgid "Retrieving status..."
-msgstr "Retrieving status..."
+msgstr "Retrieving statusâ?¦"
 
-#: ../plugins/git/anjuta-git.glade.h:70
+#: ../plugins/git/anjuta-git.ui.h:89
 msgid "Revert Commit"
 msgstr "Revert Commit"
 
-#: ../plugins/git/anjuta-git.glade.h:71
+#: ../plugins/git/anjuta-git.ui.h:90
 msgid "Revision/Tag:"
 msgstr "Revision/Tag:"
 
-#: ../plugins/git/anjuta-git.glade.h:73
+#: ../plugins/git/anjuta-git.ui.h:92
 msgid "Select A Folder"
-msgstr "Select A Folder"
+msgstr "Select a Folder"
+
+#: ../plugins/git/anjuta-git.ui.h:93
+msgid "Select Files to Check Out:"
+msgstr "Select Files to Check Out:"
+
+#: ../plugins/git/anjuta-git.ui.h:94
+#: ../plugins/subversion/anjuta-subversion.ui.h:41
+msgid "Select Files to Commit:"
+msgstr "Select Files to Commit:"
 
-#: ../plugins/git/anjuta-git.glade.h:74
-#: ../plugins/subversion/anjuta-subversion.glade.h:48
+#: ../plugins/git/anjuta-git.ui.h:95
+msgid "Select Files to Ignore:"
+msgstr "Select Files to Ignore:"
+
+#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
+msgid "Select Files to Mark as Resolved:"
+msgstr "Select Files to Mark as Resolved:"
+
+#: ../plugins/git/anjuta-git.ui.h:97
+msgid "Select Files to Unstage:"
+msgstr "Select Files to Unstage:"
+
+#: ../plugins/git/anjuta-git.ui.h:98
+msgid "Select Mailbox File"
+msgstr "Select Mailbox File"
+
+#: ../plugins/git/anjuta-git.ui.h:99
+msgid "Select file to add:"
+msgstr "Select file to add:"
+
+#: ../plugins/git/anjuta-git.ui.h:100
+msgid "Select file to remove:"
+msgstr "Select file to remove:"
+
+#: ../plugins/git/anjuta-git.ui.h:101
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
 msgid "Set Conflicts as Resolved"
 msgstr "Set Conflicts as Resolved"
 
-#: ../plugins/git/anjuta-git.glade.h:75
+#: ../plugins/git/anjuta-git.ui.h:102
+msgid "Show source revision in log message"
+msgstr "Show source revision in log message"
+
+#: ../plugins/git/anjuta-git.ui.h:103
+msgid "Show the contents of the selected stash in an editor"
+msgstr "Show the contents of the selected stash in an editor"
+
+#: ../plugins/git/anjuta-git.ui.h:104
+msgid "Sign this tag"
+msgstr "Sign this tag"
+
+#: ../plugins/git/anjuta-git.ui.h:105
 msgid "Soft"
 msgstr "Soft"
 
-#: ../plugins/git/anjuta-git.glade.h:76
+#: ../plugins/git/anjuta-git.ui.h:106
 msgid "Squash"
 msgstr "Squash"
 
-#: ../plugins/git/anjuta-git.glade.h:77
+#: ../plugins/git/anjuta-git.ui.h:107 ../plugins/git/plugin.c:811
+msgid "Stash"
+msgstr "Stash"
+
+#: ../plugins/git/anjuta-git.ui.h:108
+msgid "Stash Uncommitted Changes"
+msgstr "Stash Uncommitted Changes"
+
+#: ../plugins/git/anjuta-git.ui.h:109
+msgid "Stash indexed changes"
+msgstr "Stash indexed changes"
+
+#: ../plugins/git/anjuta-git.ui.h:110
+msgid "Stash the working tree's uncommitted changes"
+msgstr "Stash the working tree's uncommitted changes"
+
+#: ../plugins/git/anjuta-git.ui.h:111
 msgid "Switch to Another Branch"
 msgstr "Switch to Another Branch"
 
-#: ../plugins/git/anjuta-git.glade.h:78
+#: ../plugins/git/anjuta-git.ui.h:112
+msgid "Tag name:"
+msgstr "Tag name:"
+
+#: ../plugins/git/anjuta-git.ui.h:113
 msgid "Tag/Commit"
 msgstr "Tag/Commit"
 
-#: ../plugins/git/anjuta-git.glade.h:79
+#: ../plugins/git/anjuta-git.ui.h:114
+msgid "Tags to delete:"
+msgstr "Tags to delete:"
+
+#: ../plugins/git/anjuta-git.ui.h:115
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "This commit concludes a failed merge (use -i)"
 
-#: ../plugins/git/anjuta-git.glade.h:81
+#: ../plugins/git/anjuta-git.ui.h:117
 msgid "To:"
 msgstr "To:"
 
-#: ../plugins/git/anjuta-git.glade.h:82
+#: ../plugins/git/anjuta-git.ui.h:118
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/git/anjuta-git.ui.h:119
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/git/anjuta-git.ui.h:120
 msgid "Unstage Files"
 msgstr "Unstage Files"
 
-#: ../plugins/git/anjuta-git.glade.h:83
+#: ../plugins/git/anjuta-git.ui.h:121
 msgid "Use a custom log message"
 msgstr "Use a custom log message"
 
-#: ../plugins/git/anjuta-git.glade.h:84
+#: ../plugins/git/anjuta-git.ui.h:122
+msgid "Use custom author information:"
+msgstr "Use custom author information:"
+
+#: ../plugins/git/anjuta-git.ui.h:123
 msgid "View log"
 msgstr "View log"
 
+#: ../plugins/git/anjuta-git.ui.h:124
+#: ../plugins/subversion/anjuta-subversion.ui.h:58
+msgid "View the Log for File/Folder:"
+msgstr "View the Log for File/Folder:"
+
+#: ../plugins/git/anjuta-git.ui.h:126
+msgid "page 1"
+msgstr "page 1"
+
+#: ../plugins/git/anjuta-git.ui.h:127
+msgid "page 2"
+msgstr "page 2"
+
+#: ../plugins/git/anjuta-git.ui.h:128
+msgid "page 3"
+msgstr "page 3"
+
 #: ../plugins/git/git-add-dialog.c:36
 msgid "Git: File staged for add."
 msgstr "Git: File staged for add."
 
-#: ../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 "Please select a file."
 
@@ -4605,7 +4815,7 @@ msgid "Git: Added remote branch \"%s\"."
 msgstr "Git: Added remote branch \"%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 "Please enter a branch name."
 
@@ -4616,14 +4826,19 @@ msgstr "Please enter a URL."
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
 msgid "Git: Fetching..."
-msgstr "Git: Fetching..."
+msgstr "Git: Fetchingâ?¦"
+
+#: ../plugins/git/git-apply-mailbox-dialog.c:45
+msgid "Please select a mailbox file."
+msgstr "Please select a mailbox file."
 
 #: ../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:120
+#: ../plugins/subversion/subversion-switch-dialog.c:122
 msgid "Please enter a revision."
 msgstr "Please enter a revision."
 
@@ -4639,6 +4854,14 @@ msgstr "Git: Files checked out."
 msgid "Git: Commit complete."
 msgstr "Git: Commit complete."
 
+#: ../plugins/git/git-commit-dialog.c:105
+msgid "Please enter the commit author's name."
+msgstr "Please enter the commit author's name."
+
+#: ../plugins/git/git-commit-dialog.c:115
+msgid "Please enter the commit author's e-mail address."
+msgstr "Please enter the commit author's e-mail address."
+
 #: ../plugins/git/git-create-branch-dialog.c:41
 #, c-format
 msgid "Git: Created branch \"%s\"."
@@ -4649,59 +4872,75 @@ msgstr "Git: Created branch \"%s\"."
 msgid "Git: Created tag \"%s\"."
 msgstr "Git: Created tag \"%s\"."
 
-#: ../plugins/git/git-create-tag-dialog.c:108
+#: ../plugins/git/git-create-tag-dialog.c:111
 msgid "Please enter a tag name."
 msgstr "Please enter a tag name."
 
-#: ../plugins/git/git-delete-branch-dialog.c:41
-#, c-format
-msgid "Git: Deleted branch \"%s\"."
-msgstr "Git: Deleted branch \"%s\"."
+#: ../plugins/git/git-delete-branch-dialog.c:37
+msgid "Git: Deleted selected branches."
+msgstr "Git: Deleted selected branches."
+
+#: ../plugins/git/git-delete-branch-dialog.c:106
+msgid "Please select branches to delete"
+msgstr "Please select branches to delete"
+
+#: ../plugins/git/git-delete-tag-dialog.c:37
+msgid "Git: Deleted selected tags."
+msgstr "Git: Deleted selected tags."
 
 #: ../plugins/git/git-fetch-dialog.c:40
 msgid "Git: Fetch complete."
 msgstr "Git: Fetch complete."
 
-#: ../plugins/git/git-log-dialog.c:151
+#: ../plugins/git/git-log-dialog.c:152
 msgid "Graph"
 msgstr "Graph"
 
-#: ../plugins/git/git-log-dialog.c:166
+#: ../plugins/git/git-log-dialog.c:167
 msgid "Short log"
 msgstr "Short log"
 
-#: ../plugins/git/git-log-dialog.c:177
-#: ../plugins/subversion/subversion-log-dialog.c:130
+#: ../plugins/git/git-log-dialog.c:178
+#: ../plugins/subversion/subversion-log-dialog.c:132
 msgid "Author"
 msgstr "Author"
 
-#: ../plugins/git/git-log-dialog.c:305
+#: ../plugins/git/git-log-dialog.c:317
 msgid "Git: Retrieving log..."
-msgstr "Git: Retrieving log..."
+msgstr "Git: Retrieving logâ?¦"
 
-#: ../plugins/git/git-log-dialog.c:344
-#: ../plugins/subversion/subversion-add-dialog.c:63
-#: ../plugins/subversion/subversion-diff-dialog.c:114
+#: ../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
-#: ../plugins/subversion/subversion-update-dialog.c:66
+#: ../plugins/subversion/subversion-update-dialog.c:68
 msgid "Please enter a path."
 msgstr "Please enter a path."
 
-#: ../plugins/git/git-log-dialog.c:505
+#: ../plugins/git/git-log-dialog.c:399
+msgid "Select a file"
+msgstr "Select a file"
+
+#: ../plugins/git/git-log-dialog.c:546
 #, c-format
 msgid "<b>Branch:</b> %s"
 msgstr "<b>Branch:</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>Tag:</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>Remote:</b> %s"
 
+#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:674
+#: ../plugins/git/plugin.c:867
+msgid "Branch"
+msgstr "Branch"
+
 #: ../plugins/git/git-merge-dialog.c:36
 msgid "Git: Merge complete."
 msgstr "Git: Merge complete."
@@ -4710,11 +4949,35 @@ msgstr "Git: Merge complete."
 msgid "Git: Pull complete."
 msgstr "Git: Pull complete."
 
-#: ../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 "Please select a remote to pull from."
+
+#: ../plugins/git/git-pull-dialog.c:142
 msgid "Please enter the URL of the repository to pull from."
-msgstr "Please enter the URL of the repository from which to pull."
+msgstr "Please enter the URL of the repository to pull from."
+
+#: ../plugins/git/git-push-dialog.c:36
+msgid "Git: Push complete."
+msgstr "Git: Push complete."
+
+#. 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 "Please select a remote to push to."
 
-#: ../plugins/git/git-rebase-dialog.c:49
+#: ../plugins/git/git-push-dialog.c:159
+msgid "Please enter the URL of the repository to push to."
+msgstr "Please enter the URL of the repository to push to."
+
+#: ../plugins/git/git-push-dialog.c:193
+msgid "Git: Pushing..."
+msgstr "Git: Pushingâ?¦"
+
+#: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
 msgstr "Git: Rebasing"
 
@@ -4726,243 +4989,700 @@ msgstr "Git: File removed."
 msgid "Git: Resolve complete."
 msgstr "Git: Resolve complete."
 
+#: ../plugins/git/git-stash-widget.c:219
+msgid "Git: Stash dropped."
+msgstr "Git: Stash dropped."
+
+#: ../plugins/git/git-stash-widget.c:275
+msgid "Git: All stashes cleared."
+msgstr "Git: All stashes cleared."
+
 #: ../plugins/git/git-switch-dialog.c:36
 msgid "Git: Branch checkout complete."
 msgstr "Git: Branch checkout complete."
 
-#: ../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 "There are no branches available."
+
+#: ../plugins/git/git-ui-utils.c:194
+msgid "Please select a stash"
+msgstr "Please select a stash"
+
+#: ../plugins/git/git-ui-utils.c:604
+msgid "Git: Changes stored in a stash."
+msgstr "Git: Changes stored in a stash."
+
+#: ../plugins/git/git-ui-utils.c:620
+msgid "Git: Stashed changes applied."
+msgstr "Git: Stashed changes applied."
+
+#: ../plugins/git/git-ui-utils.c:744
 msgid "Git: Diff complete."
 msgstr "Git: Diff complete."
 
+#: ../plugins/git/git-ui-utils.c:760
+#, c-format
+msgid "Column %i"
+msgstr "Column %i"
+
 #: ../plugins/git/git-unstage-dialog.c:36
 msgid "Git: Files unstaged."
 msgstr "Git: Files unstaged."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:58 ../plugins/git/plugin.c:403
+#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
 msgid "_Git"
 msgstr "_Git"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:66 ../plugins/subversion/plugin.c:76
+#: ../plugins/git/plugin.c:79
+msgid "_Changes"
+msgstr "_Changes"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
 msgid "_Commit..."
-msgstr "_Commit..."
+msgstr "_Commitâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:89
+msgid "Commit changes to the local repository"
+msgstr "Commit changes to the local repository"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:74
-msgid "_Fetch"
-msgstr "_Fetch"
+#: ../plugins/git/plugin.c:95
+msgid "_Diff uncommitted changes"
+msgstr "_Diff uncommitted changes"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:97
+msgid "Show uncommitted changes"
+msgstr "Show uncommitted changes"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:82
-msgid "_Rebase"
-msgstr "_Rebase"
+#: ../plugins/git/plugin.c:103
+msgid "_Stash"
+msgstr "_Stash"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:90 ../plugins/git/plugin.c:186
-msgid "_Start..."
-msgstr "_Start..."
+#: ../plugins/git/plugin.c:111
+msgid "_Stash uncommitted changes..."
+msgstr "_Stash uncommitted changesâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:113
+msgid "Save uncommitted changes and re-apply them later"
+msgstr "Save uncommitted changes and re-apply them later"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:98
-msgid "_Continue"
-msgstr "_Continue"
+#: ../plugins/git/plugin.c:119
+msgid "_Apply stashed changes..."
+msgstr "_Apply stashed changesâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:121
+msgid "Apply stashed changes to the working tree"
+msgstr "Apply stashed changes to the working tree"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:106
-msgid "_Skip"
-msgstr "_Skip"
+#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
+msgid "_View log..."
+msgstr "_View logâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:129
+msgid "View change history"
+msgstr "View change history"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:114
-msgid "_Abort"
-msgstr "_Abort"
+#: ../plugins/git/plugin.c:135
+msgid "_Remote repository"
+msgstr "_Remote repository"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:143
+msgid "_Push..."
+msgstr "_Pushâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:145
+msgid "Push changes to a remote repository"
+msgstr "Push changes to a remote repository"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:122
+#: ../plugins/git/plugin.c:151
 msgid "_Pull..."
-msgstr "_Pull..."
+msgstr "_Pullâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:153
+msgid "Update the working copy"
+msgstr "Update the working copy"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:130
-msgid "_Unstage files..."
-msgstr "_Unstage files..."
+#: ../plugins/git/plugin.c:159
+msgid "_Fetch"
+msgstr "_Fetch"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:161
+msgid "Update remote branches"
+msgstr "Update remote branches"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:138
-msgid "_Check out files..."
-msgstr "_Check out files..."
+#: ../plugins/git/plugin.c:167
+msgid "_Files"
+msgstr "_Files"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:146
-msgid "_Resolve conflicts..."
-msgstr "_Resolve conflicts..."
+#: ../plugins/git/plugin.c:175 ../plugins/git/plugin.c:375
+#: ../plugins/git/plugin.c:591 ../plugins/subversion/plugin.c:60
+#: ../plugins/subversion/plugin.c:175
+msgid "_Add..."
+msgstr "_Addâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:177
+msgid "Add files to the repository"
+msgstr "Add files to the repository"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:154
-msgid "Create patch series..."
-msgstr "Create patch series..."
+#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
+#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+msgid "_Remove..."
+msgstr "_Removeâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:185
+msgid "Remove files from the repository"
+msgstr "Remove files from the repository"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:162 ../plugins/git/plugin.c:359
-msgid "_Reset tree..."
-msgstr "_Reset tree..."
+#: ../plugins/git/plugin.c:191
+msgid "_Ignore..."
+msgstr "_Ignoreâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:193
+msgid "Ignore files"
+msgstr "Ignore files"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:170 ../plugins/git/plugin.c:367
-msgid "_Revert commit..."
-msgstr "_Revert commit..."
+#: ../plugins/git/plugin.c:199
+msgid "_Check out files..."
+msgstr "_Check out filesâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:201
+msgid "Revert uncommitted changes to files"
+msgstr "Revert uncommitted changes to files"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:178 ../plugins/git/plugin.c:375
-msgid "_Bisect"
-msgstr "_Bisect"
+#: ../plugins/git/plugin.c:207
+msgid "_Unstage files..."
+msgstr "_Unstage filesâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:209
+msgid "Remove files from the commit index"
+msgstr "Remove files from the commit index"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:202
-msgid "_Good"
-msgstr "_Good"
+#: ../plugins/git/plugin.c:215
+msgid "_Resolve conflicts..."
+msgstr "_Resolve conflictsâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:217
+msgid "Mark conflicted files as resolved"
+msgstr "Mark conflicted files as resolved"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:210
-msgid "_Bad"
-msgstr "_Bad"
+#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
+msgid "Patches"
+msgstr "Patches"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:218 ../plugins/git/plugin.c:411
-msgid "_View log..."
-msgstr "_View log..."
+#: ../plugins/git/plugin.c:231
+msgid "Create patch series..."
+msgstr "Create patch seriesâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:233
+msgid "Generate patch files for submission upstream"
+msgstr "Generate patch files for submission upstream"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:226 ../plugins/git/plugin.c:291
-#: ../plugins/git/plugin.c:419 ../plugins/subversion/plugin.c:60
-#: ../plugins/subversion/plugin.c:175
-msgid "_Add..."
-msgstr "_Add..."
+#: ../plugins/git/plugin.c:247
+msgid "_Apply..."
+msgstr "_Applyâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:249
+msgid "Start applying a patch series"
+msgstr "Start applying a patch series"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:234 ../plugins/git/plugin.c:427
-#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "_Remove..."
+#: ../plugins/git/plugin.c:255
+msgid "_Continue with resolved conflicts"
+msgstr "_Continue with resolved conflicts"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:257
+msgid "Continue applying a series after resolving conflicts"
+msgstr "Continue applying a series after resolving conflicts"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:242
-msgid "_Ignore..."
-msgstr "_Ignore..."
+#: ../plugins/git/plugin.c:263
+msgid "_Skip current patch"
+msgstr "_Skip current patch"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:265
+msgid "Skip the current patch in the series and continue"
+msgstr "Skip the current patch in the series and continue"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
+msgid "_Abort"
+msgstr "_Abort"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:273
+msgid ""
+"Stop applying the series and return the repository to its original state"
+msgstr ""
+"Stop applying the series and return the repository to its original state"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:279
+msgid "_Branches"
+msgstr "_Branches"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:251 ../plugins/git/plugin.c:343
+#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
 msgid "_Create branch..."
-msgstr "_Create branch..."
+msgstr "_Create branchâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:289
+msgid "Create a branch"
+msgstr "Create a branch"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:259
+#: ../plugins/git/plugin.c:295
 msgid "_Delete branch..."
-msgstr "_Delete branch..."
+msgstr "_Delete branchâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:297
+msgid "Delete branches"
+msgstr "Delete branches"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:267
+#: ../plugins/git/plugin.c:303
 msgid "_Switch to another branch..."
-msgstr "_Switch to another branch..."
+msgstr "_Switch to another branchâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:305
+msgid "Switch to another branch"
+msgstr "Switch to another branch"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:275
+#: ../plugins/git/plugin.c:311
 msgid "_Merge..."
-msgstr "_Merge..."
+msgstr "_Mergeâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:313
+msgid "Merge changes from another branch into the current one"
+msgstr "Merge changes from another branch into the current one"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:319
+msgid "_Rebase"
+msgstr "_Rebase"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:321
+msgid "Merge your changes with an upstream remote branch"
+msgstr "Merge your changes with an upstream remote branch"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:283
+#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
+msgid "_Start..."
+msgstr "_Startâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:329
+msgid "Start a rebase"
+msgstr "Start a rebase"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:335
+msgid "_Continue"
+msgstr "_Continue"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:337
+msgid "Continue a rebase that stopped because of conflicts"
+msgstr "Continue a rebase that stopped because of conflicts"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:343
+msgid "_Skip"
+msgstr "_Skip"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:345
+msgid "Skip the current conflicted commit and continue"
+msgstr "Skip the current conflicted commit and continue"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:353
+msgid "Abort the rebase and put the repository in its original state"
+msgstr "Abort the rebase and put the repository in its original state"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
+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 ""
+"Selectively merge individual changes from other branches into the current one"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:367
 msgid "_Remote branches"
 msgstr "_Remote branches"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:377
+msgid "Add a remote branch"
+msgstr "Add a remote branch"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:299
+#: ../plugins/git/plugin.c:383
 msgid "_Delete..."
-msgstr "_Delete..."
+msgstr "_Deleteâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:385
+msgid "Delete a remote branch"
+msgstr "Delete a remote branch"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:307 ../plugins/git/plugin.c:351
+#: ../plugins/git/plugin.c:391
+msgid "Tags"
+msgstr "Tags"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
 msgid "_Create tag..."
-msgstr "_Create tag..."
+msgstr "_Create tagâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:401
+msgid "Create a tag"
+msgstr "Create a tag"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:315
-msgid "_Diff uncommitted changes"
-msgstr "_Diff uncommitted changes"
+#: ../plugins/git/plugin.c:407
+msgid "_Delete tag..."
+msgstr "_Delete tagâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:409
+msgid "Delete tags"
+msgstr "Delete tags"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:327
+#: ../plugins/git/plugin.c:415
+msgid "_Reset/Revert"
+msgstr "_Reset/Revert"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
+msgid "_Reset tree..."
+msgstr "_Reset treeâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:425
+msgid "Reset repository head to any past state"
+msgstr "Reset repository head to any past state"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
+msgid "_Revert commit..."
+msgstr "_Revert commitâ?¦"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:433
+msgid "Revert a commit"
+msgstr "Revert a commit"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:439
+msgid "Bisect"
+msgstr "Bisect"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:449
+msgid "Start a bisect operation"
+msgstr "Start a bisect operation"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:457
+msgid "Stop the bisect and bring the tree back to normal"
+msgstr "Stop the bisect and bring the tree back to normal"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:463
+msgid "_Good"
+msgstr "_Good"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:465
+msgid "Mark the current head revision as good"
+msgstr "Mark the current head revision as good"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:471
+msgid "_Bad"
+msgstr "_Bad"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:473
+msgid "Mark the current head revision as bad"
+msgstr "Mark the current head revision as bad"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:479
+msgid "_Initialize repository"
+msgstr "_Initialise repository"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:481
+msgid "Create a new git repository or reinitialize an existing one"
+msgstr "Create a new git repository or reinitialise an existing one"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:491
 msgid "_Show commit diff"
 msgstr "_Show commit diff"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:493
+msgid "Show changes introduced by this commit"
+msgstr "Show changes introduced by this commit"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:335
+#: ../plugins/git/plugin.c:499
 msgid "_View selected revision"
 msgstr "_View selected revision"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:501
+msgid "View a copy of this file at this revision"
+msgstr "View a copy of this file at this revision"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:509
+msgid "Create a branch with the selected revision as its head"
+msgstr "Create a branch with the selected revision as its head"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:517
+msgid "Create a tag at this revision"
+msgstr "Create a tag at this revision"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:525
+msgid "Reset repository head to this revision"
+msgstr "Reset repository head to this revision"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:533
+msgid "Revert this commit"
+msgstr "Revert this commit"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:541
+msgid "Merge this commit into the current branch"
+msgstr "Merge this commit into the current branch"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:383
+#: ../plugins/git/plugin.c:547
+msgid "_Bisect"
+msgstr "_Bisect"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:555
 msgid "_Set good revision"
 msgstr "_Set good revision"
 
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:557
+msgid "Mark this revision as good"
+msgstr "Mark this revision as good"
+
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:391
+#: ../plugins/git/plugin.c:563
 msgid "_Set bad revision"
 msgstr "_Set bad revision"
 
-#: ../plugins/git/plugin.c:581
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:565
+msgid "Mark this revision as bad"
+msgstr "Mark this revision as bad"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:585
+msgid "View changes to this file or folder"
+msgstr "View changes to this file or folder"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:593
+msgid "Add this file or folder to the repository"
+msgstr "Add this file or folder to the repository"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:601
+msgid "Remove this file or folder from the repository"
+msgstr "Remove this file or folder from the repository"
+
+#: ../plugins/git/plugin.c:766
+msgid "Top level git menu item"
+msgstr "Top level git menu item"
+
+#: ../plugins/git/plugin.c:774
 msgid "Git operations"
 msgstr "Git operations"
 
-#: ../plugins/git/plugin.c:586
+#: ../plugins/git/plugin.c:779
 msgid "Git log operations"
 msgstr "Git log operations"
 
-#: ../plugins/git/plugin.c:591
+#: ../plugins/git/plugin.c:784
 msgid "Git FM operations"
 msgstr "Git FM operations"
 
-#: ../plugins/git/plugin.c:606
+#: ../plugins/git/plugin.c:799
 msgid "Git Log"
 msgstr "Git Log"
 
@@ -4978,52 +5698,45 @@ msgstr "<b>Manage associations</b>"
 msgid "<b>New association</b>"
 msgstr "<b>New association</b>"
 
-#: ../plugins/glade/anjuta-glade.glade.h:4
+#. Link a file with a widget
+#: ../plugins/glade/anjuta-glade.glade.h:5
 msgid "Associate"
 msgstr "Associate"
 
-#: ../plugins/glade/anjuta-glade.glade.h:5
+#: ../plugins/glade/anjuta-glade.glade.h:6
 msgid "Automatically add resources"
 msgstr "Automatically add resources"
 
-#: ../plugins/glade/anjuta-glade.glade.h:6 ../plugins/glade/plugin.c:4397
+#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:763
+#: ../plugins/glade/plugin.c:3094
 msgid "Designer"
 msgstr "Designer"
 
-#: ../plugins/glade/anjuta-glade.glade.h:7
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:28
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:8
+#: ../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 "Insert handler on edit"
 
-#: ../plugins/glade/anjuta-glade.glade.h:9
+#: ../plugins/glade/anjuta-glade.glade.h:10
 msgid "Position type"
 msgstr "Position type"
 
-#: ../plugins/glade/anjuta-glade.glade.h:10
+#: ../plugins/glade/anjuta-glade.glade.h:11
 msgid "Separated designer layout"
 msgstr "Separated designer layout"
 
-#: ../plugins/glade/anjuta-glade.glade.h:11
+#: ../plugins/glade/anjuta-glade.glade.h:12
 msgid "Special regexp"
 msgstr "Special regexp"
 
-#: ../plugins/glade/anjuta-glade.glade.h:12
+#: ../plugins/glade/anjuta-glade.glade.h:13
 msgid "Widget name"
 msgstr "Widget name"
 
-#: ../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"
@@ -5054,204 +5767,230 @@ msgstr "invalid %s property value"
 msgid "Association item filename has no path"
 msgstr "Association item filename has no path"
 
-#: ../plugins/glade/plugin.c:836
+#: ../plugins/glade/plugin.c:855
 #, c-format
 msgid "No associations initialized, nothing to save"
-msgstr "No associations initialised, nothing to save"
+msgstr "No associations initialised: nothing to save"
 
-#: ../plugins/glade/plugin.c:843
+#: ../plugins/glade/plugin.c:862
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
 msgstr "Couldn't save associations because project root isn't set"
 
-#: ../plugins/glade/plugin.c:865
+#: ../plugins/glade/plugin.c:884
 #, c-format
 msgid "Failed to save associations"
 msgstr "Failed to save associations"
 
-#: ../plugins/glade/plugin.c:1349
+#. iptCurrent:
+#: ../plugins/glade/plugin.c:1196
+msgid "Current"
+msgstr "Current"
+
+#. iptBeforeEnd:
+#: ../plugins/glade/plugin.c:1197
+msgid "Before end"
+msgstr "Before end"
+
+#. iptAfterBegin:
+#: ../plugins/glade/plugin.c:1198
+msgid "After begin"
+msgstr "After begin"
+
+#. ipEOF:
+#: ../plugins/glade/plugin.c:1199
+msgid "End of file"
+msgstr "End of file"
+
+#: ../plugins/glade/plugin.c:1368
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "Couldn't introspect the signal"
 
-#: ../plugins/glade/plugin.c:1371
+#: ../plugins/glade/plugin.c:1390
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "Python language isn't supported yet"
 
-#: ../plugins/glade/plugin.c:1384
+#: ../plugins/glade/plugin.c:1403
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "Vala language isn't supported yet"
 
-#: ../plugins/glade/plugin.c:1943
+#: ../plugins/glade/plugin.c:1962
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "There is no associated editor for the designer"
 
-#: ../plugins/glade/plugin.c:1961
+#: ../plugins/glade/plugin.c:1980
 #, c-format
 msgid "Unknown language of the editor \"%s\""
 msgstr "Unknown editor language \"%s\""
 
-#: ../plugins/glade/plugin.c:2028 ../plugins/glade/plugin.c:2105
-#: ../plugins/glade/plugin.c:2230
+#: ../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 "Error while adding a new handler stub: %s"
 
-#: ../plugins/glade/plugin.c:2035 ../plugins/glade/plugin.c:2119
+#: ../plugins/glade/plugin.c:2054 ../plugins/glade/plugin.c:2138
 msgid "Couldn't find a signal information"
 msgstr "Couldn't find signal information"
 
-#: ../plugins/glade/plugin.c:2062
+#: ../plugins/glade/plugin.c:2081
 msgid "Error while adding a new handler stub: No current editor"
 msgstr "Error while adding a new handler stub: No current editor"
 
-#: ../plugins/glade/plugin.c:2233
+#: ../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 ""
-"To avoid these 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"
+
+#: ../plugins/glade/plugin.c:2324
+msgid "Couldn't find an associated document"
+msgstr "Couldn't find an associated document"
 
-#: ../plugins/glade/plugin.c:2369
+#: ../plugins/glade/plugin.c:2390
 msgid "Those documents are already associated"
 msgstr "Those documents are already associated"
 
-#: ../plugins/glade/plugin.c:2407
+#: ../plugins/glade/plugin.c:2428
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "Unable to read file: %s."
 
-#: ../plugins/glade/plugin.c:3665
+#: ../plugins/glade/plugin.c:3095
+msgid "Top level widget"
+msgstr "Top level widget"
+
+#: ../plugins/glade/plugin.c:3686
 msgid "Couldn't find a default signal name"
 msgstr "Couldn't find a default signal name"
 
-#: ../plugins/glade/plugin.c:3871
+#: ../plugins/glade/plugin.c:3896
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "Project %s has no deprecated widgets or version mismatches."
 
-#: ../plugins/glade/plugin.c:3888
+#: ../plugins/glade/plugin.c:3913
 msgid "There is no Glade project"
 msgstr "There is no Glade project"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3974
+#: ../plugins/glade/plugin.c:3999
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:3982 ../plugins/glade/plugin.c:3984
+#: ../plugins/glade/plugin.c:4007 ../plugins/glade/plugin.c:4009
 msgid "Switch between designer/code"
 msgstr "Switch between designer/code"
 
-#: ../plugins/glade/plugin.c:3990 ../plugins/glade/plugin.c:3992
+#: ../plugins/glade/plugin.c:4015 ../plugins/glade/plugin.c:4017
 msgid "Insert handler stub"
 msgstr "Insert handler stub"
 
-#: ../plugins/glade/plugin.c:3998 ../plugins/glade/plugin.c:4000
+#: ../plugins/glade/plugin.c:4023 ../plugins/glade/plugin.c:4025
 msgid "Insert handler stub, autoposition"
 msgstr "Insert handler stub, autoposition"
 
-#: ../plugins/glade/plugin.c:4006
+#: ../plugins/glade/plugin.c:4031
 msgid "Associate last designer and last editor"
 msgstr "Associate last designer and last editor"
 
-#: ../plugins/glade/plugin.c:4008
+#: ../plugins/glade/plugin.c:4033
 msgid "Associate last designer and editor"
 msgstr "Associate last designer and editor"
 
-#: ../plugins/glade/plugin.c:4014 ../plugins/glade/plugin.c:4016
+#: ../plugins/glade/plugin.c:4039 ../plugins/glade/plugin.c:4041
 msgid "Associations dialog..."
-msgstr "Associations dialogue..."
+msgstr "Associations dialogueâ?¦"
 
-#: ../plugins/glade/plugin.c:4022
+#: ../plugins/glade/plugin.c:4047
 msgid "Versioning..."
-msgstr "Versioning..."
+msgstr "Versioningâ?¦"
 
-#: ../plugins/glade/plugin.c:4024
+#: ../plugins/glade/plugin.c:4049
 msgid "Switch between library versions and check deprecations"
 msgstr "Switch between library versions and check deprecations"
 
-#: ../plugins/glade/plugin.c:4030 ../plugins/glade/plugin.c:4032
+#: ../plugins/glade/plugin.c:4055 ../plugins/glade/plugin.c:4057
 msgid "Set as default resource target"
 msgstr "Set as default resource target"
 
-#: ../plugins/glade/plugin.c:4040
+#: ../plugins/glade/plugin.c:4065
 msgid "Current default target"
 msgstr "Current default target"
 
-#: ../plugins/glade/plugin.c:4048
+#: ../plugins/glade/plugin.c:4073
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../plugins/glade/plugin.c:4056
+#: ../plugins/glade/plugin.c:4081
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../plugins/glade/plugin.c:4072
+#: ../plugins/glade/plugin.c:4097
 msgid "Redo the last action"
 msgstr "Redo the last action"
 
-#: ../plugins/glade/plugin.c:4080
+#: ../plugins/glade/plugin.c:4105
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../plugins/glade/plugin.c:4088
+#: ../plugins/glade/plugin.c:4113
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: ../plugins/glade/plugin.c:4096
+#: ../plugins/glade/plugin.c:4121
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../plugins/glade/plugin.c:4104
+#: ../plugins/glade/plugin.c:4129
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../plugins/glade/plugin.c:4282
+#: ../plugins/glade/plugin.c:4307
 msgid "Glade designer operations"
 msgstr "Glade designer operations"
 
-#: ../plugins/glade/plugin.c:4382
+#: ../plugins/glade/plugin.c:4407
 msgid "Go back in undo history"
 msgstr "Go back in undo history"
 
-#: ../plugins/glade/plugin.c:4384
+#: ../plugins/glade/plugin.c:4409
 msgid "Go forward in undo history"
 msgstr "Go forward in undo history"
 
-#: ../plugins/glade/plugin.c:4403
+#: ../plugins/glade/plugin.c:4431
 msgid "Glade Clipboard"
 msgstr "Glade Clipboard"
 
-#: ../plugins/glade/plugin.c:4408
+#: ../plugins/glade/plugin.c:4436
 msgid "Widgets"
 msgstr "Widgets"
 
-#: ../plugins/glade/plugin.c:4413
+#: ../plugins/glade/plugin.c:4441
 msgid "Palette"
 msgstr "Palette"
 
-#: ../plugins/glade/plugin.c:4663
+#: ../plugins/glade/plugin.c:4695
 #, c-format
 msgid "Not local file: %s"
 msgstr "Not local file: %s"
 
-#: ../plugins/glade/plugin.c:4684
+#: ../plugins/glade/plugin.c:4716
 #, c-format
 msgid "Could not open %s"
 msgstr "Could not open %s"
 
-#: ../plugins/glade/plugin.c:4737
+#: ../plugins/glade/plugin.c:4767
 msgid "Could not create a new glade project."
 msgstr "Could not create a new glade project."
 
-#: ../plugins/glade/plugin.c:5009 ../plugins/glade/plugin.c:5034
+#: ../plugins/glade/plugin.c:5029 ../plugins/glade/plugin.c:5054
 msgid "Glade GUI Designer"
 msgstr "Glade GUI Designer"
 
@@ -5264,111 +6003,93 @@ msgstr "Glade project '%s' saved"
 #: ../plugins/glade/anjuta-design-document.c:379
 #: ../plugins/glade/anjuta-design-document.c:406
 msgid "Invalid glade file name"
-msgstr "Invalid glade file name"
+msgstr "Invalid Glade file name"
 
-#: ../plugins/gtodo/add_edit_item.c:91
+#: ../plugins/gtodo/add_edit_item.c:99
 msgid "You need to select a to do item before you can edit it"
 msgstr "You need to select a to do item before you can edit it"
 
-#: ../plugins/gtodo/add_edit_item.c:110
+#: ../plugins/gtodo/add_edit_item.c:118
 msgid "Add Item"
 msgstr "Add Item"
 
-#: ../plugins/gtodo/add_edit_item.c:113
+#: ../plugins/gtodo/add_edit_item.c:121
 msgid "Edit Item"
 msgstr "Edit Item"
 
-#: ../plugins/gtodo/add_edit_item.c:144 ../plugins/gtodo/add_edit_item.c:145
+#: ../plugins/gtodo/add_edit_item.c:152 ../plugins/gtodo/add_edit_item.c:153
 #: ../plugins/gtodo/list_tooltip.c:42
 msgid "Summary:"
 msgstr "Summary:"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:164
-#: ../plugins/macro/anjuta-macro.glade.h:4
+#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:4
 msgid "Category:"
 msgstr "Category:"
 
-#: ../plugins/gtodo/add_edit_item.c:186 ../plugins/gtodo/add_edit_item.c:469
-#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:70
-#: ../plugins/gtodo/todo_db.c:71
+#: ../plugins/gtodo/add_edit_item.c:193 ../plugins/gtodo/add_edit_item.c:472
+#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:76
 msgid "Edit Categories"
 msgstr "Edit Categories"
 
-#: ../plugins/gtodo/add_edit_item.c:197 ../plugins/gtodo/list_tooltip.c:48
+#: ../plugins/gtodo/add_edit_item.c:205 ../plugins/gtodo/list_tooltip.c:48
 #: ../plugins/gtodo/list_tooltip.c:54
 msgid "Due date:"
 msgstr "Due date:"
 
-#: ../plugins/gtodo/add_edit_item.c:216
+#: ../plugins/gtodo/add_edit_item.c:224
 msgid "Notify when due"
 msgstr "Notify when due"
 
 #. label
-#: ../plugins/gtodo/add_edit_item.c:229 ../plugins/gtodo/list_tooltip.c:64
+#: ../plugins/gtodo/add_edit_item.c:237 ../plugins/gtodo/list_tooltip.c:64
 #: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/list_tooltip.c:77
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../plugins/gtodo/add_edit_item.c:241 ../plugins/gtodo/list_tooltip.c:77
-#: ../plugins/gtodo/todo_db.c:132
-msgid "High"
-msgstr "High"
-
-#: ../plugins/gtodo/add_edit_item.c:243 ../plugins/gtodo/list_tooltip.c:71
-#: ../plugins/gtodo/todo_db.c:131
-msgid "Medium"
-msgstr "Medium"
-
-#. create a priority string
-#: ../plugins/gtodo/add_edit_item.c:245 ../plugins/gtodo/list_tooltip.c:65
-#: ../plugins/gtodo/todo_db.c:130
-msgid "Low"
-msgstr "Low"
-
-#: ../plugins/gtodo/add_edit_item.c:256 ../plugins/gtodo/add_edit_item.c:257
+#: ../plugins/gtodo/add_edit_item.c:258 ../plugins/gtodo/add_edit_item.c:259
 #: ../plugins/gtodo/list_tooltip.c:81
 msgid "Comment:"
 msgstr "Comment:"
 
-#: ../plugins/gtodo/add_edit_item.c:281
+#: ../plugins/gtodo/add_edit_item.c:283
 msgid "Completed"
 msgstr "Completed"
 
-#: ../plugins/gtodo/add_edit_item.c:287 ../plugins/gtodo/add_edit_item.c:333
-#: ../plugins/gtodo/add_edit_item.c:446
+#: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:335
+#: ../plugins/gtodo/add_edit_item.c:448
 msgid "started:"
 msgstr "started:"
 
-#: ../plugins/gtodo/add_edit_item.c:287 ../plugins/gtodo/add_edit_item.c:294
-#: ../plugins/gtodo/add_edit_item.c:330 ../plugins/gtodo/add_edit_item.c:331
+#: ../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/a"
+msgstr "N/A"
 
-#: ../plugins/gtodo/add_edit_item.c:294 ../plugins/gtodo/add_edit_item.c:337
-#: ../plugins/gtodo/add_edit_item.c:446
+#: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
+#: ../plugins/gtodo/add_edit_item.c:448
 msgid "stopped:"
 msgstr "stopped:"
 
 #: ../plugins/gtodo/callback.c:17
 msgid "You need to select a todo item before you can remove it"
-msgstr "You need to select a todo item before you can remove it"
+msgstr "You need to select a to do item before you can remove it"
 
 #: ../plugins/gtodo/callback.c:20
 msgid "Are you sure you want to remove the selected todo item?"
 msgstr "Are you sure you want to remove the selected to do item?"
 
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:100
+#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
 msgid "Remove"
 msgstr "Remove"
 
-#: ../plugins/gtodo/callback.c:97
+#: ../plugins/gtodo/callback.c:98
 #, c-format
 msgid "Are you sure you want to remove all the completed todo items?"
 msgstr "Are you sure you want to remove all the completed to do items?"
 
-#: ../plugins/gtodo/callback.c:98
+#: ../plugins/gtodo/callback.c:99
 #, c-format
 msgid ""
 "Are you sure you want to remove all the completed todo items in the category "
@@ -5414,68 +6135,81 @@ msgstr "Custom (CSS) style sheet"
 msgid "_View"
 msgstr "_View"
 
-#: ../plugins/gtodo/interface.c:148
+#: ../plugins/gtodo/interface.c:146
 msgid "All"
 msgstr "All"
 
-#: ../plugins/gtodo/interface.c:172
+#: ../plugins/gtodo/interface.c:171
 msgid "_Export"
 msgstr "_Export"
 
-#: ../plugins/gtodo/interface.c:216
+#: ../plugins/gtodo/interface.c:215
 msgid "Priority"
 msgstr "Priority"
 
-#: ../plugins/gtodo/interface.c:223
+#: ../plugins/gtodo/interface.c:222
 msgid "Due date"
 msgstr "Due date"
 
-#: ../plugins/gtodo/interface.c:237
+#: ../plugins/gtodo/interface.c:236
 msgid "Summary"
 msgstr "Summary"
 
-#: ../plugins/gtodo/libgtodo.c:609
+#: ../plugins/gtodo/libgtodo.c:603
 #, c-format
 msgid "No permission to read the file."
 msgstr "No permission to read the file."
 
-#: ../plugins/gtodo/libgtodo.c:624
+#: ../plugins/gtodo/libgtodo.c:618
 #, c-format
 msgid "Failed to read file"
 msgstr "Failed to read file"
 
-#: ../plugins/gtodo/libgtodo.c:632 ../plugins/gtodo/libgtodo.c:643
+#: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
 #, c-format
 msgid "Failed to parse xml structure"
-msgstr "Failed to parse xml structure"
+msgstr "Failed to parse XML structure"
 
-#: ../plugins/gtodo/libgtodo.c:652
+#: ../plugins/gtodo/libgtodo.c:646
 #, c-format
 msgid "File is not a valid gtodo file"
 msgstr "File is not a valid gtodo file"
 
-#: ../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 "Business"
 
-#: ../plugins/gtodo/libgtodo.c:672
+#: ../plugins/gtodo/libgtodo.c:666
 msgid "Unfiled"
 msgstr "Unfiled"
 
-#: ../plugins/gtodo/libgtodo.c:761
+#: ../plugins/gtodo/libgtodo.c:755
 #, c-format
 msgid "No Gtodo Client to save."
 msgstr "No Gtodo Client to save."
 
-#: ../plugins/gtodo/libgtodo.c:851
+#: ../plugins/gtodo/libgtodo.c:846
 #, c-format
 msgid "No filename supplied."
 msgstr "No filename supplied."
 
+#. create a priority string
+#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:130
+msgid "Low"
+msgstr "Low"
+
+#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:131
+msgid "Medium"
+msgstr "Medium"
+
+#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:132
+msgid "High"
+msgstr "High"
+
 #: ../plugins/gtodo/mcategory.c:145
 #, c-format
 msgid "When you delete the category \"%s\", all containing items are lost"
@@ -5536,11 +6270,11 @@ msgstr "Hide items without an end date"
 
 #: ../plugins/gtodo/plugin.c:122
 msgid "Tasks manager"
-msgstr "Tasks manager"
+msgstr "Task manager"
 
 #: ../plugins/gtodo/plugin.c:128
 msgid "Tasks manager view"
-msgstr "Tasks manager view"
+msgstr "Task manager view"
 
 #: ../plugins/gtodo/plugin.c:134
 msgid "Tasks"
@@ -5548,7 +6282,7 @@ msgstr "Tasks"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
 msgid "Todo Manager"
-msgstr "Todo Manager"
+msgstr "To do Manager"
 
 #: ../plugins/gtodo/preferences.c:21
 msgid "Todo List Preferences"
@@ -5602,11 +6336,11 @@ msgstr[1] "Items that are due in the next %i days"
 
 #: ../plugins/gtodo/preferences.c:168
 msgid "Misc"
-msgstr "Misc"
+msgstr "Miscellaneous"
 
 #: ../plugins/gtodo/preferences.c:171
 msgid "Auto purge completed items"
-msgstr "Auto purge completed items"
+msgstr "Auto-purge completed items"
 
 #. Translators: First part of the sentence "Purge items after %d days"
 #: ../plugins/gtodo/preferences.c:177
@@ -5620,7 +6354,7 @@ msgstr "days."
 
 #: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
 msgid "Auto Purge"
-msgstr "Auto Purge"
+msgstr "Auto-Purge"
 
 #: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
 msgid "Notification"
@@ -5630,14 +6364,14 @@ msgstr "Notification"
 #, 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"
-msgstr[0] "Allow todo items to notifiy me when they are due in %i minute"
-msgstr[1] "Allow todo items to notifiy me when they are due in %i minutes"
+msgstr[0] "Allow to do items to notify me when they are due in %i minute"
+msgstr[1] "Allow to do items to notify me when they are due in %i minutes"
 
-#: ../plugins/gtodo/tasklists.c:9
+#: ../plugins/gtodo/tasklists.c:10
 msgid "Open a Task List"
 msgstr "Open a Task List"
 
-#: ../plugins/gtodo/tasklists.c:30
+#: ../plugins/gtodo/tasklists.c:35
 msgid "Create a Task List"
 msgstr "Create a Task List"
 
@@ -5645,29 +6379,29 @@ msgstr "Create a Task List"
 msgid "No Date"
 msgstr "No Date"
 
-#: ../plugins/macro/anjuta-macro.glade.h:1
+#: ../plugins/macro/anjuta-macro.ui.h:1
 msgid "<b>Macro details:</b>"
 msgstr "<b>Macro details:</b>"
 
-#: ../plugins/macro/anjuta-macro.glade.h:2
+#: ../plugins/macro/anjuta-macro.ui.h:2
 msgid "<b>Macro text:</b>"
 msgstr "<b>Macro text:</b>"
 
-#: ../plugins/macro/anjuta-macro.glade.h:3
+#: ../plugins/macro/anjuta-macro.ui.h:3
 msgid "<b>Macros:</b>"
 msgstr "<b>Macros:</b>"
 
-#: ../plugins/macro/anjuta-macro.glade.h:5
+#: ../plugins/macro/anjuta-macro.ui.h:5
 msgid "Edit..."
-msgstr "Edit..."
+msgstr "Editâ?¦"
 
-#: ../plugins/macro/anjuta-macro.glade.h:7
+#: ../plugins/macro/anjuta-macro.ui.h:7
 msgid "Shortcut:"
 msgstr "Shortcut:"
 
 #: ../plugins/macro/macro-actions.c:127
 msgid "Press macro shortcut..."
-msgstr "Press macro shortcut..."
+msgstr "Press macro shortcutâ?¦"
 
 #: ../plugins/macro/macro-actions.c:134
 msgid "Press shortcut"
@@ -5681,7 +6415,7 @@ msgstr "Anjuta macros"
 msgid "My macros"
 msgstr "My macros"
 
-#: ../plugins/macro/macro-dialog.c:141
+#: ../plugins/macro/macro-dialog.c:145
 #, c-format
 msgid ""
 "Name:\t %s\n"
@@ -5692,15 +6426,15 @@ msgstr ""
 "Category:\t %s\n"
 "Shortcut:\t %c\n"
 
-#: ../plugins/macro/macro-dialog.c:264
+#: ../plugins/macro/macro-dialog.c:276
 msgid "Insert"
 msgstr "Insert"
 
-#: ../plugins/macro/macro-dialog.c:267
+#: ../plugins/macro/macro-dialog.c:279
 msgid "Insert macro"
 msgstr "Insert macro"
 
-#: ../plugins/macro/macro-edit.c:204
+#: ../plugins/macro/macro-edit.c:211
 msgid "Add/Edit macro"
 msgstr "Add/Edit macro"
 
@@ -5720,7 +6454,7 @@ msgstr "Macros"
 
 #: ../plugins/macro/plugin.c:42
 msgid "_Insert Macro..."
-msgstr "_Insert Macro..."
+msgstr "_Insert Macroâ?¦"
 
 #: ../plugins/macro/plugin.c:44
 msgid "Insert a macro using a shortcut"
@@ -5728,7 +6462,7 @@ msgstr "Insert a macro using a shortcut"
 
 #: ../plugins/macro/plugin.c:49
 msgid "_Add Macro..."
-msgstr "_Add Macro..."
+msgstr "_Add Macroâ?¦"
 
 #: ../plugins/macro/plugin.c:51
 msgid "Add a macro"
@@ -5736,7 +6470,7 @@ msgstr "Add a macro"
 
 #: ../plugins/macro/plugin.c:56
 msgid "Macros..."
-msgstr "Macros..."
+msgstr "Macrosâ?¦"
 
 #: ../plugins/macro/plugin.c:58
 msgid "Add/Edit/Remove macros"
@@ -5746,131 +6480,131 @@ msgstr "Add/Edit/Remove macros"
 msgid "Macro operations"
 msgstr "Macro operations"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:1
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
 msgid "<b>Indicators</b>"
 msgstr "<b>Indicators</b>"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:2
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:2
 msgid "<b>Message colors</b>"
 msgstr "<b>Message colours</b>"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:3
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 msgid "<b>Messages options</b>"
 msgstr "<b>Messages options</b>"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:4
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
+msgid "Diagonal"
+msgstr "Diagonal"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
 msgid "Error message indicator style:"
 msgstr "Error message indicator style:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:5
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
 msgid "Errors:"
 msgstr "Errors:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:9
 msgid "Normal message indicator style:"
 msgstr "Normal message indicator style:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:7
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Number of first characters to show:"
 msgstr "Number of first characters to show:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
 msgid "Number of last characters to show:"
 msgstr "Number of last characters to show:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:9
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+msgid "Strike-Out"
+msgstr "Strike-Out"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
 msgid "Tabs position:"
-msgstr "Tabs position:"
+msgstr "Tab position:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:14
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
 msgid "Truncate long messages"
 msgstr "Truncate long messages"
 
-#. 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 ""
-"Underline-Plain\n"
-"Underline-Squiggle\n"
-"Underline-TT\n"
-"Diagonal\n"
-"Strike-Out"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
+msgid "Underline-Plain"
+msgstr "Underline-Plain"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
+msgid "Underline-Squiggle"
+msgstr "Underline-Squiggle"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
+msgid "Underline-TT"
+msgstr "Underline-TT"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Warning message indicator style:"
 msgstr "Warning message indicator style:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:22
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
 msgid "Warnings:"
 msgstr "Warnings:"
 
-#: ../plugins/message-view/anjuta-msgman.c:71
+#: ../plugins/message-view/anjuta-msgman.c:99
 msgid "Close all message tabs"
 msgstr "Close all message tabs"
 
-#: ../plugins/message-view/message-view.c:324
-#: ../plugins/message-view/message-view.c:358
-msgid "No message details"
-msgstr "No message details"
-
-#: ../plugins/message-view/message-view.c:730
+#: ../plugins/message-view/message-view.c:490
 msgid "No Messages"
 msgstr "No Messages"
 
-#: ../plugins/message-view/message-view.c:739
+#: ../plugins/message-view/message-view.c:499
 msgid "No Infos"
 msgstr "No Infos"
 
-#: ../plugins/message-view/message-view.c:751
+#: ../plugins/message-view/message-view.c:511
 msgid "No Warnings"
 msgstr "No Warnings"
 
-#: ../plugins/message-view/message-view.c:764
+#: ../plugins/message-view/message-view.c:524
 msgid "No Errors"
 msgstr "No Errors"
 
-#: ../plugins/message-view/message-view.c:809
+#: ../plugins/message-view/message-view.c:569
 msgid "Icon"
 msgstr "Icon"
 
-#: ../plugins/message-view/message-view.c:823
-#: ../plugins/message-view/plugin.c:325 ../plugins/message-view/plugin.c:417
-#: ../plugins/message-view/plugin.c:429
+#: ../plugins/message-view/message-view.c:583
+#: ../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 "Messages"
 
-#: ../plugins/message-view/message-view.c:1189
+#: ../plugins/message-view/message-view.c:942
 #, c-format
 msgid "Error writing %s"
 msgstr "Error writing %s"
 
-#: ../plugins/message-view/message-view.c:1348
+#: ../plugins/message-view/message-view.c:1099
 #, c-format
 msgid "%d Message"
 msgid_plural "%d Messages"
 msgstr[0] "%d Message"
 msgstr[1] "%d Messages"
 
-#: ../plugins/message-view/message-view.c:1354
+#: ../plugins/message-view/message-view.c:1105
 #, c-format
 msgid "%d Info"
 msgid_plural "%d Infos"
 msgstr[0] "%d Info"
 msgstr[1] "%d Infos"
 
-#: ../plugins/message-view/message-view.c:1359
+#: ../plugins/message-view/message-view.c:1110
 #, c-format
 msgid "%d Warning"
 msgid_plural "%d Warnings"
 msgstr[0] "%d Warning"
 msgstr[1] "%d Warnings"
 
-#: ../plugins/message-view/message-view.c:1364
+#: ../plugins/message-view/message-view.c:1115
 #, c-format
 msgid "%d Error"
 msgid_plural "%d Errors"
@@ -5913,44 +6647,40 @@ msgstr "Save message"
 msgid "Next/Previous Message"
 msgstr "Next/Previous Message"
 
-#: ../plugins/patch/patch-plugin.c:88
+#: ../plugins/patch/patch-plugin.c:94
 msgid "File/Directory to patch"
 msgstr "File/Directory to patch"
 
-#: ../plugins/patch/patch-plugin.c:91
+#: ../plugins/patch/patch-plugin.c:97
 msgid "Patch file"
 msgstr "Patch file"
 
-#: ../plugins/patch/patch-plugin.c:111
-msgid "Patches"
-msgstr "Patches"
-
-#: ../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 "Patch"
 
-#: ../plugins/patch/patch-plugin.c:174
+#: ../plugins/patch/patch-plugin.c:186
 msgid "Please select the directory where the patch should be applied"
 msgstr "Please select the directory where the patch should be applied"
 
-#: ../plugins/patch/patch-plugin.c:185
+#: ../plugins/patch/patch-plugin.c:197
 #, c-format
 msgid "Patching %s using %s\n"
 msgstr "Patching %s using %s\n"
 
-#: ../plugins/patch/patch-plugin.c:194
+#: ../plugins/patch/patch-plugin.c:209
 msgid "Patching...\n"
-msgstr "Patching...\n"
+msgstr "Patchingâ?¦\n"
 
-#: ../plugins/patch/patch-plugin.c:204
+#: ../plugins/patch/patch-plugin.c:219
 msgid "Patching..."
-msgstr "Patching..."
+msgstr "Patchingâ?¦"
 
-#: ../plugins/patch/patch-plugin.c:209
+#: ../plugins/patch/patch-plugin.c:224
 msgid "There are unfinished jobs, please wait until they are finished."
-msgstr "There are unfinished jobs, please wait until they are finished."
+msgstr "There are unfinished jobs: please wait until they are finished."
 
-#: ../plugins/patch/patch-plugin.c:251
+#: ../plugins/patch/patch-plugin.c:266
 msgid ""
 "Patch failed.\n"
 "Please review the failure messages.\n"
@@ -5960,24 +6690,24 @@ msgstr ""
 "Please review the failure messages.\n"
 "Examine and remove any rejected files.\n"
 
-#: ../plugins/patch/patch-plugin.c:257
+#: ../plugins/patch/patch-plugin.c:272
 msgid "Patching complete"
 msgstr "Patching complete"
 
-#: ../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 "Dry run"
 
-#: ../plugins/patch/patch-plugin.glade.h:2
+#: ../plugins/patch/patch-plugin.ui.h:2
 msgid "File/Directory to patch:"
 msgstr "File/Directory to patch:"
 
-#: ../plugins/patch/patch-plugin.glade.h:4
+#: ../plugins/patch/patch-plugin.ui.h:4
 msgid "Patch file:"
 msgstr "Patch file:"
 
-#: ../plugins/patch/patch-plugin.glade.h:5
+#: ../plugins/patch/patch-plugin.ui.h:5
 msgid "Patch level:"
 msgstr "Patch level:"
 
@@ -5991,242 +6721,35 @@ msgstr "_Tools"
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
 msgid "_Patch..."
-msgstr "_Patch..."
+msgstr "_Patchâ?¦"
 
 #: ../plugins/patch/plugin.c:92
 msgid "Patch files/directories"
 msgstr "Patch files/directories"
 
-#: ../plugins/profiler/gprof-call-graph-view.c:312
-#: ../plugins/profiler/gprof-call-graph-view.c:322
-#: ../plugins/profiler/gprof-call-graph-view.c:332
-#: ../plugins/profiler/gprof-flat-profile-view.c:56
-#: ../plugins/profiler/gprof-function-call-tree-view.c:60
-msgid "Function Name"
-msgstr "Function Name"
-
-#. Total amount of time spent in this function, excluding those it calla.
-#. * This is the same as the "Seconds" field in the flat profile.
-#. Time spent in a subroutine of a function.
-#. Time spent in this function when it was called by its caller
-#: ../plugins/profiler/gprof-call-graph-view.c:361
-#: ../plugins/profiler/gprof-call-graph-view.c:375
-#: ../plugins/profiler/gprof-call-graph-view.c:389
-msgid "Self"
-msgstr "Self"
-
-#: ../plugins/profiler/gprof-call-graph-view.c:402
-#: ../plugins/profiler/gprof-call-graph-view.c:414
-#: ../plugins/profiler/gprof-call-graph-view.c:426
-msgid "Children"
-msgstr "Children"
-
-#: ../plugins/profiler/gprof-call-graph-view.c:439
-#: ../plugins/profiler/gprof-call-graph-view.c:449
-#: ../plugins/profiler/gprof-call-graph-view.c:459
-#: ../plugins/profiler/gprof-flat-profile-view.c:113
-msgid "Calls"
-msgstr "Calls"
-
-#: ../plugins/profiler/gprof-flat-profile-view.c:68
-msgid "% Time"
-msgstr "% Time"
-
-#: ../plugins/profiler/gprof-flat-profile-view.c:82
-msgid "Cumulative Seconds"
-msgstr "Cumulative Seconds"
-
-#. The number of seconds that this function, excluding other functions it
-#. * calls, takes to execute.
-#: ../plugins/profiler/gprof-flat-profile-view.c:99
-msgid "Self Seconds"
-msgstr "Self Seconds"
-
-#. The average number of milliseconds spent in a function, excluding
-#. * the functions that it calls.
-#: ../plugins/profiler/gprof-flat-profile-view.c:127
-msgid "Self ms/call"
-msgstr "Self ms/call"
-
-#. Same as self ms/call, but includes called functions.
-#: ../plugins/profiler/gprof-flat-profile-view.c:143
-msgid "Total ms/call"
-msgstr "Total ms/call"
-
-#: ../plugins/profiler/plugin.c:178
+#: ../plugins/project-import/plugin.c:66
 msgid ""
-"Could not get profiling data.\n"
-"\n"
-"Please check the path to this target's profiling data file."
-msgstr ""
-"Could not get profiling data.\n"
-"\n"
-"Please check the path to this target's profiling data file."
-
-#: ../plugins/profiler/plugin.c:292
-msgid ""
-"This target does not have any profiling data.\n"
-"\n"
-"Please ensure that the target is complied with profiling support and that it "
-"is run at least once."
+"Generation of project file failed. Cannot find an appropriate project "
+"template to use. Please make sure your version of Anjuta is up to date."
 msgstr ""
-"This target does not have any profiling data.\n"
-"\n"
-"Please ensure that the target is complied with profiling support and that it "
-"is run at least once."
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/profiler/plugin.c:747 ../plugins/profiler/plugin.c:859
-#: ../plugins/profiler/profiler.plugin.in.h:3
-msgid "Profiler"
-msgstr "Profiler"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/profiler/plugin.c:755
-msgid "Select Target..."
-msgstr "Select Target..."
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/profiler/plugin.c:763
-msgid "Refresh"
-msgstr "Refresh"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/profiler/plugin.c:771
-msgid "Delete Data"
-msgstr "Delete Data"
-
-#: ../plugins/profiler/plugin.c:814
-msgid "Application Performance Profiler"
-msgstr "Application Performance Profiler"
-
-#: ../plugins/profiler/plugin.c:836
-msgid "Flat Profile"
-msgstr "Flat Profile"
-
-#: ../plugins/profiler/plugin.c:841 ../plugins/profiler/profiler.glade.h:7
-msgid "Call Graph"
-msgstr "Call Graph"
-
-#: ../plugins/profiler/plugin.c:846
-msgid "Function Call Tree"
-msgstr "Function Call Tree"
-
-#: ../plugins/profiler/plugin.c:853
-msgid "Function Call Chart"
-msgstr "Function Call Chart"
-
-#: ../plugins/profiler/profiler-call-graph.glade.h:1
-msgid "<b>Called By</b>"
-msgstr "<b>Called By</b>"
-
-#: ../plugins/profiler/profiler-call-graph.glade.h:2
-msgid "<b>Called</b>"
-msgstr "<b>Called</b>"
-
-#: ../plugins/profiler/profiler-call-graph.glade.h:3
-msgid "<b>Functions</b>"
-msgstr "<b>Functions</b>"
-
-#: ../plugins/profiler/profiler.glade.h:1
-msgid "<b>Profiling Data</b>"
-msgstr "<b>Profiling Data</b>"
-
-#: ../plugins/profiler/profiler.glade.h:2
-msgid "<b>Select Target to Profile</b>"
-msgstr "<b>Select Target to Profile</b>"
-
-#: ../plugins/profiler/profiler.glade.h:3
-msgid "<b>Symbols</b>"
-msgstr "<b>Symbols</b>"
-
-#: ../plugins/profiler/profiler.glade.h:4
-msgid "<b>Time Propagation</b>"
-msgstr "<b>Time Propagation</b>"
-
-#: ../plugins/profiler/profiler.glade.h:5
-msgid "Automatically refresh profile data display"
-msgstr "Automatically refresh profile data display"
-
-#: ../plugins/profiler/profiler.glade.h:6
-#: ../plugins/subversion/anjuta-subversion.glade.h:21
-msgid "Browse..."
-msgstr "Browse..."
-
-#: ../plugins/profiler/profiler.glade.h:8
-msgid "Do not propagate time for these symbols:"
-msgstr "Do not propagate time for these symbols:"
-
-#: ../plugins/profiler/profiler.glade.h:9
-msgid "Do not show static functions"
-msgstr "Do not show static functions"
+"Generation of project file failed. Cannot find an appropriate project "
+"template to use. Please make sure your version of Anjuta is up-to-date."
 
-#: ../plugins/profiler/profiler.glade.h:10
-msgid "Do not show these symbols:"
-msgstr "Do not show these symbols:"
+#: ../plugins/project-import/plugin.c:86
+#, c-format
+msgid "A file named \"%s\" already exists. Do you want to replace it?"
+msgstr "A file named \"%s\" already exists. Do you want to replace it?"
 
-#: ../plugins/profiler/profiler.glade.h:11
+#: ../plugins/project-import/plugin.c:134
+#, c-format
 msgid ""
-"Enter one symbol specification per line.\n"
-"\n"
-"For information on symbol specifications, see section \n"
-"4.5 of the gprof info page."
+"A file named \"%s\" cannot be written: %s.  Check if you have write access "
+"to the project directory."
 msgstr ""
-"Enter one symbol specification per line.\n"
-"\n"
-"For information on symbol specifications, see section \n"
-"4.5 of the gprof info page."
-
-#: ../plugins/profiler/profiler.glade.h:16
-#: ../plugins/valgrind/anjuta-valgrind.glade.h:6
-msgid "Options..."
-msgstr "Options..."
-
-#: ../plugins/profiler/profiler.glade.h:17
-msgid "Profiling Options"
-msgstr "Profiling Options"
-
-#: ../plugins/profiler/profiler.glade.h:18
-msgid "Propagate time for all symbols"
-msgstr "Propagate time for all symbols"
-
-#: ../plugins/profiler/profiler.glade.h:19
-msgid "Propagate time for only these symbols:"
-msgstr "Propagate time for only these symbols:"
-
-#: ../plugins/profiler/profiler.glade.h:20
-msgid "Select Other Target..."
-msgstr "Select Other Target..."
-
-#: ../plugins/profiler/profiler.glade.h:21
-msgid "Select Profiling Target"
-msgstr "Select Profiling Target"
-
-#: ../plugins/profiler/profiler.glade.h:22
-msgid "Show all symbols"
-msgstr "Show all symbols"
-
-#: ../plugins/profiler/profiler.glade.h:23
-msgid "Show functions that could have been called but never were"
-msgstr "Show functions that could have been called but never were"
-
-#: ../plugins/profiler/profiler.glade.h:24
-msgid "Show only these symbols:"
-msgstr "Show only these symbols:"
+"A file named \"%s\" cannot be written: %s. Check if you have write access to "
+"the project directory."
 
-#: ../plugins/profiler/profiler.glade.h:25
-msgid "Show uncalled functions"
-msgstr "Show uncalled functions"
-
-#: ../plugins/profiler/profiler.glade.h:26
-msgid "Use this profiling data file:"
-msgstr "Use this profiling data file:"
-
-#: ../plugins/project-import/project-import.c:109
+#: ../plugins/project-import/plugin.c:204
 #, c-format
 msgid ""
 "Could not find a valid project backend for the directory given (%s). Please "
@@ -6235,121 +6758,95 @@ msgstr ""
 "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."
 
-#.
-#. * Now we can't apply
-#.
-#: ../plugins/project-import/project-import.c:130
-msgid "Please, fix the configuration"
-msgstr "Please fix the configuration"
-
-#: ../plugins/project-import/project-import.c:142
+#: ../plugins/project-import/plugin.c:274
+#: ../plugins/project-import/plugin.c:330
 #, c-format
 msgid ""
-"Project name: %s\n"
-"Project type: %s\n"
-"Project path: %s\n"
+"Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
 msgstr ""
-"Project name: %s\n"
-"Project type: %s\n"
-"Project path: %s\n"
-
-#: ../plugins/project-import/project-import.c:202
-msgid "This assistant will import an existing project into Anjuta."
-msgstr "This assistant will import an existing project into Anjuta."
-
-#: ../plugins/project-import/project-import.c:207
-msgid "Import Project"
-msgstr "Import Project"
+"Couldn't checkout the supplied URI: \"%s\". The error returned was: \"%s\""
 
-#: ../plugins/project-import/project-import.c:249
-msgid "<b>Enter the project name:</b>"
-msgstr "<b>Enter the project name:</b>"
+#: ../plugins/project-import/project-import.ui.h:1
+msgid "<b>Import options</b>"
+msgstr "<b>Import options</b>"
 
-#: ../plugins/project-import/project-import.c:269
-msgid "<b>Enter the base path of your project:</b>"
-msgstr "<b>Enter the base path of your project:</b>"
+#: ../plugins/project-import/project-import.ui.h:2
+msgid "<b>Project name</b>"
+msgstr "<b>Project name</b>"
 
-#: ../plugins/project-import/project-import.c:274
-msgid "Select project directory"
-msgstr "Select project directory"
+#: ../plugins/project-import/project-import.ui.h:3
+#: ../plugins/project-wizard/templates/translatable-strings.h:34
+#: ../plugins/subversion/anjuta-subversion.ui.h:9
+msgid "Destination:"
+msgstr "Destination:"
 
-#: ../plugins/project-import/project-import.c:280
-msgid "Project to Import"
-msgstr "Project to Import"
+#: ../plugins/project-import/project-import.ui.h:4
+msgid "Import from folder"
+msgstr "Import from folder"
 
-#: ../plugins/project-import/project-import.c:293
-msgid "Confirmation"
-msgstr "Confirmation"
+#: ../plugins/project-import/project-import.ui.h:5
+msgid "Import from version control system"
+msgstr "Import from version control system"
 
-#: ../plugins/project-import/project-import.c:435
-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."
-msgstr ""
-"Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up to date."
+#: ../plugins/project-import/project-import.ui.h:6
+msgid "Location:"
+msgstr "Location:"
 
-#: ../plugins/project-import/project-import.c:458
-#, c-format
-msgid "A file named \"%s\" already exists. Do you want to replace it?"
-msgstr "A file named \"%s\" already exists. Do you want to replace it?"
+#: ../plugins/project-import/project-import-dialog.c:292
+msgid "Import project"
+msgstr "Import project"
 
-#: ../plugins/project-import/project-import.c:499
-#, c-format
-msgid ""
-"A file named \"%s\" cannot be written: %s.  Check if you have write access "
-"to the project directory."
-msgstr ""
-"A file named \"%s\" cannot be written: %s.  Check if you have write access "
-"to the project directory."
+#: ../plugins/project-import/project-import-dialog.c:296
+msgid "Import"
+msgstr "Import"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:1
+#: ../plugins/project-manager/create_dialogs.ui.h:1
 msgid "Add Source"
 msgstr "Add Source"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:2
+#: ../plugins/project-manager/create_dialogs.ui.h:2
 msgid "New Group"
 msgstr "New Group"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:3
+#: ../plugins/project-manager/create_dialogs.ui.h:3
 msgid "New Target"
 msgstr "New Target"
 
-#: ../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 "Select the _target for the new source files:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:5
+#: ../plugins/project-manager/create_dialogs.ui.h:5
 msgid "Source files:"
 msgstr "Source files:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:6
+#: ../plugins/project-manager/create_dialogs.ui.h:6
 msgid "Specify _where to create the group:"
 msgstr "Specify _where to create the group:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:7
+#: ../plugins/project-manager/create_dialogs.ui.h:7
 msgid "Specify _where to create the target:"
 msgstr "Specify _where to create the target:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:8
+#: ../plugins/project-manager/create_dialogs.ui.h:8
 msgid "Target _name:"
 msgstr "Target _name:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:9
+#: ../plugins/project-manager/create_dialogs.ui.h:9
 msgid "Target _type:"
 msgstr "Target _type:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:10
+#: ../plugins/project-manager/create_dialogs.ui.h:10
 msgid "TargetTypes"
 msgstr "TargetTypes"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:11
+#: ../plugins/project-manager/create_dialogs.ui.h:11
 msgid "_Group name:"
 msgstr "_Group name:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:12
+#: ../plugins/project-manager/create_dialogs.ui.h:12
 msgid "_Select file to add..."
-msgstr "_Select file to add..."
+msgstr "_Select file to addâ?¦"
 
 #: ../plugins/project-manager/gbf-project-model.c:233
 #: ../plugins/project-manager/plugin.c:1301
@@ -6367,38 +6864,34 @@ msgstr "GbfProject Object"
 msgid "No project loaded"
 msgstr "No project loaded"
 
-#: ../plugins/project-manager/gbf-project-util.c:81
-msgid "Couldn't load glade file"
-msgstr "Couldn't load Glade file"
-
-#: ../plugins/project-manager/gbf-project-util.c:260
-#: ../plugins/project-manager/gbf-project-util.c:268
+#: ../plugins/project-manager/gbf-project-util.c:236
+#: ../plugins/project-manager/gbf-project-util.c:244
 msgid "Can not add group"
 msgstr "Cannot add group"
 
-#: ../plugins/project-manager/gbf-project-util.c:269
+#: ../plugins/project-manager/gbf-project-util.c:245
 msgid "No parent group selected"
 msgstr "No parent group selected"
 
-#: ../plugins/project-manager/gbf-project-util.c:441
-#: ../plugins/project-manager/gbf-project-util.c:450
+#: ../plugins/project-manager/gbf-project-util.c:417
+#: ../plugins/project-manager/gbf-project-util.c:426
 msgid "Can not add target"
 msgstr "Cannot add target"
 
-#: ../plugins/project-manager/gbf-project-util.c:451
+#: ../plugins/project-manager/gbf-project-util.c:427
 msgid "No group selected"
 msgstr "No group selected"
 
-#: ../plugins/project-manager/gbf-project-util.c:556
+#: ../plugins/project-manager/gbf-project-util.c:532
 msgid "Select sources..."
-msgstr "Select sources..."
+msgstr "Select sourcesâ?¦"
 
-#: ../plugins/project-manager/gbf-project-util.c:796
-#: ../plugins/project-manager/gbf-project-util.c:803
+#: ../plugins/project-manager/gbf-project-util.c:772
+#: ../plugins/project-manager/gbf-project-util.c:779
 msgid "Can not add source files"
 msgstr "Cannot add source files"
 
-#: ../plugins/project-manager/gbf-project-util.c:804
+#: ../plugins/project-manager/gbf-project-util.c:780
 msgid "No target has been selected"
 msgstr "No target has been selected"
 
@@ -6429,7 +6922,7 @@ msgid ""
 "Are you sure you want to remove the following group from project?\n"
 "\n"
 msgstr ""
-"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"
 
 #: ../plugins/project-manager/plugin.c:664
@@ -6441,14 +6934,14 @@ msgid ""
 msgstr ""
 "Group: %s\n"
 "\n"
-"The group will not be deleted from file system."
+"The group will not be deleted from the file system."
 
 #: ../plugins/project-manager/plugin.c:667
 msgid ""
 "Are you sure you want to remove the following target from project?\n"
 "\n"
 msgstr ""
-"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"
 
 #: ../plugins/project-manager/plugin.c:668
@@ -6461,7 +6954,7 @@ msgid ""
 "Are you sure you want to remove the following source file from project?\n"
 "\n"
 msgstr ""
-"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"
 
 #: ../plugins/project-manager/plugin.c:672
@@ -6473,7 +6966,7 @@ msgid ""
 msgstr ""
 "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."
 
 #: ../plugins/project-manager/plugin.c:727
 #, c-format
@@ -6508,7 +7001,7 @@ msgstr "Refresh project manager tree"
 
 #: ../plugins/project-manager/plugin.c:836
 msgid "Add _Group..."
-msgstr "Add _Group..."
+msgstr "Add _Groupâ?¦"
 
 #: ../plugins/project-manager/plugin.c:836
 #: ../plugins/project-manager/plugin.c:870
@@ -6517,7 +7010,7 @@ msgstr "Add a group to project"
 
 #: ../plugins/project-manager/plugin.c:841
 msgid "Add _Target..."
-msgstr "Add _Target..."
+msgstr "Add _Targetâ?¦"
 
 #: ../plugins/project-manager/plugin.c:841
 #: ../plugins/project-manager/plugin.c:875
@@ -6526,7 +7019,7 @@ msgstr "Add a target to project"
 
 #: ../plugins/project-manager/plugin.c:846
 msgid "Add _Source File..."
-msgstr "Add _Source File..."
+msgstr "Add _Source Fileâ?¦"
 
 #: ../plugins/project-manager/plugin.c:846
 #: ../plugins/project-manager/plugin.c:865
@@ -6548,7 +7041,7 @@ msgstr "Properties of group/target/source"
 
 #: ../plugins/project-manager/plugin.c:865
 msgid "_Add To Project"
-msgstr "_Add To Project"
+msgstr "_Add to Project"
 
 #: ../plugins/project-manager/plugin.c:870
 msgid "Add _Group"
@@ -6577,7 +7070,7 @@ msgstr "Loading project: %s"
 
 #: ../plugins/project-manager/plugin.c:1267
 msgid "Created project view..."
-msgstr "Created project view..."
+msgstr "Created project viewâ?¦"
 
 #: ../plugins/project-manager/plugin.c:1280
 #, c-format
@@ -6603,30 +7096,34 @@ msgstr "Project manager popup actions"
 
 #: ../plugins/project-manager/plugin.c:2641
 msgid "Initializing Project..."
-msgstr "Initialising Project..."
+msgstr "Initialising Projectâ?¦"
 
 #: ../plugins/project-manager/plugin.c:2644
 msgid "Project Loaded"
 msgstr "Project Loaded"
 
-#: ../plugins/project-wizard/anjuta-project-wizard.glade.h:1
+#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
 msgid "<b>Details</b>"
 msgstr "<b>Details</b>"
 
-#: ../plugins/project-wizard/anjuta-project-wizard.glade.h:2
-#: ../plugins/project-wizard/druid.c:148
+#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:2
+#: ../plugins/project-wizard/druid.c:147
 msgid "Error"
 msgstr "Error"
 
-#: ../plugins/project-wizard/druid.c:140 ../plugins/project-wizard/druid.c:144
+#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:3
+msgid "Select project type"
+msgstr "Select project type"
+
+#: ../plugins/project-wizard/druid.c:139 ../plugins/project-wizard/druid.c:143
 msgid "Warning"
 msgstr "Warning"
 
-#: ../plugins/project-wizard/druid.c:151
+#: ../plugins/project-wizard/druid.c:150
 msgid "Message"
 msgstr "Message"
 
-#: ../plugins/project-wizard/druid.c:217
+#: ../plugins/project-wizard/druid.c:216
 msgid ""
 "<b>Confirm the following information:</b>\n"
 "\n"
@@ -6636,17 +7133,17 @@ msgstr ""
 
 #. The project type is translated too, it is something like
 #. * generic, GNOME applet, Makefile project...
-#: ../plugins/project-wizard/druid.c:221
+#: ../plugins/project-wizard/druid.c:220
 #, c-format
 msgid "Project Type: %s\n"
 msgstr "Project Type: %s\n"
 
-#: ../plugins/project-wizard/druid.c:377
+#: ../plugins/project-wizard/druid.c:374
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "Unable to find any project template in %s"
 
-#: ../plugins/project-wizard/druid.c:588
+#: ../plugins/project-wizard/druid.c:575
 #, c-format
 msgid ""
 "\n"
@@ -6655,7 +7152,7 @@ msgstr ""
 "\n"
 "Field \"%s\" is mandatory. Please enter it."
 
-#: ../plugins/project-wizard/druid.c:603
+#: ../plugins/project-wizard/druid.c:590
 #, c-format
 msgid ""
 "Field \"%s\" must start with a letter, a digit or an underscore and contains "
@@ -6664,12 +7161,12 @@ msgstr ""
 "Field \"%s\" must start with a letter, a digit or an underscore and contain "
 "only letters, digits, underscore, minus and dot. Please fix it."
 
-#: ../plugins/project-wizard/druid.c:608
+#: ../plugins/project-wizard/druid.c:595
 #, c-format
 msgid "Unknown error."
 msgstr "Unknown error."
 
-#: ../plugins/project-wizard/druid.c:635
+#: ../plugins/project-wizard/druid.c:622
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
@@ -6678,20 +7175,20 @@ msgstr ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
 "cannot be written. Do you want to continue?"
 
-#: ../plugins/project-wizard/druid.c:637
+#: ../plugins/project-wizard/druid.c:624
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "File \"%s\" already exists. Do you want to overwrite it?"
 
-#: ../plugins/project-wizard/druid.c:668
+#: ../plugins/project-wizard/druid.c:655
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../plugins/project-wizard/druid.c:679
+#: ../plugins/project-wizard/druid.c:666
 msgid "Dubious entry"
 msgstr "Dubious entry"
 
-#: ../plugins/project-wizard/druid.c:789
+#: ../plugins/project-wizard/druid.c:776
 #, c-format
 msgid ""
 "\n"
@@ -6700,7 +7197,7 @@ msgstr ""
 "\n"
 "Missing programs: %s."
 
-#: ../plugins/project-wizard/druid.c:800
+#: ../plugins/project-wizard/druid.c:787
 #, c-format
 msgid ""
 "\n"
@@ -6709,7 +7206,7 @@ msgstr ""
 "\n"
 "Missing packages: %s."
 
-#: ../plugins/project-wizard/druid.c:808
+#: ../plugins/project-wizard/druid.c:795
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
@@ -6719,7 +7216,7 @@ msgstr ""
 "project are missing. Please make sure they are properly installed before "
 "generating the project.\n"
 
-#: ../plugins/project-wizard/druid.c:814
+#: ../plugins/project-wizard/druid.c:801
 msgid ""
 "The missing programs are usually part of some distrubution packages and can "
 "be searched in your Application Manager. Similarly, the development packages "
@@ -6735,11 +7232,11 @@ msgstr ""
 "dev\" or \"-devel\" suffix in package names and can be found by searching in "
 "your Application Manager."
 
-#: ../plugins/project-wizard/druid.c:822
+#: ../plugins/project-wizard/druid.c:809
 msgid "Missing components"
 msgstr "Missing components"
 
-#: ../plugins/project-wizard/druid.c:954
+#: ../plugins/project-wizard/druid.c:941
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "Unable to build project assistant user interface reading %s."
@@ -6760,17 +7257,17 @@ msgstr "Skipping %s: file already exists"
 #: ../plugins/project-wizard/install.c:503
 #, c-format
 msgid "Creating %s ... Fail to create directory"
-msgstr "Creating %s ... Fail to create directory"
+msgstr "Creating %s â?¦ Failed to create directory"
 
 #: ../plugins/project-wizard/install.c:519
 #, c-format
 msgid "Creating %s (using AutoGen)... %s"
-msgstr "Creating %s (using AutoGen)... %s"
+msgstr "Creating %s (using AutoGen)â?¦ %s"
 
 #: ../plugins/project-wizard/install.c:524
 #, c-format
 msgid "Creating %s ... %s"
-msgstr "Creating %s ... %s"
+msgstr "Creating %s â?¦ %s"
 
 #. The %s is a name of a unix command line, by example
 #. * cp foobar.c project
@@ -6784,7 +7281,7 @@ msgid "New Project Assistant"
 msgstr "New Project Assistant"
 
 #: ../plugins/project-wizard/property.c:288
-#: ../plugins/project-wizard/property.c:340
+#: ../plugins/project-wizard/property.c:401
 msgid "No"
 msgstr "No"
 
@@ -6796,18 +7293,24 @@ msgstr "Select directory"
 msgid "Select file"
 msgstr "Select file"
 
-#: ../plugins/project-wizard/property.c:383
+#: ../plugins/project-wizard/property.c:359 ../plugins/tools/editor.c:522
+msgid "Select an Image File"
+msgstr "Select an Image File"
+
+#: ../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 "Choose Icon"
+
+#: ../plugins/project-wizard/property.c:444
 msgid "Choose directory"
 msgstr "Choose directory"
 
-#: ../plugins/project-wizard/property.c:387
+#: ../plugins/project-wizard/property.c:448
 msgid "Choose file"
 msgstr "Choose file"
 
-#: ../plugins/project-wizard/property.c:402
-msgid "Icon choice"
-msgstr "Icon choice"
-
 #: ../plugins/project-wizard/templates/translatable-strings.h:1
 msgid "A GNOME applet project"
 msgstr "A GNOME applet project"
@@ -6817,80 +7320,76 @@ msgid "A generic C++ project"
 msgstr "A generic C++ project"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:3
-msgid "A generic GNOME project"
-msgstr "A generic GNOME project"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:4
 msgid "A generic GTK+ project"
 msgstr "A generic GTK+ project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:5
+#: ../plugins/project-wizard/templates/translatable-strings.h:4
 msgid "A generic GTKmm (C++) project"
 msgstr "A generic GTKmm (C++) project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:6
+#: ../plugins/project-wizard/templates/translatable-strings.h:5
 msgid "A generic Xlib dock applet"
 msgstr "A generic Xlib dock applet"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:7
+#: ../plugins/project-wizard/templates/translatable-strings.h:6
 msgid "A generic Xlib project"
 msgstr "A generic Xlib project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:8
+#: ../plugins/project-wizard/templates/translatable-strings.h:7
 msgid "A generic java project using automake project management"
 msgstr "A generic Java project using automake project management"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:9
+#: ../plugins/project-wizard/templates/translatable-strings.h:8
 msgid "A generic minimal and flat project"
 msgstr "A generic minimal and flat project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:10
+#: ../plugins/project-wizard/templates/translatable-strings.h:9
 msgid ""
 "A generic natively compiled java project using the GNU Java Compiler (gcj)"
 msgstr ""
 "A generic natively-compiled Java project using the GNU Java Compiler (gcj)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:11
+#: ../plugins/project-wizard/templates/translatable-strings.h:10
 msgid "A generic project"
 msgstr "A generic project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:12
+#: ../plugins/project-wizard/templates/translatable-strings.h:11
 msgid "A generic python project using automake project management"
 msgstr "A generic Python project using automake project management"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:13
+#: ../plugins/project-wizard/templates/translatable-strings.h:12
 msgid "A generic wx Widgets project"
 msgstr "A generic wxWidgets project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:14
+#: ../plugins/project-wizard/templates/translatable-strings.h:13
 msgid "A sample SDL project"
 msgstr "A sample SDL project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:15
+#: ../plugins/project-wizard/templates/translatable-strings.h:14
 msgid "Add C++ support:"
 msgstr "Add C++ support:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:16
+#: ../plugins/project-wizard/templates/translatable-strings.h:15
 msgid "Add gtk-doc system:"
 msgstr "Add gtk-doc system:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:17
+#: ../plugins/project-wizard/templates/translatable-strings.h:16
 msgid "Add internationalization:"
 msgstr "Add internationalisation:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:18
+#: ../plugins/project-wizard/templates/translatable-strings.h:17
 msgid "Add shared library support:"
 msgstr "Add shared library support:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:19
+#: ../plugins/project-wizard/templates/translatable-strings.h:18
 msgid "Adds C++ support to the project so that C++ source files can be built"
 msgstr "Adds C++ support to the project so that C++ source files can be built"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:20
+#: ../plugins/project-wizard/templates/translatable-strings.h:19
 msgid "Adds support for building shared libraries in your project"
 msgstr "Adds support for building shared libraries in your project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:21
+#: ../plugins/project-wizard/templates/translatable-strings.h:20
 msgid ""
 "Adds support for internationalization so that your project can have "
 "translations in different languages"
@@ -6898,55 +7397,53 @@ msgstr ""
 "Adds support for internationalisation so that your project can have "
 "translations in different languages"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:22
-#: ../src/about.c:237
+#: ../plugins/project-wizard/templates/translatable-strings.h:21
 msgid "Anjuta Plugin"
 msgstr "Anjuta Plugin"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:23
+#: ../plugins/project-wizard/templates/translatable-strings.h:22
 msgid "Anjuta plugin project that uses libanjuta framework"
 msgstr "Anjuta plugin project that uses libanjuta framework"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:24
+#: ../plugins/project-wizard/templates/translatable-strings.h:23
 msgid "Applet Title:"
 msgstr "Applet Title:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:26
+#: ../plugins/project-wizard/templates/translatable-strings.h:25
 msgid "Basic information"
 msgstr "Basic information"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:27
+#: ../plugins/project-wizard/templates/translatable-strings.h:26
 msgid "Berkeley Software Distribution License (BSD)"
 msgstr "Berkeley Software Distribution Licence (BSD)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:28
+#: ../plugins/project-wizard/templates/translatable-strings.h:27
 msgid ""
 "Comma separated, other plugins that this plugin depends on. It could be "
 "either primary interface name or plugin location (library:class)"
 msgstr ""
-"Comma-separated, other plugins on which this plugin depends. It could be "
+"Comma-separated, other plugins that this plugin depends on. It could be "
 "either primary interface name or plugin location (library:class)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:29
+#: ../plugins/project-wizard/templates/translatable-strings.h:28
 msgid "Configure external packages"
 msgstr "Configure external packages"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:30
+#: ../plugins/project-wizard/templates/translatable-strings.h:29
 msgid "Configure external packages:"
 msgstr "Configure external packages:"
 
+#: ../plugins/project-wizard/templates/translatable-strings.h:30
+msgid "Create Gtk Builder interface file"
+msgstr "Create GtkBuilder interface file"
+
 #: ../plugins/project-wizard/templates/translatable-strings.h:31
-msgid "Create a template glade interface file"
-msgstr "Create a template glade interface file"
+msgid "Create a template Gtk Builder interface file"
+msgstr "Create a template GtkBuilder interface file"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:32
-msgid "Create glade interface file"
-msgstr "Create glade interface file"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:34
-#: ../plugins/subversion/anjuta-subversion.glade.h:26
-msgid "Destination:"
-msgstr "Destination:"
+msgid "Create a template gtk builder interface file"
+msgstr "Create a template GtkBuilder interface file"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:35
 msgid "Display description of the applet"
@@ -6981,50 +7478,46 @@ msgid "GCJ needs to know which class contains the main() function"
 msgstr "GCJ needs to know which class contains the main() function"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:43
-msgid "GNOME"
-msgstr "GNOME"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GNOME Applet"
 msgstr "GNOME Applet"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
+#: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GTK+"
 msgstr "GTK+"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
+#: ../plugins/project-wizard/templates/translatable-strings.h:45
 msgid "GTKmm"
 msgstr "GTKmm"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:47
+#: ../plugins/project-wizard/templates/translatable-strings.h:46
 msgid "General Project Information"
 msgstr "General Project Information"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
+#: ../plugins/project-wizard/templates/translatable-strings.h:48
 msgid "Generic"
 msgstr "Generic"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
+#: ../plugins/project-wizard/templates/translatable-strings.h:49
 msgid "Generic (Minimal)"
 msgstr "Generic (Minimal)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
+#: ../plugins/project-wizard/templates/translatable-strings.h:50
 msgid "Generic C++"
 msgstr "Generic C++"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
+#: ../plugins/project-wizard/templates/translatable-strings.h:51
 msgid "Generic gcj compiled java"
 msgstr "Generic gcj compiled Java"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
+#: ../plugins/project-wizard/templates/translatable-strings.h:52
 msgid "Generic java (automake)"
 msgstr "Generic Java (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
+#: ../plugins/project-wizard/templates/translatable-strings.h:53
 msgid "Generic python (automake)"
 msgstr "Generic Python (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
+#: ../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 "
@@ -7034,249 +7527,239 @@ msgstr ""
 "the required version of the package. For example, 'libgnomeui-2.0' or "
 "'libgnomeui-2.0 >= 2.2.0'"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
+#: ../plugins/project-wizard/templates/translatable-strings.h:55
 msgid "Icon File:"
 msgstr "Icon File:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
+#: ../plugins/project-wizard/templates/translatable-strings.h:56
 msgid "Icon file for the plugin"
 msgstr "Icon file for the plugin"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
+#: ../plugins/project-wizard/templates/translatable-strings.h:57
 msgid "Implement plugin interfaces"
 msgstr "Implement plugin interfaces"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
+#: ../plugins/project-wizard/templates/translatable-strings.h:58
 msgid "Interface implemented by the plugin"
 msgstr "Interface implemented by the plugin"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:60
+#: ../plugins/project-wizard/templates/translatable-strings.h:59
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
+#: ../plugins/project-wizard/templates/translatable-strings.h:61
 msgid "License"
 msgstr "Licence"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
+#: ../plugins/project-wizard/templates/translatable-strings.h:62
 msgid "Main Class:"
 msgstr "Main Class:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
+#: ../plugins/project-wizard/templates/translatable-strings.h:63
 msgid "Main class"
 msgstr "Main class"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
+#: ../plugins/project-wizard/templates/translatable-strings.h:64
 msgid "Makefile project"
 msgstr "Makefile project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
+#: ../plugins/project-wizard/templates/translatable-strings.h:65
 msgid "Makefile-based project"
 msgstr "Makefile-based project"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
+#: ../plugins/project-wizard/templates/translatable-strings.h:66
 msgid "Mininum SDL version required"
 msgstr "Mininum SDL version required"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
+#: ../plugins/project-wizard/templates/translatable-strings.h:67
 msgid "Name of the value to watch"
 msgstr "Name of the value to watch"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
+#: ../plugins/project-wizard/templates/translatable-strings.h:68
 msgid "No license"
 msgstr "No licence"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
+#: ../plugins/project-wizard/templates/translatable-strings.h:69
 msgid "Options for project build system"
 msgstr "Options for project build system"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
+#: ../plugins/project-wizard/templates/translatable-strings.h:70
 msgid "Plugin Class Name:"
 msgstr "Plugin Class Name:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
+#: ../plugins/project-wizard/templates/translatable-strings.h:71
 msgid "Plugin Dependencies:"
 msgstr "Plugin Dependencies:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
+#: ../plugins/project-wizard/templates/translatable-strings.h:72
 msgid "Plugin Description:"
 msgstr "Plugin Description:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
+#: ../plugins/project-wizard/templates/translatable-strings.h:73
 msgid "Plugin Title:"
 msgstr "Plugin Title:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
+#: ../plugins/project-wizard/templates/translatable-strings.h:74
 msgid "Plugin class name"
 msgstr "Plugin class name"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
+#: ../plugins/project-wizard/templates/translatable-strings.h:75
 msgid "Plugin has menus or/and toolbars"
-msgstr "Plugin has menus or/and toolbars"
+msgstr "Plugin has menus and/or toolbars"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
+#: ../plugins/project-wizard/templates/translatable-strings.h:76
 msgid "Plugin interfaces to implement"
 msgstr "Plugin interfaces to implement"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
+#: ../plugins/project-wizard/templates/translatable-strings.h:77
 msgid "Project Name:"
 msgstr "Project Name:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
+#: ../plugins/project-wizard/templates/translatable-strings.h:78
 msgid "Project directory, output file etc."
-msgstr "Project directory, output file etc."
+msgstr "Project directory, output file, etc."
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
+#: ../plugins/project-wizard/templates/translatable-strings.h:79
 msgid "Project directory:"
 msgstr "Project directory:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
+#: ../plugins/project-wizard/templates/translatable-strings.h:80
 msgid ""
 "Project name must not contain spaces, because it will be the name of the "
 "project build target (executable, library etc.)"
 msgstr ""
 "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.)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
+#: ../plugins/project-wizard/templates/translatable-strings.h:81
 msgid "Project name:"
 msgstr "Project name:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
+#: ../plugins/project-wizard/templates/translatable-strings.h:82
 msgid "Project options"
 msgstr "Project options"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
+#: ../plugins/project-wizard/templates/translatable-strings.h:83
 msgid "Python webproject using Django Web Framework"
 msgstr "Python web project using Django Web Framework"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
+#: ../plugins/project-wizard/templates/translatable-strings.h:84
 msgid "Require Package:"
 msgstr "Require Package:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
+#: ../plugins/project-wizard/templates/translatable-strings.h:85
 msgid "Require SDL version:"
 msgstr "Require SDL version:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
+#: ../plugins/project-wizard/templates/translatable-strings.h:86
 msgid "Require SDL_gfx library"
 msgstr "Require SDL_gfx library"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
+#: ../plugins/project-wizard/templates/translatable-strings.h:87
 msgid "Require SDL_gfx:"
 msgstr "Require SDL_gfx:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
+#: ../plugins/project-wizard/templates/translatable-strings.h:88
 msgid "Require SDL_image library"
 msgstr "Require SDL_image library"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
+#: ../plugins/project-wizard/templates/translatable-strings.h:89
 msgid "Require SDL_image:"
 msgstr "Require SDL_image:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
+#: ../plugins/project-wizard/templates/translatable-strings.h:90
 msgid "Require SDL_mixer library"
 msgstr "Require SDL_mixer library"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
+#: ../plugins/project-wizard/templates/translatable-strings.h:91
 msgid "Require SDL_mixer:"
 msgstr "Require SDL_mixer:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
+#: ../plugins/project-wizard/templates/translatable-strings.h:92
 msgid "Require SDL_net library"
 msgstr "Require SDL_net library"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
+#: ../plugins/project-wizard/templates/translatable-strings.h:93
 msgid "Require SDL_net:"
 msgstr "Require SDL_net:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
+#: ../plugins/project-wizard/templates/translatable-strings.h:94
 msgid "Require SDL_ttf library"
 msgstr "Require SDL_ttf library"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
+#: ../plugins/project-wizard/templates/translatable-strings.h:95
 msgid "Require SDL_ttf:"
 msgstr "Require SDL_ttf:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
+#: ../plugins/project-wizard/templates/translatable-strings.h:96
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
+#: ../plugins/project-wizard/templates/translatable-strings.h:97
 msgid "Select code license"
 msgstr "Select code licence"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
+#: ../plugins/project-wizard/templates/translatable-strings.h:98
 msgid "Shell values to watch"
 msgstr "Shell values to watch"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
-msgid "Use libglade for the UI"
-msgstr "Use libglade for the UI"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
+#: ../plugins/project-wizard/templates/translatable-strings.h:99
 msgid "Use pkg-config to add library support from other packages"
 msgstr "Use pkg-config to add library support from other packages"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:102
-msgid ""
-"Use the libglade-2.0 library to load the glade interface file at runtime"
-msgstr ""
-"Use the libglade-2.0 library to load the glade interface file at runtime"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:100
 msgid "Value Name:"
 msgstr "Value Name:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:104
+#: ../plugins/project-wizard/templates/translatable-strings.h:101
 msgid "Values to watch"
 msgstr "Values to watch"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
+#: ../plugins/project-wizard/templates/translatable-strings.h:103
 msgid "Whether the plugin has menus or toolbars"
 msgstr "Whether the plugin has menus or toolbars"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:107
+#: ../plugins/project-wizard/templates/translatable-strings.h:104
 msgid "Wx Widgets"
 msgstr "wxWidgets"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:108
+#: ../plugins/project-wizard/templates/translatable-strings.h:105
 msgid "Xlib"
 msgstr "Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:109
+#: ../plugins/project-wizard/templates/translatable-strings.h:106
 msgid "Xlib dock"
 msgstr "Xlib dock"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:110
+#: ../plugins/project-wizard/templates/translatable-strings.h:107
 msgid "gtk-doc is used to compile API documentations for GObject based classes"
 msgstr "gtk-doc is used to compile API documentation for GObject-based classes"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:111
+#: ../plugins/project-wizard/templates/translatable-strings.h:108
 msgid "project name"
 msgstr "project name"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:2
+#: ../plugins/run-program/anjuta-run-program.ui.h:2
 msgid "Choose a working directory"
 msgstr "Choose a working directory"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:3
+#: ../plugins/run-program/anjuta-run-program.ui.h:3
 msgid "Environment Variables:"
 msgstr "Environment Variables:"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:4
+#: ../plugins/run-program/anjuta-run-program.ui.h:4
 msgid "Program Parameters"
 msgstr "Program Parameters"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:5
+#: ../plugins/run-program/anjuta-run-program.ui.h:5
 msgid "Program:"
 msgstr "Program:"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:6
+#: ../plugins/run-program/anjuta-run-program.ui.h:6
 msgid "Run In Terminal"
-msgstr "Run In Terminal"
+msgstr "Run in Terminal"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:7
+#: ../plugins/run-program/anjuta-run-program.ui.h:7
 msgid "Working Directory:"
 msgstr "Working Directory:"
 
@@ -7295,12 +7778,12 @@ msgstr "Program directory '%s' is not local"
 msgid "Load Target to run"
 msgstr "Load Target to run"
 
-#: ../plugins/run-program/parameters.c:711
-#: ../plugins/search/search_preferences.c:534
-msgid "Name"
-msgstr "Name"
+#: ../plugins/run-program/parameters.c:616
+#, c-format
+msgid "Missing file %s"
+msgstr "Missing file %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?"
@@ -7310,659 +7793,191 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/run-program/plugin.c:215
+#: ../plugins/run-program/plugin.c:229
 msgid "_Run"
 msgstr "_Run"
 
-#: ../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 "Execute"
 
-#: ../plugins/run-program/plugin.c:225
+#: ../plugins/run-program/plugin.c:239
 msgid "Run program without debugger"
 msgstr "Run program without debugger"
 
-#: ../plugins/run-program/plugin.c:231
+#: ../plugins/run-program/plugin.c:245
 msgid "Stop Program"
 msgstr "Stop Program"
 
-#: ../plugins/run-program/plugin.c:233
+#: ../plugins/run-program/plugin.c:247
 msgid "Kill program"
 msgstr "Kill program"
 
-#: ../plugins/run-program/plugin.c:239
+#: ../plugins/run-program/plugin.c:253
 msgid "Program Parameters..."
-msgstr "Program Parameters..."
+msgstr "Program Parametersâ?¦"
 
-#: ../plugins/run-program/plugin.c:241
+#: ../plugins/run-program/plugin.c:255
 msgid "Set current program, arguments and so on"
-msgstr "Set current program, arguments and so on"
+msgstr "Set current program, arguments, etc."
 
-#: ../plugins/run-program/plugin.c:266
+#: ../plugins/run-program/plugin.c:280
 msgid "Run operations"
 msgstr "Run operations"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/sample1/plugin.c:56
-msgid "_Sample action"
-msgstr "_Sample action"
-
-#. Display label
-#. short-cut
-#: ../plugins/sample1/plugin.c:58
-msgid "Sample action"
-msgstr "Sample action"
-
-#: ../plugins/sample1/plugin.c:79
-msgid "Sample file operations"
-msgstr "Sample file operations"
-
-#: ../plugins/sample1/plugin.c:85
-msgid "SamplePlugin"
-msgstr "SamplePlugin"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:1
-msgid "<b>Autocompletion</b>"
-msgstr "<b>Autocompletion</b>"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:2
-msgid "<b>Basic Indentation</b>"
-msgstr "<b>Basic Indentation</b>"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:3
-msgid "<b>Code folding</b>"
-msgstr "<b>Code folding</b>"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:4
-msgid "<b>Highlight style</b>"
-msgstr "<b>Highlight style</b>"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:5
-msgid "<b>Misc options</b>"
-msgstr "<b>Misc options</b>"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:6
-msgid "<b>Other colors</b>"
-msgstr "<b>Other colours</b>"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:7
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:5
-msgid "<b>Print options</b>"
-msgstr "<b>Print options</b>"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:8
-msgid "Add line number every:"
-msgstr "Add line number every:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:9
-msgid "Add page header"
-msgstr "Add page header"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:10
-msgid "Attributes:"
-msgstr "Attributes:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:11
-msgid "Autocomplete XML/HTML closing tags"
-msgstr "Autocomplete XML/HTML closing tags"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:12
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:8
-msgid "Autocompletion pop up choices"
-msgstr "Autocompletion pop up choices"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:13
-msgid "Background color:"
-msgstr "Background colour:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:14
-msgid "Basic Indentation"
-msgstr "Basic Indentation"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:15
-msgid "Bold"
-msgstr "Bold"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:16
-msgid "Calltip background:"
-msgstr "Calltip background:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:17
-msgid "Caret (cursor) color:"
-msgstr "Caret (cursor) colour:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:18
-msgid "Caret blink period in ms"
-msgstr "Caret blink period in ms"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:19
-msgid "Choose autocomplete for single match"
-msgstr "Choose autocomplete for single match"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:20
-msgid "Collapse all code folds on file open"
-msgstr "Collapse all code folds on file open"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:21
-msgid "Colors & Fonts"
-msgstr "Colours & Fonts"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:22
-msgid "Colour"
-msgstr "Colour"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:23
-msgid "Compact folding"
-msgstr "Compact folding"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:24
-msgid "Disable syntax highlighting"
-msgstr "Disable syntax highlighting"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:25
-msgid "Draw line below folded lines"
-msgstr "Draw line below folded lines"
-
-#. Column where a vertical line will be drawn to indicate that lines should not be longer
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:27
-msgid "Edge column"
-msgstr "Edge column"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:29
-msgid "Editor caret (cursor) width in pixels"
-msgstr "Editor caret (cursor) width in pixels"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:30
-msgid "Enable HTML tags folding"
-msgstr "Enable HTML tags folding"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:31
-msgid "Enable automatic indentation"
-msgstr "Enable automatic indentation"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:32
-msgid "Enable braces check"
-msgstr "Enable braces check"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:33
-msgid "Enable code folding"
-msgstr "Enable code folding"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:34
-msgid "Enable comments folding"
-msgstr "Enable comments folding"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:35
-msgid "Enable line wrap"
-msgstr "Enable line wrap"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:36
-msgid "Enable python comments folding"
-msgstr "Enable python comments folding"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:37
-msgid "Enable python quoted strings folding"
-msgstr "Enable python quoted strings folding"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:38
-msgid "Filter extraneous characters in DOS mode"
-msgstr "Filter extraneous characters in DOS mode"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:39
-msgid "Fold style:"
-msgstr "Fold style:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:40
-msgid "Font:"
-msgstr "Font:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:41
-msgid "Fonts and colors for editor"
-msgstr "Fonts and colours for editor"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:42
-msgid "Foreground color:"
-msgstr "Foreground colour:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:43
-msgid "Indent closing braces"
-msgstr "Indent closing braces"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:44
-msgid "Indent opening braces"
-msgstr "Indent opening braces"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:45
-msgid "Indentation size in spaces:"
-msgstr "Indentation size in spaces:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:46
-msgid "Italic"
-msgstr "Italic"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:47
-msgid "Line numbers margin width in pixels"
-msgstr "Line numbers margin width in pixels"
-
-#. If the user presses enter, the indentation of the current line will automatically be added to the next line
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:50
-msgid "Maintain past Indentation"
-msgstr "Maintain past Indentation"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:51
-msgid "Margin Fold visible"
-msgstr "Margin Fold visible"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:52
-msgid "Margin Linenum visible"
-msgstr "Margin Linenum visible"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:53
-msgid "Margin Marker visible"
-msgstr "Margin Marker visible"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:54
-msgid "Mode:"
-msgstr "Mode:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:55
-msgid "Monochrome"
-msgstr "Monochrome"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:56
-msgid ""
-"Plus/Minus\n"
-"Arrows\n"
-"Circular\n"
-"Squares"
-msgstr ""
-"Plus/Minus\n"
-"Arrows\n"
-"Circular\n"
-"Squares"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:60
-msgid "Pressing backspace un-indents"
-msgstr "Pressing backspace un-indents"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:61
-msgid "Pressing tab inserts indentation"
-msgstr "Pressing tab inserts indentation"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:62
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:16
-msgid "Printing"
-msgstr "Printing"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:63
-msgid "Select highlight style to edit:"
-msgstr "Select highlight style to edit:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:64
-msgid "Selection background:"
-msgstr "Selection background:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:65
-msgid "Selection foreground:"
-msgstr "Selection foreground:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:66
-msgid "Strip trailling spaces on file save"
-msgstr "Strip trailling spaces on file save"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:67
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:21
-msgid "Tab size in spaces:"
-msgstr "Tab size in spaces:"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:68
-msgid "Underlined"
-msgstr "Underlined"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:69
-msgid "Use default"
-msgstr "Use default"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:70
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:22
-msgid "Use tabs for indentation"
-msgstr "Use tabs for indentation"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:71
-msgid "View EOL chars"
-msgstr "View EOL chars"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:72
-msgid "View Indentation Guides"
-msgstr "View Indentation Guides"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:73
-msgid "View Line Wrap"
-msgstr "View Line Wrap"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:74
-msgid "View Whitespaces"
-msgstr "View Whitespaces"
-
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:75
-msgid "View indentation whitespaces"
-msgstr "View indentation whitespaces"
-
-#. Next bookmark at the end of the file will jump to the first bookmark from the beginning
-#: ../plugins/scintilla/anjuta-editor-scintilla.glade.h:77
-msgid "Wrap bookmarks search around"
-msgstr "Wrap bookmarks search around"
-
-#: ../plugins/scintilla/print.c:658
-#, c-format
-msgid "File: %s"
-msgstr "File: %s"
-
-#: ../plugins/scintilla/print.c:887
-msgid "Unable to get text buffer for printing"
-msgstr "Unable to get text buffer for printing"
-
-#: ../plugins/scintilla/print.c:966
-msgid "No file to print!"
-msgstr "No file to print!"
-
-#: ../plugins/scintilla/plugin.c:130 ../plugins/scintilla/plugin.c:142
-#: ../plugins/scintilla/anjuta-editor.plugin.in.h:2
-msgid "Scintilla Editor"
-msgstr "Scintilla Editor"
-
-#: ../plugins/scintilla/text_editor.c:404
-#, c-format
-msgid ""
-"The file '%s' has been changed.\n"
-"Do you want to reload it ?"
-msgstr ""
-"The file \"%s\" has been changed.\n"
-"Do you want to reload it ?"
-
-#: ../plugins/scintilla/text_editor.c:410
-#, c-format
-msgid ""
-"The file '%s' has been changed.\n"
-"Do you want to loose your changes and reload it ?"
-msgstr ""
-"The file \"%s\" has been changed.\n"
-"Do you want to lose your changes and reload it?"
-
-#: ../plugins/scintilla/text_editor.c:430
-#, c-format
-msgid ""
-"The file '%s' has been deleted.\n"
-"Do you confirm and close it ?"
-msgstr ""
-"The file \"%s\" has been deleted.\n"
-"Do you confirm and close it ?"
-
-#: ../plugins/scintilla/text_editor.c:437
-#, c-format
-msgid ""
-"The file '%s' has been deleted.\n"
-"Do you want to loose your changes and close it ?"
-msgstr ""
-"The file \"%s\" has been deleted.\n"
-"Do you want to lose your changes and close it?"
-
-#: ../plugins/scintilla/text_editor.c:1354
-msgid "Could not get file info"
-msgstr "Could not get file info"
-
-#. DEBUG_PRINT ("%s", "This file is too big. Unable to allocate memory.");
-#: ../plugins/scintilla/text_editor.c:1366
-msgid "This file is too big. Unable to allocate memory."
-msgstr "This file is too big. Unable to allocate memory."
-
-#: ../plugins/scintilla/text_editor.c:1375
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: ../plugins/scintilla/text_editor.c:1386
-msgid "Error while reading from file"
-msgstr "Error while reading from file"
-
-#: ../plugins/scintilla/text_editor.c:1432
-msgid ""
-"The file does not look like a text file or the file encoding is not "
-"supported. Please check if the encoding of file is in the supported "
-"encodings list. If not, add it from the preferences."
-msgstr ""
-"The file does not look like a text file or the file encoding is not "
-"supported. Please check if the encoding of file is in the supported "
-"encodings list. If not, add it from the preferences."
-
-#: ../plugins/scintilla/text_editor.c:1579
-msgid "Loading file..."
-msgstr "Loading file..."
-
-#: ../plugins/scintilla/text_editor.c:1588
-#, c-format
-msgid ""
-"Could not load file: %s\n"
-"\n"
-"Details: %s"
-msgstr ""
-"Could not load file: %s\n"
-"\n"
-"Details: %s"
-
-#: ../plugins/scintilla/text_editor.c:1609
-msgid "File loaded successfully"
-msgstr "File loaded successfully"
-
-#: ../plugins/scintilla/text_editor.c:1627
-msgid "Saving file..."
-msgstr "Saving file..."
-
-#: ../plugins/scintilla/text_editor.c:1636
-#, c-format
-msgid "Could not save intermediate file %s: %s"
-msgstr "Could not save intermediate file %s: %s"
-
-#: ../plugins/scintilla/text_editor.c:1652
-msgid "File saved successfully"
-msgstr "File saved successfully"
-
-#: ../plugins/scintilla/text_editor.c:2025
-#, c-format
-msgid ""
-"Cannot load Global defaults and configuration files:\n"
-"%s.\n"
-"This may result in improper behaviour or instabilities.\n"
-"Anjuta will fall back to built in (limited) settings"
-msgstr ""
-"Cannot load Global defaults and configuration files:\n"
-"%s.\n"
-"This may result in improper behaviour or instabilities.\n"
-"Anjuta will fall back to built in (limited) settings"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:1
-msgid "<b>Scratchbox Options</b>\n"
-msgstr "<b>Scratchbox Options</b>\n"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:3
-msgid "Scratchbox directory:"
-msgstr "Scratchbox directory:"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:4
-msgid "Scratchbox target:"
-msgstr "Scratchbox target:"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:5
-msgid "Scratchbox version:"
-msgstr "Scratchbox version:"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:6
-msgid "Select Scratchbox Folder"
-msgstr "Select Scratchbox Folder"
-
-#: ../plugins/scratchbox/plugin.c:456 ../plugins/scratchbox/plugin.c:478
-#: ../plugins/scratchbox/anjuta-scratchbox.plugin.in.h:2
-msgid "Scratchbox"
-msgstr "Scratchbox"
-
-#. Public functions
-#. *---------------------------------------------------------------------------
-#: ../plugins/search/anjuta-search.glade.h:1
+#: ../plugins/search/anjuta-search.ui.h:1
 msgid "<b>Actions</b>"
 msgstr "<b>Actions</b>"
 
-#: ../plugins/search/anjuta-search.glade.h:2
+#: ../plugins/search/anjuta-search.ui.h:2
 msgid "<b>File Filter</b>"
 msgstr "<b>File Filter</b>"
 
-#: ../plugins/search/anjuta-search.glade.h:4
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "<b>Parameters</b>"
 msgstr "<b>Parameters</b>"
 
-#: ../plugins/search/anjuta-search.glade.h:5
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "<b>Scope</b>"
 msgstr "<b>Scope</b>"
 
-#. User can select variables that contain lists of files, so this is a combined noun
-#: ../plugins/search/anjuta-search.glade.h:7
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "<b>Search variable</b>"
 msgstr "<b>Search variable</b>"
 
-#: ../plugins/search/anjuta-search.glade.h:8
+#: ../plugins/search/anjuta-search.ui.h:7
 #: ../plugins/search/search-replace.c:92
 msgid "Backward"
 msgstr "Backward"
 
-#: ../plugins/search/anjuta-search.glade.h:9
+#: ../plugins/search/anjuta-search.ui.h:8
 msgid "Basic Search & Replace"
 msgstr "Basic Search & Replace"
 
-#: ../plugins/search/anjuta-search.glade.h:10
+#: ../plugins/search/anjuta-search.ui.h:9
 msgid "Choose Directories:"
 msgstr "Choose Directories:"
 
-#: ../plugins/search/anjuta-search.glade.h:11
+#: ../plugins/search/anjuta-search.ui.h:10
 msgid "Choose Files:"
 msgstr "Choose Files:"
 
-#: ../plugins/search/anjuta-search.glade.h:12
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Expand regex back references"
 msgstr "Expand regex back references"
 
-#: ../plugins/search/anjuta-search.glade.h:13
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Find & Replace"
 msgstr "Find & Replace"
 
-#: ../plugins/search/anjuta-search.glade.h:14
+#: ../plugins/search/anjuta-search.ui.h:13
 #: ../plugins/search/search-replace.c:91
 msgid "Forward"
 msgstr "Forward"
 
 #. 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/anjuta-search.ui.h:14
 #: ../plugins/search/search-replace.c:90
 msgid "Full Buffer"
 msgstr "Full Buffer"
 
-#: ../plugins/search/anjuta-search.glade.h:16
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Greedy matching"
 msgstr "Greedy matching"
 
-#: ../plugins/search/anjuta-search.glade.h:17
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Ignore Binary Files"
 msgstr "Ignore Binary Files"
 
-#: ../plugins/search/anjuta-search.glade.h:18
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Ignore Directories:"
 msgstr "Ignore Directories:"
 
-#: ../plugins/search/anjuta-search.glade.h:19
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Ignore Files:"
 msgstr "Ignore Files:"
 
-#: ../plugins/search/anjuta-search.glade.h:20
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Ignore Hidden Directories"
 msgstr "Ignore Hidden Directories"
 
-#: ../plugins/search/anjuta-search.glade.h:21
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Ignore Hidden Files"
 msgstr "Ignore Hidden Files"
 
-#: ../plugins/search/anjuta-search.glade.h:22
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "Match at start of word"
 msgstr "Match at start of word"
 
-#: ../plugins/search/anjuta-search.glade.h:24
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "Match complete lines"
 msgstr "Match complete lines"
 
-#: ../plugins/search/anjuta-search.glade.h:25
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "Match complete words"
 msgstr "Match complete words"
 
-#: ../plugins/search/anjuta-search.glade.h:26
+#: ../plugins/search/anjuta-search.ui.h:25
 msgid "Maximum Actions"
 msgstr "Maximum Actions"
 
-#: ../plugins/search/anjuta-search.glade.h:27
+#: ../plugins/search/anjuta-search.ui.h:26
 msgid "Modify"
 msgstr "Modify"
 
-#: ../plugins/search/anjuta-search.glade.h:28
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "New Name:"
 msgstr "New Name:"
 
-#: ../plugins/search/anjuta-search.glade.h:29
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "No Limit"
 msgstr "No Limit"
 
-#: ../plugins/search/anjuta-search.glade.h:30
+#: ../plugins/search/anjuta-search.ui.h:29
 msgid "Regular expression"
 msgstr "Regular expression"
 
-#: ../plugins/search/anjuta-search.glade.h:31
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Replace With:"
 msgstr "Replace With:"
 
-#: ../plugins/search/anjuta-search.glade.h:32
+#: ../plugins/search/anjuta-search.ui.h:31
 msgid "Search Action:"
 msgstr "Search Action:"
 
-#: ../plugins/search/anjuta-search.glade.h:33
+#: ../plugins/search/anjuta-search.ui.h:32
 msgid "Search Direction:"
 msgstr "Search Direction:"
 
-#. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.glade.h:35
+#: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search Expression"
 msgstr "Search Expression"
 
-#. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.glade.h:37
+#: ../plugins/search/anjuta-search.ui.h:34
 msgid "Search Expression:"
 msgstr "Search Expression:"
 
-#: ../plugins/search/anjuta-search.glade.h:38
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search In:"
 msgstr "Search In:"
 
-#: ../plugins/search/anjuta-search.glade.h:39
+#: ../plugins/search/anjuta-search.ui.h:36
 msgid "Search Recursively"
 msgstr "Search Recursively"
 
-#: ../plugins/search/anjuta-search.glade.h:40
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search Target"
 msgstr "Search Target"
 
-#: ../plugins/search/anjuta-search.glade.h:41
+#: ../plugins/search/anjuta-search.ui.h:38
 msgid "Setting"
 msgstr "Setting"
 
 #: ../plugins/search/plugin.c:68
 msgid "_Find..."
-msgstr "_Find..."
+msgstr "_Findâ?¦"
 
 #: ../plugins/search/plugin.c:69
 msgid "Search for a string or regular expression in the editor"
@@ -7982,7 +7997,7 @@ msgstr "Find _Previous"
 
 #: ../plugins/search/plugin.c:78
 msgid "Find and R_eplace..."
-msgstr "Find and R_eplace..."
+msgstr "Find and R_eplaceâ?¦"
 
 #: ../plugins/search/plugin.c:80
 msgid ""
@@ -7996,7 +8011,7 @@ msgstr "Search and Replace"
 
 #: ../plugins/search/plugin.c:85
 msgid "Fin_d in Files..."
-msgstr "Fin_d in Files..."
+msgstr "Fin_d in Filesâ?¦"
 
 #: ../plugins/search/plugin.c:86
 msgid "Search for a string in multiple files or directories"
@@ -8004,7 +8019,7 @@ msgstr "Search for a string in multiple files or directories"
 
 #: ../plugins/search/plugin.c:102
 msgid "Searching..."
-msgstr "Searching..."
+msgstr "Searchingâ?¦"
 
 #: ../plugins/search/search_preferences.c:44
 msgid "Basic Search"
@@ -8076,35 +8091,35 @@ msgstr "Replace"
 msgid "Search complete"
 msgstr "Search complete"
 
-#: ../plugins/search/search-replace.c:1039
-#: ../plugins/search/search-replace.c:1723
+#: ../plugins/search/search-replace.c:1044
+#: ../plugins/search/search-replace.c:1731
 msgid "Replace All"
 msgstr "Replace All"
 
-#: ../plugins/search/search-replace.c:1078
+#: ../plugins/search/search-replace.c:1083
 #, c-format
 msgid "The match \"%s\" was not found. Wrap search around the document?"
 msgstr "The match \"%s\" was not found. Wrap search around the document?"
 
-#: ../plugins/search/search-replace.c:1098
+#: ../plugins/search/search-replace.c:1103
 #, c-format
 msgid "The match \"%s\" was not found."
 msgstr "The match \"%s\" was not found."
 
-#: ../plugins/search/search-replace.c:1113
+#: ../plugins/search/search-replace.c:1118
 msgid "The maximum number of results has been reached."
 msgstr "The maximum number of results has been reached."
 
-#: ../plugins/search/search-replace.c:1126
+#: ../plugins/search/search-replace.c:1131
 #, c-format
 msgid "%d match has been replaced."
 msgid_plural "%d matches have been replaced."
 msgstr[0] "%d match has been replaced."
 msgstr[1] "%d matches have been replaced."
 
-#: ../plugins/search/search-replace.c:1292
+#: ../plugins/search/search-replace.c:1298
 msgid "Unable to build user interface for Search And Replace"
-msgstr "Unable to build user interface for Search And Replace"
+msgstr "Unable to build user interface for Search and Replace"
 
 #: ../plugins/sourceview/sourceview.c:364
 #, c-format
@@ -8141,10 +8156,10 @@ msgstr "The file \"%s\" is read-only! Edit anyway?"
 msgid "Could not save %s: %s"
 msgstr "Could not save %s: %s"
 
-#: ../plugins/sourceview/sourceview-io.c:270
+#: ../plugins/sourceview/sourceview-io.c:274
 #, c-format
 msgid "Could not save file because filename not yet specified"
-msgstr "Could not save file because filename not yet specified"
+msgstr "Could not save file because filename has not yet been specified"
 
 #: ../plugins/sourceview/sourceview-io.c:504
 #, c-format
@@ -8155,75 +8170,92 @@ msgstr "New file %d"
 msgid "Preparing pages for printing"
 msgstr "Preparing pages for printing"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:1
-msgid "<b>Color scheme:</b>"
-msgstr "<b>Colour scheme:</b>"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:2
-msgid "<b>Font:</b>"
-msgstr "<b>Font:</b>"
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:1
+msgid "Color scheme:"
+msgstr "Colour scheme:"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:3
-msgid "<b>Indentation and auto-format options</b>"
-msgstr "<b>Indentation and auto-format options</b>"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:6
-msgid "<b>View</b>"
-msgstr "<b>View</b>"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:7
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:2
 msgid "Create backup files"
 msgstr "Create backup files"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:9
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
 msgid "Font"
 msgstr "Font"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:10
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
+msgid "Font:"
+msgstr "Font:"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
 msgid "Highlight current line"
 msgstr "Highlight current line"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:11
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
 msgid "Highlight matching brackets"
 msgstr "Highlight matching brackets"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:12
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
 msgid "Highlight syntax"
 msgstr "Highlight syntax"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:13
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
+msgid "Indentation and auto-format options"
+msgstr "Indentation and auto-format options"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 msgid "Print Linenumbers"
-msgstr "Print Linenumbers"
+msgstr "Print Line Numbers"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+msgid "Print options"
+msgstr "Print options"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:14
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
 msgid "Print page footer"
 msgstr "Print page footer"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:15
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
 msgid "Print page header"
 msgstr "Print page header"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:17
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
+msgid "Printing"
+msgstr "Printing"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
 msgid "Right margin position in characters"
 msgstr "Right margin position in characters"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:18
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Show line numbers"
 msgstr "Show line numbers"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:19
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
 msgid "Show marks"
 msgstr "Show marks"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:20
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
 msgid "Show right margin"
 msgstr "Show right margin"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:23
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
+msgid "Tab size in spaces:"
+msgstr "Tab size in spaces:"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+msgid "Use tabs for indentation"
+msgstr "Use tabs for indentation"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
 msgid "Use theme font"
 msgstr "Use theme font"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.glade.h:24
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
+#: ../src/anjuta-app.c:493 ../src/anjuta-app.c:498
+msgid "View"
+msgstr "View"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
 msgid "Wrap long lines to fit on paper"
 msgstr "Wrap long lines to fit on paper"
 
@@ -8256,159 +8288,167 @@ msgstr "Anjuta Manual"
 msgid "Gnome Online API Documentation"
 msgstr "GNOME Online API Documentation"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:1
-msgid "<b>Branch/Tag URL:</b>"
-msgstr "<b>Branch/Tag URL:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:3
-msgid "<b>End Revision:</b>"
-msgstr "<b>End Revision:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:4
-msgid "<b>File or directory to diff:</b>"
-msgstr "<b>File or directory to diff:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:5
-msgid "<b>File/URL to Remove:</b>"
-msgstr "<b>File/URL to Remove:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:6
-msgid "<b>First Path:</b>"
-msgstr "<b>First Path:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:11
-msgid "<b>Second Path:</b>"
-msgstr "<b>Second Path:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:12
-msgid "<b>Select Changes to Revert:</b>"
-msgstr "<b>Select Changes to Revert:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:15
-msgid "<b>Source/Destination Paths:</b>"
-msgstr "<b>Source/Destination Paths:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:16
-msgid "<b>Start Revision:</b>"
-msgstr "<b>Start Revision:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:17
-msgid "<b>Subversion Options</b>"
-msgstr "<b>Subversion Options</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:19
-msgid "<b>Working Copy Path:</b>"
-msgstr "<b>Working Copy Path:</b>"
-
-#: ../plugins/subversion/anjuta-subversion.glade.h:20
+#: ../plugins/subversion/anjuta-subversion.ui.h:1
 msgid "Add file/directory"
 msgstr "Add file/directory"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:25
+#: ../plugins/subversion/anjuta-subversion.ui.h:2
+msgid "Branch/Tag URL:"
+msgstr "Branch/Tag URL:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:8
 msgid "Copy files/folders"
 msgstr "Copy files/folders"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:27
+#: ../plugins/subversion/anjuta-subversion.ui.h:10
 msgid "Diff Selected Revisions"
 msgstr "Diff Selected Revisions"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:28
+#: ../plugins/subversion/anjuta-subversion.ui.h:11
 msgid "Diff file/directory"
 msgstr "Diff file/directory"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:29
+#: ../plugins/subversion/anjuta-subversion.ui.h:12
 msgid "Diff to Previous"
 msgstr "Diff to Previous"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:33
+#: ../plugins/subversion/anjuta-subversion.ui.h:15
+msgid "End Revision:"
+msgstr "End Revision:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:16
+msgid "File or directory to diff:"
+msgstr "File or directory to diff:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:17
+msgid "File/URL to Remove:"
+msgstr "File/URL to Remove:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:18
+msgid "First Path:"
+msgstr "First Path:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:20
 msgid "Ignore ancestry"
 msgstr "Ignore ancestry"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:34
+#: ../plugins/subversion/anjuta-subversion.ui.h:22
 msgid "Merge changes into working copy"
 msgstr "Merge changes into working copy"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:35
+#: ../plugins/subversion/anjuta-subversion.ui.h:25
 msgid "Other Revision:"
 msgstr "Other Revision:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:37
+#: ../plugins/subversion/anjuta-subversion.ui.h:27
+msgid "Previous Commit Messages:"
+msgstr "Previous Commit Messages:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:28
 msgid "Realm:"
 msgstr "Realm:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:38
+#: ../plugins/subversion/anjuta-subversion.ui.h:29
 msgid "Recurse"
 msgstr "Recurse"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:39
+#: ../plugins/subversion/anjuta-subversion.ui.h:30
 msgid "Remember Password"
 msgstr "Remember Password"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:31
 msgid "Remember this decision"
 msgstr "Remember this decision"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:41
+#: ../plugins/subversion/anjuta-subversion.ui.h:32
 msgid "Remove file/directory"
 msgstr "Remove file/directory"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:42
+#: ../plugins/subversion/anjuta-subversion.ui.h:33
 msgid "Repository Head"
 msgstr "Repository Head"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:43
+#: ../plugins/subversion/anjuta-subversion.ui.h:34
 msgid "Repository authorization"
 msgstr "Repository authorisation"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:45
+#: ../plugins/subversion/anjuta-subversion.ui.h:36
 msgid "Revert Changes"
 msgstr "Revert Changes"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:47
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Save open files before diffing"
 msgstr "Save open files before diffing"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:39
+msgid "Second Path:"
+msgstr "Second Path:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:40
+msgid "Select Changes to Revert:"
+msgstr "Select Changes to Revert:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
+msgid "Source/Destination Paths:"
+msgstr "Source/Destination Paths:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source:"
 msgstr "Source:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:50
+#: ../plugins/subversion/anjuta-subversion.ui.h:46
+msgid "Start Revision:"
+msgstr "Start Revision:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:47
+msgid "Subversion Options"
+msgstr "Subversion Options"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:48
 msgid "Subversion Preferences"
 msgstr "Subversion Preferences"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:49
 msgid "Switch to branch/tag"
 msgstr "Switch to branch/tag"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:52
+#: ../plugins/subversion/anjuta-subversion.ui.h:50
 msgid "Trust server"
 msgstr "Trust server"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:51
 msgid "Update file/directory"
 msgstr "Update file/directory"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:54
+#: ../plugins/subversion/anjuta-subversion.ui.h:52
 msgid "Use first path"
 msgstr "Use first path"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:57
+#: ../plugins/subversion/anjuta-subversion.ui.h:53
+msgid "Use previous message"
+msgstr "Use previous message"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:56
 msgid "View Log"
 msgstr "View Log"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:58
+#: ../plugins/subversion/anjuta-subversion.ui.h:57
 msgid "View Selected Revision"
 msgstr "View Selected Revision"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:59
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "Whole Project"
 msgstr "Whole Project"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:61
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Working Copy"
 msgstr "Working Copy"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:62
+#: ../plugins/subversion/anjuta-subversion.ui.h:62
+msgid "Working Copy Path:"
+msgstr "Working Copy Path:"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:63
 msgid "realm"
 msgstr "realm"
 
@@ -8440,7 +8480,7 @@ msgstr "Commit your changes to the Subversion tree"
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
 msgid "_Revert..."
-msgstr "_Revert..."
+msgstr "_Revertâ?¦"
 
 #. Display label
 #. short-cut
@@ -8452,7 +8492,7 @@ msgstr "Revert changes to your working copy."
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
 msgid "_Resolve Conflicts..."
-msgstr "_Resolve Conflicts..."
+msgstr "_Resolve Conflictsâ?¦"
 
 #. Display label
 #. short-cut
@@ -8464,19 +8504,19 @@ msgstr "Resolve conflicts in your working copy."
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
 msgid "_Update..."
-msgstr "_Update..."
+msgstr "_Updateâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
 msgid "Sync your local copy with the Subversion tree"
-msgstr "Sync your local copy with the Subversion tree"
+msgstr "Syncronise your local copy with the Subversion tree"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:108
 msgid "Copy Files/Folders..."
-msgstr "Copy Files/Folders..."
+msgstr "Copy Files/Foldersâ?¦"
 
 #. Display label
 #. short-cut
@@ -8488,7 +8528,7 @@ msgstr "Copy files/folders in the repository"
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:116
 msgid "Switch to a Branch/Tag..."
-msgstr "Switch to a Branch/Tag..."
+msgstr "Switch to a Branch/Tagâ?¦"
 
 #. Display label
 #. short-cut
@@ -8500,7 +8540,7 @@ msgstr "Switch your local copy to a branch or tag in the repository"
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
 msgid "Merge..."
-msgstr "Merge..."
+msgstr "Mergeâ?¦"
 
 #. Display label
 #. short-cut
@@ -8512,7 +8552,7 @@ msgstr "Merge changes into your working copy"
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
 msgid "_View Log..."
-msgstr "_View Log..."
+msgstr "_View Logâ?¦"
 
 #. Display label
 #. short-cut
@@ -8524,7 +8564,7 @@ msgstr "View file history"
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
 msgid "_Diff..."
-msgstr "_Diff..."
+msgstr "_Diffâ?¦"
 
 #. Display label
 #. short-cut
@@ -8536,27 +8576,27 @@ msgstr "Diff local tree with repository"
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:199
 msgid "Copy..."
-msgstr "Copy..."
+msgstr "Copyâ?¦"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:207
 msgid "Diff..."
-msgstr "Diff..."
+msgstr "Diffâ?¦"
 
-#: ../plugins/subversion/plugin.c:454
+#: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
 msgstr "Subversion operations"
 
-#: ../plugins/subversion/plugin.c:460
+#: ../plugins/subversion/plugin.c:494
 msgid "Subversion popup operations"
 msgstr "Subversion popup operations"
 
-#: ../plugins/subversion/plugin.c:488
+#: ../plugins/subversion/plugin.c:526
 msgid "Subversion Log"
 msgstr "Subversion Log"
 
-#: ../plugins/subversion/subversion-add-dialog.c:39
+#: ../plugins/subversion/subversion-add-dialog.c:41
 msgid "Subversion: File will be added on next commit."
 msgstr "Subversion: File will be added on next commit."
 
@@ -8564,9 +8604,9 @@ msgstr "Subversion: File will be added on next commit."
 msgid "Subversion: Commit complete."
 msgstr "Subversion: Commit complete."
 
-#: ../plugins/subversion/subversion-commit-dialog.c:93
+#: ../plugins/subversion/subversion-commit-dialog.c:123
 msgid "Subversion: Committing changes to the repository..."
-msgstr "Subversion: Committing changes to the repository..."
+msgstr "Subversion: Committing changes to the repositoryâ?¦"
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
 msgid "Subversion: Copy complete."
@@ -8580,62 +8620,62 @@ msgstr "Please enter a source path."
 msgid "Please enter a destination path."
 msgstr "Please enter a destination path."
 
-#: ../plugins/subversion/subversion-diff-dialog.c:44
+#: ../plugins/subversion/subversion-diff-dialog.c:46
 msgid "[Head/Working Copy]"
 msgstr "[Head/Working Copy]"
 
-#: ../plugins/subversion/subversion-diff-dialog.c:59
-#: ../plugins/subversion/subversion-log-dialog.c:424
-#: ../plugins/subversion/subversion-log-dialog.c:491
+#: ../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: Retrieving diff..."
+msgstr "Subversion: Retrieving diffâ?¦"
 
-#: ../plugins/subversion/subversion-log-dialog.c:117
+#: ../plugins/subversion/subversion-log-dialog.c:119
 msgid "Diff"
 msgstr "Diff"
 
-#: ../plugins/subversion/subversion-log-dialog.c:149
+#: ../plugins/subversion/subversion-log-dialog.c:151
 msgid "Revision"
 msgstr "Revision"
 
-#: ../plugins/subversion/subversion-log-dialog.c:158
+#: ../plugins/subversion/subversion-log-dialog.c:160
 msgid "Short Log"
 msgstr "Short Log"
 
-#: ../plugins/subversion/subversion-log-dialog.c:255
+#: ../plugins/subversion/subversion-log-dialog.c:257
 msgid "Subversion: Retrieving log..."
-msgstr "Subversion: Retrieving log..."
+msgstr "Subversion: Retrieving logâ?¦"
 
-#: ../plugins/subversion/subversion-log-dialog.c:307
+#: ../plugins/subversion/subversion-log-dialog.c:309
 msgid "Subversion: File retrieved."
 msgstr "Subversion: File retrieved."
 
-#: ../plugins/subversion/subversion-log-dialog.c:349
+#: ../plugins/subversion/subversion-log-dialog.c:351
 msgid "Subversion: Retrieving file..."
-msgstr "Subversion: Retrieving file..."
+msgstr "Subversion: Retrieving fileâ?¦"
 
-#: ../plugins/subversion/subversion-merge-dialog.c:36
+#: ../plugins/subversion/subversion-merge-dialog.c:38
 msgid "Subversion: Merge complete."
 msgstr "Subversion: Merge complete."
 
-#: ../plugins/subversion/subversion-merge-dialog.c:93
+#: ../plugins/subversion/subversion-merge-dialog.c:95
 msgid "Please enter the first path."
 msgstr "Please enter the first path."
 
-#: ../plugins/subversion/subversion-merge-dialog.c:99
+#: ../plugins/subversion/subversion-merge-dialog.c:101
 msgid "Please enter the second path."
 msgstr "Please enter the second path."
 
-#: ../plugins/subversion/subversion-merge-dialog.c:105
-#: ../plugins/subversion/subversion-switch-dialog.c:100
+#: ../plugins/subversion/subversion-merge-dialog.c:107
+#: ../plugins/subversion/subversion-switch-dialog.c:102
 msgid "Please enter a working copy path."
 msgstr "Please enter a working copy path."
 
-#: ../plugins/subversion/subversion-merge-dialog.c:119
+#: ../plugins/subversion/subversion-merge-dialog.c:121
 msgid "Please enter the start revision."
 msgstr "Please enter the start revision."
 
-#: ../plugins/subversion/subversion-merge-dialog.c:134
+#: ../plugins/subversion/subversion-merge-dialog.c:136
 msgid "Please enter the end revision."
 msgstr "Please enter the end revision."
 
@@ -8651,11 +8691,11 @@ msgstr "Subversion: Resolve complete."
 msgid "Subversion: Revert complete."
 msgstr "Subversion: Revert complete."
 
-#: ../plugins/subversion/subversion-switch-dialog.c:58
+#: ../plugins/subversion/subversion-switch-dialog.c:60
 msgid "Subversion: Switch complete."
 msgstr "Subversion: Switch complete."
 
-#: ../plugins/subversion/subversion-switch-dialog.c:106
+#: ../plugins/subversion/subversion-switch-dialog.c:108
 msgid "Please enter a branch/tag URL."
 msgstr "Please enter a branch/tag URL."
 
@@ -8669,264 +8709,342 @@ msgstr "Subversion"
 msgid "Subversion: Diff complete."
 msgstr "Subversion: Diff complete."
 
-#: ../plugins/subversion/subversion-update-dialog.c:39
+#: ../plugins/subversion/subversion-update-dialog.c:41
 msgid "Subversion: Update complete."
 msgstr "Subversion: Update complete."
 
-#: ../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 "Authentication cancelled"
 
-#: ../plugins/subversion/svn-command.c:174
+#: ../plugins/subversion/svn-command.c:198
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../plugins/subversion/svn-command.c:175
+#: ../plugins/subversion/svn-command.c:199
 msgid "Fingerprint:"
 msgstr "Fingerprint:"
 
-#: ../plugins/subversion/svn-command.c:176
+#: ../plugins/subversion/svn-command.c:200
 msgid "Valid from:"
 msgstr "Valid from:"
 
-#: ../plugins/subversion/svn-command.c:177
+#: ../plugins/subversion/svn-command.c:201
 msgid "Valid until:"
 msgstr "Valid until:"
 
-#: ../plugins/subversion/svn-command.c:178
+#: ../plugins/subversion/svn-command.c:202
 msgid "Issuer DN:"
 msgstr "Issuer DN:"
 
-#: ../plugins/subversion/svn-command.c:179
+#: ../plugins/subversion/svn-command.c:203
 msgid "DER certificate:"
 msgstr "DER certificate:"
 
-#: ../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 "Deleted: %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 "Added: %s"
 
-#: ../plugins/subversion/svn-command.c:339
+#: ../plugins/subversion/svn-command.c:363
 #, c-format
 msgid "Resolved: %s"
 msgstr "Resolved: %s"
 
-#: ../plugins/subversion/svn-command.c:345
+#: ../plugins/subversion/svn-command.c:369
 #, c-format
 msgid "Updated: %s"
 msgstr "Updated: %s"
 
-#: ../plugins/subversion/svn-command.c:351
+#: ../plugins/subversion/svn-command.c:375
 #, c-format
 msgid "Externally Updated: %s"
 msgstr "Externally Updated: %s"
 
-#: ../plugins/subversion/svn-command.c:385
+#: ../plugins/subversion/svn-command.c:409
 #, c-format
 msgid "Modified: %s"
 msgstr "Modified: %s"
 
-#: ../plugins/subversion/svn-command.c:388
+#: ../plugins/subversion/svn-command.c:412
 #, c-format
 msgid "Merged: %s"
 msgstr "Merged: %s"
 
-#: ../plugins/subversion/svn-command.c:391
+#: ../plugins/subversion/svn-command.c:415
 #, c-format
 msgid "Conflicted: %s"
 msgstr "Conflicted: %s"
 
-#: ../plugins/subversion/svn-command.c:395
+#: ../plugins/subversion/svn-command.c:419
 #, c-format
 msgid "Missing: %s"
 msgstr "Missing: %s"
 
-#: ../plugins/subversion/svn-command.c:398
+#: ../plugins/subversion/svn-command.c:422
 #, c-format
 msgid "Obstructed: %s"
 msgstr "Obstructed: %s"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:272
+#: ../plugins/symbol-db/plugin.c:313
+msgid "Tag De_claration"
+msgstr "Tag De_claration"
+
+#: ../plugins/symbol-db/plugin.c:315
+msgid "Goto symbol declaration"
+msgstr "Go to symbol declaration"
+
+#. Translators: Go to the line where the tag is implemented
+#: ../plugins/symbol-db/plugin.c:322
+msgid "Tag _Implementation"
+msgstr "Tag _Implementation"
+
+#: ../plugins/symbol-db/plugin.c:324
+msgid "Goto symbol definition"
+msgstr "Go to symbol definition"
+
+#: ../plugins/symbol-db/plugin.c:331
+msgid "_Find Symbol..."
+msgstr "_Find Symbolâ?¦"
+
+#: ../plugins/symbol-db/plugin.c:332
+msgid "Find Symbol"
+msgstr "Find Symbol"
+
+#: ../plugins/symbol-db/plugin.c:1170
+#, c-format
+msgid "%s: Generating inheritances..."
+msgstr "%s: Generating inheritancesâ?¦"
+
+#: ../plugins/symbol-db/plugin.c:1175
+#, c-format
+msgid "%s: %d files scanned out of %d"
+msgstr "%s: %d files scanned out of %d"
+
+#: ../plugins/symbol-db/plugin.c:1206
+#, c-format
+msgid "Generating inheritances..."
+msgstr "Generating inheritancesâ?¦"
+
+#: ../plugins/symbol-db/plugin.c:1208
+#, c-format
+msgid "%d files scanned out of %d"
+msgstr "%d files scanned out of %d"
+
+#: ../plugins/symbol-db/plugin.c:1968
+msgid "Populating symbols' db..."
+msgstr "Populating symbol databaseâ?¦"
+
+#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+msgid "Symbols"
+msgstr "Symbols"
+
+#: ../plugins/symbol-db/plugin.c:2489
+msgid "SymbolDb popup actions"
+msgstr "SymbolDb popup actions"
+
+#: ../plugins/symbol-db/plugin.c:2497
+msgid "SymbolDb menu actions"
+msgstr "SymbolDb menu actions"
+
+#: ../plugins/symbol-db/symbol-db-prefs.c:275
 msgid "Package is not parseable"
 msgstr "Package is not parseable"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:419
-#: ../plugins/symbol-db/symbol-db-prefs.c:579
+#: ../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 "Symbol Database"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:528
+#: ../plugins/symbol-db/symbol-db-prefs.c:471
 msgid "API Tags"
 msgstr "API Tags"
 
-#: ../plugins/symbol-db/symbol-db-system.c:786
+#: ../plugins/symbol-db/symbol-db-system.c:807
 msgid "Resuming glb scan."
 msgstr "Resuming glb scan."
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:1
+#: ../plugins/symbol-db/symbol-db-view-locals.c:326
+#: ../plugins/symbol-db/symbol-db-view.c:1413
+msgid "Symbol"
+msgstr "Symbol"
+
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
 msgid "<b>Available API tags</b>"
 msgstr "<b>Available API tags</b>"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:3
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
+msgid "<b>Global</b>"
+msgstr "<b>Global</b>"
+
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
 msgid "Automatically scan project's packages"
 msgstr "Automatically scan project's packages"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:4
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
 msgid "Automatically update symbols without saving file"
 msgstr "Automatically update symbols without saving file"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:5
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
 msgid "Checking if package is parseable..."
-msgstr "Checking if package is parseable..."
-
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:6
-msgid "Ctags executable:"
-msgstr "Ctags executable:"
+msgstr "Checking if package is parseableâ?¦"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:7
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Parallel scan of project and global symbols"
 msgstr "Parallel scan of project and global symbols"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:1
-msgid "<b>Terminal options</b>"
-msgstr "<b>Terminal options</b>"
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
+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 ""
+"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)"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:2
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
 msgid ""
-"Default\n"
-"\n"
+"This option means that the global system packages will be scanned "
+"contemporary with the project's ones"
 msgstr ""
-"Default\n"
-"\n"
+"This option means that the global system packages will be scanned "
+"simultaneously with the project's ones"
+
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
+msgid ""
+"Update automatically the file's symbols without saving. The update occurs "
+"after 10 seconds of no keypress by user."
+msgstr ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by user."
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:5
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
+msgid "<b>Terminal options</b>"
+msgstr "<b>Terminal options</b>"
+
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:3
 msgid "Use GNOME terminal profile:"
-msgstr "Use GNOME terminal profile:"
+msgstr "Use GNOME Terminal profile:"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:6
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:4
 msgid "Use currently selected profile in GNOME terminal"
-msgstr "Use currently selected profile in GNOME terminal"
+msgstr "Use currently selected profile in GNOME Terminal"
 
-#: ../plugins/terminal/terminal.c:687
+#: ../plugins/terminal/terminal.c:701
 msgid "terminal operations"
 msgstr "terminal operations"
 
-#: ../plugins/terminal/terminal.c:705 ../plugins/terminal/terminal.c:863
-#: ../plugins/terminal/terminal.c:916
+#: ../plugins/terminal/terminal.c:719 ../plugins/terminal/terminal.c:886
+#: ../plugins/terminal/terminal.c:939
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../plugins/tools/anjuta-tools.glade.h:1
+#: ../plugins/tools/anjuta-tools.ui.h:1
 msgid "<b>Tools</b>"
 msgstr "<b>Tools</b>"
 
-#: ../plugins/tools/anjuta-tools.glade.h:2
+#: ../plugins/tools/anjuta-tools.ui.h:3
 msgid "Command:"
 msgstr "Command:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:4
 msgid "Edit as script"
 msgstr "Edit as script"
 
-#: ../plugins/tools/anjuta-tools.glade.h:4
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Edit command as script in Anjuta on close"
 msgstr "Edit command as script in Anjuta on close"
 
-#: ../plugins/tools/anjuta-tools.glade.h:7
+#: ../plugins/tools/anjuta-tools.ui.h:8
 msgid "Parameters:"
 msgstr "Parameters:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:9
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Save all files"
 msgstr "Save all files"
 
-#: ../plugins/tools/anjuta-tools.glade.h:10
+#: ../plugins/tools/anjuta-tools.ui.h:11
 msgid "Short cut:"
 msgstr "Short cut:"
 
 #. This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:12
+#: ../plugins/tools/anjuta-tools.ui.h:13
 msgid "Standard error:"
 msgstr "Standard error:"
 
 #. This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:14
+#: ../plugins/tools/anjuta-tools.ui.h:15
 msgid "Standard input:"
 msgstr "Standard input:"
 
 #. This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:16
+#: ../plugins/tools/anjuta-tools.ui.h:17
 msgid "Standard output:"
 msgstr "Standard output:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:17
+#: ../plugins/tools/anjuta-tools.ui.h:18
 msgid "Tool Editor"
 msgstr "Tool Editor"
 
-#: ../plugins/tools/anjuta-tools.glade.h:18
+#: ../plugins/tools/anjuta-tools.ui.h:19
 msgid "Variable list"
 msgstr "Variable list"
 
-#: ../plugins/tools/anjuta-tools.glade.h:19
+#: ../plugins/tools/anjuta-tools.ui.h:20
 msgid "Working directory:"
 msgstr "Working directory:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:20
+#: ../plugins/tools/anjuta-tools.ui.h:21
 msgid "_Variable..."
-msgstr "_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 "Are you sure you want to delete the '%s' tool?"
 
-#: ../plugins/tools/dialog.c:335
+#: ../plugins/tools/dialog.c:343
 msgid "Tool"
 msgstr "Tool"
 
-#: ../plugins/tools/editor.c:302
+#: ../plugins/tools/editor.c:316
 msgid "ask at runtime"
 msgstr "ask at runtime"
 
-#: ../plugins/tools/editor.c:307
+#: ../plugins/tools/editor.c:321
 msgid "undefined"
 msgstr "undefined"
 
-#: ../plugins/tools/editor.c:441
-msgid "Unable to build user interface for tool variable"
-msgstr "Unable to build user interface for tool variable"
-
-#: ../plugins/tools/editor.c:457
+#: ../plugins/tools/editor.c:471
 msgid "Meaning"
 msgstr "Meaning"
 
-#: ../plugins/tools/editor.c:532
+#: ../plugins/tools/editor.c:619
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../plugins/tools/editor.c:694
+#: ../plugins/tools/editor.c:791
 msgid "You must provide a tool name!"
 msgstr "You must provide a tool name!"
 
-#: ../plugins/tools/editor.c:702
+#: ../plugins/tools/editor.c:799
 msgid "You must provide a tool command!"
 msgstr "You must provide a tool command!"
 
-#: ../plugins/tools/editor.c:710
+#: ../plugins/tools/editor.c:807
 msgid "A tool with the same name already exists!"
 msgstr "A tool with the same name already exists!"
 
-#: ../plugins/tools/editor.c:727
+#: ../plugins/tools/editor.c:824
 msgid ""
 "The shortcut is already used by another component in Anjuta. Do you want to "
 "keep it anyway?"
@@ -8934,32 +9052,24 @@ msgstr ""
 "The shortcut is already used by another component in Anjuta. Do you want to "
 "keep it anyway?"
 
-#: ../plugins/tools/editor.c:815
+#: ../plugins/tools/editor.c:908
 msgid "Unable to edit script"
 msgstr "Unable to edit script"
 
-#: ../plugins/tools/editor.c:951
+#: ../plugins/tools/editor.c:1044
 msgid "New accelerator..."
-msgstr "New accelerator..."
-
-#: ../plugins/tools/editor.c:976
-msgid "Unable to build user interface for tool editor"
-msgstr "Unable to build user interface for tool editor"
+msgstr "New acceleratorâ?¦"
 
-#: ../plugins/tools/execute.c:313
+#: ../plugins/tools/execute.c:314
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: ../plugins/tools/execute.c:334
-msgid "error:"
-msgstr "error:"
-
 #. This is append to the tool name to give something
 #. * 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:408
+#: ../plugins/tools/execute.c:409
 msgid "(output)"
 msgstr "(output)"
 
@@ -8967,30 +9077,30 @@ msgstr "(output)"
 #. * 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:416
+#: ../plugins/tools/execute.c:417
 msgid "(error)"
 msgstr "(error)"
 
 #. Display the name of the command
-#: ../plugins/tools/execute.c:468
+#: ../plugins/tools/execute.c:469
 #, c-format
 msgid "Running command: %s...\n"
-msgstr "Running command: %s...\n"
+msgstr "Running command: %sâ?¦\n"
 
-#: ../plugins/tools/execute.c:508
+#: ../plugins/tools/execute.c:509
 #, c-format
 msgid "Completed unsuccessfully with status code %d\n"
 msgstr "Completed unsuccessfully with status code %d\n"
 
-#: ../plugins/tools/execute.c:628
+#: ../plugins/tools/execute.c:629
 msgid "Unable to create a buffer, command aborted"
-msgstr "Unable to create a buffer, command aborted"
+msgstr "Unable to create a buffer: command aborted"
 
-#: ../plugins/tools/execute.c:640
+#: ../plugins/tools/execute.c:641
 msgid "No document currently open, command aborted"
-msgstr "No document currently open, command aborted"
+msgstr "No document currently open: command aborted"
 
-#: ../plugins/tools/execute.c:1018
+#: ../plugins/tools/execute.c:1019
 #, c-format
 msgid "Unable to open input file %s, command aborted"
 msgstr "Unable to open input file %s, command aborted"
@@ -9017,11 +9127,104 @@ msgstr "Unable to open %s for writing"
 msgid "Tool operations"
 msgstr "Tool operations"
 
-#: ../plugins/tools/plugin.c:252 ../plugins/tools/plugin.c:259
+#: ../plugins/tools/plugin.c:256 ../plugins/tools/plugin.c:263
 #: ../plugins/tools/anjuta-tools.plugin.in.h:1
 msgid "Tools"
 msgstr "Tools"
 
+#: ../plugins/tools/variable.c:84
+msgid "Project root URI"
+msgstr "Project root URI"
+
+#: ../plugins/tools/variable.c:85
+msgid "Project root path"
+msgstr "Project root path"
+
+#: ../plugins/tools/variable.c:86
+msgid "Selected URI in the file manager plugin"
+msgstr "Selected URI in the file manager plugin"
+
+#: ../plugins/tools/variable.c:87
+msgid "Selected directory in the file manager plugin"
+msgstr "Selected directory in the file manager plugin"
+
+#: ../plugins/tools/variable.c:88
+msgid "Selected full file name in the file manager plugin"
+msgstr "Selected full file name in the file manager plugin"
+
+#: ../plugins/tools/variable.c:89
+msgid "Selected full file name without extension in the file manager plugin"
+msgstr "Selected full file name without extension in the file manager plugin"
+
+#: ../plugins/tools/variable.c:90
+msgid "Selected file name in the file manager plugin"
+msgstr "Selected file name in the file manager plugin"
+
+#: ../plugins/tools/variable.c:91
+msgid "Selected file name without extension in the file manager plugin"
+msgstr "Selected file name without extension in the file manager plugin"
+
+#: ../plugins/tools/variable.c:92
+msgid "Selected file's extension in the file manager plugin"
+msgstr "Selected file's extension in the file manager plugin"
+
+#: ../plugins/tools/variable.c:93
+msgid "Selected URI in the project manager plugin"
+msgstr "Selected URI in the project manager plugin"
+
+#: ../plugins/tools/variable.c:94
+msgid "Selected directory in the project manager plugin"
+msgstr "Selected directory in the project manager plugin"
+
+#: ../plugins/tools/variable.c:95
+msgid "Selected full file name in the project manager plugin"
+msgstr "Selected full file name in the project manager plugin"
+
+#: ../plugins/tools/variable.c:96
+msgid "Selected full file name without extension in the project manager plugin"
+msgstr ""
+"Selected full file name without extension in the project manager plugin"
+
+#: ../plugins/tools/variable.c:97
+msgid "Selected file name in the project manager plugin"
+msgstr "Selected file name in the project manager plugin"
+
+#: ../plugins/tools/variable.c:98
+msgid "Selected file name without extension in the project manager plugin"
+msgstr "Selected file name without extension in the project manager plugin"
+
+#: ../plugins/tools/variable.c:99
+msgid "Selected file extension in the project manager plugin"
+msgstr "Selected file extension in the project manager plugin"
+
+#: ../plugins/tools/variable.c:100
+msgid "Currently edited file name"
+msgstr "Currently edited file name"
+
+#: ../plugins/tools/variable.c:101
+msgid "Currently edited file name without extension"
+msgstr "Currently edited file name without extension"
+
+#: ../plugins/tools/variable.c:102
+msgid "Currently edited file directory"
+msgstr "Currently edited file directory"
+
+#: ../plugins/tools/variable.c:103
+msgid "Currently selected text in editor"
+msgstr "Currently selected text in editor"
+
+#: ../plugins/tools/variable.c:104
+msgid "Current word in editor"
+msgstr "Current word in editor"
+
+#: ../plugins/tools/variable.c:105
+msgid "Current line in editor"
+msgstr "Current line in editor"
+
+#: ../plugins/tools/variable.c:106
+msgid "Ask the user to get additional parameters"
+msgstr "Ask the user to get additional parameters"
+
 #: ../plugins/tools/variable.c:493
 msgid "Command line parameters"
 msgstr "Command line parameters"
@@ -9083,446 +9286,13 @@ msgstr "Current selection"
 msgid "String"
 msgstr "String"
 
-#: ../plugins/valgrind/anjuta-valgrind.glade.h:1
-msgid "<b>Program to test:</b>"
-msgstr "<b>Program to test:</b>"
-
-#: ../plugins/valgrind/anjuta-valgrind.glade.h:2
-msgid "<b>Valgrind</b>"
-msgstr "<b>Valgrind</b>"
-
-#: ../plugins/valgrind/anjuta-valgrind.glade.h:3
-msgid ""
-"Memcheck\n"
-"Addrcheck\n"
-"Helgrind"
-msgstr ""
-"Memcheck\n"
-"Addrcheck\n"
-"Helgrind"
-
-#: ../plugins/valgrind/anjuta-valgrind.glade.h:7
-msgid "Select Tool:"
-msgstr "Select Tool:"
-
-#: ../plugins/valgrind/anjuta-valgrind.glade.h:8
-msgid "Select Valgrind Target"
-msgstr "Select Valgrind Target"
-
-#: ../plugins/valgrind/plugin.c:135
-msgid "Options"
-msgstr "Options"
-
-#: ../plugins/valgrind/plugin.c:248
-msgid "Select debugging target"
-msgstr "Select debugging target"
-
-#: ../plugins/valgrind/plugin.c:305 ../plugins/valgrind/plugin.c:426
-#: ../plugins/valgrind/plugin.c:662 ../plugins/valgrind/plugin.c:671
-msgid "Valgrind"
-msgstr "Valgrind"
-
-#: ../plugins/valgrind/plugin.c:333
-msgid ""
-"No executable target selected for debugging with Valgrind. Please select one."
-msgstr ""
-"No executable target selected for debugging with Valgrind. Please select one."
-
-#: ../plugins/valgrind/plugin.c:342
-msgid ""
-"There aren't any available executable targets for this project.\n"
-"Please create one first."
-msgstr ""
-"There aren't any available executable targets for this project.\n"
-"Please create one first."
-
-#: ../plugins/valgrind/plugin.c:354
-msgid "Choose file where to save Valgrind log"
-msgstr "Choose file where to save Valgrind log"
-
-#: ../plugins/valgrind/plugin.c:404
-msgid "Open Valgrind log file"
-msgstr "Open Valgrind log file"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/valgrind/plugin.c:446
-msgid "_Valgrind"
-msgstr "_Valgrind"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/valgrind/plugin.c:454
-msgid "_Select Tool and Run..."
-msgstr "_Select Tool and Run..."
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/valgrind/plugin.c:462
-msgid "_Kill Execution"
-msgstr "_Kill Execution"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/valgrind/plugin.c:470
-msgid "_Load Log"
-msgstr "_Load Log"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/valgrind/plugin.c:478
-msgid "S_ave Log"
-msgstr "S_ave Log"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/valgrind/plugin.c:486
-msgid "Edit Rules"
-msgstr "Edit Rules"
-
-#: ../plugins/valgrind/plugin.c:551
-msgid "Use Valgrind debug tool"
-msgstr "Use Valgrind debug tool"
-
-#: ../plugins/valgrind/preferences.c:122
-msgid "<b>Valgrind general preferences</b>"
-msgstr "<b>Valgrind general preferences</b>"
-
-#: ../plugins/valgrind/preferences.c:128
-msgid "Valgrind binary file path:"
-msgstr "Valgrind binary file path:"
-
-#: ../plugins/valgrind/preferences.c:142
-msgid "Choose Valgrind Binary File Path..."
-msgstr "Choose Valgrind Binary File Path..."
-
-#: ../plugins/valgrind/preferences.c:161
-msgid "Preview"
-msgstr "Preview"
-
-#: ../plugins/valgrind/preferences.c:174
-msgid "lines above and below the target line."
-msgstr "lines above and below the target line."
-
-#: ../plugins/valgrind/process.c:55
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Failed to create pipe to '%s': %s"
-
-#: ../plugins/valgrind/process.c:110
-#, c-format
-msgid "Failed to create child process '%s': %s"
-msgstr "Failed to create child process '%s': %s"
-
-#: ../plugins/valgrind/vgactions.c:168
-msgid "Reached the end of the input file or error in parsing valgrind output."
-msgstr "Reached the end of the input file or error in parsing valgrind output."
-
-#: ../plugins/valgrind/vgactions.c:177
-msgid "Process exited."
-msgstr "Process exited."
-
-#: ../plugins/valgrind/vgactions.c:197
-msgid "Could not get the right valgrind-binary gconf key:"
-msgstr "Could not get the right valgrind-binary gconf key:"
-
-#: ../plugins/valgrind/vgactions.c:205
-#, c-format
-msgid ""
-"Valgrind binary [%s] does not exist. Please check the preferences or install "
-"Valgrind package."
-msgstr ""
-"Valgrind binary [%s] does not exist. Please check the preferences or install "
-"Valgrind package."
-
-#: ../plugins/valgrind/vgactions.c:241 ../plugins/valgrind/vgactions.c:248
-msgid "Could not get the right pipe for the process."
-msgstr "Could not get the right pipe for the process."
-
-#: ../plugins/valgrind/vgcachegrindprefs.c:197
-#, c-format
-msgid ""
-"Invalid syntax in settings '%s'.\n"
-"Please enter a value of the form \"<integer>,<integer>,<integer>\"."
-msgstr ""
-"Invalid syntax in settings '%s'.\n"
-"Please enter a value of the form \"<integer>,<integer>,<integer>\"."
-
-#: ../plugins/valgrind/vgcachegrindprefs.c:234
-msgid "Override default settings"
-msgstr "Override default settings"
-
-#. This is the format of the preference, simply translate the words
-#. * inside the <>
-#: ../plugins/valgrind/vgcachegrindprefs.c:246
-msgid "Enter <size>,<assoc>,<line_size>:"
-msgstr "Enter <size>,<assoc>,<line_size>:"
-
-#: ../plugins/valgrind/vgcachegrindprefs.c:280
-msgid "Cachegrind"
-msgstr "Cachegrind"
-
-#: ../plugins/valgrind/vgdefaultview.c:189
-msgid "Error contains"
-msgstr "Error contains"
-
-#: ../plugins/valgrind/vgdefaultview.c:190
-msgid "Function contains"
-msgstr "Function contains"
-
-#: ../plugins/valgrind/vgdefaultview.c:191
-msgid "Object contains"
-msgstr "Object contains"
-
-#: ../plugins/valgrind/vgdefaultview.c:192
-msgid "Source filename contains"
-msgstr "Source filename contains"
-
-#: ../plugins/valgrind/vgdefaultview.c:229
-#, c-format
-msgid "Invalid regular expression: '%s': %s"
-msgstr "Invalid regular expression: '%s': %s"
-
-#. FIXME: we should really get this title from somewhere else?
-#: ../plugins/valgrind/vgdefaultview.c:773
-msgid "Valgrind Suppression Rules"
-msgstr "Valgrind Suppression Rules"
-
-#. FIXME: we should really get this title from somewhere else?
-#: ../plugins/valgrind/vgdefaultview.c:1118
-#: ../plugins/valgrind/vgrule-list.c:135
-msgid "Valgrind Suppression"
-msgstr "Valgrind Suppression"
-
-#: ../plugins/valgrind/vgdefaultview.c:1166
-msgid "Cu_t"
-msgstr "Cu_t"
-
-#: ../plugins/valgrind/vgdefaultview.c:1170
-msgid "Suppress"
-msgstr "Suppress"
-
-#: ../plugins/valgrind/vgdefaultview.c:1172
-msgid "Edit in Custom Editor"
-msgstr "Edit in Custom Editor"
-
-#. demangle = decode C++ name encoding
-#: ../plugins/valgrind/vggeneralprefs.c:179
-msgid "Demangle C++ symbol names"
-msgstr "Demangle C++ symbol names"
-
-#: ../plugins/valgrind/vggeneralprefs.c:187
-msgid "Show"
-msgstr "Show"
-
-#: ../plugins/valgrind/vggeneralprefs.c:199
-msgid "callers in stack trace"
-msgstr "callers in stack trace"
-
-#: ../plugins/valgrind/vggeneralprefs.c:206
-msgid "Stop showing errors if there are too many"
-msgstr "Stop showing errors if there are too many"
-
-#: ../plugins/valgrind/vggeneralprefs.c:214
-msgid "Round malloc sizes to next word"
-msgstr "Round malloc sizes to next word"
-
-#: ../plugins/valgrind/vggeneralprefs.c:222
-msgid "Trace any child processes forked off by the program being debugged"
-msgstr "Trace any child processes forked off by the program being debugged"
-
-#: ../plugins/valgrind/vggeneralprefs.c:230
-msgid "Track open file descriptors"
-msgstr "Track open file descriptors"
-
-#: ../plugins/valgrind/vggeneralprefs.c:238
-msgid "Add time stamps to log messages"
-msgstr "Add time stamps to log messages"
-
-#: ../plugins/valgrind/vggeneralprefs.c:246
-msgid "Call __libc_freeres() at exit before checking for memory leaks"
-msgstr "Call __libc_freeres() at exit before checking for memory leaks"
-
-#: ../plugins/valgrind/vggeneralprefs.c:254
-msgid "Suppressions File:"
-msgstr "Suppressions File:"
-
-#: ../plugins/valgrind/vggeneralprefs.c:274
-msgid "Choose Valgrind Suppressions File..."
-msgstr "Choose Valgrind Suppressions File..."
-
-#: ../plugins/valgrind/vghelgrindprefs.c:165
-msgid "Helgrind"
-msgstr "Helgrind"
-
-#: ../plugins/valgrind/vghelgrindprefs.c:170
-msgid "Assume thread stacks are used privately"
-msgstr "Assume thread stacks are used privately"
-
-#: ../plugins/valgrind/vghelgrindprefs.c:179
-msgid "Show location of last word access on error:"
-msgstr "Show location of last word access on error:"
-
-#: ../plugins/valgrind/vgmemcheckprefs.c:189
-msgid "Memcheck"
-msgstr "Memcheck"
-
-#: ../plugins/valgrind/vgmemcheckprefs.c:194
-msgid "Memory leaks"
-msgstr "Memory leaks"
-
-#: ../plugins/valgrind/vgmemcheckprefs.c:199
-msgid "Leak check:"
-msgstr "Leak check:"
-
-#: ../plugins/valgrind/vgmemcheckprefs.c:210
-msgid "Show reachable blocks in leak check"
-msgstr "Show reachable blocks in leak check"
-
-#: ../plugins/valgrind/vgmemcheckprefs.c:218
-msgid "Leak resolution:"
-msgstr "Leak resolution:"
-
-#: ../plugins/valgrind/vgmemcheckprefs.c:236
-msgid "Keep up to"
-msgstr "Keep up to"
-
-#: ../plugins/valgrind/vgmemcheckprefs.c:248
-msgid "bytes in the queue after being free()'d"
-msgstr "bytes in the queue after being free()'d"
-
-#: ../plugins/valgrind/vgmemcheckprefs.c:255
-msgid "Work around bugs generated by gcc 2.96"
-msgstr "Work around bugs generated by gcc 2.96"
-
-#: ../plugins/valgrind/vgrule-editor.c:197
-msgid "Grow"
-msgstr "Grow"
-
-#: ../plugins/valgrind/vgrule-editor.c:201
-msgid "Shrink"
-msgstr "Shrink"
-
-#: ../plugins/valgrind/vgrule-editor.c:227
-msgid "Rule name:"
-msgstr "Rule name:"
-
-#: ../plugins/valgrind/vgrule-editor.c:237
-msgid "Suppress messages of type:"
-msgstr "Suppress messages of type:"
-
-#: ../plugins/valgrind/vgrule-editor.c:247
-msgid "Suppress when using:"
-msgstr "Suppress when using:"
-
-#: ../plugins/valgrind/vgrule-editor.c:260
-msgid "System call:"
-msgstr "System call:"
-
-#: ../plugins/valgrind/vgrule-editor.c:271
-msgid "Call chain:"
-msgstr "Call chain:"
-
-#: ../plugins/valgrind/vgrule-editor.c:529
-#: ../plugins/valgrind/vgrule-editor.c:544
-#, c-format
-msgid "Error saving to suppression file '%s': %s"
-msgstr "Error saving to suppression file '%s': %s"
-
-#: ../plugins/valgrind/vgrule-list.c:177 ../plugins/valgrind/vgrule-list.c:246
-msgid "You have forgotten to name your suppression rule."
-msgstr "You have forgotten to name your suppression rule."
-
-#: ../plugins/valgrind/vgrule-list.c:651
-#, c-format
-msgid "Cannot save suppression rules: %s"
-msgstr "Cannot save suppression rules: %s"
-
-#: ../plugins/valgrind/vgrule-list.c:653
-msgid "You have not set a suppressions file in your settings."
-msgstr "You have not set a suppressions file in your settings."
-
-#: ../src/about.c:185
+#: ../src/about.c:202
 msgid "Copyright (c) Naba Kumar"
 msgstr "Copyright (c) Naba Kumar"
 
-#: ../src/anjuta.c:419
+#: ../src/anjuta.c:428
 msgid "Loaded Session..."
-msgstr "Loaded Session..."
-
-#: ../src/anjuta.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Appearance</b>"
-
-#: ../src/anjuta.glade.h:2
-msgid "<b>Project Defaults</b>"
-msgstr "<b>Project Defaults</b>"
-
-#: ../src/anjuta.glade.h:3
-msgid "<b>Session</b>"
-msgstr "<b>Session</b>"
-
-#: ../src/anjuta.glade.h:4
-msgid ""
-"Default\n"
-"Text below icons\n"
-"Text beside icons\n"
-"Icons only\n"
-"Text only"
-msgstr ""
-"Default\n"
-"Text below icons\n"
-"Text beside icons\n"
-"Icons only\n"
-"Text only"
-
-#: ../src/anjuta.glade.h:9
-msgid "Default project directory:"
-msgstr "Default project directory:"
-
-#: ../src/anjuta.glade.h:10
-msgid "Developer email address:"
-msgstr "Developer e-mail address:"
-
-#: ../src/anjuta.glade.h:11
-msgid "Developer name:"
-msgstr "Developer name:"
-
-#: ../src/anjuta.glade.h:12
-msgid "Do not load last project and files on startup"
-msgstr "Do not load last project and files on startup"
-
-#: ../src/anjuta.glade.h:13
-msgid "Do not load last session on startup"
-msgstr "Do not load last session on startup"
-
-#. Style of the buttons/tabs used to select docked windows in anjuta
-#: ../src/anjuta.glade.h:15
-msgid "Dock switcher style:"
-msgstr "Dock switcher style:"
-
-#: ../src/anjuta.glade.h:17
-msgid "Select projects directory"
-msgstr "Select project directory"
-
-#: ../src/anjuta.glade.h:18
-msgid ""
-"Text\n"
-"Icons\n"
-"Text + Icons\n"
-"Gnome toolbar setting\n"
-"Tabs"
-msgstr ""
-"Text\n"
-"Icons\n"
-"Text + Icons\n"
-"GNOME toolbar setting\n"
-"Tabs"
-
-#. translators: translate the same as in gnome-control-center
-#: ../src/anjuta.glade.h:24
-msgid "Toolbar button labels:"
-msgstr "Toolbar button labels:"
+msgstr "Loaded Sessionâ?¦"
 
 #: ../src/anjuta-actions.h:23
 msgid "_File"
@@ -9650,25 +9420,21 @@ msgstr "About External _Plugins"
 
 #: ../src/anjuta-actions.h:96
 msgid "About third party Anjuta plugins"
-msgstr "About third party Anjuta plugins"
+msgstr "About third-party Anjuta plugins"
 
-#: ../src/anjuta-app.c:426
+#: ../src/anjuta-app.c:489
 msgid "Edit"
 msgstr "Edit"
 
-#: ../src/anjuta-app.c:430 ../src/anjuta-app.c:435
-msgid "View"
-msgstr "View"
-
-#: ../src/anjuta-app.c:657
+#: ../src/anjuta-app.c:734
 msgid "Installed plugins"
 msgstr "Installed plugins"
 
-#: ../src/anjuta-app.c:661
+#: ../src/anjuta-app.c:738
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: ../src/anjuta-app.c:733
+#: ../src/anjuta-app.c:810
 #, c-format
 msgid "Value doesn't exist"
 msgstr "Value doesn't exist"
@@ -9685,11 +9451,11 @@ msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
 #: ../src/main.c:70
 msgid "Do not show the splashscreen"
-msgstr "Do not show the splashscreen"
+msgstr "Do not show the splash screen"
 
 #: ../src/main.c:76
 msgid "Start a new instance and do not open the file in a existing"
-msgstr "Start a new instance and do not open the file in a existing"
+msgstr "Start a new instance and do not open the file in an existing instance"
 
 #: ../src/main.c:82
 msgid "Do not open last session on startup"
@@ -9701,114 +9467,200 @@ msgstr "Do not open last project and files on startup"
 
 #: ../src/main.c:94
 msgid "Shutdown anjuta properly releasing all resources (for debugging)"
-msgstr "Shutdown anjuta properly releasing all resources (for debugging)"
+msgstr "Shut down Anjuta, properly releasing all resources (for debugging)"
 
 #: ../src/main.c:156
 msgid "- Integrated Development Environment"
 msgstr "- Integrated Development Environment"
 
-#: ../src/main.c:224
+#: ../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>Autocompletion (C/C++/Java only)</b>"
+#: ../src/preferences.ui.h:1
+msgid "Appearance"
+msgstr "Appearance"
+
+#: ../src/preferences.ui.h:3
+msgid "Default project directory:"
+msgstr "Default project directory:"
+
+#: ../src/preferences.ui.h:4
+msgid "Developer email address:"
+msgstr "Developer e-mail address:"
+
+#: ../src/preferences.ui.h:5
+msgid "Developer name:"
+msgstr "Developer name:"
+
+#: ../src/preferences.ui.h:6
+msgid "Do not load last project and files on startup"
+msgstr "Do not load last project and files on startup"
+
+#: ../src/preferences.ui.h:7
+msgid "Do not load last session on startup"
+msgstr "Do not load last session on startup"
+
+#. Style of the buttons/tabs used to select docked windows in anjuta
+#: ../src/preferences.ui.h:9
+msgid "Dock switcher style:"
+msgstr "Dock switcher style:"
+
+#: ../src/preferences.ui.h:11
+msgid "Gnome toolbar setting"
+msgstr "GNOME toolbar setting"
+
+#: ../src/preferences.ui.h:12
+msgid "Icons"
+msgstr "Icons"
+
+#: ../src/preferences.ui.h:13
+msgid "Icons only"
+msgstr "Icons only"
+
+#: ../src/preferences.ui.h:14
+msgid "Project Defaults"
+msgstr "Project Defaults"
+
+#: ../src/preferences.ui.h:15
+msgid "Select projects directory"
+msgstr "Select project directory"
+
+#: ../src/preferences.ui.h:16
+msgid "Session"
+msgstr "Session"
+
+#: ../src/preferences.ui.h:17
+msgid "Tabs"
+msgstr "Tabs"
+
+#: ../src/preferences.ui.h:19
+msgid "Text + Icons"
+msgstr "Text + Icons"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:2
-msgid "<b>Calltips</b>"
-msgstr "<b>Calltips</b>"
+#: ../src/preferences.ui.h:20
+msgid "Text below icons"
+msgstr "Text below icons"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:3
-msgid "<b>Indentation parameters</b>"
-msgstr "<b>Indentation parameters</b>"
+#: ../src/preferences.ui.h:21
+msgid "Text beside icons"
+msgstr "Text beside icons"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:4
-msgid "<b>Smart Indentation</b>"
-msgstr "<b>Smart Indentation</b>"
+#: ../src/preferences.ui.h:22
+msgid "Text only"
+msgstr "Text only"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:5
+#. translators: translate the same as in gnome-control-center
+#: ../src/preferences.ui.h:24
+msgid "Toolbar button labels:"
+msgstr "Toolbar button labels:"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
+msgid "Do not display warning if not using a Debug configuration"
+msgstr "Do not display warning if not using a Debug configuration"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "Add '(' after function call autocompletion"
 
-#: ../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 "Add a space after function call autocompletion"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:7
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
 msgid "Autocomplete"
 msgstr "Autocomplete"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
+msgid "Autocompletion (C/C++/Java only)"
+msgstr "Autocompletion (C/C++/Java only)"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
+msgid "Autocompletion pop up choices"
+msgstr "Autocompletion pop up choices"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Brace indentation size in spaces:"
 msgstr "Brace indentation size in spaces:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:10
-msgid "Enable adaptive indentation"
-msgstr "Enable adaptive indentation"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+msgid "Calltips"
+msgstr "Calltips"
 
-#: ../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 "Enable code completion"
 
-#: ../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 "Enable smart bracket completion"
+msgstr "Enable smart brace completion"
 
-#: ../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 "Enable smart indentation"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:14
-msgid "Pressing tab indents"
-msgstr "Pressing tab indents"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+msgid "Indent:"
+msgstr "Indent:"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+msgid "Indentation parameters"
+msgstr "Indentation parameters"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+msgid "Line up parentheses"
+msgstr "Line up parentheses"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+msgid "Parenthese indentation"
+msgstr "Parenthesis indentation"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Show calltips"
 msgstr "Show calltips"
 
-#: ../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 "Smart Indentation"
 
-#: ../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 "Statement indentation size in spaces:"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1899
+#: ../plugins/language-support-cpp-java/plugin.c:1921
 msgid "_AutoComplete"
-msgstr "_AutoComplete"
+msgstr "_Auto-Complete"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1900
+#: ../plugins/language-support-cpp-java/plugin.c:1922
 msgid "AutoComplete the current word"
-msgstr "AutoComplete the current word"
+msgstr "Auto-complete the current word"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1906
+#: ../plugins/language-support-cpp-java/plugin.c:1928
 msgid "Auto Indent"
-msgstr "Auto Indent"
+msgstr "Auto-Indent"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1907
+#: ../plugins/language-support-cpp-java/plugin.c:1929
 msgid "Auto indent current line or selection based on indentation settings"
 msgstr "Auto-indent current line or selection based on indentation settings"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1912
+#: ../plugins/language-support-cpp-java/plugin.c:1934
 msgid "Swap .h/.c"
 msgstr "Swap .h/.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1913
+#: ../plugins/language-support-cpp-java/plugin.c:1935
 msgid "Swap c header and source files"
-msgstr "Swap c header and source files"
+msgstr "Swap C header and source files"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1956
+#: ../plugins/language-support-cpp-java/plugin.c:1978
 msgid "C++/Java Assistance"
 msgstr "C++/Java Assistance"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2044
-#: ../plugins/language-support-cpp-java/plugin.c:2053
+#: ../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"
 
-#: ../plugins/sourceview/plugin.c:223 ../plugins/sourceview/plugin.c:261
+#: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView Editor"
 
@@ -9852,14 +9704,6 @@ msgstr "File manager for project and single files"
 msgid "A Subversion client plugin based on libsvn"
 msgstr "A Subversion client plugin based on libsvn"
 
-#: ../plugins/class-inheritance/anjuta-class-inheritance.plugin.in.h:1
-msgid "A graph painter for the inheritance of the classes."
-msgstr "A graph painter for the inheritance of the classes."
-
-#: ../plugins/class-inheritance/anjuta-class-inheritance.plugin.in.h:2
-msgid "Class Inheritance"
-msgstr "Class Inheritance"
-
 #: ../plugins/glade/anjuta-glade.plugin.in.h:1
 msgid "Glade File"
 msgstr "Glade File"
@@ -9900,14 +9744,6 @@ msgstr "Patches files and directories."
 msgid "Use external program from Anjuta"
 msgstr "Use external program from Anjuta"
 
-#: ../plugins/sample1/anjuta-sample.plugin.in.h:1
-msgid "Sample Plugin"
-msgstr "Sample Plugin"
-
-#: ../plugins/sample1/anjuta-sample.plugin.in.h:2
-msgid "Sample Plugin for Anjuta."
-msgstr "Sample Plugin for Anjuta."
-
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in.h:1
 msgid "Automake Build"
 msgstr "Automake Build"
@@ -9930,11 +9766,11 @@ msgstr "CVS Plugin"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
 msgid "Import an existing autotools project to anjuta"
-msgstr "Import an existing autotools project to anjuta"
+msgstr "Import an existing autotools project to Anjuta"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:2
 msgid "Project From Existing Sources"
-msgstr "Project From Existing Sources"
+msgstr "Project from Existing Sources"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
 msgid "Project Import Assistant"
@@ -9942,19 +9778,11 @@ msgstr "Project Import Assistant"
 
 #: ../plugins/sourceview/sourceview.plugin.in.h:1
 msgid "GtkSourceview editor"
-msgstr "GtkSourceview editor"
+msgstr "GtkSourceView editor"
 
 #: ../plugins/sourceview/sourceview.plugin.in.h:2
 msgid "The default editor based on GtkSourceview"
-msgstr "The default editor based on GtkSourceview"
-
-#: ../plugins/scintilla/anjuta-editor.plugin.in.h:1
-msgid "An alternate editor based on Scintilla"
-msgstr "An alternate editor based on Scintilla"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.plugin.in.h:1
-msgid "Change build commands to use scratchbox 1 or 2"
-msgstr "Change build commands to use scratchbox 1 or 2"
+msgstr "The default editor based on GtkSourceView"
 
 #: ../plugins/starter/anjuta-starter.plugin.in.h:2
 msgid "Welcome page with most common actions."
@@ -9966,20 +9794,12 @@ msgstr "C++ and Java support Plugin"
 
 #: ../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."
-msgstr "C++ and Java support plugin for code completion, auto indentation etc."
+msgstr "C++ and Java support plugin for code completion, auto-indentation etc."
 
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:2
 msgid "Project Assistant"
 msgstr "Project Assistant"
 
-#: ../plugins/profiler/profiler.plugin.in.h:1
-msgid "Application performance profiler"
-msgstr "Application performance profiler"
-
-#: ../plugins/profiler/profiler.plugin.in.h:2
-msgid "Profile"
-msgstr "Profile"
-
 #: ../plugins/search/anjuta-search.plugin.in.h:1
 msgid "Component for searching"
 msgstr "Component for searching"
@@ -9996,10 +9816,6 @@ msgstr "Anjuta Class Generator Plugin"
 msgid "C++/GObject Class"
 msgstr "C++/GObject Class"
 
-#: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
-msgid "Class Generator"
-msgstr "Class Generator"
-
 #: ../plugins/project-manager/anjuta-project-manager.plugin.in.h:1
 msgid "Project Manager"
 msgstr "Project Manager"
@@ -10009,8 +9825,8 @@ msgid "Project Manager Plugin for Anjuta."
 msgstr "Project Manager Plugin for Anjuta."
 
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:2
-msgid "Symbol Database Plugin for Anjuta (unstable)."
-msgstr "Symbol Database Plugin for Anjuta (unstable)."
+msgid "Symbol Database Plugin for Anjuta."
+msgstr "Symbol Database Plugin for Anjuta."
 
 #: ../plugins/message-view/anjuta-message-manager.plugin.in.h:1
 msgid "Manages messages from external apps"
@@ -10020,14 +9836,6 @@ msgstr "Manages messages from external apps"
 msgid "Message Manager"
 msgstr "Message Manager"
 
-#: ../plugins/valgrind/anjuta-valgrind.plugin.in.h:1
-msgid "Powerful debugging tool."
-msgstr "Powerful debugging tool."
-
-#: ../plugins/valgrind/anjuta-valgrind.plugin.in.h:2
-msgid "Valgrind Plugin"
-msgstr "Valgrind Plugin"
-
 #: ../plugins/file-loader/anjuta-loader.plugin.in.h:2
 msgid "File loader to load different files"
 msgstr "File loader to load different files"
@@ -10068,6 +9876,968 @@ msgstr "Autotools backend"
 msgid "Autotools backend for project manager"
 msgstr "Autotools backend for project manager"
 
+#~ msgid "Fixed data-view"
+#~ msgstr "Fixed data-view"
+
+#~ msgid "Inheritance Graph"
+#~ msgstr "Inheritance Graph"
+
+#~ msgid ""
+#~ "General Public License (GPL)\n"
+#~ "Lesser General Public License (LGPL)\n"
+#~ "No License"
+#~ msgstr ""
+#~ "General Public Licence (GPL)\n"
+#~ "Lesser General Public Licence (LGPL)\n"
+#~ "No Licence"
+
+#~ msgid "Directory"
+#~ msgstr "Directory"
+
+#~ msgid ""
+#~ "Top\n"
+#~ "Bottom\n"
+#~ "Left\n"
+#~ "Right"
+#~ msgstr ""
+#~ "Top\n"
+#~ "Bottom\n"
+#~ "Left\n"
+#~ "Right"
+
+#~ msgid "<b>Filter</b>"
+#~ msgstr "<b>Filter</b>"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Command Line Parameters"
+#~ msgstr "Command Line Parameters"
+
+#~ msgid "Enter a Hexa adress or select one in the data"
+#~ msgstr "Enter a Hexa adress or select one in the data"
+
+#~ msgid "Execute Program"
+#~ msgstr "Execute Program"
+
+#~ msgid "Run in Terminal"
+#~ msgstr "Run in Terminal"
+
+#~ msgid "_Pass:"
+#~ msgstr "_Pass:"
+
+#~ msgid "<b>Bad revision:</b>"
+#~ msgstr "<b>Bad revision:</b>"
+
+#~ msgid "<b>Changes:</b>"
+#~ msgstr "<b>Changes:</b>"
+
+#~ msgid "<b>Filters</b>"
+#~ msgstr "<b>Filters</b>"
+
+#~ msgid "<b>Log Message:</b>"
+#~ msgstr "<b>Log Message:</b>"
+
+#~ msgid "<b>Log message:</b>"
+#~ msgstr "<b>Log message:</b>"
+
+#~ msgid "<b>Mode:</b>"
+#~ msgstr "<b>Mode:</b>"
+
+#~ msgid "<b>Revision:</b>"
+#~ msgstr "<b>Revision:</b>"
+
+#~ msgid "<b>Select file to add:</b>"
+#~ msgstr "<b>Select file to add:</b>"
+
+#~ msgid "<b>Tag name:</b>"
+#~ msgstr "<b>Tag name:</b>"
+
+#~ msgid "<b>URL:</b>"
+#~ msgstr "<b>URL:</b>"
+
+#~ msgid "on_widget_signal"
+#~ msgstr "on_widget_signal"
+
+#~ msgid "widget_signal_cb"
+#~ msgstr "widget_signal_cb"
+
+#~ msgid ""
+#~ "Underline-Plain\n"
+#~ "Underline-Squiggle\n"
+#~ "Underline-TT\n"
+#~ "Diagonal\n"
+#~ "Strike-Out"
+#~ msgstr ""
+#~ "Underline-Plain\n"
+#~ "Underline-Squiggle\n"
+#~ "Underline-TT\n"
+#~ "Diagonal\n"
+#~ "Strike-Out"
+
+#~ msgid "No message details"
+#~ msgstr "No message details"
+
+#~ msgid "Function Name"
+#~ msgstr "Function Name"
+
+#~ msgid "Self"
+#~ msgstr "Self"
+
+#~ msgid "Children"
+#~ msgstr "Children"
+
+#~ msgid "% Time"
+#~ msgstr "% Time"
+
+#~ msgid "Cumulative Seconds"
+#~ msgstr "Cumulative Seconds"
+
+#~ msgid "Self Seconds"
+#~ msgstr "Self Seconds"
+
+#~ msgid "Self ms/call"
+#~ msgstr "Self ms/call"
+
+#~ msgid "Total ms/call"
+#~ msgstr "Total ms/call"
+
+#~ msgid ""
+#~ "Could not get profiling data.\n"
+#~ "\n"
+#~ "Please check the path to this target's profiling data file."
+#~ msgstr ""
+#~ "Could not get profiling data.\n"
+#~ "\n"
+#~ "Please check the path to this target's profiling data file."
+
+#~ msgid ""
+#~ "This target does not have any profiling data.\n"
+#~ "\n"
+#~ "Please ensure that the target is complied with profiling support and that "
+#~ "it is run at least once."
+#~ msgstr ""
+#~ "This target does not have any profiling data.\n"
+#~ "\n"
+#~ "Please ensure that the target is complied with profiling support and that "
+#~ "it is run at least once."
+
+#~ msgid "Profiler"
+#~ msgstr "Profiler"
+
+#~ msgid "Select Target..."
+#~ msgstr "Select Target..."
+
+#~ msgid "Refresh"
+#~ msgstr "Refresh"
+
+#~ msgid "Application Performance Profiler"
+#~ msgstr "Application Performance Profiler"
+
+#~ msgid "Flat Profile"
+#~ msgstr "Flat Profile"
+
+#~ msgid "Call Graph"
+#~ msgstr "Call Graph"
+
+#~ msgid "Function Call Tree"
+#~ msgstr "Function Call Tree"
+
+#~ msgid "Function Call Chart"
+#~ msgstr "Function Call Chart"
+
+#~ msgid "<b>Called By</b>"
+#~ msgstr "<b>Called By</b>"
+
+#~ msgid "<b>Called</b>"
+#~ msgstr "<b>Called</b>"
+
+#~ msgid "<b>Functions</b>"
+#~ msgstr "<b>Functions</b>"
+
+#~ msgid "<b>Profiling Data</b>"
+#~ msgstr "<b>Profiling Data</b>"
+
+#~ msgid "<b>Select Target to Profile</b>"
+#~ msgstr "<b>Select Target to Profile</b>"
+
+#~ msgid "<b>Symbols</b>"
+#~ msgstr "<b>Symbols</b>"
+
+#~ msgid "<b>Time Propagation</b>"
+#~ msgstr "<b>Time Propagation</b>"
+
+#~ msgid "Automatically refresh profile data display"
+#~ msgstr "Automatically refresh profile data display"
+
+#~ msgid "Do not propagate time for these symbols:"
+#~ msgstr "Do not propagate time for these symbols:"
+
+#~ msgid "Do not show static functions"
+#~ msgstr "Do not show static functions"
+
+#~ msgid "Do not show these symbols:"
+#~ msgstr "Do not show these symbols:"
+
+#~ msgid ""
+#~ "Enter one symbol specification per line.\n"
+#~ "\n"
+#~ "For information on symbol specifications, see section \n"
+#~ "4.5 of the gprof info page."
+#~ msgstr ""
+#~ "Enter one symbol specification per line.\n"
+#~ "\n"
+#~ "For information on symbol specifications, see section \n"
+#~ "4.5 of the gprof info page."
+
+#~ msgid "Options..."
+#~ msgstr "Options..."
+
+#~ msgid "Profiling Options"
+#~ msgstr "Profiling Options"
+
+#~ msgid "Propagate time for all symbols"
+#~ msgstr "Propagate time for all symbols"
+
+#~ msgid "Propagate time for only these symbols:"
+#~ msgstr "Propagate time for only these symbols:"
+
+#~ msgid "Select Other Target..."
+#~ msgstr "Select Other Target..."
+
+#~ msgid "Select Profiling Target"
+#~ msgstr "Select Profiling Target"
+
+#~ msgid "Show all symbols"
+#~ msgstr "Show all symbols"
+
+#~ msgid "Show functions that could have been called but never were"
+#~ msgstr "Show functions that could have been called but never were"
+
+#~ msgid "Show only these symbols:"
+#~ msgstr "Show only these symbols:"
+
+#~ msgid "Show uncalled functions"
+#~ msgstr "Show uncalled functions"
+
+#~ msgid "Use this profiling data file:"
+#~ msgstr "Use this profiling data file:"
+
+#~ msgid "Please, fix the configuration"
+#~ msgstr "Please fix the configuration"
+
+#~ msgid ""
+#~ "Project name: %s\n"
+#~ "Project type: %s\n"
+#~ "Project path: %s\n"
+#~ msgstr ""
+#~ "Project name: %s\n"
+#~ "Project type: %s\n"
+#~ "Project path: %s\n"
+
+#~ msgid "This assistant will import an existing project into Anjuta."
+#~ msgstr "This assistant will import an existing project into Anjuta."
+
+#~ msgid "<b>Enter the project name:</b>"
+#~ msgstr "<b>Enter the project name:</b>"
+
+#~ msgid "<b>Enter the base path of your project:</b>"
+#~ msgstr "<b>Enter the base path of your project:</b>"
+
+#~ msgid "Confirmation"
+#~ msgstr "Confirmation"
+
+#~ msgid "Couldn't load glade file"
+#~ msgstr "Couldn't load Glade file"
+
+#~ msgid "Icon choice"
+#~ msgstr "Icon choice"
+
+#~ msgid "A generic GNOME project"
+#~ msgstr "A generic GNOME project"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#~ msgid "Use libglade for the UI"
+#~ msgstr "Use libglade for the UI"
+
+#~ msgid ""
+#~ "Use the libglade-2.0 library to load the glade interface file at runtime"
+#~ msgstr ""
+#~ "Use the libglade-2.0 library to load the glade interface file at runtime"
+
+#~ msgid "_Sample action"
+#~ msgstr "_Sample action"
+
+#~ msgid "Sample action"
+#~ msgstr "Sample action"
+
+#~ msgid "Sample file operations"
+#~ msgstr "Sample file operations"
+
+#~ msgid "SamplePlugin"
+#~ msgstr "SamplePlugin"
+
+#~ msgid "<b>Autocompletion</b>"
+#~ msgstr "<b>Autocompletion</b>"
+
+#~ msgid "<b>Basic Indentation</b>"
+#~ msgstr "<b>Basic Indentation</b>"
+
+#~ msgid "<b>Code folding</b>"
+#~ msgstr "<b>Code folding</b>"
+
+#~ msgid "<b>Highlight style</b>"
+#~ msgstr "<b>Highlight style</b>"
+
+#~ msgid "<b>Misc options</b>"
+#~ msgstr "<b>Misc options</b>"
+
+#~ msgid "<b>Other colors</b>"
+#~ msgstr "<b>Other colours</b>"
+
+#~ msgid "Add line number every:"
+#~ msgstr "Add line number every:"
+
+#~ msgid "Add page header"
+#~ msgstr "Add page header"
+
+#~ msgid "Attributes:"
+#~ msgstr "Attributes:"
+
+#~ msgid "Autocomplete XML/HTML closing tags"
+#~ msgstr "Autocomplete XML/HTML closing tags"
+
+#~ msgid "Background color:"
+#~ msgstr "Background colour:"
+
+#~ msgid "Basic Indentation"
+#~ msgstr "Basic Indentation"
+
+#~ msgid "Bold"
+#~ msgstr "Bold"
+
+#~ msgid "Calltip background:"
+#~ msgstr "Calltip background:"
+
+#~ msgid "Caret (cursor) color:"
+#~ msgstr "Caret (cursor) colour:"
+
+#~ msgid "Caret blink period in ms"
+#~ msgstr "Caret blink period in ms"
+
+#~ msgid "Choose autocomplete for single match"
+#~ msgstr "Choose autocomplete for single match"
+
+#~ msgid "Collapse all code folds on file open"
+#~ msgstr "Collapse all code folds on file open"
+
+#~ msgid "Colors & Fonts"
+#~ msgstr "Colours & Fonts"
+
+#~ msgid "Colour"
+#~ msgstr "Colour"
+
+#~ msgid "Compact folding"
+#~ msgstr "Compact folding"
+
+#~ msgid "Disable syntax highlighting"
+#~ msgstr "Disable syntax highlighting"
+
+#~ msgid "Draw line below folded lines"
+#~ msgstr "Draw line below folded lines"
+
+#~ msgid "Edge column"
+#~ msgstr "Edge column"
+
+#~ msgid "Editor caret (cursor) width in pixels"
+#~ msgstr "Editor caret (cursor) width in pixels"
+
+#~ msgid "Enable HTML tags folding"
+#~ msgstr "Enable HTML tags folding"
+
+#~ msgid "Enable automatic indentation"
+#~ msgstr "Enable automatic indentation"
+
+#~ msgid "Enable braces check"
+#~ msgstr "Enable braces check"
+
+#~ msgid "Enable code folding"
+#~ msgstr "Enable code folding"
+
+#~ msgid "Enable comments folding"
+#~ msgstr "Enable comments folding"
+
+#~ msgid "Enable line wrap"
+#~ msgstr "Enable line wrap"
+
+#~ msgid "Enable python comments folding"
+#~ msgstr "Enable python comments folding"
+
+#~ msgid "Enable python quoted strings folding"
+#~ msgstr "Enable python quoted strings folding"
+
+#~ msgid "Filter extraneous characters in DOS mode"
+#~ msgstr "Filter extraneous characters in DOS mode"
+
+#~ msgid "Fold style:"
+#~ msgstr "Fold style:"
+
+#~ msgid "Fonts and colors for editor"
+#~ msgstr "Fonts and colours for editor"
+
+#~ msgid "Foreground color:"
+#~ msgstr "Foreground colour:"
+
+#~ msgid "Indent closing braces"
+#~ msgstr "Indent closing braces"
+
+#~ msgid "Indent opening braces"
+#~ msgstr "Indent opening braces"
+
+#~ msgid "Indentation size in spaces:"
+#~ msgstr "Indentation size in spaces:"
+
+#~ msgid "Italic"
+#~ msgstr "Italic"
+
+#~ msgid "Line numbers margin width in pixels"
+#~ msgstr "Line numbers margin width in pixels"
+
+#~ msgid "Maintain past Indentation"
+#~ msgstr "Maintain past Indentation"
+
+#~ msgid "Margin Fold visible"
+#~ msgstr "Margin Fold visible"
+
+#~ msgid "Margin Linenum visible"
+#~ msgstr "Margin Linenum visible"
+
+#~ msgid "Margin Marker visible"
+#~ msgstr "Margin Marker visible"
+
+#~ msgid "Monochrome"
+#~ msgstr "Monochrome"
+
+#~ msgid ""
+#~ "Plus/Minus\n"
+#~ "Arrows\n"
+#~ "Circular\n"
+#~ "Squares"
+#~ msgstr ""
+#~ "Plus/Minus\n"
+#~ "Arrows\n"
+#~ "Circular\n"
+#~ "Squares"
+
+#~ msgid "Pressing backspace un-indents"
+#~ msgstr "Pressing backspace un-indents"
+
+#~ msgid "Pressing tab inserts indentation"
+#~ msgstr "Pressing tab inserts indentation"
+
+#~ msgid "Select highlight style to edit:"
+#~ msgstr "Select highlight style to edit:"
+
+#~ msgid "Selection background:"
+#~ msgstr "Selection background:"
+
+#~ msgid "Selection foreground:"
+#~ msgstr "Selection foreground:"
+
+#~ msgid "Strip trailling spaces on file save"
+#~ msgstr "Strip trailling spaces on file save"
+
+#~ msgid "Underlined"
+#~ msgstr "Underlined"
+
+#~ msgid "Use default"
+#~ msgstr "Use default"
+
+#~ msgid "View EOL chars"
+#~ msgstr "View EOL chars"
+
+#~ msgid "View Indentation Guides"
+#~ msgstr "View Indentation Guides"
+
+#~ msgid "View Line Wrap"
+#~ msgstr "View Line Wrap"
+
+#~ msgid "View Whitespaces"
+#~ msgstr "View Whitespaces"
+
+#~ msgid "View indentation whitespaces"
+#~ msgstr "View indentation whitespaces"
+
+#~ msgid "Wrap bookmarks search around"
+#~ msgstr "Wrap bookmarks search around"
+
+#~ msgid "File: %s"
+#~ msgstr "File: %s"
+
+#~ msgid "Unable to get text buffer for printing"
+#~ msgstr "Unable to get text buffer for printing"
+
+#~ msgid "No file to print!"
+#~ msgstr "No file to print!"
+
+#~ msgid "Scintilla Editor"
+#~ msgstr "Scintilla Editor"
+
+#~ msgid ""
+#~ "The file '%s' has been changed.\n"
+#~ "Do you want to reload it ?"
+#~ msgstr ""
+#~ "The file \"%s\" has been changed.\n"
+#~ "Do you want to reload it ?"
+
+#~ msgid ""
+#~ "The file '%s' has been changed.\n"
+#~ "Do you want to loose your changes and reload it ?"
+#~ msgstr ""
+#~ "The file \"%s\" has been changed.\n"
+#~ "Do you want to lose your changes and reload it?"
+
+#~ msgid ""
+#~ "The file '%s' has been deleted.\n"
+#~ "Do you confirm and close it ?"
+#~ msgstr ""
+#~ "The file \"%s\" has been deleted.\n"
+#~ "Do you confirm and close it ?"
+
+#~ msgid ""
+#~ "The file '%s' has been deleted.\n"
+#~ "Do you want to loose your changes and close it ?"
+#~ msgstr ""
+#~ "The file \"%s\" has been deleted.\n"
+#~ "Do you want to lose your changes and close it?"
+
+#~ msgid "Could not get file info"
+#~ msgstr "Could not get file info"
+
+#~ msgid "This file is too big. Unable to allocate memory."
+#~ msgstr "This file is too big. Unable to allocate memory."
+
+#~ msgid "Could not open file"
+#~ msgstr "Could not open file"
+
+#~ msgid "Error while reading from file"
+#~ msgstr "Error while reading from file"
+
+#~ msgid ""
+#~ "The file does not look like a text file or the file encoding is not "
+#~ "supported. Please check if the encoding of file is in the supported "
+#~ "encodings list. If not, add it from the preferences."
+#~ msgstr ""
+#~ "The file does not look like a text file or the file encoding is not "
+#~ "supported. Please check if the encoding of file is in the supported "
+#~ "encodings list. If not, add it from the preferences."
+
+#~ msgid "Loading file..."
+#~ msgstr "Loading file..."
+
+#~ msgid ""
+#~ "Could not load file: %s\n"
+#~ "\n"
+#~ "Details: %s"
+#~ msgstr ""
+#~ "Could not load file: %s\n"
+#~ "\n"
+#~ "Details: %s"
+
+#~ msgid "File loaded successfully"
+#~ msgstr "File loaded successfully"
+
+#~ msgid "Saving file..."
+#~ msgstr "Saving file..."
+
+#~ msgid "Could not save intermediate file %s: %s"
+#~ msgstr "Could not save intermediate file %s: %s"
+
+#~ msgid "File saved successfully"
+#~ msgstr "File saved successfully"
+
+#~ msgid ""
+#~ "Cannot load Global defaults and configuration files:\n"
+#~ "%s.\n"
+#~ "This may result in improper behaviour or instabilities.\n"
+#~ "Anjuta will fall back to built in (limited) settings"
+#~ msgstr ""
+#~ "Cannot load Global defaults and configuration files:\n"
+#~ "%s.\n"
+#~ "This may result in improper behaviour or instabilities.\n"
+#~ "Anjuta will fall back to built in (limited) settings"
+
+#~ msgid "<b>Scratchbox Options</b>\n"
+#~ msgstr "<b>Scratchbox Options</b>\n"
+
+#~ msgid "Scratchbox directory:"
+#~ msgstr "Scratchbox directory:"
+
+#~ msgid "Scratchbox target:"
+#~ msgstr "Scratchbox target:"
+
+#~ msgid "Scratchbox version:"
+#~ msgstr "Scratchbox version:"
+
+#~ msgid "Scratchbox"
+#~ msgstr "Scratchbox"
+
+#~ msgid "<b>Font:</b>"
+#~ msgstr "<b>Font:</b>"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>View</b>"
+
+#~ msgid "<b>End Revision:</b>"
+#~ msgstr "<b>End Revision:</b>"
+
+#~ msgid "<b>Subversion Options</b>"
+#~ msgstr "<b>Subversion Options</b>"
+
+#~ msgid "Ctags executable:"
+#~ msgstr "Ctags executable:"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Default\n"
+#~ "\n"
+
+#~ msgid "Unable to build user interface for tool variable"
+#~ msgstr "Unable to build user interface for tool variable"
+
+#~ msgid "Unable to build user interface for tool editor"
+#~ msgstr "Unable to build user interface for tool editor"
+
+#~ msgid "<b>Program to test:</b>"
+#~ msgstr "<b>Program to test:</b>"
+
+#~ msgid "<b>Valgrind</b>"
+#~ msgstr "<b>Valgrind</b>"
+
+#~ msgid ""
+#~ "Memcheck\n"
+#~ "Addrcheck\n"
+#~ "Helgrind"
+#~ msgstr ""
+#~ "Memcheck\n"
+#~ "Addrcheck\n"
+#~ "Helgrind"
+
+#~ msgid "Select Tool:"
+#~ msgstr "Select Tool:"
+
+#~ msgid "Select Valgrind Target"
+#~ msgstr "Select Valgrind Target"
+
+#~ msgid "Select debugging target"
+#~ msgstr "Select debugging target"
+
+#~ msgid "Valgrind"
+#~ msgstr "Valgrind"
+
+#~ msgid ""
+#~ "No executable target selected for debugging with Valgrind. Please select "
+#~ "one."
+#~ msgstr ""
+#~ "No executable target selected for debugging with Valgrind. Please select "
+#~ "one."
+
+#~ msgid ""
+#~ "There aren't any available executable targets for this project.\n"
+#~ "Please create one first."
+#~ msgstr ""
+#~ "There aren't any available executable targets for this project.\n"
+#~ "Please create one first."
+
+#~ msgid "Choose file where to save Valgrind log"
+#~ msgstr "Choose file where to save Valgrind log"
+
+#~ msgid "Open Valgrind log file"
+#~ msgstr "Open Valgrind log file"
+
+#~ msgid "_Valgrind"
+#~ msgstr "_Valgrind"
+
+#~ msgid "_Select Tool and Run..."
+#~ msgstr "_Select Tool and Run..."
+
+#~ msgid "_Kill Execution"
+#~ msgstr "_Kill Execution"
+
+#~ msgid "_Load Log"
+#~ msgstr "_Load Log"
+
+#~ msgid "S_ave Log"
+#~ msgstr "S_ave Log"
+
+#~ msgid "Edit Rules"
+#~ msgstr "Edit Rules"
+
+#~ msgid "Use Valgrind debug tool"
+#~ msgstr "Use Valgrind debug tool"
+
+#~ msgid "<b>Valgrind general preferences</b>"
+#~ msgstr "<b>Valgrind general preferences</b>"
+
+#~ msgid "Valgrind binary file path:"
+#~ msgstr "Valgrind binary file path:"
+
+#~ msgid "Choose Valgrind Binary File Path..."
+#~ msgstr "Choose Valgrind Binary File Path..."
+
+#~ msgid "Preview"
+#~ msgstr "Preview"
+
+#~ msgid "lines above and below the target line."
+#~ msgstr "lines above and below the target line."
+
+#~ msgid "Failed to create pipe to '%s': %s"
+#~ msgstr "Failed to create pipe to '%s': %s"
+
+#~ msgid "Failed to create child process '%s': %s"
+#~ msgstr "Failed to create child process '%s': %s"
+
+#~ msgid ""
+#~ "Reached the end of the input file or error in parsing valgrind output."
+#~ msgstr ""
+#~ "Reached the end of the input file or error in parsing valgrind output."
+
+#~ msgid "Process exited."
+#~ msgstr "Process exited."
+
+#~ msgid "Could not get the right valgrind-binary gconf key:"
+#~ msgstr "Could not get the right valgrind-binary gconf key:"
+
+#~ msgid ""
+#~ "Valgrind binary [%s] does not exist. Please check the preferences or "
+#~ "install Valgrind package."
+#~ msgstr ""
+#~ "Valgrind binary [%s] does not exist. Please check the preferences or "
+#~ "install Valgrind package."
+
+#~ msgid "Could not get the right pipe for the process."
+#~ msgstr "Could not get the right pipe for the process."
+
+#~ msgid ""
+#~ "Invalid syntax in settings '%s'.\n"
+#~ "Please enter a value of the form \"<integer>,<integer>,<integer>\"."
+#~ msgstr ""
+#~ "Invalid syntax in settings '%s'.\n"
+#~ "Please enter a value of the form \"<integer>,<integer>,<integer>\"."
+
+#~ msgid "Override default settings"
+#~ msgstr "Override default settings"
+
+#~ msgid "Enter <size>,<assoc>,<line_size>:"
+#~ msgstr "Enter <size>,<assoc>,<line_size>:"
+
+#~ msgid "Cachegrind"
+#~ msgstr "Cachegrind"
+
+#~ msgid "Error contains"
+#~ msgstr "Error contains"
+
+#~ msgid "Function contains"
+#~ msgstr "Function contains"
+
+#~ msgid "Object contains"
+#~ msgstr "Object contains"
+
+#~ msgid "Source filename contains"
+#~ msgstr "Source filename contains"
+
+#~ msgid "Invalid regular expression: '%s': %s"
+#~ msgstr "Invalid regular expression: '%s': %s"
+
+#~ msgid "Valgrind Suppression Rules"
+#~ msgstr "Valgrind Suppression Rules"
+
+#~ msgid "Valgrind Suppression"
+#~ msgstr "Valgrind Suppression"
+
+#~ msgid "Cu_t"
+#~ msgstr "Cu_t"
+
+#~ msgid "Suppress"
+#~ msgstr "Suppress"
+
+#~ msgid "Edit in Custom Editor"
+#~ msgstr "Edit in Custom Editor"
+
+#~ msgid "Demangle C++ symbol names"
+#~ msgstr "Demangle C++ symbol names"
+
+#~ msgid "Show"
+#~ msgstr "Show"
+
+#~ msgid "callers in stack trace"
+#~ msgstr "callers in stack trace"
+
+#~ msgid "Stop showing errors if there are too many"
+#~ msgstr "Stop showing errors if there are too many"
+
+#~ msgid "Round malloc sizes to next word"
+#~ msgstr "Round malloc sizes to next word"
+
+#~ msgid "Trace any child processes forked off by the program being debugged"
+#~ msgstr "Trace any child processes forked off by the program being debugged"
+
+#~ msgid "Track open file descriptors"
+#~ msgstr "Track open file descriptors"
+
+#~ msgid "Add time stamps to log messages"
+#~ msgstr "Add time stamps to log messages"
+
+#~ msgid "Call __libc_freeres() at exit before checking for memory leaks"
+#~ msgstr "Call __libc_freeres() at exit before checking for memory leaks"
+
+#~ msgid "Suppressions File:"
+#~ msgstr "Suppressions File:"
+
+#~ msgid "Choose Valgrind Suppressions File..."
+#~ msgstr "Choose Valgrind Suppressions File..."
+
+#~ msgid "Helgrind"
+#~ msgstr "Helgrind"
+
+#~ msgid "Assume thread stacks are used privately"
+#~ msgstr "Assume thread stacks are used privately"
+
+#~ msgid "Show location of last word access on error:"
+#~ msgstr "Show location of last word access on error:"
+
+#~ msgid "Memcheck"
+#~ msgstr "Memcheck"
+
+#~ msgid "Memory leaks"
+#~ msgstr "Memory leaks"
+
+#~ msgid "Leak check:"
+#~ msgstr "Leak check:"
+
+#~ msgid "Show reachable blocks in leak check"
+#~ msgstr "Show reachable blocks in leak check"
+
+#~ msgid "Leak resolution:"
+#~ msgstr "Leak resolution:"
+
+#~ msgid "Keep up to"
+#~ msgstr "Keep up to"
+
+#~ msgid "bytes in the queue after being free()'d"
+#~ msgstr "bytes in the queue after being free()'d"
+
+#~ msgid "Work around bugs generated by gcc 2.96"
+#~ msgstr "Work around bugs generated by gcc 2.96"
+
+#~ msgid "Grow"
+#~ msgstr "Grow"
+
+#~ msgid "Shrink"
+#~ msgstr "Shrink"
+
+#~ msgid "Rule name:"
+#~ msgstr "Rule name:"
+
+#~ msgid "Suppress messages of type:"
+#~ msgstr "Suppress messages of type:"
+
+#~ msgid "Suppress when using:"
+#~ msgstr "Suppress when using:"
+
+#~ msgid "System call:"
+#~ msgstr "System call:"
+
+#~ msgid "Call chain:"
+#~ msgstr "Call chain:"
+
+#~ msgid "Error saving to suppression file '%s': %s"
+#~ msgstr "Error saving to suppression file '%s': %s"
+
+#~ msgid "You have forgotten to name your suppression rule."
+#~ msgstr "You have forgotten to name your suppression rule."
+
+#~ msgid "Cannot save suppression rules: %s"
+#~ msgstr "Cannot save suppression rules: %s"
+
+#~ msgid "You have not set a suppressions file in your settings."
+#~ msgstr "You have not set a suppressions file in your settings."
+
+#~ msgid "<b>Session</b>"
+#~ msgstr "<b>Session</b>"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "Text below icons\n"
+#~ "Text beside icons\n"
+#~ "Icons only\n"
+#~ "Text only"
+#~ msgstr ""
+#~ "Default\n"
+#~ "Text below icons\n"
+#~ "Text beside icons\n"
+#~ "Icons only\n"
+#~ "Text only"
+
+#~ msgid ""
+#~ "Text\n"
+#~ "Icons\n"
+#~ "Text + Icons\n"
+#~ "Gnome toolbar setting\n"
+#~ "Tabs"
+#~ msgstr ""
+#~ "Text\n"
+#~ "Icons\n"
+#~ "Text + Icons\n"
+#~ "GNOME toolbar setting\n"
+#~ "Tabs"
+
+#~ msgid "<b>Calltips</b>"
+#~ msgstr "<b>Calltips</b>"
+
+#~ msgid "<b>Smart Indentation</b>"
+#~ msgstr "<b>Smart Indentation</b>"
+
+#~ msgid "Enable adaptive indentation"
+#~ msgstr "Enable adaptive indentation"
+
+#~ msgid "Pressing tab indents"
+#~ msgstr "Pressing tab indents"
+
+#~ msgid "A graph painter for the inheritance of the classes."
+#~ msgstr "A graph painter for the inheritance of the classes."
+
+#~ msgid "Class Inheritance"
+#~ msgstr "Class Inheritance"
+
+#~ msgid "Sample Plugin"
+#~ msgstr "Sample Plugin"
+
+#~ msgid "Sample Plugin for Anjuta."
+#~ msgstr "Sample Plugin for Anjuta."
+
+#~ msgid "An alternate editor based on Scintilla"
+#~ msgstr "An alternate editor based on Scintilla"
+
+#~ msgid "Change build commands to use scratchbox 1 or 2"
+#~ msgstr "Change build commands to use scratchbox 1 or 2"
+
+#~ msgid "Application performance profiler"
+#~ msgstr "Application performance profiler"
+
+#~ msgid "Profile"
+#~ msgstr "Profile"
+
+#~ msgid "Powerful debugging tool."
+#~ msgstr "Powerful debugging tool."
+
+#~ msgid "Valgrind Plugin"
+#~ msgstr "Valgrind Plugin"
+
 #~ msgid "Loaded: "
 #~ msgstr "Loaded: "
 
@@ -10232,9 +11002,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Find the previous occurrence of current word"
 #~ msgstr "Find the previous occurrence of current word"
 
-#~ msgid "Symbol"
-#~ msgstr "Symbol"
-
 #~ msgid "Directories to scan"
 #~ msgstr "Directories to scan"
 
@@ -10277,18 +11044,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Update Global Tags"
 #~ msgstr "Update Global Tags"
 
-#~ msgid "Tag _Definition"
-#~ msgstr "Tag _Definition"
-
-#~ msgid "Goto symbol definition"
-#~ msgstr "Goto symbol definition"
-
-#~ msgid "Tag De_claration"
-#~ msgstr "Tag De_claration"
-
-#~ msgid "Goto symbol declaration"
-#~ msgstr "Goto symbol declaration"
-
 #~ msgid "Goto _Definition"
 #~ msgstr "Goto _Definition"
 
@@ -10304,27 +11059,9 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Refresh symbol browser tree"
 #~ msgstr "Refresh symbol browser tree"
 
-#~ msgid "Created symbols..."
-#~ msgstr "Created symbols..."
-
-#~ msgid "Local"
-#~ msgstr "Local"
-
-#~ msgid "Global"
-#~ msgstr "Global"
-
-#~ msgid "Symbol browser actions"
-#~ msgstr "Symbol browser actions"
-
-#~ msgid "Symbol browser popup actions"
-#~ msgstr "Symbol browser popup actions"
-
 #~ msgid "Symbol navigations"
 #~ msgstr "Symbol navigations"
 
-#~ msgid "Symbols"
-#~ msgstr "Symbols"
-
 #~ msgid ""
 #~ "/usr/bin/ctags\n"
 #~ "/usr/local/bin/ctags"
@@ -10626,9 +11363,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "<b>Statements</b>"
 #~ msgstr "<b>Statements</b>"
 
-#~ msgid "After Declarations"
-#~ msgstr "After Declarations"
-
 #~ msgid "After Procedures"
 #~ msgstr "After Procedures"
 
@@ -10644,12 +11378,6 @@ msgstr "Autotools backend for project manager"
 #~ "Select the 'Indent Setting' button to manage the autoformat styles.\n"
 #~ "Read the info page for 'indent' for more details"
 
-#~ msgid "Bottom"
-#~ msgstr "Bottom"
-
-#~ msgid "Brace"
-#~ msgstr "Brace"
-
 #~ msgid "Braces after IF Line"
 #~ msgstr "Braces after IF Line"
 
@@ -10662,9 +11390,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Braces on Struct"
 #~ msgstr "Braces on Struct"
 
-#~ msgid "Break before Boolean"
-#~ msgstr "Break before Boolean"
-
 #~ msgid "Continue at Parenth."
 #~ msgstr "Continue at Parenth."
 
@@ -10701,9 +11426,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Display the indent output according the selected parameters."
 #~ msgstr "Display the indent output according the selected parameters."
 
-#~ msgid "First Column"
-#~ msgstr "First Column"
-
 #~ msgid ""
 #~ "Foece a space between an 'if' and the following parenthesis (default)."
 #~ msgstr ""
@@ -10746,15 +11468,9 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Indent Setting"
 #~ msgstr "Indent Setting"
 
-#~ msgid "Indentation"
-#~ msgstr "Indentation"
-
 #~ msgid "Insert a line before a Box comment."
 #~ msgstr "Insert a line before a Box comment."
 
-#~ msgid "Left"
-#~ msgstr "Left"
-
 #~ msgid "Length       "
 #~ msgstr "Length       "
 
@@ -10835,9 +11551,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Procnames start lines"
 #~ msgstr "Procnames start lines"
 
-#~ msgid "Right"
-#~ msgstr "Right"
-
 #~ msgid "Save the selected Style with the modified parameters."
 #~ msgstr "Save the selected Style with the modified parameters."
 
@@ -10916,9 +11629,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Tab Size      "
 #~ msgstr "Tab Size      "
 
-#~ msgid "Top"
-#~ msgstr "Top"
-
 #~ msgid "Update Style"
 #~ msgstr "Update Style"
 
@@ -10979,9 +11689,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Next mesg"
 #~ msgstr "Next mesg"
 
-#~ msgid "Prev bookmark"
-#~ msgstr "Prev bookmark"
-
 #~ msgid "Next bookmark"
 #~ msgstr "Next bookmark"
 
@@ -11042,9 +11749,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Go"
 #~ msgstr "Go"
 
-#~ msgid "Tags"
-#~ msgstr "Tags"
-
 #~ msgid "Find Usage"
 #~ msgstr "Find Usage"
 
@@ -11353,9 +12057,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "C_Custom_Indent"
 #~ msgstr "C_Custom_Indent"
 
-#~ msgid "Changelog"
-#~ msgstr "Changelog"
-
 #~ msgid "Copyright"
 #~ msgstr "Copyright"
 
@@ -11428,24 +12129,9 @@ msgstr "Autotools backend for project manager"
 #~ msgid "switch"
 #~ msgstr "switch"
 
-#~ msgid "Diagonal"
-#~ msgstr "Diagonal"
-
 #~ msgid "Information:"
 #~ msgstr "Information:"
 
-#~ msgid "Strike-Out"
-#~ msgstr "Strike-Out"
-
-#~ msgid "Underline Plain"
-#~ msgstr "Underline Plain"
-
-#~ msgid "Underline Squiggle"
-#~ msgstr "Underline Squiggle"
-
-#~ msgid "Underline-TT"
-#~ msgstr "Underline-TT"
-
 #~ msgid "URI is link"
 #~ msgstr "URI is link"
 
@@ -11541,9 +12227,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "svn.diff"
 #~ msgstr "svn.diff"
 
-#~ msgid "Update delete"
-#~ msgstr "Update delete"
-
 #~ msgid "Update add"
 #~ msgstr "Update add"
 
@@ -11568,9 +12251,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Commit postfix"
 #~ msgstr "Commit postfix"
 
-#~ msgid "Blame revision"
-#~ msgstr "Blame revision"
-
 #~ msgid "Unknown notification"
 #~ msgstr "Unknown notification"
 
@@ -11955,9 +12635,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Error in writing files"
 #~ msgstr "Error in writing files"
 
-#~ msgid "Parameters"
-#~ msgstr "Parameters"
-
 #~ msgid "Set debugger parameters"
 #~ msgstr "Set debugger parameters"
 
@@ -12333,15 +13010,9 @@ msgstr "Autotools backend for project manager"
 #~ msgid "Supports are only available to File mode compilation and build."
 #~ msgstr "Supports are only available to File mode compilation and build."
 
-#~ msgid "Top level Makefile.am"
-#~ msgstr "Top level Makefile.am"
-
 #~ msgid "Update tags image automatically"
 #~ msgstr "Update tags image automatically"
 
-#~ msgid "User information"
-#~ msgstr "User information"
-
 #~ msgid "User name:"
 #~ msgstr "User name:"
 
@@ -12996,9 +13667,6 @@ msgstr "Autotools backend for project manager"
 #~ msgid "GIF files"
 #~ msgstr "GIF files"
 
-#~ msgid "Text files"
-#~ msgstr "Text files"
-
 #~ msgid "XML files"
 #~ msgstr "XML files"
 



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