[anjuta/git-shell] Merge branch 'master' into 'git-shell'



commit 902e39840162fa5dfa07ff2011b65f28335b83fd
Author: James Liggett <jrliggett cox net>
Date:   Tue May 11 00:54:54 2010 -0700

    Merge branch 'master' into 'git-shell'

 .gitignore                                         |   64 +-
 AUTHORS                                            |    1 +
 Makefile.am                                        |    2 +-
 NEWS                                               |   13 -
 TODO.tasks                                         |   22 +-
 configure.in                                       |   96 +-
 libanjuta/Makefile.am                              |    7 +-
 libanjuta/anjuta-async-command.c                   |   16 +-
 libanjuta/anjuta-async-command.h                   |    6 +-
 libanjuta/anjuta-async-notify.c                    |   14 +-
 libanjuta/anjuta-c-module.c                        |    9 +
 libanjuta/anjuta-command-queue.c                   |   20 +-
 libanjuta/anjuta-command.c                         |    4 +-
 libanjuta/anjuta-convert.h                         |    6 +
 libanjuta/anjuta-plugin-description.h              |    8 +
 libanjuta/anjuta-plugin-manager.h                  |    5 +
 libanjuta/anjuta-preferences-dialog.c              |    1 +
 libanjuta/anjuta-preferences.c                     |    2 +-
 libanjuta/anjuta-shell.c                           |   74 +
 libanjuta/anjuta-shell.h                           |   33 +
 libanjuta/anjuta-ui.h                              |   27 +-
 libanjuta/anjuta-utils.h                           |   33 +-
 libanjuta/interfaces/libanjuta.idl                 |   41 +-
 manuals/reference/libanjuta/Makefile.am            |    2 +-
 mime/Makefile.am                                   |   10 +-
 mime/gnome-mime-application-x-anjuta.png           |  Bin 3549 -> 0 bytes
 mime/gnome-mime-application-x-anjuta.svg           |  281 --
 pixmaps/Makefile.am                                |    9 +-
 pixmaps/anjuta.png                                 |  Bin 3649 -> 0 bytes
 pixmaps/anjuta.svg                                 |  491 --
 plugins/Makefile.am                                |    1 +
 plugins/class-gen/Makefile.am                      |    4 +-
 plugins/class-gen/anjuta-class-gen.plugin.in       |    2 +-
 plugins/class-gen/class_logo.xpm                   | 1004 ----
 plugins/class-gen/plugin.c                         |    2 +-
 plugins/debug-manager/breakpoints.c                |   71 +-
 plugins/debug-manager/breakpoints.h                |    3 +
 plugins/debug-manager/plugin.c                     |   24 +-
 plugins/devhelp/plugin.c                           |   85 +-
 plugins/devhelp/plugin.h                           |    3 +-
 plugins/dir-project/sources.list                   |    2 +
 plugins/document-manager/action-callbacks.c        |   37 +
 plugins/document-manager/action-callbacks.h        |    1 +
 plugins/document-manager/anjuta-docman.c           |   61 +-
 plugins/document-manager/anjuta-docman.h           |    1 +
 .../anjuta-document-manager.plugin.in              |    2 +-
 .../document-manager/anjuta-document-manager.xml   |    1 +
 plugins/document-manager/plugin.c                  |    3 +
 plugins/file-manager/Makefile.am                   |    1 +
 plugins/file-manager/file-model.c                  |    2 +-
 plugins/file-wizard/Makefile.am                    |    3 +-
 plugins/file-wizard/anjuta-file-wizard-plugin.png  |  Bin 3768 -> 0 bytes
 plugins/file-wizard/anjuta-file-wizard.plugin.in   |    2 +-
 plugins/file-wizard/plugin.c                       |    2 +-
 plugins/glade/Makefile.am                          |   38 +-
 plugins/glade/anjuta-design-document.c             |  314 +--
 plugins/glade/anjuta-design-document.h             |   27 +-
 plugins/glade/anjuta-glade.plugin.in               |    2 +-
 plugins/glade/designer-associations-item.c         |  529 ---
 plugins/glade/designer-associations-item.h         |  159 -
 plugins/glade/designer-associations.c              |  353 --
 plugins/glade/designer-associations.h              |  131 -
 plugins/glade/plugin.c                             | 4770 +------------------
 plugins/glade/plugin.h                             |   31 +-
 plugins/gtodo/Makefile.am                          |    1 +
 plugins/gtodo/preferences.c                        |   31 +
 plugins/js-debugger/Makefile.am                    |    4 +-
 plugins/language-support-cpp-java/Makefile.am      |    6 +-
 .../language-support-cpp-java/cpp-java-assist.c    |   14 +-
 .../cxxparser/engine-parser.cpp                    |    7 +-
 plugins/language-support-js/Makefile.am            |   19 +-
 plugins/language-support-js/js-context.c           |    2 +-
 plugins/language-support-js/js-context.h           |    2 +-
 plugins/language-support-js/js-node.c              |    2 +-
 plugins/language-support-js/js-node.h              |    2 +-
 .../js_support_plugin.plugin.in                    |    7 -
 plugins/language-support-js/jsparse.c              |    2 +-
 plugins/language-support-js/jsparse.h              |    2 +-
 plugins/language-support-js/jstypes.h              |    2 +-
 plugins/language-support-js/lex.l                  |    2 +-
 plugins/language-support-js/lex.yy.c               |    2 +-
 plugins/language-support-js/lex.yy.h               |    2 +-
 plugins/language-support-js/y.tab.c                |    1 -
 plugins/language-support-js/y.tab.h                |    1 -
 plugins/message-view/anjuta-msgman.c               |  119 +-
 plugins/message-view/anjuta-msgman.h               |    2 +-
 plugins/message-view/message-view.c                |  180 +-
 plugins/message-view/message-view.h                |   12 +
 plugins/message-view/plugin.c                      |  137 +-
 plugins/message-view/plugin.h                      |    6 +
 plugins/patch/plugin.c                             |   14 +-
 plugins/patch/plugin.h                             |    1 +
 plugins/project-manager/Makefile.am                |    1 +
 plugins/project-wizard/.cvsignore                  |    4 -
 plugins/project-wizard/templates/.cvsignore        |    4 -
 .../templates/anjuta-plugin/.cvsignore             |    4 -
 .../templates/anjuta-plugin/po/.cvsignore          |    4 -
 .../templates/anjuta-plugin/src/.cvsignore         |    4 -
 plugins/project-wizard/templates/cpp/.cvsignore    |    2 -
 plugins/project-wizard/templates/gcj/.cvsignore    |    4 -
 .../project-wizard/templates/gcj/src/.cvsignore    |    4 -
 plugins/project-wizard/templates/gtk/.cvsignore    |    4 -
 plugins/project-wizard/templates/gtk/po/.cvsignore |    4 -
 .../project-wizard/templates/gtk/src/.cvsignore    |    4 -
 plugins/project-wizard/templates/gtkmm/.cvsignore  |    4 -
 .../project-wizard/templates/gtkmm/po/.cvsignore   |    4 -
 .../project-wizard/templates/gtkmm/src/.cvsignore  |    4 -
 plugins/project-wizard/templates/java/.cvsignore   |    4 -
 .../project-wizard/templates/java/po/.cvsignore    |    4 -
 .../project-wizard/templates/java/src/.cvsignore   |    4 -
 .../project-wizard/templates/library/po/.cvsignore |    4 -
 .../project-wizard/templates/minimal/.cvsignore    |    4 -
 plugins/project-wizard/templates/mkfile/.cvsignore |    4 -
 .../project-wizard/templates/mkfile/po/.cvsignore  |    4 -
 .../project-wizard/templates/mkfile/src/.cvsignore |    4 -
 plugins/project-wizard/templates/python/.cvsignore |    4 -
 .../project-wizard/templates/python/po/.cvsignore  |    4 -
 .../project-wizard/templates/python/src/.cvsignore |    4 -
 plugins/project-wizard/templates/sdl/.cvsignore    |    4 -
 plugins/project-wizard/templates/sdl/po/.cvsignore |    4 -
 .../project-wizard/templates/sdl/src/.cvsignore    |    4 -
 .../project-wizard/templates/terminal/.cvsignore   |    4 -
 .../templates/terminal/po/.cvsignore               |    4 -
 .../templates/terminal/src/.cvsignore              |    4 -
 plugins/project-wizard/templates/wxwin/.cvsignore  |    4 -
 .../project-wizard/templates/wxwin/po/.cvsignore   |    4 -
 .../project-wizard/templates/wxwin/src/.cvsignore  |    4 -
 .../project-wizard/templates/xlib-dock/.cvsignore  |    4 -
 .../templates/xlib-dock/po/.cvsignore              |    4 -
 .../templates/xlib-dock/src/.cvsignore             |    4 -
 plugins/project-wizard/templates/xlib/.cvsignore   |    4 -
 .../project-wizard/templates/xlib/po/.cvsignore    |    4 -
 .../project-wizard/templates/xlib/src/.cvsignore   |    4 -
 plugins/sourceview/sourceview.c                    |   27 +
 plugins/symbol-db/Makefile.am                      |    8 +-
 plugins/symbol-db/anjuta-symbol-db-plugin-48.png   |  Bin 1475 -> 1495 bytes
 plugins/symbol-db/anjuta-tags/Makefile.am          |   39 +-
 plugins/symbol-db/anjuta-tags/c.c                  |   29 +-
 plugins/symbol-db/anjuta-tags/ctags-visitor.vala   |    7 +-
 plugins/symbol-db/anjuta-tags/gir.c                |   23 +-
 plugins/symbol-db/anjuta-tags/js_parser/Grammar.y  | 1193 -----
 .../symbol-db/anjuta-tags/js_parser/js-context.c   |  630 ---
 .../symbol-db/anjuta-tags/js_parser/js-context.h   |   92 -
 plugins/symbol-db/anjuta-tags/js_parser/js-node.c  |  203 -
 plugins/symbol-db/anjuta-tags/js_parser/js-node.h  |   90 -
 plugins/symbol-db/anjuta-tags/js_parser/jsparse.c  |  147 -
 plugins/symbol-db/anjuta-tags/js_parser/jsparse.h  |   13 -
 plugins/symbol-db/anjuta-tags/js_parser/jstypes.h  |  114 -
 plugins/symbol-db/anjuta-tags/js_parser/lex.l      |  126 -
 plugins/symbol-db/anjuta-tags/js_parser/lex.yy.c   | 3698 ---------------
 plugins/symbol-db/anjuta-tags/js_parser/lex.yy.h   |  339 --
 plugins/symbol-db/anjuta-tags/js_parser/y.tab.c    | 4643 -------------------
 plugins/symbol-db/anjuta-tags/js_parser/y.tab.h    |  168 -
 plugins/symbol-db/anjuta-tags/jscript.c            |   21 +-
 plugins/symbol-db/anjuta-tags/make.c               |    4 +-
 plugins/symbol-db/anjuta-tags/python.c             |    6 +-
 plugins/symbol-db/anjuta-tags/vala.c               |    1 +
 plugins/symbol-db/anjuta-tags/verilog.c            |    3 +-
 plugins/symbol-db/images/Makefile.am               |   11 +-
 plugins/symbol-db/images/element-method-16.png     |  Bin 604 -> 650 bytes
 plugins/symbol-db/plugin.c                         |   78 +-
 plugins/symbol-db/plugin.h                         |    4 +-
 plugins/symbol-db/symbol-db-engine-core.c          |  101 +-
 plugins/symbol-db/symbol-db-engine-core.h          |   12 +
 plugins/symbol-db/symbol-db-engine-priv.h          |   56 +-
 plugins/symbol-db/symbol-db-engine-queries.c       | 1047 +----
 plugins/symbol-db/symbol-db-engine-queries.h       |  113 +-
 plugins/symbol-db/symbol-db-engine-utils.c         |   74 +-
 plugins/symbol-db/symbol-db-engine.h               |    7 +
 plugins/symbol-db/symbol-db-iface.c                |    1 +
 plugins/symbol-db/symbol-db-model-file.c           |  270 +-
 plugins/symbol-db/symbol-db-model-file.h           |    9 +-
 plugins/symbol-db/symbol-db-model-project.c        |  268 +-
 plugins/symbol-db/symbol-db-model-project.h        |    9 +-
 plugins/symbol-db/symbol-db-model.c                |  834 +++--
 plugins/symbol-db/symbol-db-model.h                |    7 +-
 plugins/symbol-db/symbol-db-system.c               |    4 +-
 plugins/symbol-db/symbol-db-views.c                |   61 +
 plugins/symbol-db/tables.sql                       |   63 +-
 po/POTFILES.in                                     |   20 +-
 po/bg.po                                           |   61 +-
 po/ca.po                                           |   21 +-
 po/ca valencia po                                  | 4837 ++++++++++----------
 po/da.po                                           |   71 +-
 po/el.po                                           | 1230 +++---
 po/es.po                                           |  390 +-
 po/fr.po                                           |  265 +-
 po/gl.po                                           |  389 +-
 po/th.po                                           |  783 ++--
 po/uk.po                                           | 4055 +++++++++--------
 src/anjuta-app.c                                   |  147 +-
 src/anjuta-app.h                                   |    1 +
 src/shell.c                                        |   49 +
 193 files changed, 8840 insertions(+), 27841 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d69cf0d..a92530c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,76 +36,14 @@
 /intltool-update
 /intltool-update.in
 /libtool
+/po/*.gmo
 /po/*.mo
 /po/.intltool-merge-cache
 /po/Makefile
 /po/Makefile.in
 /po/Makefile.in.in
 /po/POTFILES
-/po/ar.gmo
-/po/az.gmo
-/po/be.gmo
-/po/be latin gmo
-/po/bg.gmo
-/po/ca.gmo
-/po/ca valencia gmo
-/po/cs.gmo
-/po/da.gmo
-/po/de.gmo
-/po/dz.gmo
-/po/el.gmo
-/po/en_CA.gmo
-/po/en_GB.gmo
-/po/es.gmo
-/po/eu.gmo
-/po/fi.gmo
-/po/fr.gmo
-/po/ga.gmo
-/po/gl.gmo
-/po/gu.gmo
-/po/he.gmo
-/po/hi.gmo
-/po/hr.gmo
-/po/hu.gmo
-/po/id.gmo
-/po/it.gmo
-/po/ja.gmo
-/po/kn.gmo
-/po/ko.gmo
-/po/lt.gmo
-/po/lv.gmo
-/po/mai.gmo
-/po/mk.gmo
-/po/ml.gmo
-/po/mr.gmo
-/po/ms.gmo
-/po/nb.gmo
-/po/ne.gmo
-/po/nl.gmo
-/po/oc.gmo
-/po/or.gmo
-/po/pa.gmo
-/po/pl.gmo
-/po/pt.gmo
-/po/pt_BR.gmo
-/po/ru.gmo
-/po/rw.gmo
-/po/si.gmo
-/po/sk.gmo
-/po/sl.gmo
-/po/sq.gmo
-/po/sr.gmo
-/po/sr latin gmo
 /po/stamp-it
-/po/sv.gmo
-/po/te.gmo
-/po/th.gmo
-/po/tr.gmo
-/po/uk.gmo
-/po/vi.gmo
-/po/zh_CN.gmo
-/po/zh_HK.gmo
-/po/zh_TW.gmo
 /so_locations
 /stamp-h1
 /tags
diff --git a/AUTHORS b/AUTHORS
index 46dfb73..7d2393a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -108,6 +108,7 @@ Contributors:
 	Ross Golder  <ross golder org>
 	Roy Wood  <roy wood filogix com>
 	s|s  <supreet sethi gmail com>
+	Saleem Ansari <tuxdna gmail com>
 	Séastien Côé  <cots01 gel usherb ca>
 	Sylvain Defresne  <sdefrense gmail com>
 	Stanislav Brabec  <sbrabec suse cz>
diff --git a/Makefile.am b/Makefile.am
index 0e3b578..836698c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 
 SUBDIRS = \
 	pixmaps scripts data \
-	doc libanjuta plugins src manuals mime launcher po
+	doc libfoocanvas libanjuta plugins src manuals mime launcher po
 
 anjutadocdir = $(docdir)
 anjutadoc_DATA = \
diff --git a/NEWS b/NEWS
index 8837555..91a022b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,3 @@
-Anjuta 2.30.0 "Ostern in Berlin" (29 March 2009) -- Johannes Schmid
-
-Bugs fixed:
-git: Free the log message for merges at the right time
-Makefile.am missing libxml flags in some plugins (bgo#613559)
-macro: #613118 - Please fix escaping of UTF-chars in ui file
-project-wizard: JS template support and require GJS 0.6
-build: bgo#612959 - Anjuta crashes when clicked 'Compile'
-language-support-cpp-java: Avoid duplication of local symbols in project search
-language-support-cpp-java: Fixed some undo problems with indentation
-sourceview: bgo#567029 - underline warnings/errors using user-selected message colors
-starter: Add tooltip for recent projects.
-
 Anjuta 2.29.92 "Give me Shortcuts" (8 March 2009) -- Johannes Schmid
 
 Changes:
diff --git a/TODO.tasks b/TODO.tasks
index a8169cf..0f5671f 100644
--- a/TODO.tasks
+++ b/TODO.tasks
@@ -19,17 +19,6 @@ box (instead of hardcoded names in the source).</comment>
       <comment>A generic print interface</comment>
     </item>
     <item>
-      <attribute id="1159907132" priority="1" done="0" start_date="732587" enddate="99999999" notify="0" endtime="-60" last_edited="1159907262"/>
-      <summary>Bug fixing batch #1</summary>
-      <comment>[Skill: Medium, Work: 12hrs, Bounty: $25]
-
-* Bug #346777    Cannot change the editor font
-* Bug #351214    Anjuta doesn't respect Gnome blinking cursor preference
-* Bug #357151    a + character in a directory name confuses anjuta
-* Bug #357541    can't launch Anjuta project file from Nautilus
-* Bug #357820    Goto / Previous history should return to previous cursor ...</comment>
-    </item>
-    <item>
       <attribute id="1159907660" priority="1" done="0" start_date="732587" enddate="99999999" notify="0" endtime="-60" last_edited="1159907660"/>
       <summary>Automated tests for Anjuta</summary>
       <comment>[Skill: Basic, Work: 20hrs]
@@ -65,6 +54,17 @@ This is partly done but somebody has to fix the new "indent" plugin!</comment>
       <comment>[Skill: medium, Work: 30h, Bounty: $100, Status: Completed, Bug: #480093]
 Create better icons for toolbars and plugin icons following the tango style guidelines to make them consistent with rest of the GNOME icons.</comment>
     </item>
+    <item>
+      <attribute id="1159907132" priority="1" done="0" start_date="732587" enddate="99999999" notify="0" endtime="-60" last_edited="1272100803"/>
+      <summary>Bug fixing batch #1</summary>
+      <comment>[Skill: Medium, Work: 12hrs, Bounty: $25]
+
+* Bug #346777    Cannot change the editor font (fixed)
+* Bug #351214    Anjuta doesn't respect Gnome blinking cursor preference
+* Bug #357151    a + character in a directory name confuses anjuta (fixed)
+* Bug #357541    can't launch Anjuta project file from Nautilus (fixed)
+* Bug #357820    Goto / Previous history should return to previous cursor (fixed)</comment>
+    </item>
   </category>
   <category title="libanjuta" place="2">
     <item>
diff --git a/configure.in b/configure.in
index ff474c4..2276b98 100644
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
 
 m4_define(anjuta_major_version,  2)
-m4_define(anjuta_minor_version, 30)
-m4_define(anjuta_micro_version,  0)
+m4_define(anjuta_minor_version, 31)
+m4_define(anjuta_micro_version,  1)
 m4_define(anjuta_nano_version, 0)
 m4_define(anjuta_version, anjuta_major_version.anjuta_minor_version.anjuta_micro_version.anjuta_nano_version)
 
@@ -27,6 +27,7 @@ AC_SUBST(ANJUTA_VERSION)
 GLIB_REQUIRED=2.18.0
 GDK_PIXBUF_REQUIRED=2.0.0
 GTK_REQUIRED=2.17.10
+PANGO_REQUIRED=0.23
 ORBIT_REQUIRED=2.6.0
 GCONF_REQUIRED=2.12.0
 VTE_REQUIRED=0.9.0
@@ -45,10 +46,12 @@ LIBWNCK_REQUIRED=2.12
 GDA_REQUIRED=4.0.0
 UNIQUE_REQUIRED=1.0.0
 VALA_REQUIRED=0.7.8
+LIBGRAPHVIZ_REQUIRED=1.0
 
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GDK_PIXBUF_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
+AC_SUBST(PANGO_REQUIRED)
 AC_SUBST(ORBIT_REQUIRED)
 AC_SUBST(VTE_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
@@ -63,6 +66,7 @@ AC_SUBST(GTKSOURCEVIEW_REQUIRED)
 AC_SUBST(LIBWNCK_REQUIRED)
 AC_SUBST(GDA_REQUIRED)
 AC_SUBST(UNIQUE_REQUIRED)
+AC_SUBST(LIBGRAPHVIZ_REQUIRED)
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
 AC_CONFIG_HEADERS(config.h)
@@ -148,6 +152,8 @@ PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1])
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
 
+PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED)
+
 PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED)
 
 PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= $ORBIT_REQUIRED)
@@ -296,6 +302,21 @@ LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta.la'
 AC_SUBST(LIBANJUTA_CFLAGS)
 AC_SUBST(LIBANJUTA_LIBS)
 
+dnl Setup FooCanvas Library flags
+dnl --------------------------
+LIBFOOCANVAS_CFLAGS='-I$(top_srcdir)'
+LIBFOOCANVAS_LIBS='$(top_builddir)/libfoocanvas/libanjuta-foocanvas.la'
+AC_SUBST(LIBFOOCANVAS_CFLAGS)
+AC_SUBST(LIBFOOCANVAS_LIBS)
+
+dnl Checks for Xft/XRender for foocanvas
+dnl
+AC_CHECK_LIB(Xrender, XRenderFindFormat, 
+	[AC_SUBST(RENDER_LIBS, "-lXrender -lXext")
+	 AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])],
+	[AC_SUBST(RENDER_LIBS, "")],
+	[-lXext])
+
 dnl Setup Plugin directories
 dnl ------------------------
 anjuta_plugin_dir='$(libdir)/anjuta'
@@ -717,11 +738,11 @@ dnl ------------------------------------------
 if test -n "$SVN_INCLUDE" ; then
 	SVN_INCLUDE="-I$SVN_INCLUDE"
 	if test x != "x$SVN_LIB" ; then
-	    SVN_LIB="-L$SVN_LIB $APR_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
+	    SVN_LIB="-L$SVN_LIB $APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
 	else
-	    SVN_LIB="$APR_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
+	    SVN_LIB="$APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
 	fi
-	SVN_CFLAGS="$APR_CFLAGS $NEON_CFLAGS"
+	SVN_CFLAGS="$APR_CFLAGS $APR_UTILS_CFLAGS $NEON_CFLAGS"
 fi
 
 AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])
@@ -750,6 +771,57 @@ fi
 
 AC_SUBST(SYMBOL_DB_SHM)
 
+
+dnl Check for graphviz (class inheritance and profiler plugins)
+dnl --------------------------------------------------------------------------
+dnl FIXME: For some strange reason graphviz-devel rpm install the *.pc files
+dnl in /usr/lib/graphviz/pkgconfig, instead of usual /usr/lib/pkgconfig. This
+dnl makes pkgconfig check fail if we don't add the above path in
+dnl PKG_CONFIG_PATH. We have added both /usr/lib/graphviz/pkgconfig and
+dnl /usr/local/lib/pkgconfig paths. If graphviz is installed in other prefix
+dnl (other than /usr or /usr/local or the current installation prefix),
+dnl following pkgconfig check will fail.
+dnl --------------------------------------------------------------------------
+AC_ARG_ENABLE(graphviz,
+	AC_HELP_STRING([--disable-graphviz],[Disable GraphViz support in Anjuta]), 
+	[ if test "$enableval" = "no"; then
+		user_disabled_graphviz=1
+	  fi ],
+	[ user_disabled_graphviz=0 ])
+
+AC_MSG_CHECKING(if GraphViz support is disabled)
+if test "$user_disabled_graphviz" = 1; then
+	AC_MSG_RESULT(yes)
+	libgraphviz_found="no"
+else
+	AC_MSG_RESULT(no)
+	
+	dnl Set pkgconfig path
+	ANJUTA_PKG_CONFIG_PATH_SAVE="${PKG_CONFIG_PATH}"
+	PKG_CONFIG_PATH="/usr/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
+	PKG_CONFIG_PATH="/usr/local/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
+	PKG_CONFIG_PATH="/usr/lib64/graphviz/pkgconfig:$PKG_CONFIG_PATH"
+	PKG_CONFIG_PATH="/usr/local/lib64/graphviz/pkgconfig:$PKG_CONFIG_PATH"
+	
+	anjuta_save_prefix="$prefix"
+	test "x$prefix" = xNONE && prefix=$ac_default_prefix
+	graphviz_pkgconfig=`eval echo ${libdir}/graphviz/pkgconfig`
+	PKG_CONFIG_PATH="$graphviz_pkgconfig:$PKG_CONFIG_PATH"
+	prefix="$anjuta_save_prefix"
+
+	export PKG_CONFIG_PATH
+	PKG_CHECK_MODULES(GRAPHVIZ,
+		[libgvc >= $LIBGRAPHVIZ_REQUIRED libgraph >= $LIBGRAPHVIZ_REQUIRED], 
+		[libgraphviz_found="yes"],
+		[libgraphviz_found="no"])
+	
+	dnl Restore pkgconfig path
+	PKG_CONFIG_PATH="${ANJUTA_PKG_CONFIG_PATH_SAVE}"
+	export PKG_CONFIG_PATH
+fi
+
+AM_CONDITIONAL(HAVE_GRAPHVIZ, [test x$libgraphviz_found = xyes])
+
 dnl --------- help outputs -----------
 dnl manuals/C/Makefile
 dnl manuals/C/anjuta-tutorial/Makefile
@@ -765,12 +837,19 @@ dnl manuals/ja/anjuta-manual/Makefile
 AC_OUTPUT([
 Makefile
 po/Makefile.in
+libfoocanvas/Makefile
 libanjuta/Makefile
 libanjuta/libanjuta-1.0.pc
 libanjuta/anjuta-version.h
 libanjuta/interfaces/Makefile
 src/Makefile
 pixmaps/Makefile
+pixmaps/16x16/Makefile
+pixmaps/22x22/Makefile
+pixmaps/24x24/Makefile
+pixmaps/32x32/Makefile
+pixmaps/48x48/Makefile
+pixmaps/scalable/Makefile
 data/Makefile
 data/welcome.txt
 doc/anjuta.1
@@ -782,6 +861,7 @@ plugins/Makefile
 plugins/gtodo/Makefile
 plugins/class-gen/Makefile
 plugins/class-gen/templates/Makefile
+plugins/class-inheritance/Makefile
 plugins/patch/Makefile
 plugins/document-manager/Makefile
 plugins/document-manager/images/Makefile
@@ -927,6 +1007,12 @@ if [ test x$enable_vala = xyes ]; then
 else
         echo "Building Vala ctags parser (requires vala):.............NO"
 fi
+if [ test x$libgraphviz_found = xyes ]; then
+        echo "Building class inheritance plugin: .....................YES"
+else
+        echo "Building class inheritance plugin: .....................NO"
+        echo "        Requires graphviz (>= 2.6.0); http://graphviz.org";
+fi
 echo "-------------------------------------------------------------------"
 echo "AM_CFLAGS = $AM_CFLAGS"
 echo "AM_CXXFLAGS = $AM_CXXFLAGS"
diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am
index e1252de..6a0d9d5 100644
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@ -84,8 +84,10 @@ libanjuta_la_SOURCES= \
 	anjuta-command-queue.h \
 	anjuta-project.c \
 	anjuta-project.h \
+	anjuta-drop-entry.c \
 	anjuta-drop-entry.h \
-	anjuta-drop-entry.c
+	anjuta-tabber.c \
+	anjuta-tabber.h
 
 
 if HAVE_PLUGIN_GLADE
@@ -146,7 +148,8 @@ libanjuta_include = \
 	gbf-project.h \
 	anjuta-project.h \
 	anjuta-command-queue.h \
-	anjuta-drop-entry.h
+	anjuta-drop-entry.h \
+	anjuta-tabber.h
 
 libanjutainclude_HEADERS = \
 	$(libanjuta_include) \
diff --git a/libanjuta/anjuta-async-command.c b/libanjuta/anjuta-async-command.c
index 1b46fb2..b0e438d 100644
--- a/libanjuta/anjuta-async-command.c
+++ b/libanjuta/anjuta-async-command.c
@@ -178,9 +178,16 @@ anjuta_async_command_class_init (AnjutaAsyncCommandClass *klass)
 	parent_class->notify_progress = notify_progress;
 }
 
+/**
+ * anjuta_async_command_set_error_message:
+ * @command: AnjutaAsyncCommand object
+ * @error_message: The error message that should be used
+ *
+ * Set the error message this async command resulted in
+ */
 void
 anjuta_async_command_set_error_message (AnjutaCommand *command, 
-										gchar *error_message)
+										const gchar *error_message)
 {
 	anjuta_async_command_lock (ANJUTA_ASYNC_COMMAND (command));
 	ANJUTA_COMMAND_GET_CLASS (command)->set_error_message (command, 
@@ -188,6 +195,13 @@ anjuta_async_command_set_error_message (AnjutaCommand *command,
 	anjuta_async_command_unlock (ANJUTA_ASYNC_COMMAND (command));
 }
 
+/**
+ * anjuta_async_command_get_error_message:
+ * @command: AnjutaAsyncCommand object
+ *
+ * Returns: The error message the async command resulted in. The caller
+ * should free the string
+ */
 gchar *
 anjuta_async_command_get_error_message (AnjutaCommand *command)
 {
diff --git a/libanjuta/anjuta-async-command.h b/libanjuta/anjuta-async-command.h
index 729c5f5..62daaf2 100644
--- a/libanjuta/anjuta-async-command.h
+++ b/libanjuta/anjuta-async-command.h
@@ -36,8 +36,8 @@ G_BEGIN_DECLS
 #define ANJUTA_TYPE_ASYNC_COMMAND             (anjuta_async_command_get_type ())
 #define ANJUTA_ASYNC_COMMAND(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_ASYNC_COMMAND, AnjutaAsyncCommand))
 #define ANJUTA_ASYNC_COMMAND_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_ASYNC_COMMAND, AnjutaAsyncCommandClass))
-#define IS_ANJUTA_ASYNC_COMMAND(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANJUTA_TYPE_ASYNC_COMMAND))
-#define IS_ANJUTA_ASYNC_COMMAND_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_ASYNC_COMMAND))
+#define ANJUTA_IS_ASYNC_COMMAND(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANJUTA_TYPE_ASYNC_COMMAND))
+#define ANJUTA_IS_ASYNC_COMMAND_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_ASYNC_COMMAND))
 #define ANJUTA_ASYNC_COMMAND_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), ANJUTA_TYPE_ASYNC_COMMAND, AnjutaAsyncCommandClass))
 
 typedef struct _AnjutaAsyncCommandClass AnjutaAsyncCommandClass;
@@ -59,7 +59,7 @@ struct _AnjutaAsyncCommand
 GType anjuta_async_command_get_type (void) G_GNUC_CONST;
 
 void anjuta_async_command_set_error_message (AnjutaCommand *command, 
-											 gchar *error_message);
+											 const gchar *error_message);
 gchar *anjuta_async_command_get_error_message (AnjutaCommand *command);
 
 void anjuta_async_command_lock (AnjutaAsyncCommand *self);
diff --git a/libanjuta/anjuta-async-notify.c b/libanjuta/anjuta-async-notify.c
index 9578e7a..62b5596 100644
--- a/libanjuta/anjuta-async-notify.c
+++ b/libanjuta/anjuta-async-notify.c
@@ -116,11 +116,11 @@ anjuta_async_notify_new (void)
 /**
  * anjuta_async_notify_get_error:
  *
- * Gets the error set on @self.
- *
  * @self: An #AnjutaAsyncNotify object
  * @error: Return location for the error set by the called interface to which 
  *		   this object was passed. If no error is set, @error is set to NULL.
+ *
+ * Gets the error set on @self.
  */
 void
 anjuta_async_notify_get_error (AnjutaAsyncNotify *self, GError **error)
@@ -131,12 +131,11 @@ anjuta_async_notify_get_error (AnjutaAsyncNotify *self, GError **error)
 
 /**
  * anjuta_async_notify_set_error:
- *
- * Sets the error for an interface call. This method should only be used by 
- * interface implementations themselves, not by clients. 
- *
  * @self: An #AnjutaAsyncNotify object
  * @error: Error to set
+ *
+ * Sets the error for an interface call. This method should only be used by 
+ * interface implementations themselves, not by clients.  
  */
 void
 anjuta_async_notify_set_error (AnjutaAsyncNotify *self, GError *error)
@@ -149,11 +148,10 @@ anjuta_async_notify_set_error (AnjutaAsyncNotify *self, GError *error)
 
 /**
  * anjuta_async_notify_notify_finished:
+ * @self: An #AnjutaAsyncNotify object
  *
  * Emits the finished signal. This method should only be used by 
  * interface methods themselves, not by clients. 
- *
- * @self: An #AnjutaAsyncNotify object
  */
 void
 anjuta_async_notify_notify_finished (AnjutaAsyncNotify *self)
diff --git a/libanjuta/anjuta-c-module.c b/libanjuta/anjuta-c-module.c
index 79e82ff..31e85a7 100644
--- a/libanjuta/anjuta-c-module.c
+++ b/libanjuta/anjuta-c-module.c
@@ -188,6 +188,15 @@ anjuta_c_module_init (AnjutaCModule *module)
 /* Public functions
  *---------------------------------------------------------------------------*/
 
+/**
+ * anjuta_c_module_get_last_error:
+ * @module: AnjutaCModule object
+ * @err: return location for a GError
+ *
+ * Receives the error that occured when the module was loaded
+ *
+ * Returns: TRUE if there was an Error, FALSE otherwise
+ */
 gboolean
 anjuta_c_module_get_last_error (AnjutaCModule *module, GError** err)
 {
diff --git a/libanjuta/anjuta-command-queue.c b/libanjuta/anjuta-command-queue.c
index 22377fc..74885fd 100644
--- a/libanjuta/anjuta-command-queue.c
+++ b/libanjuta/anjuta-command-queue.c
@@ -28,6 +28,15 @@ enum
 
 static guint anjuta_command_queue_signals[LAST_SIGNAL] = { 0 };
 
+/**
+ * SECTION: anjuta-command-queue
+ * @short_description: #AnjutaCommandQueue is used to queue commands
+ * @include: libanjuta/anjuta-async-command.h
+ *
+ * #AnjutaCommandQueue always starts the next command in the queue when
+ * the previous command finishes. That also works for asyncronous commands
+ */
+
 struct _AnjutaCommandQueuePriv
 {
 	GQueue *queue;
@@ -132,6 +141,15 @@ anjuta_command_queue_new (AnjutaCommandQueueExecuteMode mode)
 	return self;
 }
 
+/**
+ * anjuta_command_queue_push:
+ * @self: AnjutaCommandQueue object
+ * @command: The command to add
+ *
+ * Adds a command to the Queue and starts it if there are no other commands
+ * waiting
+ */
+
 void
 anjuta_command_queue_push (AnjutaCommandQueue *self, AnjutaCommand *command)
 {
@@ -184,4 +202,4 @@ anjuta_command_queue_start (AnjutaCommandQueue *self)
 
 	return ret;
 		
-}
\ No newline at end of file
+}
diff --git a/libanjuta/anjuta-command.c b/libanjuta/anjuta-command.c
index dac4ad1..7c83c3f 100644
--- a/libanjuta/anjuta-command.c
+++ b/libanjuta/anjuta-command.c
@@ -284,7 +284,8 @@ anjuta_command_notify_data_arrived (AnjutaCommand *self)
 
 /**
  * anjuta_command_notify_complete:
- * @self: Command object.
+ * @self: Command object
+ * @return_code: The returned code that is passed to the notify callback
  * 
  * Used by base classes derived from #AnjutaCommand to emit the 
  * ::command-finished signal. This method should not be used by client code or  
@@ -299,6 +300,7 @@ anjuta_command_notify_complete (AnjutaCommand *self, guint return_code)
 /**
  * anjuta_command_notify_progress:
  * @self: Command object.
+ * @progress: The of the command that is passed to the notify callback
  * 
  * Emits the ::progress signal. Can be used by both base classes and 
  * commands as needed. 
diff --git a/libanjuta/anjuta-convert.h b/libanjuta/anjuta-convert.h
index 8cb2172..59e2827 100644
--- a/libanjuta/anjuta-convert.h
+++ b/libanjuta/anjuta-convert.h
@@ -33,6 +33,12 @@
 #include <glib.h>
 #include "anjuta-encodings.h"
 
+/**
+ * AnjutaConvertError:
+ * @ANJUTA_CONVERT_ERROR_AUTO_DETECTION_FAILED: The charset couldn't be autodetected
+ *
+ * Possibly errors that can occur during charset conversion
+ */
 typedef enum 
 {
 	ANJUTA_CONVERT_ERROR_AUTO_DETECTION_FAILED = 1100
diff --git a/libanjuta/anjuta-plugin-description.h b/libanjuta/anjuta-plugin-description.h
index ae2838a..8710faf 100644
--- a/libanjuta/anjuta-plugin-description.h
+++ b/libanjuta/anjuta-plugin-description.h
@@ -39,6 +39,14 @@ typedef void (*AnjutaPluginDescriptionLineFunc) (AnjutaPluginDescription *df,
 												 const gchar *value,
 												 gpointer   data);
 
+/**
+ * AnjutaPluginDescriptionParseError:
+ * @ANJUTA_PLUGIN_DESCRIPTION_PARSE_ERROR_INVALID_SYNTAX: Syntax of plugin file is invalid
+ * @ANJUTA_PLUGIN_DESCRIPTION_PARSE_ERROR_INVALID_ESCAPES: Invalid escape sequence
+ * @ANJUTA_PLUGIN_DESCRIPTION_PARSE_ERROR_INVALID_CHARS: Invalid characters
+ *
+ * Possible errors when parsing a plugin file
+ */
 typedef enum
 {
   ANJUTA_PLUGIN_DESCRIPTION_PARSE_ERROR_INVALID_SYNTAX,
diff --git a/libanjuta/anjuta-plugin-manager.h b/libanjuta/anjuta-plugin-manager.h
index 3a73e75..08d95ce 100644
--- a/libanjuta/anjuta-plugin-manager.h
+++ b/libanjuta/anjuta-plugin-manager.h
@@ -35,6 +35,11 @@ G_BEGIN_DECLS
 #define ANJUTA_PLUGIN_MANAGER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), ANJUTA_TYPE_PLUGIN_MANAGER, AnjutaPluginManagerClass))
 #define ANJUTA_PLUGIN_MANAGER_ERROR            (anjuta_plugin_manager_error_quark())
 
+/**
+  * AnjutaPluginManagerError:
+  * @ANJUTA_PLUGIN_MANAGER_MISSING_FACTORY: The factory for the plugin couldn't be found
+  * @ANJUTA_PLUGIN_MANAGER_ERROR_UNKNOWN: Unknown error
+  */
 typedef enum
 {
 	ANJUTA_PLUGIN_MANAGER_MISSING_FACTORY,
diff --git a/libanjuta/anjuta-preferences-dialog.c b/libanjuta/anjuta-preferences-dialog.c
index 7307322..6fca129 100644
--- a/libanjuta/anjuta-preferences-dialog.c
+++ b/libanjuta/anjuta-preferences-dialog.c
@@ -241,6 +241,7 @@ anjuta_preferences_dialog_new (void)
  * anjuta_preferences_dialog_add_page:
  * @dlg: A #AnjutaPreferencesDialog object.
  * @name: Name of the preferences page.
+ * @title: Title of the page
  * @icon: Icon file name.
  * @page: page widget.
  *
diff --git a/libanjuta/anjuta-preferences.c b/libanjuta/anjuta-preferences.c
index f17ed31..a705f1d 100644
--- a/libanjuta/anjuta-preferences.c
+++ b/libanjuta/anjuta-preferences.c
@@ -1548,7 +1548,6 @@ anjuta_preferences_reset_defaults (AnjutaPreferences * pr)
 /**
  * anjuta_preferences_foreach:
  * @pr: A #AnjutaPreferences object.
- * @filter: Keys to filter out from the loop.
  * @callback: User callback function.
  * @data: User data passed to @callback
  *
@@ -1818,6 +1817,7 @@ anjuta_preferences_class_init (AnjutaPreferencesClass *class)
 
 /**
  * anjuta_preferences_new:
+ * @plugin_manager: #AnjutaPluginManager to be used
  * 
  * Creates a new #AnjutaPreferences object
  * 
diff --git a/libanjuta/anjuta-shell.c b/libanjuta/anjuta-shell.c
index df85d44..6c1cb9e 100644
--- a/libanjuta/anjuta-shell.c
+++ b/libanjuta/anjuta-shell.c
@@ -416,6 +416,80 @@ anjuta_shell_present_widget (AnjutaShell *shell,
 }
 
 /**
+ * anjuta_shell_iconify_dockable_widget:
+ * @shell: A #AnjutaShell interface.
+ * @widget: a #GtkWidget to iconify.
+ * @error: Error propagation object.
+ *
+ * If the widget is dockable, it iconifies it.
+ */
+void anjuta_shell_iconify_dockable_widget (AnjutaShell *shell, 
+                                     GtkWidget   *widget,
+                                     GError      **error)
+{
+	ANJUTA_SHELL_GET_IFACE (shell)->iconify_dockable_widget (shell, widget, error);
+}
+
+/**
+ * anjuta_shell_hide_dockable_widget:
+ * @shell: A #AnjutaShell interface.
+ * @widget: a #GtkWidget to hide.
+ * @error: Error propagation object.
+ *
+ * If the widget is dockable, it hides it.
+ */
+void anjuta_shell_hide_dockable_widget (AnjutaShell *shell, 
+                                     GtkWidget   *widget,
+                                     GError      **error)
+{
+	ANJUTA_SHELL_GET_IFACE (shell)->hide_dockable_widget (shell, widget, error);
+}
+
+/**
+ * anjuta_shell_show_dockable_widget:
+ * @shell: A #AnjutaShell interface.
+ * @widget: a #GtkWidget to show.
+ * @error: Error propagation object.
+ *
+ * If the widget was hidden or iconified, it will make it visible.
+ */
+void anjuta_shell_show_dockable_widget (AnjutaShell *shell, 
+                                     GtkWidget   *widget,
+                                     GError      **error)
+{
+	ANJUTA_SHELL_GET_IFACE (shell)->show_dockable_widget (shell, widget, error);
+}
+
+/**
+ * anjuta_shell_maximize_widget:
+ * @shell: A #AnjutaShell interface.
+ * @widget_name: Name of the widget to be maximized.
+ * @error: Error propagation object.
+ *
+ * Maximizes a widget so it will occupy all the possible space.
+ */
+void anjuta_shell_maximize_widget   (AnjutaShell *shell,
+                                     const char  *widget_name,
+                                     GError      **error)
+{
+	ANJUTA_SHELL_GET_IFACE (shell)->maximize_widget (shell, widget_name, error);
+}
+
+/**
+ * anjuta_shell_unmaximize:
+ * @shell: A #AnjutaShell interface.
+ * @error: Error propagation object.
+ *
+ * Unmaximizes the UI which was previously maximized by 
+ * #anjuta_shell_maximize_widget 
+ */
+void anjuta_shell_unmaximize (AnjutaShell *shell,
+                              GError      **error)
+{
+	ANJUTA_SHELL_GET_IFACE (shell)->unmaximize (shell, error);
+}
+
+/**
  * anjuta_shell_add_value:
  * @shell: A #AnjutaShell interface
  * @name: Name of the value
diff --git a/libanjuta/anjuta-shell.h b/libanjuta/anjuta-shell.h
index 7cc5d76..ad5e609 100644
--- a/libanjuta/anjuta-shell.h
+++ b/libanjuta/anjuta-shell.h
@@ -44,6 +44,10 @@ G_BEGIN_DECLS
 typedef struct _AnjutaShell      AnjutaShell;
 typedef struct _AnjutaShellIface AnjutaShellIface;
 
+/**
+ * AnjutaShellError_
+ * @ANJUTA_SHELL_ERROR_DOESNT_EXIST:
+ */
 typedef enum
 {
 	ANJUTA_SHELL_ERROR_DOESNT_EXIST,
@@ -105,6 +109,21 @@ struct _AnjutaShellIface {
 	void (*present_widget)    (AnjutaShell  *shell,
 							   GtkWidget    *widget,
 							   GError      **error);
+	
+	void (*iconify_dockable_widget) (AnjutaShell *shell, 
+                               GtkWidget    *widget,
+                               GError      **error);
+	void (*hide_dockable_widget) (AnjutaShell *shell, 
+                               GtkWidget    *widget,
+                               GError      **error);
+	void (*show_dockable_widget) (AnjutaShell *shell, 
+                               GtkWidget    *widget,
+                               GError      **error);
+	void (*maximize_widget)   (AnjutaShell  *shell,
+	                           const char   *widget_name,
+                               GError      **error);
+	void (*unmaximize)        (AnjutaShell  *shell,
+                               GError      **error);
 	void (*add_value)         (AnjutaShell  *shell,
 							   const char   *name,
 							   const GValue *value,
@@ -174,6 +193,20 @@ void   anjuta_shell_remove_widget   (AnjutaShell     *shell,
 void   anjuta_shell_present_widget  (AnjutaShell     *shell,
 									 GtkWidget       *widget,
 									 GError         **error);
+void anjuta_shell_iconify_dockable_widget (AnjutaShell *shell, 
+                                     GtkWidget   *widget,
+                                     GError      **error);
+void anjuta_shell_hide_dockable_widget (AnjutaShell *shell, 
+                                     GtkWidget   *widget,
+                                     GError      **error);
+void anjuta_shell_show_dockable_widget (AnjutaShell *shell, 
+                                     GtkWidget   *widget,
+                                     GError      **error);
+void anjuta_shell_maximize_widget   (AnjutaShell *shell,
+                                     const char  *widget_name,
+                                     GError      **error);
+void anjuta_shell_unmaximize        (AnjutaShell *shell,
+                                     GError      **error);
 void   anjuta_shell_add_value       (AnjutaShell     *shell,
 									 const char      *name,
 									 const GValue    *value,
diff --git a/libanjuta/anjuta-ui.h b/libanjuta/anjuta-ui.h
index 196eadb..bee3e97 100644
--- a/libanjuta/anjuta-ui.h
+++ b/libanjuta/anjuta-ui.h
@@ -137,7 +137,12 @@ void anjuta_ui_save_accels (const gchar *filename);
 
 void anjuta_ui_unload_accels (AnjutaUI *ui);
 
-/* Convenience macros to register stock icons */
+/**
+ * BEGIN_REGISTER_ICON:
+ * @plugin: The anjuta plugin to register the icons for
+ *
+ * Convenience macros to register stock icons 
+ */
 #define BEGIN_REGISTER_ICON(plugin) \
 { \
 	AnjutaUI *ui = anjuta_shell_get_ui ((plugin)->shell, NULL); \
@@ -145,7 +150,12 @@ void anjuta_ui_unload_accels (AnjutaUI *ui);
 	GtkIconSet *icon_set; \
 	GtkIconSource *	icon_source = gtk_icon_source_new ();
 
-/* Register icon with size 16 and size 24, icon should be the 
+/**
+ * REGISTER_ICON_FULL:
+ * @icon: name of the icon (without size and extension)
+ * @stock_id: stock-id that should be assigned to the icon
+ *
+ * Register icon with size 16 and size 24, icon should be the 
  * filename (without path) striped of the size (16,24) and the *.png
  * (e.g anjuta-icon-24.png => anjuta-icon)
  */
@@ -162,7 +172,12 @@ void anjuta_ui_unload_accels (AnjutaUI *ui);
 	gtk_icon_set_add_source (icon_set, icon_source); \
 	gtk_icon_factory_add (icon_factory, stock_id, icon_set);
 
-/* Register icon for all sizes (will be scaled) 
+/**
+ * REGISTER_ICON:
+ * @icon: name of the icon (without size and extension)
+ * @stock_id: stock-id that should be assigned to the icon
+ *
+ * Register icon for all sizes (will be scaled) 
  * icon should be the full filename without path (e.g anjuta-icon.png)
  */
 
@@ -177,6 +192,12 @@ void anjuta_ui_unload_accels (AnjutaUI *ui);
 	} \
 	}
 
+
+/** 
+ * END_REGISTER_ICON:
+ *
+ * Ends a BEGIN_REGISTER_ICON sequence
+ */
 #define END_REGISTER_ICON \
 	gtk_icon_source_free (icon_source); \
 }
diff --git a/libanjuta/anjuta-utils.h b/libanjuta/anjuta-utils.h
index c5ef85e..baf65a0 100644
--- a/libanjuta/anjuta-utils.h
+++ b/libanjuta/anjuta-utils.h
@@ -149,6 +149,15 @@ GSList *anjuta_utils_drop_get_files (GtkSelectionData *selection_data);
 
 /* Temporarily copied here */
 
+/**
+ * ANJUTA_TYPE_BEGIN:
+ * @class_name: Name of the object
+ * @prefix: Prefix used for object methods
+ * @parent_type: The parent type of the object
+ *
+ * Create a new GObject for Anjuta. You can use ANJUTA_TYPE_ADD_INTERFACE
+ * to add interfaces to it and should close it using ANJUTA_TYPE_END
+ */
 #define ANJUTA_TYPE_BEGIN(class_name, prefix, parent_type) \
 GType                                                     \
 prefix##_get_type (void)                                  \
@@ -172,11 +181,24 @@ prefix##_get_type (void)                                  \
         type = g_type_register_static (parent_type,       \
                                        #class_name,       \
                                        &type_info, 0);
+
+/**
+ * ANJUTA_TYPE_END
+ *
+ * Ends a declaration that began with ANJUTA_TYPE_BEGIN
+ */
 #define ANJUTA_TYPE_END                                   \
      }                                                    \
   return type;                                            \
 }
 
+/**
+ * ANJUTA_TYPE_ADD_INTERFACE:
+ * @prefix: Prefix for the interface methods
+ * @interface_type: Type of the interface to implement
+ *
+ * Adds an interface to a declaration started with ANJUTA_TYPE_BEGIN
+ */
 #define ANJUTA_TYPE_ADD_INTERFACE(prefix,interface_type)  \
     {                                                     \
         GInterfaceInfo iface_info = {                     \
@@ -189,10 +211,19 @@ prefix##_get_type (void)                                  \
                                      &iface_info);        \
     }
 
+/**
+ * ANJUTA_TYPE_BOILERPLATE:
+ * @class_name: Name of the object
+ * @prefix: Prefix for the class methods
+ * @parent_type: Parent type for object
+ *
+ * Simpliefied version of ANJUTA_TYPE_BEGIN that just creates an Object
+ * without interfaces and doesn't need ANJUTA_TYPE_END
+ */
 #define ANJUTA_TYPE_BOILERPLATE(class_name, prefix, parent_type) \
 ANJUTA_TYPE_BEGIN(class_name, prefix, parent_type);              \
 ANJUTA_TYPE_END
 
 G_END_DECLS
 
-#endif
+#endif
\ No newline at end of file
diff --git a/libanjuta/interfaces/libanjuta.idl b/libanjuta/interfaces/libanjuta.idl
index f5a67ce..f608c3e 100644
--- a/libanjuta/interfaces/libanjuta.idl
+++ b/libanjuta/interfaces/libanjuta.idl
@@ -114,7 +114,7 @@ interface IAnjutaFile
 		/**
 		 * ianjuta_file_savable_set_dirty:
 		 * @obj: Self
-		 * @dirty: 
+		 * @dirty: Whether the file was edited or not
 		 * @err: Error propagation and reporting
 		 * 
 		 * if @dirty is TRUE, sets dirty for the content. Save point will be
@@ -240,7 +240,8 @@ interface IAnjutaMarkable
 		BREAKPOINT_ENABLED,
 		PROGRAM_COUNTER
 	}
-  /**
+	
+	/**
 	 * IAnjutaMarkable::marker-clicked:
 	 * @obj: Self
 	 * @double_click: whether the marker was double clicked
@@ -1293,6 +1294,16 @@ interface IAnjutaEditor
 	 * number of line breaks in the added or removed text.
 	 */
 	void   ::changed (GObject *position, gboolean added, gint length, gint lines, const gchar *text);
+
+	/**
+	 * IAnjutaEditor::line-marks-gutter-clicked:
+	 * @obj: Self
+	 * @double_click: whether the line marks gutter was double clicked
+	 * @location: location of the clicked marker
+	 * 
+	 * The signal is emitted when the user clicks on a marker
+	 */
+	void   ::line_marks_gutter_clicked (gint location);
 	
 	/**
 	 * ianjuta_editor_get_tabsize:
@@ -2321,7 +2332,7 @@ interface IAnjutaEditor
 	interface IAnjutaEditorGoto
 	{
 		/**
-		 * ianjuta_editor_goto_start_block()
+		 * ianjuta_editor_goto_start_block:
 		 * @obj: Self
 		 * @err: Error propagation and reporting
 		 *
@@ -2330,7 +2341,7 @@ interface IAnjutaEditor
 		void start_block();
 		
 		/**
-		 * ianjuta_editor_goto_end_block()
+		 * ianjuta_editor_goto_end_block:
 		 * @obj: Self
 		 * @err: Error propagation and reporting
 		 *
@@ -2339,7 +2350,7 @@ interface IAnjutaEditor
 		void end_block();
 
 		/**
-		 * ianjuta_editor_goto_matching_brace()
+		 * ianjuta_editor_goto_matching_brace:
 		 * @obj: Self
 		 * @err: Error propagation and reporting
 		 *
@@ -5176,7 +5187,6 @@ interface IAnjutaSymbol
 	
 	/** 
 	 * IAnjutaSymbolType:
-	 *
 	 * @IANJUTA_SYMBOL_TYPE_UNDEF: Unknown type. If you have to search for all the known
 	 * types use this flag because it's quicker than #IANJUTA_SYMBOL_TYPE_MAX.
 	 * @IANJUTA_SYMBOL_TYPE_CLASS: Class declaration
@@ -5226,15 +5236,12 @@ interface IAnjutaSymbol
 		TYPE_MACRO_WITH_ARG = 262144,  
 		TYPE_FILE = 524288,            
 		TYPE_OTHER = 1048576,          
-		TYPE_SCOPE_CONTAINER = IANJUTA_SYMBOL_TYPE_CLASS | IANJUTA_SYMBOL_TYPE_ENUM | IANJUTA_SYMBOL_TYPE_ENUMERATOR | IANJUTA_SYMBOL_TYPE_INTERFACE | IANJUTA_SYMBOL_TYPE_NAMESPACE | IANJUTA_SYMBOL_TYPE_PACKAGE | IANJUTA_SYMBOL_TYPE_STRUCT | IANJUTA_SYMBOL_TYPE_TYPEDEF | IANJUTA_SYMBOL_TYPE_UNION,
+		TYPE_SCOPE_CONTAINER = IANJUTA_SYMBOL_TYPE_CLASS | IANJUTA_SYMBOL_TYPE_ENUM | IANJUTA_SYMBOL_TYPE_INTERFACE | IANJUTA_SYMBOL_TYPE_NAMESPACE | IANJUTA_SYMBOL_TYPE_PACKAGE | IANJUTA_SYMBOL_TYPE_STRUCT | IANJUTA_SYMBOL_TYPE_UNION,
 		TYPE_MAX = 2097151             
 	}
 
 	/** 
-	 * IAnjutaSymbolField: Field masks. Used mainly to retrieve the fields of a symbol
-	 * throught the call to ianjuta_symbol_get_extra_info_string () or the various
-	 * ianjuta_symbol_manager_* () functions.
-	 *
+	 * IAnjutaSymbolField:
 	 * @IANJUTA_SYMBOL_FIELD_SIMPLE: With this field you will have name, line of declaration,
 	 *                               is_file_scope and signature of the symbol.
 	 * @IANJUTA_SYMBOL_FIELD_FILE_PATH: The path to the file. It's obtained using something like
@@ -5255,6 +5262,10 @@ interface IAnjutaSymbol
 	 * @IANJUTA_SYMBOL_FIELD_FILE_INCLUDE: field mainly ignored.
 	 * @IANJUTA_SYMBOL_FIELD_PROJECT_NAME: the project this symbol belongs to.
 	 * @IANJUTA_SYMBOL_FIELD_WORKSPACE_NAME: the workspace this symbol belongs to.
+	 *
+	 * Field masks. Used mainly to retrieve the fields of a symbol
+	 * throught the call to ianjuta_symbol_get_extra_info_string () or the various
+	 * ianjuta_symbol_manager_* () functions
 	 */
 	enum Field
 	{
@@ -5506,13 +5517,13 @@ interface IAnjutaSymbolManager
 	
 	/** 
 	 * IAnjutaSymbolManagerSearchFileScope: 
- 	 * You cannot use bitwise OR in this parameter.	 
-	 *
 	 * @IANJUTA_SYMBOL_MANAGER_SEARCH_FS_IGNORE: to be ignored (e.g. Will search both private and public scopes). 
 	 * @IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PUBLIC: only global public function will be searched 
  	 * (the ones that _do not_ belong to the file scope). 
 	 * @IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PRIVATE: only private or static (for C language) will be searched 
      * (the ones that _do_ belong to the file scope). 
+     *
+     * You cannot use bitwise OR in this parameter.
 	 */	
 	enum SearchFileScope
 	{
@@ -5576,7 +5587,7 @@ interface IAnjutaSymbolManager
 	IAnjutaIterable* search_system (IAnjutaSymbolType match_types, gboolean include_types, IAnjutaSymbolField info_fields, const gchar *pattern, SearchFileScope filescope_search, gint results_limit, gint results_offset);
 
 	/**
-	* ianjuta_symbol_manager_search_project_async:
+	* ianjuta_symbol_manager_search_system_async:
 	* @obj: Self
 	* @match_types: If passed #IANJUTA_SYMBOL_TYPE_UNDEF the function will not perfom any filter.
 	* @include_types: Should the result contain or exclude the match_types? TRUE to include them,
@@ -5739,7 +5750,7 @@ interface IAnjutaSymbolManager
 	IAnjutaIterable* get_members (const IAnjutaSymbol *symbol, IAnjutaSymbolField info_fields);
 	
 	/**
-	* ianjuta_symbol_manager_get_parents:
+	* ianjuta_symbol_manager_get_class_parents:
 	* @obj: Self
 	* @symbol: Symbol which you want to know the parent classes of.
 	* @info_fields: Kind of infos you would like to have available on the resulting Symbols.
diff --git a/manuals/reference/libanjuta/Makefile.am b/manuals/reference/libanjuta/Makefile.am
index 356784b..ab97d5c 100644
--- a/manuals/reference/libanjuta/Makefile.am
+++ b/manuals/reference/libanjuta/Makefile.am
@@ -42,7 +42,7 @@ CFILE_GLOB=$(top_srcdir)/libanjuta/*.c $(top_srcdir)/libanjuta/interfaces/ianjut
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=
+IGNORE_HFILES=anjuta-enum-types.h anjuta-marshal.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/mime/Makefile.am b/mime/Makefile.am
index 8e7fcad..cec113c 100644
--- a/mime/Makefile.am
+++ b/mime/Makefile.am
@@ -1,16 +1,8 @@
 mimexmldir = $(datadir)/mime/packages
 mimexml_DATA = anjuta.xml
 
-mimepngicondir = $(datadir)/icons/gnome/48x48/mimetypes
-mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-
-mimesvgicondir = $(datadir)/icons/gnome/scalable/mimetypes
-mimesvgicon_DATA = gnome-mime-application-x-anjuta.svg
-
 EXTRA_DIST = \
-	$(mimexml_DATA) \
-	$(mimepngicon_DATA) \
-	$(mimesvgicon_DATA)
+	$(mimexml_DATA)
 
 ## Update mime only when system wide installation takes place
 
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 11138a0..3311b76 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,9 +1,4 @@
-## Process this file with automake to produce Makefile.in
-
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = anjuta.png
-svgicondir = $(datadir)/icons/hicolor/scalable/apps
-svgicon_DATA = anjuta.svg
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -22,8 +17,6 @@ anjuta_pixmapsdir = $(anjuta_image_dir)
 
 anjuta_pixmaps_DATA = \
 	madeinanjuta.xcf \
-	anjuta.svg \
-	anjuta.png \
 	anjuta_logo.png \
 	anjuta_splash.png \
 	directory.png \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 329fd2b..13ba3da 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -15,6 +15,7 @@ SUBDIRS = . \
 	cvs-plugin \
 	macro \
 	class-gen \
+	class-inheritance \
 	patch \
 	subversion \
 	project-import \
diff --git a/plugins/class-gen/Makefile.am b/plugins/class-gen/Makefile.am
index a62e8c7..fbee05c 100644
--- a/plugins/class-gen/Makefile.am
+++ b/plugins/class-gen/Makefile.am
@@ -13,8 +13,8 @@ plugin_in_files = anjuta-class-gen.plugin.in
 # Plugin pixmaps
 clsgen_pixmapsdir = $(anjuta_image_dir)
 clsgen_pixmaps_DATA = \
-	class_logo.xpm
-
+	anjuta-class-gen-plugin.svg \
+	anjuta-class-gen-plugin-48.png
 
 clsgen_plugindir = $(anjuta_plugin_dir)
 clsgen_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
diff --git a/plugins/class-gen/anjuta-class-gen.plugin.in b/plugins/class-gen/anjuta-class-gen.plugin.in
index 0923ee6..d53a81e 100644
--- a/plugins/class-gen/anjuta-class-gen.plugin.in
+++ b/plugins/class-gen/anjuta-class-gen.plugin.in
@@ -2,7 +2,7 @@
 _Name=Class Generator
 _Description=Anjuta Class Generator Plugin
 Location=anjuta-class-gen:AnjutaClassGenPlugin
-Icon=class_logo.xpm
+Icon=anjuta-class-gen-plugin-48.png
 Interfaces=IAnjutaWizard
 UserActivatable=no
 
diff --git a/plugins/class-gen/plugin.c b/plugins/class-gen/plugin.c
index a02bd22..35509c8 100644
--- a/plugins/class-gen/plugin.c
+++ b/plugins/class-gen/plugin.c
@@ -35,7 +35,7 @@
 
 #include "window.h"
 
-#define ICON_FILE "class_logo.xpm"
+#define ICON_FILE "anjuta-class-gen-plugin-48.png"
 
 static gpointer parent_class;
 
diff --git a/plugins/debug-manager/breakpoints.c b/plugins/debug-manager/breakpoints.c
index 3203df6..b27a6ef 100644
--- a/plugins/debug-manager/breakpoints.c
+++ b/plugins/debug-manager/breakpoints.c
@@ -1622,11 +1622,36 @@ on_jump_to_breakpoint_activate (GtkAction * action, BreakpointsDBase *bd)
 	}
 }
 
+
+static void
+update_breakpoint(BreakpointsDBase *bd, IAnjutaEditor *te, gchar *uri, guint line_number){
+	/* Find corresponding breakpoint
+	 * Try to find right mark (it could have moved) first */
+	BreakpointItem *bi;
+	bi = breakpoints_dbase_find_breakpoint_from_mark (bd, te, line_number);
+	DEBUG_PRINT("breakpoints db %p, editor %p, uri %s, line_number %d, BreakpointItem %p", bd, te, uri, line_number, bi);
+	if (bi == NULL)
+	{
+		bi = breakpoints_dbase_find_breakpoint_from_line (bd, uri, line_number);
+	}
+
+	if (bi == NULL)
+	{
+		bi = breakpoint_item_new_from_uri (bd, uri, line_number, TRUE);
+
+		breakpoints_dbase_add_breakpoint (bd, bi);
+	}
+	else
+	{
+		breakpoints_dbase_remove_breakpoint (bd, bi);
+	}
+}
+
+/* update the breakpoint with current active line in the editor */
 static void
 on_toggle_breakpoint_activate (GtkAction * action, BreakpointsDBase *bd)
 {
 	IAnjutaEditor *te;
-	BreakpointItem *bi;
 	GFile* file;
 	gchar *uri;
 	guint line;
@@ -1641,24 +1666,29 @@ on_toggle_breakpoint_activate (GtkAction * action, BreakpointsDBase *bd)
 	uri = g_file_get_uri (file);
 	g_object_unref (file);
 	
-	/* Find corresponding breakpoint
-	 * Try to find right mark (it could have moved) first */
-	bi = breakpoints_dbase_find_breakpoint_from_mark (bd, te, line);
-	if (bi == NULL)
-	{
-		bi = breakpoints_dbase_find_breakpoint_from_line (bd, uri, line);
-	}
+	update_breakpoint(bd, te, uri, line);
+
+	g_free (uri);
+}
+
+/* update the breakpoint when the line number is known */
+static void
+on_line_marks_gutter_clicked(GtkAction * action, gint line_number, BreakpointsDBase *bd)
+{
+	IAnjutaEditor *te;
+	GFile* file;
+	gchar *uri;
+
+	/* Get current editor and line */
+	te = dma_get_current_editor (ANJUTA_PLUGIN (bd->plugin));
+	if (te == NULL) return;       /* Missing editor */
+	file = ianjuta_file_get_file (IANJUTA_FILE (te), NULL);
+	if (file == NULL) return;     /* File not saved yet, it's not possible to put a breakpoint in it */
+	uri = g_file_get_uri (file);
+	g_object_unref (file);
+
+	update_breakpoint(bd, te, uri, line_number);
 
-	if (bi == NULL)
-	{
-		bi = breakpoint_item_new_from_uri (bd, uri, line, TRUE);
-	
-		breakpoints_dbase_add_breakpoint (bd, bi);
-	}
-	else
-	{
-		breakpoints_dbase_remove_breakpoint (bd, bi);
-	}
 	g_free (uri);
 }
 
@@ -2076,3 +2106,8 @@ breakpoints_dbase_destroy (BreakpointsDBase * bd)
 	g_free (bd);
 }
 
+/* Handler for breakpoint toggle on double clicking line marks gutter */
+void breakpoint_toggle_handler(GtkAction * action, gint line_number, BreakpointsDBase *bd) {
+	/* Simply delegate to an internal API for now */
+	on_line_marks_gutter_clicked (action, line_number, bd);
+}
diff --git a/plugins/debug-manager/breakpoints.h b/plugins/debug-manager/breakpoints.h
index cd500a0..2d2cd5a 100644
--- a/plugins/debug-manager/breakpoints.h
+++ b/plugins/debug-manager/breakpoints.h
@@ -41,6 +41,9 @@ typedef struct _BreakpointsDBase BreakpointsDBase;
 BreakpointsDBase *breakpoints_dbase_new (DebugManagerPlugin *plugin);
 void breakpoints_dbase_destroy (BreakpointsDBase * bd);
 
+/* Handler for breakpoint toggle on double clicking line marks gutter */
+void breakpoint_toggle_handler(GtkAction * action, gint line_number, BreakpointsDBase *bd);
+
 G_END_DECLS
 											
 #endif
diff --git a/plugins/debug-manager/plugin.c b/plugins/debug-manager/plugin.c
index acd7a58..134a418 100644
--- a/plugins/debug-manager/plugin.c
+++ b/plugins/debug-manager/plugin.c
@@ -278,12 +278,34 @@ value_added_current_editor (AnjutaPlugin *plugin, const char *name,
 		self->current_editor = NULL;
 		return;
 	}
-							 
+
 	self->current_editor = IANJUTA_EDITOR (editor);
 	g_object_add_weak_pointer (G_OBJECT (self->current_editor), (gpointer *)(gpointer)&self->current_editor);
 		
 	/* Restore program counter marker */
 	show_program_counter_in_editor (self);
+
+	/* connect signal to enable/disable breakpoints on double clicking the line marks gutter */
+	/* firstly, find the handler of previously connected signal */
+	/* secondly, connect signal if a handler wasn't found for the signal */
+	guint signal_id = g_signal_lookup( "line-marks-gutter-clicked", IANJUTA_TYPE_EDITOR);
+	glong handler_id = g_signal_handler_find( (gpointer)self->current_editor,
+            G_SIGNAL_MATCH_ID,
+            signal_id,
+            0, NULL, NULL, NULL );
+
+
+	DEBUG_PRINT("current editor %p, breapoints db %p", self->current_editor, self->breakpoints);
+
+	if(!handler_id) {
+		g_signal_connect (
+				self->current_editor,
+				"line-marks-gutter-clicked",
+				G_CALLBACK (breakpoint_toggle_handler),
+				self->breakpoints
+			);
+	}
+
 }
 
 static void
diff --git a/plugins/devhelp/plugin.c b/plugins/devhelp/plugin.c
index ce7baf6..fb69583 100644
--- a/plugins/devhelp/plugin.c
+++ b/plugins/devhelp/plugin.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
+#include <libanjuta/anjuta-tabber.h>
 #include <libanjuta/interfaces/ianjuta-document-manager.h>
 #include <libanjuta/interfaces/ianjuta-editor.h>
 #include <libanjuta/interfaces/ianjuta-help.h>
@@ -294,38 +295,6 @@ static void on_load_finished (GObject* view, GObject* frame, gpointer user_data)
 	anjuta_devhelp_check_history(devhelp);
 }
 
-static void
-on_notebook_button_toggled (GtkToggleButton *button,
-                            AnjutaDevhelp *devhelp)
-{
-	int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "__page"));
-	gtk_notebook_set_current_page (GTK_NOTEBOOK(devhelp->control_notebook), page);
-}
-
-static void
-on_notebook_switch_page (GtkNotebook* notebook,
-                         GtkNotebookPage* page,
-                         guint page_num,
-                         AnjutaDevhelp *devhelp)
-{
-	g_signal_handlers_block_by_func (devhelp->button_tree,
-	                                 on_notebook_button_toggled,
-	                                 devhelp);
-	g_signal_handlers_block_by_func (devhelp->button_search,
-	                                 on_notebook_button_toggled,
-	                                 devhelp);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(devhelp->button_tree),
-	                              page_num == 0);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(devhelp->button_search),
-	                              page_num == 1);
-	g_signal_handlers_unblock_by_func (devhelp->button_tree,
-	                                   on_notebook_button_toggled,
-	                                   devhelp);
-	g_signal_handlers_unblock_by_func (devhelp->button_search,
-	                                   on_notebook_button_toggled,
-	                                   devhelp);
-}
-
 #endif
 
 static gboolean
@@ -363,35 +332,42 @@ devhelp_activate (AnjutaPlugin *plugin)
 	devhelp->uiid = anjuta_ui_merge (ui, UI_FILE);
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
+	devhelp->control_notebook = gtk_notebook_new ();
+	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (devhelp->control_notebook),
+	                            FALSE);
+
 	/* Tabs in grip */
-	devhelp->tab_hbox = gtk_hbox_new (FALSE, 1);
-	devhelp->button_tree = gtk_toggle_button_new_with_label (_("Contents"));
-	devhelp->button_search = gtk_toggle_button_new_with_label (_("Search"));	
+	devhelp->tab_hbox = gtk_hbox_new (FALSE, 1);	
 
 	gtk_box_pack_start (GTK_BOX (devhelp->tab_hbox),
 	                    gtk_image_new_from_stock (ANJUTA_STOCK_DEVHELP,
 	                                              GTK_ICON_SIZE_MENU),
 	                    FALSE, FALSE, 0);
 	label = gtk_label_new (_("Help"));
-	gtk_label_set_ellipsize (GTK_LABEL (label),
-	                         PANGO_ELLIPSIZE_END);
+	devhelp->tabber = anjuta_tabber_new (GTK_NOTEBOOK(devhelp->control_notebook));
+	
+	
 	gtk_box_pack_start (GTK_BOX (devhelp->tab_hbox),
 	                    label,
-	                    TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (devhelp->tab_hbox),
-	                    devhelp->button_tree,
-	                    FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (devhelp->tab_hbox),
-	                    devhelp->button_search,
 	                    FALSE, FALSE, 0);
+	gtk_box_pack_end (GTK_BOX (devhelp->tab_hbox),
+	                    devhelp->tabber,
+	                    TRUE, TRUE, 5);
+
+	label = gtk_label_new (_("Contents"));
+	gtk_label_set_ellipsize (GTK_LABEL (label),
+	                         PANGO_ELLIPSIZE_END);
+	anjuta_tabber_add_tab (ANJUTA_TABBER (devhelp->tabber),
+	                       label);
+	
+	label = gtk_label_new (_("Search"));
+	gtk_label_set_ellipsize (GTK_LABEL (label),
+	                         PANGO_ELLIPSIZE_END);
+	anjuta_tabber_add_tab (ANJUTA_TABBER (devhelp->tabber),
+	                       label);
+	
 	gtk_widget_show_all (devhelp->tab_hbox);
 
-	g_signal_connect (devhelp->button_tree, "toggled",
-	                  G_CALLBACK(on_notebook_button_toggled), devhelp);
-	g_object_set_data (G_OBJECT(devhelp->button_tree), "__page", GINT_TO_POINTER(0));	
-	g_signal_connect (devhelp->button_search, "toggled",
-	                  G_CALLBACK(on_notebook_button_toggled), devhelp);
-	g_object_set_data (G_OBJECT(devhelp->button_search), "__page", GINT_TO_POINTER(1));		
 	/*
 	 * Forward/back buttons
 	 */
@@ -419,7 +395,7 @@ devhelp_activate (AnjutaPlugin *plugin)
 	g_signal_connect (devhelp->go_forward, "clicked",
 	                  G_CALLBACK (on_go_forward_clicked), devhelp);
 
-	devhelp->online = gtk_button_new_with_label (_("Online"));
+	devhelp->online = gtk_button_new_with_label ("library.gnome.org");
 	g_signal_connect (devhelp->online, "clicked",
 	                  G_CALLBACK (on_online_clicked), devhelp);
 
@@ -442,16 +418,9 @@ devhelp_activate (AnjutaPlugin *plugin)
 									GTK_POLICY_NEVER,
 									GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (books_sw),
-									     GTK_SHADOW_IN);
+									     GTK_SHADOW_NONE);
 	gtk_container_set_border_width (GTK_CONTAINER (books_sw), 2);
 	
-	devhelp->control_notebook = gtk_notebook_new ();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (devhelp->control_notebook),
-	                            FALSE);
-	g_signal_connect (devhelp->control_notebook,
-	                  "switch-page",
-	                  G_CALLBACK(on_notebook_switch_page),
-	                  devhelp);
 	devhelp->book_tree = dh_book_tree_new (books);
 	
 	devhelp->search = dh_search_new (keywords);
diff --git a/plugins/devhelp/plugin.h b/plugins/devhelp/plugin.h
index cb91d59..ec89758 100644
--- a/plugins/devhelp/plugin.h
+++ b/plugins/devhelp/plugin.h
@@ -60,8 +60,7 @@ struct _AnjutaDevhelp{
 	GtkWidget      *go_forward;
 	GtkWidget      *online;
 
-	GtkWidget      *button_tree;
-	GtkWidget      *button_search;	
+	GtkWidget      *tabber;
 	
 	IAnjutaEditor	*editor;
 	guint editor_watch_id;
diff --git a/plugins/dir-project/sources.list b/plugins/dir-project/sources.list
index 50371cf..4f16b36 100644
--- a/plugins/dir-project/sources.list
+++ b/plugins/dir-project/sources.list
@@ -12,6 +12,8 @@
 *.rb
 *.y
 *.l
+*.vala
+*.gs
 *.in
 *.in.in
 *.am
diff --git a/plugins/document-manager/action-callbacks.c b/plugins/document-manager/action-callbacks.c
index a4960b3..501b5ff 100644
--- a/plugins/document-manager/action-callbacks.c
+++ b/plugins/document-manager/action-callbacks.c
@@ -257,6 +257,43 @@ on_close_all_file_activate (GtkAction *action, gpointer user_data)
 	}
 }
 
+void 
+on_close_other_file_activate (GtkAction *action, gpointer user_data)
+{
+	GList *buffers;
+	AnjutaDocman *docman;
+	IAnjutaDocument *curr_doc;
+	DocmanPlugin *plugin;
+	plugin = ANJUTA_PLUGIN_DOCMAN (user_data);
+	docman = ANJUTA_DOCMAN (plugin->docman);
+	
+	/* Close all 'saved' files */
+	buffers = anjuta_docman_get_all_doc_widgets (docman);
+	if (buffers)
+	{
+		GList *node;
+		node = buffers;
+
+		curr_doc = anjuta_docman_get_current_document (docman);
+		while (node)
+		{	
+			IAnjutaDocument *doc;
+			GList* next;
+			doc = IANJUTA_DOCUMENT (node->data);
+			next = g_list_next (node); /* grab it now, as we may change it. */
+			if (doc && doc != curr_doc)
+			{
+				if (!ianjuta_file_savable_is_dirty (IANJUTA_FILE_SAVABLE (doc), NULL))
+				{
+					anjuta_docman_remove_document (docman, doc);
+				}
+			}
+			node = next;
+		}
+		g_list_free (buffers);
+	}	
+}
+
 void
 on_reload_file_activate (GtkAction *action, gpointer user_data)
 {
diff --git a/plugins/document-manager/action-callbacks.h b/plugins/document-manager/action-callbacks.h
index 2c972a6..ccb408b 100644
--- a/plugins/document-manager/action-callbacks.h
+++ b/plugins/document-manager/action-callbacks.h
@@ -26,6 +26,7 @@ void on_save_all_activate (GtkAction *action, gpointer user_data);
 void on_close_file_activate (GtkAction *action, gpointer user_data);
 void on_reload_file_activate (GtkAction *action, gpointer user_data);
 void on_close_all_file_activate (GtkAction *action, gpointer user_data);
+void on_close_other_file_activate (GtkAction *action, gpointer user_data);
 
 void on_print_activate (GtkAction *action, gpointer user_data);
 void on_print_preview_activate (GtkAction *action, gpointer user_data);
diff --git a/plugins/document-manager/anjuta-docman.c b/plugins/document-manager/anjuta-docman.c
index 79ab99f..68961c4 100644
--- a/plugins/document-manager/anjuta-docman.c
+++ b/plugins/document-manager/anjuta-docman.c
@@ -288,15 +288,54 @@ on_notebook_tab_btnpress (GtkWidget *wid, GdkEventButton *event, AnjutaDocman* d
 {
 	if (event->type == GDK_BUTTON_PRESS && event->button != 3)	/* right-click is for menu */
 		docman->priv->tab_pressed = TRUE;
-
+	
 	return FALSE;
 }
 
 static gboolean
 on_notebook_tab_btnrelease (GtkWidget *widget, GdkEventButton *event, AnjutaDocman* docman)
 {
+	AnjutaDocmanPage *page;
+	AnjutaDocmanPage *curr_page = NULL;
+	
 	docman->priv->tab_pressed = FALSE;
 
+	/* close on middle click */
+	if (event->button == 2)
+	{
+		/* the close function works only on the current document */
+		GList* node;
+		for (node = docman->priv->pages; node != NULL; node = g_list_next (node))
+		{
+			page = (AnjutaDocmanPage *) node->data;
+			if (page->box == widget)
+			{
+				/* we've found the page that user wants to close. Save the current
+				 * page for a later setup
+				 */
+				curr_page = anjuta_docman_get_current_page (docman);
+				anjuta_docman_set_current_document (docman, page->doc);
+				break;
+			}
+		}
+		if (node == NULL)
+			return FALSE;		
+
+		if (page != NULL) 
+		{
+			on_close_file_activate (NULL, docman->priv->plugin);
+
+			if (curr_page != NULL)
+			{
+				/* set the old current page */
+				anjuta_docman_set_current_document (docman, curr_page->doc);
+			}		
+		}
+
+		return FALSE;
+	}	
+
+	/* normal button click close */
 	if (anjuta_preferences_get_bool (docman->priv->preferences, EDITOR_TABS_RECENT_FIRST))
 	{
 		GList *node;
@@ -317,6 +356,22 @@ on_notebook_tab_btnrelease (GtkWidget *widget, GdkEventButton *event, AnjutaDocm
 	return FALSE;
 }
 
+static gboolean
+on_notebook_tab_double_click(GtkWidget *widget, GdkEventButton *event, 
+                             AnjutaDocman* docman)
+{
+	if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
+	{
+		if(!docman->maximized)
+			anjuta_shell_maximize_widget(docman->shell, "AnjutaDocumentManager", NULL);
+		else
+			anjuta_shell_unmaximize(docman->shell, NULL);
+		docman->maximized = docman->maximized ? FALSE:TRUE;
+	}
+
+  return FALSE;
+}
+
 static void
 on_notebook_page_reordered (GtkNotebook *notebook, GtkWidget *child,
 							guint page_num, AnjutaDocman *docman)
@@ -485,6 +540,9 @@ anjuta_docman_page_init (AnjutaDocman *docman, IAnjutaDocument *doc,
 	g_signal_connect (G_OBJECT (box), "button-release-event",
 					  G_CALLBACK (on_notebook_tab_btnrelease),
 					  docman);
+	g_signal_connect (G_OBJECT (box), "event",
+	                  G_CALLBACK (on_notebook_tab_double_click),
+	                  docman);
 
 	page->widget = GTK_WIDGET (doc);	/* this is the notebook-page child widget */
 	page->doc = doc;
@@ -868,6 +926,7 @@ anjuta_docman_new (DocmanPlugin* plugin, AnjutaPreferences *pref)
 		real_docman->priv->plugin = plugin;
 		real_docman->priv->preferences = pref;
 		real_docman->priv->documents_action_group = gtk_action_group_new ("ActionGroupDocument");
+		real_docman->maximized = FALSE;
 		ui = anjuta_shell_get_ui (ANJUTA_PLUGIN (plugin)->shell, NULL);
 		gtk_ui_manager_insert_action_group (GTK_UI_MANAGER (ui), real_docman->priv->documents_action_group, 0);
 		g_object_unref (real_docman->priv->documents_action_group);
diff --git a/plugins/document-manager/anjuta-docman.h b/plugins/document-manager/anjuta-docman.h
index d5764d4..3835ff3 100644
--- a/plugins/document-manager/anjuta-docman.h
+++ b/plugins/document-manager/anjuta-docman.h
@@ -44,6 +44,7 @@ struct _AnjutaDocman {
 	GtkNotebook parent;
 	AnjutaDocmanPriv *priv;
 	AnjutaShell *shell;
+	gboolean maximized;
 };
 
 struct _AnjutaDocmanClass {
diff --git a/plugins/document-manager/anjuta-document-manager.plugin.in b/plugins/document-manager/anjuta-document-manager.plugin.in
index 1d4cc6c..c884fba 100644
--- a/plugins/document-manager/anjuta-document-manager.plugin.in
+++ b/plugins/document-manager/anjuta-document-manager.plugin.in
@@ -8,4 +8,4 @@ Interfaces=IAnjutaDocumentManager,IAnjutaFile,IAnjutaFileSavable
 UserActivatable=no
 
 [File Loader]
-SupportedMimeTypes=text/*,text/source,application/x-perl,application/x-python,application/x-shellscript,application/x-php,application/x-java,application/x-javascript,application/x-ruby,application/x-m4,application/x-reject,application/xml,application/xslt+xml,text/html,application/javascript,application/x-glade
+SupportedMimeTypes=text/*,text/source,application/x-perl,application/x-python,application/x-shellscript,application/x-php,application/x-java,application/x-javascript,application/x-ruby,application/x-m4,application/x-reject,application/xml,application/xslt+xml,text/html,application/javascript
diff --git a/plugins/document-manager/anjuta-document-manager.xml b/plugins/document-manager/anjuta-document-manager.xml
index e69e189..3da2bc6 100644
--- a/plugins/document-manager/anjuta-document-manager.xml
+++ b/plugins/document-manager/anjuta-document-manager.xml
@@ -104,6 +104,7 @@
 			<menu name="Documents" action="ActionMenuDocuments">
 				<menuitem name="SaveAll" action="ActionFileSaveAll" />
 				<menuitem name="CloseAll" action="ActionFileCloseAll" />
+				<menuitem name="CloseOther" action="ActionFileCloseOther" />
 				<separator />
 				<menu name="DocumentsBookmarks" action="ActionMenuBookmark">
 				  <menuitem name="AddBookmark" action="ActionBookmarkAdd" />
diff --git a/plugins/document-manager/plugin.c b/plugins/document-manager/plugin.c
index 824ab11..0585b2e 100644
--- a/plugins/document-manager/plugin.c
+++ b/plugins/document-manager/plugin.c
@@ -161,6 +161,9 @@ static GtkActionEntry actions_file[] = {
   { "ActionFileCloseAll", GTK_STOCK_CLOSE, N_("Close All"), "<shift><control>w",
 	N_("Close all files"),
     G_CALLBACK (on_close_all_file_activate)},
+  { "ActionFileCloseOther", GTK_STOCK_CLOSE, N_("Close Other"), "<shift><control>o",
+	N_("Close other documents"),
+    G_CALLBACK (on_close_other_file_activate)},	
   { "ActionFileReload", GTK_STOCK_REVERT_TO_SAVED, N_("Reload F_ile"), NULL,
 	N_("Reload current file"),
     G_CALLBACK (on_reload_file_activate)},
diff --git a/plugins/file-manager/Makefile.am b/plugins/file-manager/Makefile.am
index 2336be4..3bcbd94 100644
--- a/plugins/file-manager/Makefile.am
+++ b/plugins/file-manager/Makefile.am
@@ -11,6 +11,7 @@ file_manager_pixmapsdir = $(anjuta_image_dir)
 file_manager_pixmaps_DATA = \
 	anjuta-file-manager-plugin.svg \
 	anjuta-file-manager-plugin-48.png \
+	anjuta-file-manager-plugin-16.png \
 	vcs-added.png \
 	vcs-conflict.png \
 	vcs-deleted.png \
diff --git a/plugins/file-manager/file-model.c b/plugins/file-manager/file-model.c
index 07f4324..0ed25f5 100644
--- a/plugins/file-manager/file-model.c
+++ b/plugins/file-manager/file-model.c
@@ -340,7 +340,7 @@ file_model_update_file (FileModel* model,
 		if ((icon_info = gtk_icon_theme_choose_icon (gtk_icon_theme_get_default(),
 													 (const gchar **)icon_names,
 													 ICON_SIZE,
-													 GTK_ICON_LOOKUP_GENERIC_FALLBACK)))
+													 GTK_ICON_LOOKUP_FORCE_SIZE)))
 		{
 			pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
 			gtk_icon_info_free(icon_info);
diff --git a/plugins/file-wizard/Makefile.am b/plugins/file-wizard/Makefile.am
index e98e7a7..ee06ba6 100644
--- a/plugins/file-wizard/Makefile.am
+++ b/plugins/file-wizard/Makefile.am
@@ -5,7 +5,8 @@ wizard_glade_DATA =  anjuta-file-wizard.ui
 # Plugin pixmaps
 wizard_pixmapsdir = $(anjuta_image_dir)
 wizard_pixmaps_DATA = \
-	anjuta-file-wizard-plugin.png
+	anjuta-file-wizard-plugin.svg \
+	anjuta-file-wizard-plugin-48.png
 
 # Plugin Icon file
 plugin_in_files = anjuta-file-wizard.plugin.in
diff --git a/plugins/file-wizard/anjuta-file-wizard.plugin.in b/plugins/file-wizard/anjuta-file-wizard.plugin.in
index 4a86782..0451741 100644
--- a/plugins/file-wizard/anjuta-file-wizard.plugin.in
+++ b/plugins/file-wizard/anjuta-file-wizard.plugin.in
@@ -2,7 +2,7 @@
 _Name=File Assistant
 _Description=Anjuta File Assistant Plugin
 Location=anjuta-file-wizard:AnjutaFileWizardPlugin
-Icon=anjuta-file-wizard-plugin.png
+Icon=anjuta-file-wizard-plugin-48.png
 Interfaces=IAnjutaWizard
 UserActivatable=no
 
diff --git a/plugins/file-wizard/plugin.c b/plugins/file-wizard/plugin.c
index fc6da68..e4e4687 100644
--- a/plugins/file-wizard/plugin.c
+++ b/plugins/file-wizard/plugin.c
@@ -30,7 +30,7 @@
 #include "plugin.h"
 
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-file-wizard.ui"
-#define ICON_FILE "anjuta-file-wizard-plugin.png"
+#define ICON_FILE "anjuta-file-wizard-plugin-48.png"
 
 static gpointer parent_class;
 
diff --git a/plugins/glade/Makefile.am b/plugins/glade/Makefile.am
index d3760dc..4ec897c 100644
--- a/plugins/glade/Makefile.am
+++ b/plugins/glade/Makefile.am
@@ -1,10 +1,6 @@
 
 if HAVE_PLUGIN_GLADE
 
-# Plugin glade file
-glade_gladedir = $(anjuta_glade_dir)
-glade_glade_DATA = anjuta-glade.glade
-
 # Plugin UI file
 glade_uidir = $(anjuta_ui_dir)
 glade_ui_DATA = anjuta-glade.ui
@@ -22,24 +18,11 @@ plugin_in_files = anjuta-glade.plugin.in
 glade_plugindir = $(anjuta_plugin_dir)
 glade_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
-# Marshallers
-marshallers_SOURCES = \
-	anjuta-glade-marshallers.c \
-	anjuta-glade-marshallers.h
-
-anjuta-glade-marshallers.h: anjuta-glade-marshallers.list
-	glib-genmarshal $< --header --prefix=anjuta_glade_marshallers > $@
-
-anjuta-glade-marshallers.c: anjuta-glade-marshallers.list anjuta-glade-marshallers.h
-	echo "#include \"anjuta-glade-marshallers.h\"" > $@ && \
-	glib-genmarshal $< --body --prefix=anjuta_glade_marshallers >> $@
-
 # Include paths
 AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(PLUGIN_GLADE_CFLAGS) \
-	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS)
 
 # Where to install the plugin
@@ -49,32 +32,21 @@ plugindir = $(anjuta_plugin_dir)
 plugin_LTLIBRARIES = libanjuta-glade.la
 
 # Plugin sources
-libanjuta_glade_la_SOURCES = \
-	$(marshallers_SOURCES) \
-	plugin.c plugin.h \
-	anjuta-design-document.h \
-	anjuta-design-document.c \
-	designer-associations.h \
-	designer-associations.c \
-	designer-associations-item.h \
-	designer-associations-item.c
+libanjuta_glade_la_SOURCES = plugin.c plugin.h \
+	anjuta-design-document.h                      \
+	anjuta-design-document.c 
 
 libanjuta_glade_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
 libanjuta_glade_la_LIBADD = \
 	$(PLUGIN_GLADE_LIBS) \
-	$(LIBANJUTA_LIBS) \
-	$(LIBXML_LIBS)
+	$(LIBANJUTA_LIBS)
 endif
 
 EXTRA_DIST = \
-	anjuta-glade-marshallers.list \
 	$(plugin_in_files) \
 	$(glade_plugin_DATA) \
 	$(glade_ui_DATA) \
-	$(glade_pixmaps_DATA) \
-	$(glade_glade_DATA)
-
+	$(glade_pixmaps_DATA)
 
--include $(top_srcdir)/git.mk
diff --git a/plugins/glade/anjuta-design-document.c b/plugins/glade/anjuta-design-document.c
index 916df57..b34951e 100644
--- a/plugins/glade/anjuta-design-document.c
+++ b/plugins/glade/anjuta-design-document.c
@@ -2,19 +2,19 @@
 /*
  * anjuta
  * Copyright (C) Johannes Schmid 2007 <jhs gnome org>
- *
+ * 
  * anjuta is free software.
- *
+ * 
  * You may redistribute it and/or modify it under the terms of the
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
- *
+ * 
  * anjuta is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with anjuta.  If not, write to:
  * 	The Free Software Foundation, Inc.,
@@ -32,165 +32,34 @@
 enum
 {
 	PROP_0,
-	PROP_PLUGIN,
-	PROP_DESIGN_VIEW,
-	PROP_DESIGN_VIEW_PARENT
+	PROP_PLUGIN
 };
 
 struct _AnjutaDesignDocumentPrivate
 {
 	GladePlugin* glade_plugin;
-	GladeDesignView *design_view;
-	GtkContainer *design_view_parent;
 };
 
-static GObjectClass *parent_class = NULL;
-
 #define ADD_GET_PRIVATE(o) \
 	(G_TYPE_INSTANCE_GET_PRIVATE ((o), ANJUTA_TYPE_DESIGN_DOCUMENT, AnjutaDesignDocumentPrivate))
 
 static void
 anjuta_design_document_instance_init (AnjutaDesignDocument *object)
 {
-
-}
-
-static void
-anjuta_design_document_design_view_destroy_cb (GtkObject *object, AnjutaDesignDocument* self);
-
-void
-anjuta_design_document_set_design_view_parent (AnjutaDesignDocument* self,
-                                               GtkContainer *container)
-{
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
-	g_return_if_fail (priv->design_view != NULL);
-
-	/* Remove the old label */
-	if (container == GTK_CONTAINER (self))
-	{
-		GtkWidget *child = gtk_bin_get_child (GTK_BIN (self));
-		if (child)
-			gtk_container_remove (GTK_CONTAINER (self), child);
-	}
-	/* Don't set priv->design_view_parent here because it will be set
-	 * in anjuta_design_document_design_view_parent_change_cb
-	 */
-	if (priv->design_view_parent)
-	{
-		gtk_container_remove (priv->design_view_parent,
-		                      GTK_WIDGET (priv->design_view));
-	}
-	DEBUG_PRINT ("%s", container ? "Setting the new container for design view" :
-	             "Unsetting the container for design view");
-	if (container)
-	{
-		gtk_container_add (container,
-		                   GTK_WIDGET (priv->design_view));
-	}
-
-	/* if the document widget is empty then add a label with an appropriate text.
-	 * container may be NULL only while construction or destruction */
-	if (container && gtk_bin_get_child (GTK_BIN (self)) == NULL)
-	{
-		GtkWidget *label;
-		label = gtk_label_new ("Designer layout is detached");
-		gtk_container_add (GTK_CONTAINER (self), label);
-		gtk_widget_show (GTK_WIDGET (label));
-	}
-}
-
-static void
-anjuta_design_document_design_view_destroy_cb (GtkObject *object, AnjutaDesignDocument* self)
-{
-	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (self));
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
-	if (priv->design_view)
-	{
-		DEBUG_PRINT ("Design view destroying");
-		anjuta_design_document_set_design_view_parent (self, NULL);
-	}
-	else
-		DEBUG_PRINT ("The design view has already been destroyed");
-}/*
-
-static void
-anjuta_design_document_design_view_parent_destroy_cb (GtkObject *object, AnjutaDesignDocument* self)
-{
-	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (self));
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-	DEBUG_PRINT ("The design view parent destroyed");
-	if (priv->design_view)
-		anjuta_design_document_set_design_view_parent (self, NULL);
-}*/
-
-static void
-anjuta_design_document_design_view_parent_set_cb (GtkWidget *widget,
-                                                  GtkObject *old_parent,
-                                                  AnjutaDesignDocument *self)
-{
-	GtkWidget *new_parent;
-	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (self));
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-	if (priv->design_view_parent)
-	{
-		/*g_signal_handlers_disconnect_by_func (G_OBJECT (priv->design_view_parent),
-		         G_CALLBACK(anjuta_design_document_design_view_destroy_cb), self);*/
-		g_object_unref (priv->design_view_parent);
-	}
-	new_parent = gtk_widget_get_parent (widget);
-	if (new_parent)
-	{
-		g_object_ref (new_parent);
-		/*g_signal_connect (G_OBJECT (new_parent), "destroy",
-						  G_CALLBACK(anjuta_design_document_design_view_parent_destroy_cb),
-						  self);*/
-	}
-	priv->design_view_parent = GTK_CONTAINER (new_parent);
-}
-
-void
-anjuta_design_document_set_design_view (AnjutaDesignDocument *self, GladeDesignView *value)
-{
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-	g_return_if_fail (priv->design_view == NULL);
-	priv->design_view = g_object_ref (value);
-	g_signal_connect (G_OBJECT(priv->design_view), "destroy",
-					  G_CALLBACK(anjuta_design_document_design_view_destroy_cb),
-					  self);
-	g_signal_connect (G_OBJECT(priv->design_view), "parent-set",
-					  G_CALLBACK(anjuta_design_document_design_view_parent_set_cb),
-					  self);
-}
-
-GladeDesignView *
-anjuta_design_document_get_design_view (AnjutaDesignDocument *self)
-{
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
-	return priv->design_view;
+	
 }
 
 static void
 anjuta_design_document_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
 	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (object));
-	AnjutaDesignDocument *self = ANJUTA_DESIGN_DOCUMENT (object);
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
+	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(object);
+	
 	switch (prop_id)
 	{
 	case PROP_PLUGIN:
 		priv->glade_plugin = g_value_get_object(value);
 		break;
-	case PROP_DESIGN_VIEW:
-		anjuta_design_document_set_design_view (self, g_value_get_object(value));
-		break;
-	case PROP_DESIGN_VIEW_PARENT:
-		g_return_if_fail (priv->design_view != NULL);
-		anjuta_design_document_set_design_view_parent (self, g_value_get_object(value));
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -201,17 +70,10 @@ static void
 anjuta_design_document_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
 	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (object));
-	AnjutaDesignDocument *self = ANJUTA_DESIGN_DOCUMENT (object);
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
+	
+	
 	switch (prop_id)
 	{
-	case PROP_DESIGN_VIEW:
-		g_value_set_object(value, priv->design_view);
-		break;
-	case PROP_DESIGN_VIEW_PARENT:
-		g_value_set_object(value, priv->design_view_parent);
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -219,72 +81,15 @@ anjuta_design_document_get_property (GObject *object, guint prop_id, GValue *val
 }
 
 static void
-anjuta_design_document_parent_set_cb (GtkWidget *widget,
-                                      GtkObject *old_parent,
-                                      AnjutaDesignDocument *self)
-{
-	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (self));
-	AnjutaDesignDocumentPrivate *priv = ADD_GET_PRIVATE (self);
-	if (gtk_widget_get_parent (GTK_WIDGET (self)) == NULL && priv->design_view)
-		anjuta_design_document_set_design_view_parent (self, NULL);
-}
-
-static void
-anjuta_design_document_constructed (GObject *object)
-{
-	AnjutaDesignDocument *self = ANJUTA_DESIGN_DOCUMENT (object);
-	AnjutaDesignDocumentPrivate *priv = ADD_GET_PRIVATE (self);
-	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (object));
-
-	if (!priv->design_view_parent)
-	{
-		anjuta_design_document_set_design_view_parent (self, GTK_CONTAINER (self));
-	}
-
-	/* document manager doesn't destroy the document, but unparents it,
-	 * so we do destroy the document when parent is NULL
-	 */
-	g_signal_connect (object, "parent-set",
-	                  G_CALLBACK (anjuta_design_document_parent_set_cb), self);
-
-	if (parent_class->constructed)
-		parent_class->constructed (object);
-}
-
-static void
-anjuta_design_document_dispose (GObject *object)
-{
-	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (object));
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(object);
-
-	DEBUG_PRINT ("Disposing anjuta_design_document");
-	anjuta_design_document_set_design_view_parent (ANJUTA_DESIGN_DOCUMENT(object), NULL);
-	if (priv->design_view)
-	{
-		GladeDesignView *design_view = priv->design_view;
-		/* Mark design view as destroying */
-		priv->design_view = NULL;
-		gtk_widget_destroy (GTK_WIDGET (design_view));
-		g_object_unref (design_view);
-	}
-
-	parent_class->dispose (object);
-}
-
-static void
 anjuta_design_document_class_init (AnjutaDesignDocumentClass *klass)
 {
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
 	object_class->set_property = anjuta_design_document_set_property;
 	object_class->get_property = anjuta_design_document_get_property;
-	object_class->dispose = anjuta_design_document_dispose;
-	object_class->constructed = anjuta_design_document_constructed;
-
-	parent_class = g_type_class_peek (g_type_parent (G_TYPE_FROM_CLASS (klass)));
-
-	g_type_class_add_private (klass, sizeof(AnjutaDesignDocumentPrivate));
 
+	g_type_class_add_private (klass, sizeof(ANJUTA_TYPE_DESIGN_DOCUMENT));
+	
 	g_object_class_install_property (object_class,
 	                                 PROP_PLUGIN,
 	                                 g_param_spec_object ("plugin",
@@ -292,34 +97,14 @@ anjuta_design_document_class_init (AnjutaDesignDocumentClass *klass)
 	                                                      "",
 	                                                      G_TYPE_OBJECT,
 	                                                      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (object_class,
-	                                 PROP_DESIGN_VIEW,
-	                                 g_param_spec_object ("design-view",
-	                                                      "",
-	                                                      "",
-	                                                      GLADE_TYPE_DESIGN_VIEW,
-	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (object_class,
-	                                 PROP_DESIGN_VIEW_PARENT,
-	                                 g_param_spec_object ("design-view-parent",
-	                                                      "",
-	                                                      "",
-	                                                      GTK_TYPE_CONTAINER,
-	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 }
 
 GtkWidget*
-anjuta_design_document_new (GladePlugin* glade_plugin,
-                            GladeDesignView *design_view,
-                            GtkContainer *design_view_parent)
+anjuta_design_document_new (GladePlugin* glade_plugin, GladeProject* project)
 {
-	/* "design-view" property should be before "design-view-parent" one */
-	return GTK_WIDGET(g_object_new(ANJUTA_TYPE_DESIGN_DOCUMENT,
+	return GTK_WIDGET(g_object_new(ANJUTA_TYPE_DESIGN_DOCUMENT, 
 								   "plugin", glade_plugin,
-								   "design-view", design_view,
-								   "design-view-parent", design_view_parent,
+								   "project", project,
 								   NULL));
 }
 
@@ -327,24 +112,23 @@ static void ifile_open(IAnjutaFile* ifile, GFile* file, GError **e)
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(ifile);
 	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
+	
 	ianjuta_file_open(IANJUTA_FILE(priv->glade_plugin), file, e);
 }
 
 static GFile* ifile_get_file(IAnjutaFile* ifile, GError **e)
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(ifile);
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
-	GladeProject* project = glade_design_view_get_project(priv->design_view);
-
+	
+	GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(self));
+	
 	const gchar* path = glade_project_get_path(project);
 	if (path != NULL)
 		return g_file_new_for_path (path);
 	else
 		return NULL;
-}
 
+}
 
 static void
 ifile_iface_init(IAnjutaFileIface *iface)
@@ -358,22 +142,22 @@ static void ifile_savable_save (IAnjutaFileSavable* file, GError **e)
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(file);
 	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
 	
-	GladeProject* project = glade_design_view_get_project(priv->design_view);
+	GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(self));
 	
 	if (glade_project_get_path(project) != NULL) 
 	{
 		AnjutaStatus *status;
 		
 		status = anjuta_shell_get_status (ANJUTA_PLUGIN(priv->glade_plugin)->shell, NULL);
+		
 		if (glade_project_save (project, glade_project_get_path(project),
 								NULL)) 
 		{
 			anjuta_status_set (status, _("Glade project '%s' saved"),
 							   glade_project_get_name(project));
-			g_signal_emit_by_name(G_OBJECT(self), "update-save-ui");
-			g_signal_emit_by_name(G_OBJECT(self), "saved", file);
-		}
-		else
+			g_signal_emit_by_name(G_OBJECT(self), "save_point", TRUE);
+		} 
+		else 
 		{
 			anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(priv->glade_plugin)->shell),
 										_("Invalid Glade file name"));
@@ -388,19 +172,19 @@ static void ifile_savable_save_as(IAnjutaFileSavable* ifile, GFile* file, GError
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(ifile);
 	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
-	GladeProject* project = glade_design_view_get_project(priv->design_view);
-
+	
+	GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(self));
+	
 	AnjutaStatus *status = anjuta_shell_get_status (ANJUTA_PLUGIN(priv->glade_plugin)->shell, NULL);
-
+		
 	if (glade_project_save (project, g_file_get_path (file),
-								NULL))
+								NULL)) 
 	{
 		anjuta_status_set (status, _("Glade project '%s' saved"),
 							   glade_project_get_name(project));
-	g_signal_emit_by_name(G_OBJECT(self), "update-save-ui");
-	}
-	else
+		g_signal_emit_by_name(G_OBJECT(self), "save_point", TRUE);
+	} 
+	else 
 	{
 		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(priv->glade_plugin)->shell),
 									_("Invalid Glade file name"));
@@ -409,16 +193,15 @@ static void ifile_savable_save_as(IAnjutaFileSavable* ifile, GFile* file, GError
 }
 
 static void ifile_savable_set_dirty(IAnjutaFileSavable* file, gboolean dirty, GError **e)
-{
+{	
 	/* FIXME */
 }
 
 static gboolean ifile_savable_is_dirty(IAnjutaFileSavable* file, GError **e)
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(file);
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
-	GladeProject* project = glade_design_view_get_project(priv->design_view);
+	
+	GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(self));
 	if (project == NULL)
 		return FALSE;
 	if (glade_project_get_modified (project))
@@ -441,7 +224,6 @@ ifile_savable_is_read_only (IAnjutaFileSavable* savable, GError** e)
 static gboolean
 ifile_savable_is_conflict (IAnjutaFileSavable* savable, GError** e)
 {
-	// FIXME
 	return FALSE;
 }
 
@@ -460,11 +242,10 @@ ifile_savable_iface_init(IAnjutaFileSavableIface *iface)
 static gboolean idocument_can_redo(IAnjutaDocument *editor, GError **e)
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(editor);
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
 	GladeCommand *redo_item;
 	const gchar *redo_description = NULL;
 
-	GladeProject* project = glade_design_view_get_project(priv->design_view);
+	GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(self));
 	if (!project)
 	{
 		redo_item = NULL;
@@ -482,10 +263,9 @@ static gboolean idocument_can_redo(IAnjutaDocument *editor, GError **e)
 static gboolean idocument_can_undo(IAnjutaDocument *editor, GError **e)
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(editor);
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
 	GladeCommand *undo_item;
 	const gchar *undo_description = NULL;
-	GladeProject* project = glade_design_view_get_project(priv->design_view);
+	GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(self));
 	if (!project)
 	{
 		undo_item = NULL;
@@ -512,13 +292,13 @@ static void idocument_end_undo_action (IAnjutaDocument *editor, GError **e)
 }
 
 
-static void
+static void 
 idocument_undo(IAnjutaDocument* edit, GError** ee)
 {
 	glade_app_command_undo();
 }
 
-static void
+static void 
 idocument_redo(IAnjutaDocument* edit, GError** ee)
 {
 	glade_app_command_redo();
@@ -534,30 +314,29 @@ static void idocument_grab_focus (IAnjutaDocument *editor, GError **e)
 static const gchar* idocument_get_filename(IAnjutaDocument *editor, GError **e)
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(editor);
-	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-	GladeProject* project = glade_design_view_get_project(priv->design_view);
+	GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(self));
 	return glade_project_get_name(project);
 }
 
-static void
+static void 
 idocument_cut(IAnjutaDocument* edit, GError** ee)
 {
 	glade_app_command_cut();
 }
 
-static void
+static void 
 idocument_copy(IAnjutaDocument* edit, GError** ee)
 {
  	glade_app_command_copy();
 }
 
-static void
+static void 
 idocument_paste(IAnjutaDocument* edit, GError** ee)
 {
 	glade_app_command_paste(NULL);
 }
 
-static void
+static void 
 idocument_clear(IAnjutaDocument* edit, GError** ee)
 {
 	glade_app_command_delete();
@@ -581,8 +360,9 @@ idocument_iface_init (IAnjutaDocumentIface *iface)
 	iface->clear = idocument_clear;
 }
 
-ANJUTA_TYPE_BEGIN (AnjutaDesignDocument, anjuta_design_document, GTK_TYPE_ALIGNMENT);
+ANJUTA_TYPE_BEGIN (AnjutaDesignDocument, anjuta_design_document, GLADE_TYPE_DESIGN_VIEW);
 ANJUTA_TYPE_ADD_INTERFACE(idocument, IANJUTA_TYPE_DOCUMENT);
 ANJUTA_TYPE_ADD_INTERFACE(ifile, IANJUTA_TYPE_FILE);
 ANJUTA_TYPE_ADD_INTERFACE(ifile_savable, IANJUTA_TYPE_FILE_SAVABLE);
 ANJUTA_TYPE_END;
+
diff --git a/plugins/glade/anjuta-design-document.h b/plugins/glade/anjuta-design-document.h
index 3bbf5b0..ce2788c 100644
--- a/plugins/glade/anjuta-design-document.h
+++ b/plugins/glade/anjuta-design-document.h
@@ -2,19 +2,19 @@
 /*
  * anjuta
  * Copyright (C) Johannes Schmid 2007 <jhs gnome org>
- *
+ * 
  * anjuta is free software.
- *
+ * 
  * You may redistribute it and/or modify it under the terms of the
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
- *
+ * 
  * anjuta is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with anjuta.  If not, write to:
  * 	The Free Software Foundation, Inc.,
@@ -26,7 +26,7 @@
 #define _ANJUTA_DESIGN_DOCUMENT_H_
 
 #include <glib-object.h>
-#include <gladeui/glade-design-view.h>
+#include <gladeui/glade.h>
 #include "plugin.h"
 
 G_BEGIN_DECLS
@@ -44,27 +44,18 @@ typedef struct _AnjutaDesignDocumentPrivate AnjutaDesignDocumentPrivate;
 
 struct _AnjutaDesignDocumentClass
 {
-	GtkAlignmentClass parent_class;
+	GladeDesignViewClass parent_class;
 };
 
 struct _AnjutaDesignDocument
 {
-	GtkAlignment parent_instance;
+	GladeDesignView parent_instance;
 	gboolean is_project_added;
 };
 
 GType anjuta_design_document_get_type (void) G_GNUC_CONST;
-GtkWidget*
-anjuta_design_document_new (GladePlugin* glade_plugin,
-                            GladeDesignView *design_view,
-                            GtkContainer *design_view_parent);
-GladeDesignView *
-anjuta_design_document_get_design_view (AnjutaDesignDocument *self);
-void
-anjuta_design_document_set_design_view (AnjutaDesignDocument *self, GladeDesignView *value);
-void
-anjuta_design_document_set_design_view_parent (AnjutaDesignDocument* self,
-                                               GtkContainer *container);
+GtkWidget* 
+anjuta_design_document_new (GladePlugin* glade_plugin, GladeProject* project);
 
 G_END_DECLS
 
diff --git a/plugins/glade/anjuta-glade.plugin.in b/plugins/glade/anjuta-glade.plugin.in
index 42cc76e..7b06589 100644
--- a/plugins/glade/anjuta-glade.plugin.in
+++ b/plugins/glade/anjuta-glade.plugin.in
@@ -7,7 +7,7 @@ Interfaces=IAnjutaFile,IAnjutaWizard
 UserActivatable=no
 
 [File Loader]
-SupportedMimeTypes=application/x-glade,application/x-designer,application/xml
+SupportedMimeTypes=application/x-glade,application/x-designer
 
 [Wizard]
 _Title=Glade File
diff --git a/plugins/glade/plugin.c b/plugins/glade/plugin.c
index d641c51..f9dca39 100644
--- a/plugins/glade/plugin.c
+++ b/plugins/glade/plugin.c
@@ -22,111 +22,32 @@
 
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
-#include <libanjuta/anjuta-preferences.h>
 #include <libanjuta/interfaces/ianjuta-file.h>
 #include <libanjuta/interfaces/ianjuta-file-savable.h>
 #include <libanjuta/interfaces/ianjuta-wizard.h>
 #include <libanjuta/interfaces/ianjuta-help.h>
 #include <libanjuta/interfaces/ianjuta-document-manager.h>
-#include <libanjuta/interfaces/ianjuta-language.h>
-#include <libanjuta/interfaces/ianjuta-editor.h>
-#include <libanjuta/interfaces/ianjuta-symbol.h>
-#include <libanjuta/interfaces/ianjuta-symbol-manager.h>
-#include <libanjuta/interfaces/ianjuta-project-manager.h>
-#include <libanjuta/interfaces/ianjuta-preferences.h>
 
 #include "plugin.h"
 #include "anjuta-design-document.h"
-#include "designer-associations.h"
-#include <ctype.h>
 
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-glade.ui"
-#define GLADE_PLUGIN_GLADE_UI_FILE PACKAGE_DATA_DIR"/glade/anjuta-glade.glade"
-#define ICON_FILE "anjuta-glade-plugin-48.png"
-
-#define PREFERENCES_PAGE_NAME "preferences_page"
-#define HANDLER_TEMPLATE_BUTTON0_NAME "handler_template_button0"
-#define HANDLER_TEMPLATE_BUTTON1_NAME "handler_template_button1"
-#define INSERT_HANDLER_ON_EDIT_NAME "insert_handler_on_edit"
-#define AUTO_ADD_RESOURCE_NAME "auto_add_resource"
-#define DEFAULT_RESOURCE_ENTRY_NAME "default_resource_entry"
-#define SEPARATED_DESIGNER_LAYOUT_NAME "separated_designer_layout"
 
 static gpointer parent_class;
 
 /* This is variable required from libdevhelp */
 gchar *geometry = NULL;
 
-typedef enum
-{
-	GLADE_DESIGNER_DEFAULT,
-	GLADE_DESIGNER_DESIGN,
-	GLADE_DESIGNER_PREVIEW
-} GladeDesignerMode;
-
-#define DIALOG_OPTIONS_COUNT 3
-#define DO_SPEC_REGEXP 0
-#define DO_WIDGET_NAME 1
-#define DO_POSITION_TYPE 2
-
-typedef struct
-{
-	gboolean updating;
-	gulong associations_signal;
-	DesignerAssociationsItem *current_item;
-	gboolean fields_changed[DIALOG_OPTIONS_COUNT];
-	GtkWidget *options_entries[DIALOG_OPTIONS_COUNT];
-	GtkWidget *options_checkboxes[DIALOG_OPTIONS_COUNT-1];
-	GtkWidget *options_button_save, *options_button_revert;
-	GtkTreeView *treeview;
-	GtkTable *options_table;
-} AssociationsDialogData;
-
 struct _GladePluginPriv
 {
-	gboolean destroying;
-	gboolean deactivating;
 	gint uiid;
 	GtkActionGroup *action_group;
 	GladeApp  *gpw;
 	GtkWidget *inspector;
 	GtkWidget *view_box;
 	GtkWidget *projects_combo;
-	gint editor_watch_id, project_watch_id, pm_current_uri_watch_id;
-	GtkBuilder *xml;
-
-	GtkWindow *dialog;
-	AssociationsDialogData *dialog_data;
-
-	GtkWidget *prefs;
-
-	GFile *project_root;
-	DesignerAssociations *associations;
-
-	gboolean insert_handler_on_edit;
-	gint default_handler_template;
-	GFile *default_resource_target;
-	gboolean auto_add_resource;
-
-	GFile *last_editor;
-	GFile *last_designer;
-	gchar *last_signal_name;
-	gchar *last_object_name;
-	GType last_object_type;
-	gchar *last_handler_name;
-	gchar *last_toplevel_name;
-
-	GtkWidget *new_container;
-	GtkWidget *designer_layout_box;
-	GtkWidget *designer_layout_box_child;
-	gboolean separated_designer_layout; /* Don't set directly */
-	GtkWidget *designer_toolbar;
-	GtkToolItem *button_undo, *button_redo;
-
-	GladeSignalEditor *last_gse;
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-	GList *gse_list;
-#endif
+	gint editor_watch_id;
+	gboolean destroying;
 };
 
 enum {
@@ -135,271 +56,79 @@ enum {
 	N_COLUMNS
 };
 
-#define PLUGIN_GLADE_ERROR plugin_glade_error_quark()
-
-typedef enum
-{
-	PLUGIN_GLADE_ERROR_GENERIC
-} PluginGladeError;
-
-GQuark
-plugin_glade_error_quark (void);
-GQuark
-plugin_glade_error_quark (void)
-{
-  return g_quark_from_static_string ("plugin-glade-error-quark");
-}
-
-static void
-designer_associations_raise_editor_priority (DesignerAssociations *self,
-                                             GFile *editor,
-                                             GFile *project_root)
-{
-	DesignerAssociationsItem *item;
-	GList *node;
-	GList *new_list = NULL;
-
-	if (!editor)
-		return;
-	node = self->associations;
-	while (node)
-	{
-		GList *old_node = NULL;
-
-		item = DESIGNER_ASSOCIATIONS_ITEM (node->data);
-		if (g_file_equal (item->editor, editor))
-			old_node = node;
-
-		node = node->next;
-
-		if (old_node)
-		{
-			item = DESIGNER_ASSOCIATIONS_ITEM (old_node->data);
-			self->associations = g_list_delete_link (self->associations, old_node);
-			new_list = g_list_prepend (new_list, item);
-		}
-	}
-	new_list = g_list_reverse (new_list);
-	self->associations = g_list_concat (new_list, self->associations);
-	designer_associations_notify_loaded (self);
-}
-
-static void
-designer_associations_raise_designer_priority (DesignerAssociations *self,
-                                               GFile *designer,
-                                               const gchar *widget_name,
-                                               GFile *project_root)
-{
-	DesignerAssociationsItem *item;
-	GList *node;
-	GList *new_list = NULL;
-
-	if (!designer)
-		return;
-	node = self->associations;
-	while (node)
-	{
-		GList *old_node = NULL;
-
-		item = DESIGNER_ASSOCIATIONS_ITEM (node->data);
-		if (g_file_equal (item->designer, designer))
-			old_node = node;
-
-		node = node->next;
-
-		if (old_node)
+static void 
+update_current_project (GtkComboBox *projects_combo,
+                        GladeProject* project)
+{	
+	GtkTreeIter iter;
+	GladeProject *cur_project;	
+	GtkTreeModel* model = gtk_combo_box_get_model (projects_combo);
+	
+	if (gtk_tree_model_get_iter_first (model, &iter))
+		do
 		{
-			item = DESIGNER_ASSOCIATIONS_ITEM (old_node->data);
-			self->associations = g_list_delete_link (self->associations, old_node);
-			new_list = g_list_prepend (new_list, item);
+			gtk_tree_model_get (model, &iter, PROJECT_COL, &cur_project, -1);
+			if (project == cur_project)
+			{
+				gtk_combo_box_set_active_iter (projects_combo, &iter);
+				break;
+			}
 		}
-	}
-	new_list = g_list_reverse (new_list);
-	self->associations = g_list_concat (new_list, self->associations);
-	designer_associations_notify_loaded (self);
+		while (gtk_tree_model_iter_next (model, &iter));
 }
 
 static void
-doc_list_changed (AnjutaPlugin *anjuta_plugin);
-
-static IAnjutaEditor *
-find_editor_by_file (IAnjutaDocumentManager *docman, GFile *editor);
-
-static void
 value_added_current_editor (AnjutaPlugin *plugin, const char *name,
-                            const GValue *value, gpointer data)
+							const GValue *value, gpointer data)
 {
-	GladePlugin* glade_plugin = ANJUTA_PLUGIN_GLADE(plugin);
-	GObject *editor;
-	GFile *file;
-
+	//GladePlugin* glade_plugin = ANJUTA_PLUGIN_GLADE(plugin);
+	GObject *editor;	
 	editor = g_value_get_object (value);
-	file = ianjuta_file_get_file (IANJUTA_FILE (editor), NULL);
 	if (ANJUTA_IS_DESIGN_DOCUMENT(editor))
 	{
-		AnjutaDesignDocument *doc = ANJUTA_DESIGN_DOCUMENT(editor);
-		GladeDesignView *design_view =
-			anjuta_design_document_get_design_view (doc);
-		GladeProject *project =
-			glade_design_view_get_project (design_view);
-
-		if (!doc->is_project_added)
+		AnjutaDesignDocument* view = ANJUTA_DESIGN_DOCUMENT(editor);
+		GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(view));
+		if (!view->is_project_added)
 		{
 			glade_app_add_project (project);
-			doc->is_project_added = TRUE;
+			view->is_project_added = TRUE;
 		}
 		glade_app_set_project (project);
 	}
-	else if (IANJUTA_IS_EDITOR (editor))
-	{
-		if (!(file && glade_plugin->priv->last_editor &&
-		    g_file_equal (glade_plugin->priv->last_editor, file)))
-		{
-			if (glade_plugin->priv->last_editor)
-				g_object_unref (glade_plugin->priv->last_editor);
-			glade_plugin->priv->last_editor = g_object_ref (file);
-			designer_associations_raise_editor_priority (glade_plugin->priv->associations,
-			                                             glade_plugin->priv->last_editor,
-			                                             glade_plugin->priv->project_root);
-		}
-	}
-	if (file)
-		g_object_unref (file);
-
-	doc_list_changed (plugin);
 }
 
 static void
 value_removed_current_editor (AnjutaPlugin *plugin,
-                              const char *name, gpointer data)
-{
-	doc_list_changed (plugin);
-}
-
-static void
-value_added_project_root_uri (AnjutaPlugin *plugin, const gchar *name,
-                              const GValue *value, gpointer user_data)
-{
-	const gchar *root_uri;
-	GladePlugin *glade_plugin = ANJUTA_PLUGIN_GLADE (plugin);
-
-	if (glade_plugin->priv->project_root)
-		g_object_unref (glade_plugin->priv->project_root);
-	root_uri = g_value_get_string (value);
-	glade_plugin->priv->project_root = g_file_new_for_uri (root_uri);
-	DEBUG_PRINT ("Added project root \"%s\"", root_uri);
-}
-
-static void
-value_removed_project_root_uri (AnjutaPlugin *plugin, const gchar *name,
-                                gpointer user_data)
-{
-	GladePlugin *glade_plugin = ANJUTA_PLUGIN_GLADE (plugin);
-
-	if (glade_plugin->priv->project_root)
-		g_object_unref (glade_plugin->priv->project_root);
-	glade_plugin->priv->project_root = NULL;
-	DEBUG_PRINT ("Removed project root");
-}
-
-static void
-value_added_pm_current_uri (AnjutaPlugin *plugin, const char *name,
-                            const GValue *value, gpointer data)
-{
-	AnjutaUI *ui;
-	GtkAction *action;
-	GFile *selected;
-	IAnjutaProjectManager *projman =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-		                            IAnjutaProjectManager, NULL);
-
-	ui = anjuta_shell_get_ui (plugin->shell, NULL);
-	action = anjuta_ui_get_action (ui, "ActionGroupGlade", "ActionSetDefaultTarget");
-	selected = ianjuta_project_manager_get_selected (projman, NULL);
-	gtk_action_set_sensitive (action, selected != NULL);
-	g_object_unref (selected);
-}
-
-static void
-value_removed_pm_current_uri (AnjutaPlugin *plugin,
-	                      const char *name, gpointer data)
+							  const char *name, gpointer data)
 {
-	AnjutaUI *ui;
-	GtkAction *action;
-
-	ui = anjuta_shell_get_ui (plugin->shell, NULL);
-	action = anjuta_ui_get_action (ui, "ActionGroupGlade", "ActionSetDefaultTarget");
-	gtk_action_set_sensitive (action, FALSE);
-}
-
-static void
-update_current_project (GtkComboBox *projects_combo,
-                        GladeProject* project)
-{
-	GtkTreeIter iter;
-	GladeProject *cur_project;
-	GtkTreeModel* model = gtk_combo_box_get_model (projects_combo);
-
-	if (gtk_tree_model_get_iter_first (model, &iter))
-		do
-		{
-			gtk_tree_model_get (model, &iter, PROJECT_COL, &cur_project, -1);
-			if (project == cur_project)
-			{
-				gtk_combo_box_set_active_iter (projects_combo, &iter);
-				break;
-			}
-		}
-		while (gtk_tree_model_iter_next (model, &iter));
+	
 }
 
 static void
 glade_update_ui (GladeApp *app, GladePlugin *plugin)
 {
 	IAnjutaDocument* doc;
-	IAnjutaDocumentManager* docman =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-		                            IAnjutaDocumentManager, NULL);
-
+	IAnjutaDocumentManager* docman = 
+		anjuta_shell_get_interface(ANJUTA_PLUGIN(plugin)->shell,
+								   IAnjutaDocumentManager, NULL);
+	
 	update_current_project (GTK_COMBO_BOX (plugin->priv->projects_combo), glade_app_get_project ());
-	if (!plugin->priv->separated_designer_layout)
+	/* Emit IAnjutaDocument signal */	
+	doc = ianjuta_document_manager_get_current_document(docman, NULL);
+	if (doc && ANJUTA_IS_DESIGN_DOCUMENT(doc))
 	{
-		/* Emit IAnjutaDocument signal */
-		doc = ianjuta_document_manager_get_current_document(docman, NULL);
-		if (doc && ANJUTA_IS_DESIGN_DOCUMENT(doc))
-		{
-			g_signal_emit_by_name (G_OBJECT(doc), "update_ui");
-			g_signal_emit_by_name (G_OBJECT(doc), "update-save-ui");
-		}
-	}
-
-	{
-		GtkAction *save_action, *undo_action, *redo_action;
-		GladeProject *project;
-
-		save_action = gtk_action_group_get_action (plugin->priv->action_group, "ActionGladeSave");
-		undo_action = gtk_action_group_get_action (plugin->priv->action_group, "ActionGladeUndo");
-		redo_action = gtk_action_group_get_action (plugin->priv->action_group, "ActionGladeRedo");
-		project = glade_app_get_project ();
-		if (project)
-		{
-			gtk_action_set_sensitive (save_action, glade_project_get_modified (project));
-			gtk_action_set_sensitive (undo_action, glade_project_next_undo_item (project) != NULL);
-			gtk_action_set_sensitive (redo_action, glade_project_next_redo_item (project) != NULL);
-			gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (plugin->priv->button_undo),
-			                               glade_project_undo_items (project));
-			gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (plugin->priv->button_redo),
-			                               glade_project_redo_items (project));
-		}
+		g_signal_emit_by_name (G_OBJECT(doc), "update_ui");
+		g_signal_emit_by_name (G_OBJECT(doc), "update-save-ui");
 	}
+	
 }
 
 static void
-on_api_help (GladeEditor* editor,
-             const gchar* book,
-             const gchar* page,
-             const gchar* search,
-             GladePlugin* plugin)
+on_api_help (GladeEditor* editor, 
+			 const gchar* book,
+			 const gchar* page,
+			 const gchar* search,
+			 GladePlugin* plugin)
 {
 	gchar *book_comm = NULL, *page_comm = NULL;
 	gchar *string;
@@ -407,13 +136,13 @@ on_api_help (GladeEditor* editor,
 	AnjutaPlugin* aplugin = ANJUTA_PLUGIN(plugin);
 	AnjutaShell* shell = aplugin->shell;
 	IAnjutaHelp* help;
-
+	
 	help = anjuta_shell_get_interface(shell, IAnjutaHelp, NULL);
-
+	
 	/* No API Help Plugin */
 	if (help == NULL)
 		return;
-
+	
 	if (book) book_comm = g_strdup_printf ("book:%s ", book);
 	if (page) page_comm = g_strdup_printf ("page:%s ", page);
 
@@ -433,46 +162,27 @@ glade_do_close (GladePlugin *plugin, GladeProject *project)
 	glade_app_remove_project (project);
 }
 
-static gint
-get_page_num_for_design_view (GladeDesignView *design_view, GladePlugin *plugin)
-{
-	if (!design_view)
-		return -1;
-	gint page_num =
-		gtk_notebook_page_num (GTK_NOTEBOOK (plugin->priv->new_container),
-		                       gtk_widget_get_parent (GTK_WIDGET (design_view)));
-	return page_num;
-}
-
 static void
-check_deactivation (GladePlugin* plugin)
-{
-	GtkTreeModel* model = model = gtk_combo_box_get_model (GTK_COMBO_BOX (plugin->priv->projects_combo));
-	if (!plugin->priv->deactivating && gtk_tree_model_iter_n_children (model, NULL) <= 0)
-		anjuta_plugin_deactivate (ANJUTA_PLUGIN (plugin));
-}
-
-static void
-on_document_destroy (AnjutaDesignDocument* doc, GladePlugin *plugin)
+on_document_destroy (GtkWidget* document, GladePlugin *plugin)
 {
 	GladeProject *project;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 
 	DEBUG_PRINT ("%s", "Destroying Document");
-
-	project = g_object_get_data (G_OBJECT(doc), "__project");
-
+	
 	if (plugin->priv->destroying)
 	{
 		return;
 	}
+	
+	project = glade_design_view_get_project(GLADE_DESIGN_VIEW(document));
 
 	if (!project)
 	{
 		return;
 	}
-
+		
 	/* Remove project from our list */
 	model = gtk_combo_box_get_model (GTK_COMBO_BOX (plugin->priv->projects_combo));
 	if (gtk_tree_model_get_iter_first (model, &iter))
@@ -480,7 +190,7 @@ on_document_destroy (AnjutaDesignDocument* doc, GladePlugin *plugin)
 		do
 		{
 			GladeProject *project_node;
-
+			
 			gtk_tree_model_get (model, &iter, PROJECT_COL, &project_node, -1);
 			if (project == project_node)
 			{
@@ -490,87 +200,40 @@ on_document_destroy (AnjutaDesignDocument* doc, GladePlugin *plugin)
 		}
 		while (gtk_tree_model_iter_next (model, &iter));
 	}
-
 	glade_do_close (plugin, project);
 
-	check_deactivation(plugin);
+	if (gtk_tree_model_iter_n_children (model, NULL) <= 0)
+		anjuta_plugin_deactivate (ANJUTA_PLUGIN (plugin));
 }
 
 static void
 on_shell_destroy (AnjutaShell* shell, GladePlugin *glade_plugin)
 {
-	DEBUG_PRINT ("Shell destroy");
 	glade_plugin->priv->destroying = TRUE;
 }
 
-static AnjutaDesignDocument *
-get_design_document_from_project (GladeProject *project)
-{
-	return ANJUTA_DESIGN_DOCUMENT (g_object_get_data (G_OBJECT (project), "design_document"));
-}
-
-static GladeProject *
-get_project_from_design_document (AnjutaDesignDocument *design_document)
-{
-	GladeDesignView *design_view =
-		anjuta_design_document_get_design_view (design_document);
-	return glade_design_view_get_project (design_view);
-}
-
 static void
 on_glade_project_changed (GtkComboBox *combo, GladePlugin *plugin)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	GFile *file;
-	IAnjutaDocumentManager* docman =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-		                           IAnjutaDocumentManager, NULL);
-
+	IAnjutaDocumentManager* docman = 
+		anjuta_shell_get_interface(ANJUTA_PLUGIN(plugin)->shell,
+								   IAnjutaDocumentManager, NULL);
+	
 	model = gtk_combo_box_get_model (GTK_COMBO_BOX (plugin->priv->projects_combo));
 	if (gtk_combo_box_get_active_iter (combo, &iter))
 	{
 		GladeProject *project;
-		AnjutaDesignDocument *design_document = NULL;
-		GladeDesignView *design_view = NULL;
+		
+		GtkWidget *design_view;
 		gtk_tree_model_get (model, &iter, PROJECT_COL, &project, -1);
 		glade_app_set_project (project);
-
-		if (plugin->priv->associations)
-		{
-			design_document = get_design_document_from_project (project);
-			design_view = anjuta_design_document_get_design_view (design_document);
-			file = ianjuta_file_get_file (IANJUTA_FILE (design_document), NULL);
-
-			if (plugin->priv->last_designer)
-				g_object_unref (plugin->priv->last_designer);
-			plugin->priv->last_designer = file;
-			designer_associations_raise_designer_priority (plugin->priv->associations,
-			                                               plugin->priv->last_designer,
-			                                               NULL,
-			                                               plugin->priv->project_root);
-			doc_list_changed (ANJUTA_PLUGIN (plugin));
-		}
-
-		if (plugin->priv->separated_designer_layout)
-		{
-			/* Cannot avoid duplicated setting of current page while
-			 * user selects a page, bacause we don't have a new current
-			 * page number here
-			 */
-			gint page_num = get_page_num_for_design_view (design_view, plugin);
-			if (page_num >= 0)
-				gtk_notebook_set_current_page (GTK_NOTEBOOK (plugin->priv->new_container),
-				                               page_num);
-		}
-		else
-		{
-			if (design_document)
-				ianjuta_document_manager_set_current_document(docman, IANJUTA_DOCUMENT(design_document), NULL);
-		}
-
+		
+		design_view = g_object_get_data (G_OBJECT (project), "design_view");
+		ianjuta_document_manager_set_current_document(docman, IANJUTA_DOCUMENT(design_view), NULL);
+		
         glade_inspector_set_project (GLADE_INSPECTOR (plugin->priv->inspector), project);
-
 	}
 }
 
@@ -591,451 +254,20 @@ register_stock_icons (AnjutaPlugin *plugin)
 }
 
 static void
-switch_back_to_editor (GladePlugin *plugin)
-{
-	IAnjutaDocumentManager *docman =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-		                            IAnjutaDocumentManager, NULL);
-	IAnjutaDocument *doc = ianjuta_document_manager_get_current_document (docman, NULL);
-	IAnjutaEditor *editor;
-	if (ANJUTA_IS_DESIGN_DOCUMENT (doc) && plugin->priv->last_editor)
-	{
-		editor = find_editor_by_file (docman, plugin->priv->last_editor);
-		if (editor)
-			ianjuta_document_manager_set_current_document (docman, IANJUTA_DOCUMENT(editor), NULL);
-	}
-}
-
-static gboolean
-on_designer_notebook_enter_notify (GtkWidget *widget, GdkEvent *event, GladePlugin *plugin)
-{
-	switch_back_to_editor (plugin);
-	return FALSE;
-}
-
-static void
-on_designer_layout_switch_page (GtkNotebook *notebook, GtkNotebookPage *page,
-                                guint page_num, GladePlugin *plugin)
-{
-	GladeProject *project;
-	GladeDesignView *design_view;
-	GtkBin *bin;
-	AnjutaDesignDocument *doc;
-
-	DEBUG_PRINT ("Page of design view switched to %d", page_num);
-	g_return_if_fail (page);
-	/* yeap that's a bit hacky */
-	bin = GTK_BIN (*(GtkWidget**)page);
-	g_return_if_fail (bin);
-	design_view = GLADE_DESIGN_VIEW (gtk_bin_get_child (bin));
-	if (!design_view)
-	{
-		DEBUG_PRINT ("The notebook tab doesn't contains a design_view");
-		return;
-	}
-	project = glade_design_view_get_project (design_view);
-	if (project)
-	{
-		doc = get_design_document_from_project (project);
-		if (doc && doc->is_project_added)
-			glade_app_set_project (project);
-	}
-}
-
-static void
-on_designer_layout_page_child_remove (GtkContainer *container, GtkWidget *widget,
-                                    GladePlugin *plugin)
-{
-	gint page_num =
-		gtk_notebook_page_num (GTK_NOTEBOOK (plugin->priv->new_container),
-		                       GTK_WIDGET (container));
-	if (page_num >= 0)
-		gtk_notebook_remove_page (GTK_NOTEBOOK (plugin->priv->new_container), page_num);
-	else
-	{
-		DEBUG_PRINT ("The page has already been removed");
-	}
-}
-
-static void
-designer_layout_add_doc (AnjutaDesignDocument *doc,
-                         GtkContainer *container,
-                         GladePlugin *plugin,
-                         gboolean prepend)
-{
-	gint page_num;
-	GladeDesignView *view = anjuta_design_document_get_design_view (doc);
-	GladeProject *project = glade_design_view_get_project (view);
-	if (!container)
-	{
-		container = GTK_CONTAINER (gtk_event_box_new());
-		anjuta_design_document_set_design_view_parent (doc, container);
-	}
-	/* Remove the page when the design view removed */
-	g_signal_connect (G_OBJECT (container), "remove",
-	                  G_CALLBACK (on_designer_layout_page_child_remove), plugin);
-	if (prepend)
-	{
-		page_num = gtk_notebook_prepend_page (GTK_NOTEBOOK (plugin->priv->new_container),
-		                                      GTK_WIDGET (container),
-		                                      gtk_label_new (glade_project_get_name (project)));
-	}
-	else
-	{
-		page_num = gtk_notebook_append_page (GTK_NOTEBOOK (plugin->priv->new_container),
-		                                     GTK_WIDGET (container),
-		                                     gtk_label_new (glade_project_get_name (project)));
-	}
-	DEBUG_PRINT ("Adding page #%d", page_num);
-	gtk_widget_show_all (GTK_WIDGET (container));
-}
-
-static void
-desinger_layout_add_all_docs (GladePlugin *plugin)
-{
-	GList *docwids, *node;
-	IAnjutaDocumentManager *docman;
-
-	docman = anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-	                                     IAnjutaDocumentManager, NULL);
-	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
-	if (docwids)
-	{
-		for (node = docwids; node != NULL; node = g_list_next (node))
-		{
-			if (ANJUTA_IS_DESIGN_DOCUMENT (node->data))
-			{
-				AnjutaDesignDocument *doc = ANJUTA_DESIGN_DOCUMENT (node->data);
-				designer_layout_add_doc (doc, NULL, plugin, FALSE);
-			}
-		}
-		g_list_free (docwids);
-	}
-}
-
-static void
-designer_layout_remove_doc (AnjutaDesignDocument *doc,
-                            GladePlugin *plugin)
-{
-	/* The tab will be removed automatically while unparenting the design view */
-	anjuta_design_document_set_design_view_parent (doc, GTK_CONTAINER (doc));
-}
-
-static void
-desinger_layout_remove_all_docs (GladePlugin *plugin)
-{
-	GList *docwids, *node;
-	IAnjutaDocumentManager *docman;
-
-	docman = anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-	                                     IAnjutaDocumentManager, NULL);
-	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
-	if (docwids)
-	{
-		for (node = docwids; node != NULL; node = g_list_next (node))
-		{
-			if (ANJUTA_IS_DESIGN_DOCUMENT (node->data))
-			{
-				AnjutaDesignDocument *doc = ANJUTA_DESIGN_DOCUMENT (node->data);
-				designer_layout_remove_doc (doc, plugin);
-				anjuta_design_document_set_design_view_parent (doc, GTK_CONTAINER (doc));
-			}
-		}
-		g_list_free (docwids);
-	}
-}
-
-static void
-update_separated_designer_layout (gboolean init, GladePlugin *plugin)
-{
-	if (init != plugin->priv->separated_designer_layout)
-	{
-		GladePluginPriv *priv = plugin->priv;
-		plugin->priv->separated_designer_layout = init;
-		if (init)
-		{
-			gint page_num;
-			GladeProject *project;
-			GladeDesignView *design_view;
-			anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell,
-			                         priv->designer_layout_box,
-			                         "AnjutaGladeDesignerLayout", _("Designer"),
-			                         "glade-plugin-icon",
-			                         ANJUTA_SHELL_PLACEMENT_FLOATING, NULL);
-			desinger_layout_add_all_docs (plugin);
-			g_signal_connect (G_OBJECT (priv->new_container), "switch-page",
-							  G_CALLBACK (on_designer_layout_switch_page), plugin);
-			project = glade_app_get_project ();
-			if (project)
-			{
-				design_view = glade_design_view_get_from_project (project);
-				page_num = get_page_num_for_design_view (design_view, plugin);
-				if (page_num >= 0)
-					gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->new_container),
-					                               page_num);
-			}
-			g_signal_connect (G_OBJECT (priv->designer_layout_box), "enter-notify-event",
-							  G_CALLBACK(on_designer_notebook_enter_notify), plugin);
-			gtk_widget_show_all (priv->designer_layout_box);
-		}
-		else /* uninitialization */
-		{
-			g_signal_handlers_disconnect_by_func (G_OBJECT (priv->new_container),
-			                  G_CALLBACK (on_designer_layout_switch_page), plugin);
-			g_signal_handlers_disconnect_by_func (G_OBJECT (priv->designer_layout_box),
-			                     G_CALLBACK(on_designer_notebook_enter_notify), plugin);
-			desinger_layout_remove_all_docs (plugin);
-			anjuta_shell_remove_widget (ANJUTA_PLUGIN (plugin)->shell,
-			                            priv->designer_layout_box,
-			                            NULL);
-		}
-	}
-}
-
-#define GLADE_PREFERENCES_TAG "preferences"
-#define GLADE_DEFAULT_HANDLER_TEMPLATE_INDEX_TAG "handler-template-index"
-#define GLADE_INSERT_HANDLER_ON_EDIT_TAG "insert-signal-on-edit"
-#define GLADE_DEFAULT_RESOURCE_TARGET "default-resource-target"
-#define GLADE_AUTO_ADD_RESOURCE "auto-add-resource"
-#define GLADE_SEPARATED_DESIGNER_LAYOUT "separated-designer-layout"
-
-static void
-glade_plugin_save_preferences (GladePlugin *plugin, xmlDocPtr xml_doc, xmlNodePtr node)
-{
-	xmlNodePtr child_node;
-	gchar *value;
-
-	child_node = xmlNewDocNode (xml_doc, NULL,
-	                            BAD_CAST (GLADE_PREFERENCES_TAG), NULL);
-	xmlAddChild (node, child_node);
-
-	value = g_strdup_printf ("%d", plugin->priv->default_handler_template);
-	xmlSetProp (child_node, BAD_CAST (GLADE_DEFAULT_HANDLER_TEMPLATE_INDEX_TAG),
-	            BAD_CAST (value));
-	g_free (value);
-
-	value = g_strdup_printf ("%d", plugin->priv->insert_handler_on_edit);
-	xmlSetProp (child_node, BAD_CAST (GLADE_INSERT_HANDLER_ON_EDIT_TAG),
-	            BAD_CAST (value));
-	g_free (value);
-
-	value = g_strdup_printf ("%d", plugin->priv->auto_add_resource);
-	xmlSetProp (child_node, BAD_CAST (GLADE_AUTO_ADD_RESOURCE),
-	            BAD_CAST (value));
-	g_free (value);
-
-	value = g_strdup_printf ("%d", plugin->priv->separated_designer_layout);
-	xmlSetProp (child_node, BAD_CAST (GLADE_SEPARATED_DESIGNER_LAYOUT),
-	            BAD_CAST (value));
-	g_free (value);
-
-	value = g_file_get_uri (plugin->priv->default_resource_target);
-	xmlSetProp (child_node, BAD_CAST (GLADE_DEFAULT_RESOURCE_TARGET),
-	            BAD_CAST (value));
-	g_free (value);
-}
-
-static void
-on_associations_changed (DesignerAssociations *self, DesignerAssociationsItem *item,
-                         DesignerAssociationsAction action, GladePlugin *plugin);
-static void
-on_default_resource_target_changed (GFile *selected, GladePlugin *plugin);
-
-static gboolean
-glade_plugin_do_save_associations (GladePlugin *plugin, GError **error)
-{
-	xmlDocPtr xml_doc;
-	xmlNodePtr node;
-	GFile *associations_file;
-	gchar *associations_filename;
-
-	if (!plugin->priv->associations)
-	{
-		g_set_error (error, PLUGIN_GLADE_ERROR,
-		             PLUGIN_GLADE_ERROR_GENERIC,
-		             _("No associations initialized: nothing to save"));
-		return FALSE;
-	}
-	if (!plugin->priv->project_root)
-	{
-		g_set_error (error, PLUGIN_GLADE_ERROR,
-		             PLUGIN_GLADE_ERROR_GENERIC,
-		             _("Couldn't save associations because project root isn't set"));
-		return FALSE;
-	}
-
-	xml_doc = xmlNewDoc (BAD_CAST ("1.0"));
-	node = xmlNewDocNode (xml_doc, NULL, BAD_CAST (DA_XML_TAG_ROOT), NULL);
-	xmlDocSetRootElement (xml_doc, node);
-	glade_plugin_save_preferences (plugin, xml_doc, node);
-	designer_associations_save_to_xml (plugin->priv->associations,
-	                                   xml_doc, node,
-	                                   plugin->priv->project_root);
-	xmlKeepBlanksDefault (0);
-
-	associations_file =
-		g_file_resolve_relative_path (plugin->priv->project_root,
-		                             ".anjuta/associations");
-	associations_filename = g_file_get_path (associations_file);
-	DEBUG_PRINT ("Saving associations to file %s", associations_filename);
-	if (xmlSaveFormatFile (associations_filename, xml_doc, 1) == -1)
-	{
-		g_set_error (error, PLUGIN_GLADE_ERROR,
-		             PLUGIN_GLADE_ERROR_GENERIC,
-		             _("Failed to save associations"));
-		return FALSE;
-	}
-	g_object_unref (associations_file);
-	g_free (associations_filename);
-	xmlFreeDoc (xml_doc);
-
-	return TRUE;
-}
-
-/* Save and destroy associations */
-static void
-glade_plugin_save_associations (GladePlugin *plugin)
-{
-	GError *error = NULL;
-
-	if (plugin->priv->dialog)
-	{
-		gtk_widget_destroy (GTK_WIDGET (plugin->priv->dialog));
-		plugin->priv->dialog = NULL;
-	}
-
-	glade_plugin_do_save_associations (plugin, &error);
-	if (error)
-	{
-		DEBUG_PRINT ("Error while saving associations: %s", error->message);
-		g_error_free (error);
-	}
-
-	if (plugin->priv->associations)
-	{
-		g_object_unref (plugin->priv->associations);
-		plugin->priv->associations = NULL;
-	}
-}
-
-static void
-update_actions (GladePlugin *plugin)
-{
-	on_default_resource_target_changed (plugin->priv->default_resource_target, plugin);
-}
-
-static void
-update_prefs_page (GladePlugin *plugin);
-
-static void
-glade_plugin_load_preferences (GladePlugin *plugin, xmlDocPtr xml_doc, xmlNodePtr node)
-{
-	xmlNodePtr child_node;
-	gchar *value;
-
-	child_node = search_child (node,
-	                           GLADE_PREFERENCES_TAG);
-	if (!child_node)
-		return;
-
-	value = (gchar*)xmlGetProp (child_node, BAD_CAST (GLADE_DEFAULT_HANDLER_TEMPLATE_INDEX_TAG));
-	if (value)
-	{
-		plugin->priv->default_handler_template = g_ascii_strtoll (value, NULL, 0);
-		xmlFree (value);
-	}
-
-	value = (gchar*)xmlGetProp (child_node, BAD_CAST (GLADE_INSERT_HANDLER_ON_EDIT_TAG));
-	if (value)
-	{
-		plugin->priv->insert_handler_on_edit = g_ascii_strtoll (value, NULL, 0);
-		xmlFree (value);
-	}
-
-	value = (gchar*)xmlGetProp (child_node, BAD_CAST (GLADE_AUTO_ADD_RESOURCE));
-	if (value)
-	{
-		plugin->priv->auto_add_resource = g_ascii_strtoll (value, NULL, 0);
-		xmlFree (value);
-	}
-
-	value = (gchar*)xmlGetProp (child_node, BAD_CAST (GLADE_SEPARATED_DESIGNER_LAYOUT));
-	if (value)
-	{
-		update_separated_designer_layout (g_ascii_strtoll (value, NULL, 0), plugin);
-		xmlFree (value);
-	}
-
-	value = (gchar *)xmlGetProp (child_node, BAD_CAST (GLADE_DEFAULT_RESOURCE_TARGET));
-	plugin->priv->default_resource_target = g_file_new_for_uri (value);
-
-	update_actions (plugin);
-	update_prefs_page (plugin);
-}
-
-static void
-glade_plugin_load_associations (GladePlugin *plugin)
-{
-	GError *error = NULL;
-	xmlDocPtr xml_doc;
-	xmlNodePtr node;
-	GFile *associations_file;
-	gchar *associations_filename;
-
-	if (plugin->priv->associations)
-	{
-		DEBUG_PRINT ("Associations is already loaded");
-		return;
-	}
-	plugin->priv->associations = designer_associations_new();
-	g_signal_connect (plugin->priv->associations, "item-notify",
-			  G_CALLBACK(on_associations_changed), plugin);
-	//designer_associations_clear (plugin->priv->associations);
-
-	if (plugin->priv->project_root)
-	{
-		associations_file =
-			g_file_resolve_relative_path (plugin->priv->project_root,
-			                             ".anjuta/associations");
-		associations_filename = g_file_get_path (associations_file);
-		xml_doc = xmlParseFile (associations_filename);
-		DEBUG_PRINT ("Loading associations from %s", associations_filename);
-		g_object_unref (associations_file);
-		g_free (associations_filename);
-		if (xml_doc)
-		{
-			node = xmlDocGetRootElement (xml_doc);
-			if (node)
-			{
-				glade_plugin_load_preferences (plugin, xml_doc, node);
-				designer_associations_load_from_xml (plugin->priv->associations, xml_doc, node,
-				                                     plugin->priv->project_root, &error);
-				if (error)
-				{
-					g_warning ("%s", error->message);
-					g_error_free (error);
-				}
-			}
-			else
-				DEBUG_PRINT ("Couldn't load associations root node");
-			xmlFreeDoc (xml_doc);
-		}
-		else
-			DEBUG_PRINT ("Couldn't load associations");
-	}
-	else
-		DEBUG_PRINT ("Couldn't load associations because project_root is not set");
-}
-
-static void
-glade_plugin_save_doc_list (AnjutaShell *shell, AnjutaSession *session,
-                            GladePlugin *plugin)
+on_session_save (AnjutaShell *shell, AnjutaSessionPhase phase,
+				 AnjutaSession *session, GladePlugin *plugin)
 {
 	GList *files, *docwids, *node;
+/*	GtkTreeModel *model;
+	GtkTreeIter iter;
+*/
 	IAnjutaDocumentManager *docman;
-
+	
+	if (phase != ANJUTA_SESSION_PHASE_NORMAL)
+		return;
+	
 	docman = anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-	                                     IAnjutaDocumentManager, NULL);
+										 IAnjutaDocumentManager, NULL);
 	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
 	if (docwids)
 	{
@@ -1050,7 +282,6 @@ glade_plugin_save_doc_list (AnjutaShell *shell, AnjutaSession *session,
 				file = ianjuta_file_get_file (IANJUTA_FILE (node->data), NULL);
 				if (file != NULL)
 				{
-					DEBUG_PRINT ("Saving %s to session", g_file_get_uri (file));
 					files = g_list_prepend (files, g_file_get_uri (file));
 					/* uri is not freed here */
 				}
@@ -1066,3205 +297,90 @@ glade_plugin_save_doc_list (AnjutaShell *shell, AnjutaSession *session,
 			g_list_free (files);
 		}
 	}
-}
-
-static void
-on_session_save (AnjutaShell *shell, AnjutaSessionPhase phase,
-                 AnjutaSession *session, GladePlugin *plugin)
-{
-	if (phase != ANJUTA_SESSION_PHASE_NORMAL)
-		return;
-	DEBUG_PRINT ("Saving session");
-	glade_plugin_save_doc_list (shell, session, plugin);
-	glade_plugin_save_associations (plugin);
-}
-
-static void
-on_session_load (AnjutaShell *shell, AnjutaSessionPhase phase,
-                 AnjutaSession *session, GladePlugin *plugin)
-{
-	if (phase != ANJUTA_SESSION_PHASE_NORMAL)
-		return;
-	DEBUG_PRINT ("Loading session");
-	glade_plugin_load_associations (plugin);
-}
-
-static void
-inspector_item_activated_cb (GladeInspector     *inspector,
-							 AnjutaPlugin       *plugin)
-{
-	GList *item = glade_inspector_get_selected_items (inspector);
-	g_assert (GLADE_IS_WIDGET (item->data) && (item->next == NULL));
-
-	/* switch to this widget in the workspace */
-	glade_widget_show (GLADE_WIDGET (item->data));
-
-	g_list_free (item);
-}
-
-#if 0
-static void
-on_glade_resource_removed (GladeProject *project, const gchar *resource,
-                           GladePlugin *plugin)
-{
-}
-
-static void
-on_glade_resource_added (GladeProject *project, const gchar *resource,
-                         GladePlugin *plugin)
-{
-	gchar *str, *glade_basename, *resource_uri;
-	GError *error = NULL;
-	IAnjutaProjectManager *projman;
-
-	if (!plugin->priv->auto_add_resource)
-		return;
-	if (!plugin->priv->default_resource_target)
-	{
-		DEBUG_PRINT ("No default data target");
-		return;
-	}
-	projman = anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-	                                      IAnjutaProjectManager, NULL);
-	glade_basename = g_path_get_dirname (glade_project_get_path (project));
-	resource_uri = g_build_filename (glade_basename, resource, NULL);
-	DEBUG_PRINT ("Adding resource \"%s\" to the target \"%s\"",
-	              resource_uri, plugin->priv->default_resource_target);
-	str = ianjuta_project_manager_add_source_quiet (projman,
-	                                                resource_uri,
-	                                                plugin->priv->default_resource_target,
-	                                                &error);
-	if (error)
-	{
-		g_warning ("Error while adding resource: %s", error->message);
-		g_error_free (error);
-	}
-
-	g_free (str);
-	g_free (resource_uri);
-	g_free (glade_basename);
-}
-#endif
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* * * * * * * *   Signal handlers management  * * * * * * * * * * */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-static GladeWidget *
-find_root_gwidget (GladeWidget *widget)
-{
-	g_return_val_if_fail (widget, NULL);
-
-	while (widget->parent)
-		widget = widget->parent;
-
-	return widget;
-}
-
-static gchar *
-get_uri_from_ianjuta_file (IAnjutaFile *ifile)
-{
-	GFile *file = ianjuta_file_get_file (ifile, NULL);
-	gchar *path = g_file_get_uri (file);
-	g_object_unref (file);
-	return path;
-}
-
-enum
-{
-	iptCurrent,
-	iptBeforeEnd,
-	iptAfterBegin,
-	iptEOF,
-	count_ipt
-};
-
-const gchar *ipt_names [count_ipt + 1] = {
-	/* iptCurrent: */       N_("Current"),
-	/* iptBeforeEnd: */     N_("Before end"),
-	/* iptAfterBegin: */    N_("After begin"),
-	/* ipEOF: */            N_("End of file"),
-	NULL
-};
-
-/* position should be set to the begginning of special mark */
-static void
-insert_code_block_into_editor (IAnjutaEditor *editor, IAnjutaIterable *position,
-                               GPtrArray *code_block, guint lines_count,
-                               gchar *start_str, gchar *end_str)
-{
-	gint i;
-	gchar *str;
-	gchar **str_array;
-
-	str_array = g_new0 (gchar *, lines_count + 2 + 1);
-	str_array[0] = start_str;
-	for (i = 1; i < lines_count+1; i++)
-	{
-		str_array[i] = g_ptr_array_index (code_block, i-1);
-	}
-	str_array[lines_count+1] = end_str;
-
-	str = g_strjoinv (NULL, str_array);
-
-	ianjuta_document_begin_undo_action (IANJUTA_DOCUMENT (editor), NULL);
-	ianjuta_editor_insert (editor, position, str, -1, NULL);
-	ianjuta_document_end_undo_action (IANJUTA_DOCUMENT (editor), NULL);
-
-	g_free (str);
-	g_free (str_array);
-}
-
-#define append_line(s) \
-	{g_ptr_array_add (code_block, (gchar*)s); lines_count++;}
-
-#define append_line_dup(s) \
-	append_line (g_strdup (s))
-
-/* returns chunk count */
-static guint
-format_handler_stub (GPtrArray *code_block, GType object_type,
-                     const gchar *object_name, const gchar *signal_name,
-                     const gchar *handler_name, gint *line_offset)
-{
-	GSignalQuery query;
-	guint signal_id;
-	guint lines_count = 0;
-	gchar *buffer;
-
-	signal_id = g_signal_lookup (signal_name, object_type);
-	g_signal_query (signal_id, &query);
-
-	if (query.signal_id)
-	{
-		gint i;
-
-		if (query.return_type == 0)
-		{
-			append_line_dup ("void");
-		}
-		else
-		{
-			append_line_dup (g_type_name (query.return_type));
-		}
-		append_line_dup ("\n");
-
-		buffer = g_strdup_printf ("%s (%s *self", handler_name,
-		                           g_type_name (object_type));
-
-		for (i=0; i<query.n_params; i++)
-		{
-			if (G_TYPE_IS_OBJECT (query.param_types[i]) ||
-			    G_TYPE_FUNDAMENTAL (query.param_types[i]) == G_TYPE_BOXED)
-			{
-				buffer = g_strconcat (buffer,
-				                      g_strdup_printf (", %s *arg%d",
-				                                        g_type_name (query.param_types[i]), i),
-				                                        NULL);
-			}
-			else
-			{
-				buffer = g_strconcat (buffer,
-				                      g_strdup_printf (", %s arg%d",
-				                                        g_type_name (query.param_types[i]), i),
-				                                        NULL);
-			}
-		}
-
-		buffer = g_strconcat (buffer, ", gpointer user_data)\n", NULL);
-		append_line (buffer);
-
-		append_line_dup (g_strdup("{\n\n}"));
-
-		if (line_offset)
-			(*line_offset) += 3;
-	}
-
-	return lines_count;
-}
-
-static gboolean
-validate_position (IAnjutaIterable *position, gint position_type)
-{
-	return (position || position_type == iptEOF);
-}
-
-static void
-do_insert_handler_stub_C (IAnjutaDocumentManager *docman, IAnjutaEditor *editor,
-                          IAnjutaIterable *position, gint position_type,
-                          GType object_type, const gchar *object_name,
-                          const gchar *signal_name, const gchar *handler_name,
-                          gboolean raise_editor, GError **error)
-{
-	GPtrArray *code_block;
-	gchar *start_str = "";
-	gchar *end_str = "";
-	gint lineno;
-	gint line_offset = 0;
-	gint lines_count;
-
-	if (!validate_position (position, position_type))
-		return;
-
-	switch (position_type)
-	{
-	case iptBeforeEnd:
-		end_str = "\n\n";
-		break;
-	case iptAfterBegin:
-		lineno = ianjuta_editor_get_line_from_position (editor, position, NULL);
-		position = ianjuta_editor_get_line_end_position (editor, lineno, NULL);
-		/* there's no need in break, honestly */
-	case iptCurrent:
-		start_str = "\n\n";
-		line_offset += 2;
-		break;
-	case iptEOF:
-		position = ianjuta_editor_get_end_position (editor, NULL);
-		start_str = "\n";
-		end_str = "\n";
-		line_offset += 1;
-		break;
-	}
-
-	g_return_if_fail (position);
-	lineno = ianjuta_editor_get_line_from_position (editor,
-							position,
-							NULL);
-	code_block = g_ptr_array_new ();
-	lines_count = format_handler_stub (code_block, object_type, object_name,
-	                                   signal_name, handler_name, &line_offset);
-	insert_code_block_into_editor (editor, position, code_block, lines_count,
-	                               start_str, end_str);
-	if (lines_count > 0 && raise_editor)
-	{
-		ianjuta_document_manager_set_current_document (docman,
-		                                               IANJUTA_DOCUMENT (editor),
-		                                               NULL);
-		ianjuta_document_grab_focus (IANJUTA_DOCUMENT (editor), NULL);
-		ianjuta_editor_goto_position (editor,
-		                              ianjuta_editor_get_line_end_position (editor,
-		                                                                    lineno + line_offset,
-		                                                                    NULL),
-		                              NULL);
-	}
-	if (lines_count <= 0)
-		g_set_error (error,
-	                 PLUGIN_GLADE_ERROR,
-	                 PLUGIN_GLADE_ERROR_GENERIC,
-	                 _("Couldn't introspect the signal"));
-
-	{
-		gint i;
-		for (i = 0; i < lines_count; i++)
-		{
-			g_free (g_ptr_array_index (code_block, i));
-		}
-		g_ptr_array_free (code_block, TRUE);
-	}
-}
-
-static void
-do_insert_handler_stub_Python (IAnjutaDocumentManager *docman, IAnjutaEditor *editor,
-                               IAnjutaIterable *position, gint position_type,
-                               GType object_type, const gchar *object_name,
-                               const gchar *signal_name, const gchar *handler_name,
-                               gboolean raise_editor, GError **error)
-{
-	g_set_error (error,
-	             PLUGIN_GLADE_ERROR,
-	             PLUGIN_GLADE_ERROR_GENERIC,
-	             _("Python language isn't supported yet"));
-}
-
-static void
-do_insert_handler_stub_Vala (IAnjutaDocumentManager *docman, IAnjutaEditor *editor,
-                             IAnjutaIterable *position, gint position_type,
-                             GType object_type, const gchar *object_name,
-                             const gchar *signal_name, const gchar *handler_name,
-                             gboolean raise_editor, GError **error)
-{
-	g_set_error (error,
-	             PLUGIN_GLADE_ERROR,
-	             PLUGIN_GLADE_ERROR_GENERIC,
-	             _("Vala language isn't supported yet"));
-}
-
-typedef struct _LanguageSyntax
-{
-	gchar *begin_regexp;
-	gchar *end_regexp;
-} LanguageSyntax;
-
-const LanguageSyntax _default_syntax_C = {
-	"^\\s*\\/\\*+\\s*(\\S*)\\s*callbacks",
-	"^\\s*\\/\\*+\\s*end\\s*of\\s*(\\S*)\\s*callbacks"
-};
-
-const LanguageSyntax _default_syntax_Python = {
-	"^\\s*#\\s*(\\S*)\\s*callbacks",
-	"^\\s*#\\s*end\\s*of\\s*(\\S*)\\s*callbacks"
-};
-
-typedef enum
-{
-	ANJUTA_LANGUAGE_NONE,
-	ANJUTA_LANGUAGE_C,
-	ANJUTA_LANGUAGE_PYTHON,
-	ANJUTA_LANGUAGE_VALA
-} LanguageId;
-
-LanguageSyntax const *default_syntax_C = &_default_syntax_C;
-LanguageSyntax const *default_syntax_Python = &_default_syntax_Python;
-LanguageSyntax const *default_syntax_Vala = &_default_syntax_C;
-
-static IAnjutaIterable *
-find_auto_position (GladePlugin *plugin, IAnjutaEditor *editor,
-                    const gchar *regexp_str)
-{
-	IAnjutaIterable *position = NULL;
-	IAnjutaIterable *fallback_pos = NULL;
-	GRegex *regex;
-	GError *error = NULL;
-	GMatchInfo *match_info;
-	gchar *all_text;
-
-	g_return_val_if_fail (editor, NULL);
-	g_return_val_if_fail (regexp_str, NULL);
-
-	regex = g_regex_new (regexp_str,
-	                     G_REGEX_CASELESS | G_REGEX_MULTILINE,
-	                     0, &error);
-	if (error)
-	{
-		g_warning ("%s", error->message);
-		g_error_free (error);
-	}
-	if (!regex)
-		return NULL;
-
-	all_text = ianjuta_editor_get_text_all (editor, NULL);
-	g_regex_match (regex, all_text, 0, &match_info);
-	while (g_match_info_matches (match_info))
-	{
-		gchar *word = g_match_info_fetch (match_info, 1);
-
-		if (plugin->priv->last_toplevel_name && word &&
-		    g_str_equal (plugin->priv->last_toplevel_name, word))
-		{
-			gint start_pos, end_pos;
-			g_match_info_fetch_pos (match_info, 0, &start_pos, &end_pos);
-
-			/* use "+1" because we are at the end of previous line */
-			position = ianjuta_editor_get_position_from_offset (editor, start_pos + 1, NULL);
-			g_free (word);
-			break;
-		}
-
-		if (word && g_str_equal (word, ""))
-		{
-			gint start_pos, end_pos;
-			g_match_info_fetch_pos (match_info, 0, &start_pos, &end_pos);
-			fallback_pos = ianjuta_editor_get_position_from_offset (editor, start_pos + 1, NULL);
-		}
-		g_free (word);
-		g_match_info_next (match_info, NULL);
-	}
-
-	g_match_info_free (match_info);
-	g_regex_unref (regex);
-	g_free (all_text);
-
-	return position ? position : fallback_pos;
-}
-
-static IAnjutaEditor *
-find_editor_by_file (IAnjutaDocumentManager* docman, GFile *editor)
-{
-	GList *docwids, *node;
-	IAnjutaEditor *retval = NULL;
-
-	g_return_val_if_fail (G_IS_FILE (editor), NULL);
-
-	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
-	if (docwids)
-	{
-		for (node = docwids; node != NULL; node = g_list_next (node))
-		{
-			if (IANJUTA_IS_EDITOR (node->data))
-			{
-				GFile *file;
-
-				file = ianjuta_file_get_file (IANJUTA_FILE (node->data), NULL);
-				if (g_file_equal (editor, file))
-					retval = IANJUTA_EDITOR (node->data);
-				g_object_unref (file);
-				if (retval)
-					break;
-			}
-		}
-		g_list_free (docwids);
-	}
-
-	return retval;
-}
-
-static AnjutaDesignDocument *
-find_designer_by_file (IAnjutaDocumentManager* docman, GFile *designer)
-{
-	GList *docwids, *node;
-	AnjutaDesignDocument *retval = NULL;
-
-	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
-	if (docwids)
-	{
-		for (node = docwids; node != NULL; node = g_list_next (node))
-		{
-			if (ANJUTA_IS_DESIGN_DOCUMENT (node->data))
-			{
-				GFile *file;
-
-				file = ianjuta_file_get_file (IANJUTA_FILE (node->data), NULL);
-				if (g_file_equal (designer, file))
-					retval = ANJUTA_DESIGN_DOCUMENT (node->data);
-				g_object_unref (file);
-				if (retval)
-					break;
-			}
-		}
-		g_list_free (docwids);
-	}
-
-	return retval;
-}
-
-static GList *
-designer_associations_match_editor (DesignerAssociations *self,
-                                    GFile *editor,
-                                    GFile *project_root)
-{
-	GList *node;
-	GList *result = NULL;
-	DesignerAssociationsItem *item;
-
-	node = self->associations;
-	while (node)
-	{
-		item = node->data;
-
-		if (g_file_equal (item->editor, editor))
-			result = g_list_prepend (result, item);
-
-		node = node->next;
-	}
-
-	result = g_list_reverse (result);
-	return result;
-}
-
-static GList *
-designer_associations_match_designer (DesignerAssociations *self,
-                                      GFile *designer,
-                                      const gchar *widget_name,
-                                      GFile *project_root)
-{
-	GList *node;
-	GList *result = NULL;
-	GList *fallback_result = NULL;
-	DesignerAssociationsItem *item;
-
-	node = self->associations;
-	while (node)
+/*
+	files = anjuta_session_get_string_list (session, "File Loader", "Files");
+	if (files)
+		files = g_list_reverse (files);
+	
+	model = gtk_combo_box_get_model (GTK_COMBO_BOX (plugin->priv->projects_combo));
+	if (gtk_tree_model_get_iter_first (model, &iter))
 	{
-		item = node->data;
-
-		if (g_file_equal (item->designer, designer))
+		do
 		{
-			if (widget_name)
-			{
-				if (item->widget_name)
-				{
-					if (widget_name && item->widget_name &&
-					    g_str_equal (widget_name, item->widget_name))
-					{
-						result = g_list_prepend (result, item);
-					}
-				}
-				else
-					fallback_result = g_list_prepend (fallback_result, item);
-			}
-			else
-			{ /* if (!widget_name) */
-				if (item->widget_name)
-					fallback_result = g_list_prepend (fallback_result, item);
-				else
-					result = g_list_prepend (result, item);
-			}
-		}
-		node = node->next;
-	}
-
-	result = g_list_reverse (result);
-	fallback_result = g_list_reverse (fallback_result);
-	result = g_list_concat (result, fallback_result);
-	return result;
-}
-
-#ifdef DEBUG
-static void
-dump_items_list (GList *items)
-{
-	GList *node;
-	DesignerAssociationsItem *item;
-
-	DEBUG_PRINT ("======================================================");
-	DEBUG_PRINT ("Dumping items list");
-	for (node = items; node; node = node->next)
-	{
-		item = node->data;
-		DEBUG_PRINT ("Designer: \"%s\", %d refs;\nWidget: %s\nEditor: \"%s\", %d refs"
-		             "---------------------------------------------------------------------",
-		              g_file_get_path (item->designer), G_OBJECT(item->designer)->ref_count,
-		              item->widget_name,
-		              g_file_get_path (item->editor), G_OBJECT(item->editor)->ref_count);
-	}
-	DEBUG_PRINT ("======================================================");
-}
+#if (GLADEUI_VERSION >= 330)
+			const gchar *ppath;
 #endif
-
-static GList *
-get_associated_items_for_designer (IAnjutaDocument *doc,
-                                   const gchar *widget_name,
-                                   GladePlugin* plugin)
-{
-	GList *list = NULL;
-	IAnjutaFile *file;
-	GFile *gfile;
-
-	g_return_val_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (doc), NULL);
-
-	file = IANJUTA_FILE (doc);
-	g_return_val_if_fail (file, NULL);
-	gfile = ianjuta_file_get_file (file, NULL);
-	g_return_val_if_fail (gfile, NULL);
-
-	list = designer_associations_match_designer (plugin->priv->associations,
-	                                             gfile,
-	                                             widget_name,
-	                                             plugin->priv->project_root);
-	g_object_unref (gfile);
-#ifdef DEBUG
-	dump_items_list (list);
-#endif
-	return list;
-}
-
-static GList *
-get_associated_items_for_editor (IAnjutaDocument *doc,
-                                 GladePlugin* plugin)
-{
-	GList *list = NULL;
-	IAnjutaFile *file;
-	GFile *gfile;
-
-	g_return_val_if_fail (IANJUTA_IS_EDITOR (doc), NULL);
-	file = IANJUTA_FILE (doc);
-	g_return_val_if_fail (file, NULL);
-	gfile = ianjuta_file_get_file (file, NULL);
-	g_return_val_if_fail (gfile, NULL);
-
-	list = designer_associations_match_editor (plugin->priv->associations,
-	                                           gfile,
-	                                           plugin->priv->project_root);
-	g_object_unref (gfile);
-#ifdef DEBUG
-	dump_items_list (list);
+			gchar *uri;
+			GladeProject *project;
+			gtk_tree_model_get (model, &iter, PROJECT_COL, &project, -1);
+#if (GLADEUI_VERSION >= 330)
+			ppath = glade_project_get_path (project);
+			if (ppath)
+#else
+			if (project->path)
 #endif
-	return list;
-}
-
-static IAnjutaEditor *
-find_valid_editor (GList *items, GladePlugin *plugin,
-                   DesignerAssociationsItem **matching_item)
-{
-	GList *node;
-	IAnjutaEditor *retval = NULL;
-	DesignerAssociationsItem *item;
-	AnjutaPlugin *anjuta_plugin = ANJUTA_PLUGIN (plugin);
-	IAnjutaDocumentManager *docman =
-		IANJUTA_DOCUMENT_MANAGER (anjuta_shell_get_object (anjuta_plugin->shell,
-		                         "IAnjutaDocumentManager", NULL));
-	g_return_val_if_fail (docman, NULL);
-
-	for (node = items; node; node = node->next)
-	{
-		item = node->data;
-		retval = find_editor_by_file (docman, item->editor);
-		if (retval)
-		{
-			if (matching_item)
-				*matching_item = item;
-			break;
-		}
-	}
-
-	return retval;
-}
-
-static AnjutaDesignDocument *
-find_valid_designer (GList *items, GladePlugin *plugin,
-                     DesignerAssociationsItem **matching_item)
-{
-	GList *node;
-	AnjutaDesignDocument *retval = NULL;
-	DesignerAssociationsItem *item;
-	AnjutaPlugin *anjuta_plugin = ANJUTA_PLUGIN (plugin);
-	IAnjutaDocumentManager *docman =
-		IANJUTA_DOCUMENT_MANAGER (anjuta_shell_get_object (anjuta_plugin->shell,
-		                         "IAnjutaDocumentManager", NULL));
-	g_return_val_if_fail (docman, NULL);
-
-	for (node = items; node; node = node->next)
-	{
-		item = node->data;
-		retval = find_designer_by_file (docman, item->designer);
-		if (retval)
-		{
-			if (matching_item)
-				*matching_item = item;
-			break;
-		}
-	}
-
-	return retval;
-}
-
-static IAnjutaEditor *
-get_associated_editor_for_doc (IAnjutaDocument *doc, const gchar *widget_name,
-                               GladePlugin* plugin, IAnjutaDocumentManager *docman,
-                               DesignerAssociationsItem **matching_item)
-{
-	IAnjutaEditor *editor = NULL;
-
-	if (IANJUTA_IS_EDITOR(doc))
-	{
-		GList *list = get_associated_items_for_editor (doc, plugin);
-		if (find_valid_designer (list, plugin, matching_item))
-			editor = IANJUTA_EDITOR (doc);
-		g_list_free (list);
-	}
-	else if (ANJUTA_IS_DESIGN_DOCUMENT(doc))
-	{
-		GList *list = get_associated_items_for_designer (doc, widget_name, plugin);
-		editor = find_valid_editor (list, plugin, matching_item);
-		g_list_free (list);
-	}
-
-	return editor;
-}
-
-static gchar *
-gse_get_signal_name (GtkTreeModel *model, GtkTreeIter *iter)
-{
-	gchar *signal_name;
-	gtk_tree_model_get (model, iter,
-	                    GSE_COLUMN_SIGNAL, &signal_name,
-	                    -1);
-
-	if (signal_name == NULL)
-	{
-		GtkTreeIter iter_signal;
-
-		if (!gtk_tree_model_iter_parent (model, &iter_signal, iter))
-			g_assert (FALSE);
-
-		gtk_tree_model_get (model, &iter_signal, GSE_COLUMN_SIGNAL, &signal_name, -1);
-		g_assert (signal_name != NULL);
-	}
-
-	return signal_name;
-}
-
-static IAnjutaIterable *
-get_auto_position (DesignerAssociationsItem *matching_item,
-                   IAnjutaEditor *editor, GladePlugin *plugin,
-                   gint *result_position_type, const LanguageSyntax *syntax)
-{
-	IAnjutaIterable *position = NULL;
-	gint position_type = 0;
-	gchar *str = NULL;
-
-	str = designer_associations_item_get_option (matching_item, "special_regexp");
-	if (!str)
-	{
-		position_type =
-			designer_associations_item_get_option_as_int (matching_item,
-			                                             "position_type",
-			                                              ipt_names);
-		switch (position_type)
-		{
-		case iptCurrent:
-			position = ianjuta_editor_get_position (editor, NULL);
-		case iptAfterBegin:
-			position = find_auto_position (plugin, editor, syntax->begin_regexp);
-			break;
-		case iptBeforeEnd:
-			position = find_auto_position (plugin, editor, syntax->end_regexp);
-			break;
-		/* iptEOF: nothing for now */
-		}
-	}
-	else
-	{
-		position = find_auto_position (plugin, editor, str);
-		g_free (str);
-	}
-
-	if (result_position_type)
-		*result_position_type = position_type;
-	return position;
-}
-
-static void
-forget_last_signal (GladePlugin *plugin)
-{
-	plugin->priv->last_object_type = 0;
-	g_free (plugin->priv->last_object_name);
-	        plugin->priv->last_object_name = NULL;
-	g_free (plugin->priv->last_signal_name);
-	        plugin->priv->last_signal_name = NULL;
-	g_free (plugin->priv->last_handler_name);
-	        plugin->priv->last_handler_name = NULL;
-	g_free (plugin->priv->last_toplevel_name);
-	        plugin->priv->last_toplevel_name = NULL;
-}
-
-static gboolean
-validate_last_signal (GladePlugin *plugin)
-{
-	gboolean validated = (plugin->priv->last_object_type != 0 &&
-	                      plugin->priv->last_object_name != NULL &&
-	                      plugin->priv->last_signal_name != NULL &&
-	                      plugin->priv->last_handler_name != NULL);
-	if (!validated)
-		forget_last_signal (plugin);
-
-	return validated;
-}
-
-static gboolean
-glade_plugin_fetch_last_signal (GladePlugin *plugin)
-{
-	GtkTreeView *tree_view;
-	GtkTreeIter iter;
-	GtkTreeModel  *model;
-	GtkTreeSelection *selection;
-	gchar *signal_handler = NULL;
-	gchar *signal_name;
-	gboolean slot;
-	GladeWidget *gwidget = GLADE_WIDGET (plugin->priv->last_gse->widget);
-
-	if (gwidget)
-	{
-		tree_view = GTK_TREE_VIEW (plugin->priv->last_gse->signals_list);
-		selection = gtk_tree_view_get_selection (tree_view);
-		if (gtk_tree_selection_get_selected (selection, &model, &iter))
-		{
-			gtk_tree_model_get (model, &iter, GSE_COLUMN_HANDLER, &signal_handler,
-			                                  GSE_COLUMN_SLOT, &slot, -1);
-			/*if (plugin->priv->last_signal_editor->is_void_handler (signal_handler))*/
-			if (slot)
-			{
-				g_free (signal_handler);
-				signal_handler = NULL;
-				return FALSE;
-			}
-
-			signal_name = gse_get_signal_name (model, &iter);
-
-			plugin->priv->last_object_name = g_strdup (gwidget->name);
-			plugin->priv->last_signal_name = signal_name;
-			plugin->priv->last_object_type = G_OBJECT_TYPE (gwidget->object);
-			plugin->priv->last_handler_name = signal_handler;
-			plugin->priv->last_toplevel_name = g_strdup (find_root_gwidget (gwidget)->name);
-
-			return TRUE;
-		}
-	}
-
-	return validate_last_signal (plugin);
-}
-
-static LanguageId
-language_name_to_id (const gchar *lang_name)
-{
-	LanguageId lang_id = ANJUTA_LANGUAGE_NONE;
-
-	if (g_str_equal (lang_name, "C") || g_str_equal (lang_name, "C++"))
-		lang_id = ANJUTA_LANGUAGE_C;
-	else if (g_str_equal (lang_name, "Python"))
-		lang_id = ANJUTA_LANGUAGE_PYTHON;
-	else if (g_str_equal (lang_name, "Vala"))
-		lang_id = ANJUTA_LANGUAGE_VALA;
-
-	return lang_id;
-}
-
-static void
-insert_handler_stub_auto (IAnjutaDocument *doc, GladePlugin *plugin,
-                          gboolean raise_editor, GError **error)
-{
-	IAnjutaEditor *editor = NULL;
-	const gchar *lang_name;
-	DesignerAssociationsItem *matching_item = NULL;
-	LanguageId lang_id;
-	const LanguageSyntax *syntax;
-	AnjutaPlugin *anjuta_plugin = ANJUTA_PLUGIN (plugin);
-	IAnjutaDocumentManager* docman;
-	IAnjutaLanguage* lang_manager =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN (anjuta_plugin)->shell,
-		                            IAnjutaLanguage, NULL);
-
-	docman = anjuta_shell_get_interface (anjuta_plugin->shell,
-	                                     IAnjutaDocumentManager, NULL);
-	g_return_if_fail (lang_manager);
-	g_return_if_fail (validate_last_signal (plugin));
-	if (doc == NULL)
-	{
-		if (plugin->priv->separated_designer_layout)
-			doc = IANJUTA_DOCUMENT (get_design_document_from_project (glade_app_get_project()));
-		else
-			doc = ianjuta_document_manager_get_current_document (docman, NULL);
-	}
-
-	DEBUG_PRINT ("Inserting handler using autoposition");
-	editor = get_associated_editor_for_doc (doc, plugin->priv->last_toplevel_name,
-	                                        plugin, docman, &matching_item);
-
-	if (!editor)
-	{
-		g_set_error (error,
-		             PLUGIN_GLADE_ERROR,
-		             PLUGIN_GLADE_ERROR_GENERIC,
-		             _("There is no associated editor for the designer"));
-		return;
-	}
-	lang_name = ianjuta_language_get_name_from_editor (lang_manager,
-	                                                   IANJUTA_EDITOR_LANGUAGE (editor),
-	                                                   NULL);
-	DEBUG_PRINT ("Language of %s is %s", g_file_get_path (ianjuta_file_get_file (IANJUTA_FILE(editor), NULL)),
-	                                     lang_name);
-
-	lang_id = language_name_to_id (lang_name);
-	switch (lang_id)
-	{
-	case ANJUTA_LANGUAGE_NONE:
-		{
-			gchar *uri = get_uri_from_ianjuta_file (IANJUTA_FILE (editor));
-			g_set_error (error,
-			             PLUGIN_GLADE_ERROR,
-			             PLUGIN_GLADE_ERROR_GENERIC,
-			             _("Unknown editor language \"%s\""), uri);
-			g_free (uri);
-			return;
-		}
-	case ANJUTA_LANGUAGE_C:
-		syntax = default_syntax_C;
-		break;
-	case ANJUTA_LANGUAGE_PYTHON:
-		syntax = default_syntax_Python;
-		break;
-	case ANJUTA_LANGUAGE_VALA:
-		syntax = default_syntax_Vala;
-		break;
-	}
-	IAnjutaIterable *position = NULL;
-	gint position_type = 0;
-
-	position = get_auto_position (matching_item, editor, plugin,
-	                              &position_type, default_syntax_C);
-	if (!position && position_type != iptEOF)
-		position_type = iptEOF;
-
-	switch (lang_id)
-	{
-	case ANJUTA_LANGUAGE_NONE:
-		g_assert_not_reached();
-		return;
-	case ANJUTA_LANGUAGE_C:
-		do_insert_handler_stub_C (docman, editor, position, position_type,
-		                          plugin->priv->last_object_type,
-		                          plugin->priv->last_object_name,
-		                          plugin->priv->last_signal_name,
-		                          plugin->priv->last_handler_name,
-		                          raise_editor, error);
-		break;
-	case ANJUTA_LANGUAGE_PYTHON:
-		do_insert_handler_stub_Python (docman, editor, position, position_type,
-		                               plugin->priv->last_object_type,
-		                               plugin->priv->last_object_name,
-		                               plugin->priv->last_signal_name,
-		                               plugin->priv->last_handler_name,
-		                               raise_editor, error);
-		break;
-	case ANJUTA_LANGUAGE_VALA:
-		do_insert_handler_stub_Vala (docman, editor, position, position_type,
-		                             plugin->priv->last_object_type,
-		                             plugin->priv->last_object_name,
-		                             plugin->priv->last_signal_name,
-		                             plugin->priv->last_handler_name,
-		                             raise_editor, error);
-		break;
-	}
-
-	//forget_last_signal (plugin);
-}
-
-static void
-on_insert_handler_stub_auto (GtkAction* action, GladePlugin* plugin)
-{
-	GError *error = NULL;
-
-	if (glade_plugin_fetch_last_signal (plugin))
-	{
-		insert_handler_stub_auto (NULL, plugin, TRUE, &error);
-		if (error)
-		{
-			anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-										_("Error while adding a new handler stub: %s"),
-										error->message);
-			g_error_free (error);
-		}
-	}
-	else
-		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                            _("Couldn't find signal information"));
-}
-
-static void
-insert_handler_stub_manual (GladePlugin* plugin, gboolean raise_editor)
-{
-	IAnjutaEditor *editor;
-	const gchar *lang_name;
-	IAnjutaDocument *doc;
-	GError *error = NULL;
-	IAnjutaIterable *position;
-	AnjutaPlugin *anjuta_plugin = ANJUTA_PLUGIN (plugin);
-	IAnjutaDocumentManager* docman =
-		anjuta_shell_get_interface (anjuta_plugin->shell,
-		                            IAnjutaDocumentManager, NULL);
-	IAnjutaLanguage* lang_manager =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN (anjuta_plugin)->shell,
-		                            IAnjutaLanguage, NULL);
-	g_return_if_fail (lang_manager);
-	g_return_if_fail (validate_last_signal (plugin));
-
-	DEBUG_PRINT ("Inserting handler manually");
-	doc = ianjuta_document_manager_get_current_document (docman, NULL);
-
-	if (!IANJUTA_IS_EDITOR (doc))
-	{
-		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                            "%s", _("Error while adding a new handler stub: No current editor"));
-		return;
-	}
-	editor = IANJUTA_EDITOR (doc);
-	lang_name = ianjuta_language_get_name_from_editor (lang_manager,
-	                                                   IANJUTA_EDITOR_LANGUAGE (editor),
-	                                                   NULL);
-	DEBUG_PRINT ("Language is %s", lang_name);
-	position = ianjuta_editor_get_position (editor, NULL);
-	/* Scintilla plugin treats C files as C++ */
-
-	switch (language_name_to_id (lang_name))
-	{
-	case ANJUTA_LANGUAGE_NONE:
-	case ANJUTA_LANGUAGE_C:
-		do_insert_handler_stub_C (docman, editor, position, iptCurrent,
-		                          plugin->priv->last_object_type,
-		                          plugin->priv->last_object_name,
-		                          plugin->priv->last_signal_name,
-		                          plugin->priv->last_handler_name,
-		                          TRUE, &error);
-		break;
-	case ANJUTA_LANGUAGE_PYTHON:
-		do_insert_handler_stub_Python (docman, editor, position, iptCurrent,
-		                               plugin->priv->last_object_type,
-		                               plugin->priv->last_object_name,
-		                               plugin->priv->last_signal_name,
-		                               plugin->priv->last_handler_name,
-		                               TRUE, &error);
-		break;
-	case ANJUTA_LANGUAGE_VALA:
-		do_insert_handler_stub_Vala (docman, editor, position, iptCurrent,
-		                             plugin->priv->last_object_type,
-		                             plugin->priv->last_object_name,
-		                             plugin->priv->last_signal_name,
-		                             plugin->priv->last_handler_name,
-		                             TRUE, &error);
-		break;
-	}
-
-	if (error)
-	{
-		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-									_("Error while adding a new handler stub: %s"), error->message);
-		g_error_free (error);
-	}
-
-	/*forget_last_signal (plugin);*/
-}
-
-static void
-on_insert_handler_stub_manual (GtkAction* action, GladePlugin* plugin)
-{
-	if (glade_plugin_fetch_last_signal (plugin))
-		insert_handler_stub_manual (plugin, TRUE);
-	else
-		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                            _("Couldn't find signal information"));
-}
-
-/* return true only if symbol definitely exists */
-static gboolean
-goto_symbol (const gchar *handler_name, GladePlugin* plugin,
-             gboolean do_goto)
-{
-	AnjutaPlugin *anjuta_plugin = ANJUTA_PLUGIN (plugin);
-	IAnjutaSymbolManager *manager;
-	IAnjutaIterable *symbol_iter;
-	GError *error = NULL;
-	gboolean retval = FALSE;
-	IAnjutaDocumentManager *docman;
-
-/* FIXME: symbol database should have been updated here or recent handlers will not be found */
-	manager = anjuta_shell_get_interface (anjuta_plugin->shell,
-	                                      IAnjutaSymbolManager, NULL);
-	docman = anjuta_shell_get_interface (anjuta_plugin->shell,
-	                                     IAnjutaDocumentManager, NULL);
-	DEBUG_PRINT ("Looking for symbol %s", handler_name);
-	if (manager)
-	{
-		symbol_iter =
-			ianjuta_symbol_manager_search (manager,
-			                               IANJUTA_SYMBOL_TYPE_FUNCTION, TRUE,
-			                               do_goto ? IANJUTA_SYMBOL_FIELD_FILE_PATH :
-			                               IANJUTA_SYMBOL_FIELD_SIMPLE,
-			                               handler_name, FALSE, IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PRIVATE, FALSE,
-			                               1, -1, &error);
-		if (error)
-		{
-			g_warning ("%s", error->message);
-			g_error_free (error);
-		}
-		if (symbol_iter)
-		{
-			if (ianjuta_iterable_get_length (symbol_iter, NULL) > 0)
-			{
-				GFile *file;
-				guint line;
-				IAnjutaEditor *editor;
-				IAnjutaSymbol *symbol;
-
-				symbol = IANJUTA_SYMBOL (symbol_iter);
-				if (symbol)
-				{
-					retval = TRUE;
-					DEBUG_PRINT ("Symbol found");
-				}
-				if (do_goto)
-				{
-					file = ianjuta_symbol_get_file (symbol, NULL);
-					line = ianjuta_symbol_get_line (symbol, NULL);
-					if (file)
-					{
-						DEBUG_PRINT ("Going to symbol at %s#%d", g_file_get_uri (file), line);
-						editor = ianjuta_document_manager_goto_file_line (docman, file, line, NULL);
-						g_object_unref (file);
-
-						if (editor)
-						{
-							ianjuta_document_manager_set_current_document (docman,
-							                                               IANJUTA_DOCUMENT (editor),
-							                                               NULL);
-							ianjuta_document_grab_focus (IANJUTA_DOCUMENT (editor), NULL);
-						}
-					}
-				}
-			}
-			g_object_unref (G_OBJECT (symbol_iter));
-		}
-	}
-
-	return retval;
-}
-
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-static gboolean
-on_handler_editing_done (GladeSignalEditor *self, gchar *signal_name,
-                         gchar *old_handler, gchar *new_handler, GtkTreeIter *iter,
-                         GladePlugin *plugin)
-{
-	GError *error = NULL;
-	g_return_val_if_fail (plugin, FALSE);
-	GladeWidget *gwidget = self->widget;
-
-	DEBUG_PRINT ("Handler for signal %s changed from %s to %s in the widget %s",
-	              signal_name, old_handler, new_handler, gwidget->name);
-	if (old_handler == NULL && goto_symbol (new_handler, plugin, FALSE) == FALSE)
-	{
-		forget_last_signal (plugin);
-
-		plugin->priv->last_object_name = g_strdup (gwidget->name);
-		plugin->priv->last_signal_name = g_strdup (signal_name);
-		plugin->priv->last_object_type = G_OBJECT_TYPE (gwidget->object);
-		plugin->priv->last_handler_name = g_strdup (new_handler);
-		plugin->priv->last_toplevel_name = g_strdup (find_root_gwidget (gwidget)->name);
-
-		if (plugin->priv->insert_handler_on_edit)
-		{
-			IAnjutaDocument *doc;
-
-			g_return_val_if_fail (gwidget->project, FALSE);
-
-			doc = IANJUTA_DOCUMENT (get_design_document_from_project (gwidget->project));
-			g_return_val_if_fail (doc, FALSE);
-			insert_handler_stub_auto (doc, plugin, TRUE, &error);
-			if (error)
 			{
-				gchar *error_message =
-					g_strdup_printf(_("Error while adding a new handler stub: %s"),
-					                error->message);
-				GtkButton *button = GTK_BUTTON(gtk_builder_get_object (plugin->priv->xml,
-						       	INSERT_HANDLER_ON_EDIT_NAME));
-				gchar *hint_message =
-					g_strdup_printf(_("To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"), gtk_button_get_label (button));
-
-				anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-										   "%s. %s", error_message, hint_message);
-				g_error_free (error);
-				g_free (error_message);
-				g_free (hint_message);
-			}
-		}
-	}
-
-	return FALSE;
-}
-#endif
-
-static void
-switch_designer_and_editor (GladePlugin* plugin)
-{
-	IAnjutaDocumentManager* docman = NULL;
-	GList* docwids = NULL;
-	GList *node;
-	GFile *assoc_file = NULL;
-	IAnjutaLanguage *ilanguage;
-	IAnjutaDocument* doc;
-	IAnjutaFile *file = NULL;
-	DesignerAssociationsItem *matching_item = NULL;
-	AnjutaPlugin *anjuta_plugin = ANJUTA_PLUGIN (plugin);
-
-	ilanguage = anjuta_shell_get_interface (anjuta_plugin->shell,
-	                                        IAnjutaLanguage, NULL);
-	if (!ilanguage)
-		return;
-
-	docman = anjuta_shell_get_interface (anjuta_plugin->shell,
-	                                     IAnjutaDocumentManager, NULL);
-	if (docman == NULL)
-		return;
-	doc = ianjuta_document_manager_get_current_document (docman, NULL);
-
-	if (IANJUTA_IS_EDITOR(doc))
-	{
-		GList *list = get_associated_items_for_editor (doc, plugin);
-		file = IANJUTA_FILE(find_valid_designer (list, plugin, &matching_item));
-		g_list_free (list);
-		if (file)
-			assoc_file = ianjuta_file_get_file (file, NULL);
-	}
-	else if (ANJUTA_IS_DESIGN_DOCUMENT(doc))
-	{
-		GList *list;
-		const gchar *widget_name = NULL;
-		/* FIXME: use last_toplevel widget name? */
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-		GladeWidget *widget = GLADE_WIDGET (plugin->priv->last_gse->widget);
-		if (widget)
-			widget = find_root_gwidget (widget);
-		if (widget)
-			widget_name = glade_widget_get_name (widget);
+				GFile *file = g_file_new_for_path (
+#if (GLADEUI_VERSION >= 330)
+					ppath);
+#else
+					project->path);
 #endif
-
-		list = get_associated_items_for_designer (doc, widget_name, plugin);
-		file = IANJUTA_FILE(find_valid_editor (list, plugin, &matching_item));
-		g_list_free (list);
-		if (file)
-			assoc_file = ianjuta_file_get_file (file, NULL);
-	}
-
-	if (!assoc_file)
-	{
-		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                           _("Couldn't find an associated document"));
-		return;
-	}
-
-	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
-	if (docwids)
-	{
-		for (node = docwids; node != NULL; node = g_list_next (node))
-		{
-			GFile *tmp_file;
-
-			tmp_file = ianjuta_file_get_file (IANJUTA_FILE(node->data), NULL);
-			if (g_file_equal (tmp_file, assoc_file))
-			{
-				if (plugin->priv->separated_designer_layout &&
-				    ANJUTA_IS_DESIGN_DOCUMENT (node->data))
-				{
-					AnjutaDesignDocument *doc = ANJUTA_DESIGN_DOCUMENT (node->data);
-					GladeDesignView *design_view = anjuta_design_document_get_design_view (doc);
-					glade_app_set_project (glade_design_view_get_project (design_view));
-				}
-				else
-				{
-					ianjuta_document_manager_set_current_document (docman,
-					                                               IANJUTA_DOCUMENT (node->data), NULL);
-					ianjuta_document_grab_focus (IANJUTA_DOCUMENT(node->data), NULL);
-					g_object_unref (tmp_file);
-					break;
-				}
-			}
-			g_object_unref (tmp_file);
-		}
-		g_list_free (docwids);
-	}
-
-	g_object_unref (assoc_file);
-}
-
-static void
-on_switch_designer_and_editor (GtkAction* action, GladePlugin* plugin)
-{
-	switch_designer_and_editor (plugin);
-}
-
-static void
-associate_designer_and_editor (DesignerAssociations *associations,
-                               GFile *designer, gchar *widget_name,
-                               GFile *editor,
-                               GFile *project_root,
-                               GtkWindow *window,
-                               GladePlugin* plugin)
-{
-	DesignerAssociationsItem *item;
-
-	item = designer_associations_search_item (associations,
-	                                          editor,
-	                                          designer);
-	if (item)
-	{
-		gchar *designer_path, *editor_path;
-
-		designer_path = g_file_get_path (designer);
-		editor_path = g_file_get_path (editor);
-		g_warning ("Association \"%s\" <=> \"%s\" already exists",
-		            designer_path, editor_path);
-		anjuta_util_dialog_warning (window,
-		                           _("Those documents are already associated"));
-		g_free (designer_path);
-		g_free (editor_path);
-		return;
-	}
-
-	item = designer_associations_item_from_data (editor,
-	                                             NULL, designer,
-	                                             NULL, project_root);
-	designer_associations_item_set_option (item, "position_type", _(ipt_names[3]));
-	designer_associations_add_item (associations, item);
-}
-
-static void
-on_associate_designer_and_editor (GtkAction* action, GladePlugin* plugin)
-{
-	if (plugin->priv->last_designer && plugin->priv->last_editor)
-	{
-		associate_designer_and_editor (plugin->priv->associations,
-		                               plugin->priv->last_designer, NULL,
-		                               plugin->priv->last_editor,
-		                               plugin->priv->project_root,
-		                               GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                               plugin);
-	}
-}
-
-static GtkBuilder *
-glade_plugin_get_glade_xml (GladePlugin* plugin)
-{
-	if (!plugin->priv->xml)
-	{
-		GError *error = NULL;
-
-		plugin->priv->xml = gtk_builder_new ();
-		if (!gtk_builder_add_from_file (plugin->priv->xml, GLADE_PLUGIN_GLADE_UI_FILE, &error))
-		{
-			anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-			                          _("Unable to read file: %s."),
-			                          GLADE_PLUGIN_GLADE_UI_FILE);
-			g_object_unref (plugin->priv->xml);
-			plugin->priv->xml = NULL;
-			if (error)
-			{
-				g_warning ("%s", error->message);
-				g_error_free (error);
-			}
-			return NULL;
-		}
-		if (error)
-		{
-			g_warning ("%s", error->message);
-			g_error_free (error);
-		}
-
-		gtk_builder_connect_signals (plugin->priv->xml, plugin);
-	}
-
-	return plugin->priv->xml;
-}
-
-
-
-/* ------- Associations dialog ------- */
-
-#define MODEL_INITED "model_inited"
-#define FIELD_CHANGED "field_changed"
-#define ASSOCIATIONS_ITEM "associations_item"
-#define ASSOCIATIONS_DIALOG_NAME "associations_dialog"
-#define ASSOCIATIONS_TREEVIEW_NAME "treeview_associations"
-#define ASSOCIATIONS_SPEC_REGEXP_NAME "spec_regexp"
-#define ASSOCIATIONS_WIDGET_NAME_NAME "widget_name"
-#define ASSOCIATIONS_SPEC_REGEXP_CHECKBOX_NAME "checkbutton_spec_regexp"
-#define ASSOCIATIONS_WIDGET_NAME_CHECKBOX_NAME "checkbutton_widget_name"
-#define ASSOCIATIONS_SPEC_REGEXP_REVERT_NAME "button_revert_spec_regexp"
-#define ASSOCIATIONS_WIDGET_NAME_REVERT_NAME "button_revert_widget_name"
-#define ASSOCIATIONS_POSITION_TYPE_NAME "position_type"
-#define ASSOCIATIONS_DESIGNERS_LIST_NAME "designers_list"
-#define ASSOCIATIONS_EDITORS_LIST_NAME "editors_list"
-#define ASSOCIATIONS_ASSOCIATE_BUTTON_NAME "associate_button"
-#define ASSOCIATIONS_TABLE_OPTIONS_NAME "table_options"
-#define ASSOCIATIONS_OPTIONS_SAVE_NAME "options_save"
-#define ASSOCIATIONS_OPTIONS_REVERT_NAME "options_revert"
-#define ASSOCIATIONS_DIALOG_XML "associations_xml"
-
-enum {
-	ID_COLUMN,
-	ITEM_COLUMN,
-	DESIGNER_COLUMN,
-	WIDGET_COLUMN,
-	EDITOR_COLUMN,
-	OPTIONS_COLUMN,
-	LAST_COLUMN
-};
-
-void
-associations_dialog_position_type_changed_cb (GtkComboBox *widget, GladePlugin* plugin);
-void
-associations_dialog_button_delete_cb (GtkButton *button, GladePlugin* plugin);
-void
-associations_dialog_button_close_cb (GtkButton *button, GladePlugin* plugin);
-void
-associations_dialog_button_save_cb (GtkButton *button, GladePlugin* plugin);
-void
-associations_dialog_button_associate_cb (GtkButton *self, GladePlugin *plugin);
-void
-associations_dialog_options_save_cb (GtkButton *self, GladePlugin *plugin);
-void
-associations_dialog_options_revert_cb (GtkButton *self, GladePlugin *plugin);
-void
-associations_dialog_spec_regexp_toggled (GtkToggleButton *togglebutton, GladePlugin *plugin);
-void
-associations_dialog_widget_name_toggled (GtkToggleButton *togglebutton, GladePlugin *plugin);
-void
-associations_dialog_revert_spec_regexp (GtkButton *button, GladePlugin *plugin);
-void
-associations_dialog_revert_widget_name (GtkButton *button, GladePlugin *plugin);
-void
-associations_dialog_spec_regexp_changed (GtkEditable *editable, GladePlugin *plugin);
-void
-associations_dialog_widget_name_changed (GtkEditable *editable, GladePlugin *plugin);
-void
-associations_dialog_spec_regexp_activate (GtkEntry *entry, GladePlugin *plugin);
-void
-associations_dialog_widget_name_activate (GtkEntry *entry, GladePlugin *plugin);
-
-static gboolean
-gtk_tree_selection_get_one_selected (GtkTreeSelection *selection, GtkTreeModel **model,
-                                     GtkTreeIter *iter)
-{
-	GList *selected;
-	GtkTreeModel *tree_model;
-
-	if (gtk_tree_selection_count_selected_rows (selection) != 1)
-		return FALSE;
-	selected = gtk_tree_selection_get_selected_rows (selection, &tree_model);
-	gtk_tree_model_get_iter (tree_model, iter, selected->data);
-	gtk_tree_path_free (selected->data);
-	g_list_free (selected);
-	if (model)
-		*model = tree_model;
-	return TRUE;
-}
-
-static void
-associations_dialog_mark_all_fields_as_unchanged (GladePlugin *plugin)
-{
-	bzero (plugin->priv->dialog_data->fields_changed,
-	       sizeof(plugin->priv->dialog_data->fields_changed));
-
-	if (plugin->priv->dialog_data->current_item)
-	{
-		g_object_unref (plugin->priv->dialog_data->current_item);
-		plugin->priv->dialog_data->current_item = NULL;
-	}
-
-	gtk_widget_set_sensitive (plugin->priv->dialog_data->options_button_save, FALSE);
-	gtk_widget_set_sensitive (plugin->priv->dialog_data->options_button_revert, FALSE);
-}
-
-static void
-associations_dialog_load_all_field (GladePlugin *plugin)
-{
-	GtkTreeIter iter;
-	DesignerAssociationsItem *item;
-	GtkTreeModel *model;
-	gchar *spec_regexp;
-	GtkEntry *entry;
-	GtkCheckButton *checkbutton;
-	GtkTreeView *treeview;
-	GtkTreeSelection *selection;
-	GtkComboBox *combobox;
-	gint i;
-
-	g_return_if_fail (plugin->priv->dialog);
-	g_return_if_fail (plugin->priv->xml);
-
-	treeview = plugin->priv->dialog_data->treeview;
-	selection = gtk_tree_view_get_selection (treeview);
-	g_return_if_fail (gtk_tree_selection_get_one_selected (selection, &model, &iter));
-
-	gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
-	                    ITEM_COLUMN, &item, -1);
-
-	/* Special regexp */
-	spec_regexp = designer_associations_item_get_option (item, "spec_regexp");
-	entry = GTK_ENTRY (plugin->priv->dialog_data->options_entries[DO_SPEC_REGEXP]);
-	checkbutton = GTK_CHECK_BUTTON (plugin->priv->dialog_data->options_checkboxes[DO_SPEC_REGEXP]);
-	gtk_entry_set_text (entry, spec_regexp ? spec_regexp : "");
-	gtk_widget_set_sensitive (GTK_WIDGET (entry), spec_regexp != NULL);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), spec_regexp != NULL);
-	g_free (spec_regexp);
-
-	/* Widget name */
-	entry = GTK_ENTRY (plugin->priv->dialog_data->options_entries[DO_WIDGET_NAME]);
-	checkbutton = GTK_CHECK_BUTTON (plugin->priv->dialog_data->options_checkboxes[DO_WIDGET_NAME]);
-	gtk_entry_set_text (entry, item->widget_name ? item->widget_name : "");
-	gtk_widget_set_sensitive (GTK_WIDGET (entry), item->widget_name != NULL);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), item->widget_name != NULL);
-
-	/* Position type */
-	combobox = GTK_COMBO_BOX (plugin->priv->dialog_data->options_entries[DO_POSITION_TYPE]);
-	i = designer_associations_item_get_option_as_int (item, "position_type", ipt_names);
-	gtk_combo_box_set_active (combobox, i);
-
-	associations_dialog_mark_all_fields_as_unchanged (plugin);
-
-	g_object_unref (G_OBJECT (item));
-}
-
-static void
-associations_dialog_clear_all_field (GladePlugin *plugin)
-{
-	GtkEntry *entry;
-	GtkCheckButton *checkbutton;
-	GtkComboBox *combobox;
-
-	g_return_if_fail (plugin->priv->dialog);
-	g_return_if_fail (plugin->priv->xml);
-
-	/* Special regexp */
-	entry = GTK_ENTRY (plugin->priv->dialog_data->options_entries[DO_SPEC_REGEXP]);
-	checkbutton = GTK_CHECK_BUTTON (plugin->priv->dialog_data->options_checkboxes[DO_SPEC_REGEXP]);
-	gtk_entry_set_text (entry, "");
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), FALSE);
-
-	/* Widget name */
-	entry = GTK_ENTRY (plugin->priv->dialog_data->options_entries[DO_WIDGET_NAME]);
-	checkbutton = GTK_CHECK_BUTTON (plugin->priv->dialog_data->options_checkboxes[DO_WIDGET_NAME]);
-	gtk_entry_set_text (entry, "");
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), FALSE);
-
-	/* Position type */
-	combobox = GTK_COMBO_BOX (plugin->priv->dialog_data->options_entries[DO_POSITION_TYPE]);
-	gtk_combo_box_set_active (combobox, -1);
-
-	associations_dialog_mark_all_fields_as_unchanged (plugin);
-}
-
-static void
-associations_dialog_update_options_editor (GladePlugin *plugin)
-{
-	GtkTreeIter iter;
-	GtkBuilder *xml;
-	GtkTreeModel *model;
-	GtkWidget *table;
-	GtkTreeSelection *selection;
-
-	g_return_if_fail (plugin->priv->dialog);
-	g_return_if_fail (plugin->priv->xml);
-	g_return_if_fail (!plugin->priv->dialog_data->updating);
-	plugin->priv->dialog_data->updating = TRUE;
-
-	xml = plugin->priv->xml;
-	selection = gtk_tree_view_get_selection (plugin->priv->dialog_data->treeview);
-	table = GTK_WIDGET (plugin->priv->dialog_data->options_table);
-
-	if (gtk_tree_selection_get_one_selected (selection, &model, &iter))
-	{
-		gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE);
-		associations_dialog_load_all_field (plugin);
-	}
-	else
-	{
-		gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE);
-		associations_dialog_clear_all_field (plugin);
-	}
-
-	plugin->priv->dialog_data->updating = FALSE;
-}
-
-static void
-fill_position_type_combobox_model (GtkListStore *model)
-{
-	GtkTreeIter iter;
-	int i;
-
-	for (i=0; i<count_ipt; i++)
-	{
-		gtk_list_store_append (model, &iter);
-		gtk_list_store_set (model, &iter,
-		                    0, i,
-		                    1, _(ipt_names[i]),
-		                    -1);
-	}
-}
-
-static void
-associations_dialog_update_model (GtkListStore *model, GladePlugin *plugin)
-{
-	DesignerAssociationsItem *item;
-	GList *node;
-
-	g_return_if_fail (plugin->priv->dialog);
-	g_return_if_fail (!plugin->priv->dialog_data->updating);
-	plugin->priv->dialog_data->updating = TRUE;
-
-	gtk_list_store_clear (model);
-
-	for (node = plugin->priv->associations->associations; node;
-	     node = node->next)
-	{
-		gchar *designer, *editor, *options;
-		GtkTreeIter iter;
-
-		item = node->data;
-		designer = g_file_get_basename (item->designer);
-		editor = g_file_get_basename (item->editor);
-		options = designer_associations_options_to_string (item->options, "=", ";");
-
-		gtk_list_store_append (model, &iter);
-		gtk_list_store_set (model, &iter,
-		                    ID_COLUMN, item->id,
-		                    ITEM_COLUMN, item,
-		                    DESIGNER_COLUMN, designer,
-		                    WIDGET_COLUMN, item->widget_name,
-		                    EDITOR_COLUMN, editor,
-		                    OPTIONS_COLUMN, options,
-		                    -1);
-
-		g_free (designer);
-		g_free (editor);
-		g_free (options);
-	}
-
-	plugin->priv->dialog_data->updating = FALSE;
-}
-
-static void
-associations_dialog_update_row (DesignerAssociationsItem *item, GtkTreeModel *model,
-                                GtkTreeIter *iter, GladePlugin *plugin)
-{
-	gchar *designer, *editor, *options;
-
-	g_return_if_fail (plugin->priv->dialog);
-	g_return_if_fail (!plugin->priv->dialog_data->updating);
-	plugin->priv->dialog_data->updating = TRUE;
-
-	designer = g_file_get_basename (item->designer);
-	editor = g_file_get_basename (item->editor);
-	options = designer_associations_options_to_string (item->options, "=", ";");
-	gtk_list_store_set (GTK_LIST_STORE (model), iter,
-	                    DESIGNER_COLUMN, designer,
-	                    WIDGET_COLUMN, item->widget_name,
-	                    EDITOR_COLUMN, editor,
-	                    OPTIONS_COLUMN, options,
-	                    -1);
-
-	g_free (designer);
-	g_free (editor);
-	g_free (options);
-
-	plugin->priv->dialog_data->updating = FALSE;
-}
-
-static const gchar *
-get_string_from_entry (GtkEntry *entry, GtkCheckButton *checkbutton)
-{
-	const gchar *value;
-
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)) == FALSE)
-		value = NULL;
-	else
-	{
-		value = gtk_entry_get_text (entry);
-		if (value && !strcmp (value, ""))
-			value = NULL;
-	}
-
-	return value;
-}
-
-static gboolean
-associations_dialog_commit_all_fields (GladePlugin *plugin)
-{
-	DesignerAssociationsItem *item;
-	GtkComboBox *combobox;
-
-	/* plugin->priv->dialog may be null while closing the dialog */
-	g_return_val_if_fail (plugin->priv->xml, FALSE);
-	g_return_val_if_fail (!plugin->priv->dialog_data->updating, FALSE);
-
-	item = plugin->priv->dialog_data->current_item;
-	if (!item)
-		return FALSE;
-	g_object_ref (item);
-
-	if (plugin->priv->dialog_data->fields_changed[DO_SPEC_REGEXP])
-	{
-		designer_associations_item_set_option (item, "spec_regexp",
-		                                       get_string_from_entry (GTK_ENTRY (plugin->priv->dialog_data->options_entries[DO_SPEC_REGEXP]),
-		                                                              GTK_CHECK_BUTTON (plugin->priv->dialog_data->options_checkboxes[DO_SPEC_REGEXP])));
-	}
-
-	if (plugin->priv->dialog_data->fields_changed[DO_WIDGET_NAME])
-	{
-		designer_associations_item_set_widget_name (item,
-		                                            get_string_from_entry (GTK_ENTRY (plugin->priv->dialog_data->options_entries[DO_WIDGET_NAME]),
-	                                                                       GTK_CHECK_BUTTON (plugin->priv->dialog_data->options_checkboxes[DO_WIDGET_NAME])));
-	}
-
-	if (plugin->priv->dialog_data->fields_changed[DO_POSITION_TYPE])
-	{
-		gint i;
-		combobox = GTK_COMBO_BOX (plugin->priv->dialog_data->options_entries[DO_POSITION_TYPE]);
-		i = gtk_combo_box_get_active (combobox);
-		if (i >= 0 && i < count_ipt)
-			designer_associations_item_set_option (item, "position_type", _(ipt_names[i]));
-		else
-			g_warning ("Invalid item index of position type");
-	}
-
-	designer_associations_notify_changed (plugin->priv->associations, item);
-
-	g_object_unref (item);
-	plugin->priv->dialog_data->current_item = NULL;
-
-	return TRUE;
-}
-
-void
-associations_dialog_options_save_cb (GtkButton *self, GladePlugin *plugin)
-{
-	associations_dialog_commit_all_fields (plugin);
-}
-
-void
-associations_dialog_options_revert_cb (GtkButton *self, GladePlugin *plugin)
-{
-	associations_dialog_update_options_editor (plugin);
-}
-
-static gboolean
-associations_dialog_mark_field_as_changed (GladePlugin *plugin, gint index)
-{
-	GtkTreeView *treeview;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	DesignerAssociationsItem *item = NULL;
-	GtkTreeModel *model;
-
-	g_return_val_if_fail (plugin->priv->dialog, FALSE);
-	g_return_val_if_fail (plugin->priv->xml, FALSE);
-	if (plugin->priv->dialog_data->updating)
-		return FALSE;
-
-	treeview = GTK_TREE_VIEW(plugin->priv->dialog_data->treeview);
-	selection = gtk_tree_view_get_selection (treeview);
-	g_return_val_if_fail (gtk_tree_selection_get_one_selected (selection, &model, &iter), FALSE);
-
-	gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
-	                    ITEM_COLUMN, &item, -1);
-	g_return_val_if_fail (item, FALSE);
-	if  (plugin->priv->dialog_data->current_item &&
-	     plugin->priv->dialog_data->current_item != item)
-	{
-		g_warning ("plugin->priv->dialog_data->current_item != item");
-	}
-	g_object_unref (item);
-
-	plugin->priv->dialog_data->fields_changed[index] = TRUE;
-	plugin->priv->dialog_data->current_item = item;
-
-	gtk_widget_set_sensitive (plugin->priv->dialog_data->options_button_save, TRUE);
-	gtk_widget_set_sensitive (plugin->priv->dialog_data->options_button_revert, TRUE);
-
-	return TRUE;
-}
-
-void
-associations_dialog_spec_regexp_changed (GtkEditable *editable, GladePlugin *plugin)
-{
-	associations_dialog_mark_field_as_changed (plugin, DO_SPEC_REGEXP);
-}
-
-void
-associations_dialog_widget_name_changed (GtkEditable *editable, GladePlugin *plugin)
-{
-	associations_dialog_mark_field_as_changed (plugin, DO_WIDGET_NAME);
-}
-
-void
-associations_dialog_spec_regexp_toggled (GtkToggleButton *togglebutton, GladePlugin *plugin)
-{
-	if (associations_dialog_mark_field_as_changed (plugin, DO_SPEC_REGEXP))
-		gtk_widget_set_sensitive (plugin->priv->dialog_data->options_entries[DO_SPEC_REGEXP],
-					  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(plugin->priv->dialog_data->options_checkboxes[DO_SPEC_REGEXP])));
-}
-
-void
-associations_dialog_widget_name_toggled (GtkToggleButton *togglebutton, GladePlugin *plugin)
-{
-	if (associations_dialog_mark_field_as_changed (plugin, DO_WIDGET_NAME))
-		gtk_widget_set_sensitive (plugin->priv->dialog_data->options_entries[DO_WIDGET_NAME],
-					  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(plugin->priv->dialog_data->options_checkboxes[DO_WIDGET_NAME])));
-}
-
-void
-associations_dialog_position_type_changed_cb (GtkComboBox *widget, GladePlugin* plugin)
-{
-	associations_dialog_mark_field_as_changed (plugin, DO_POSITION_TYPE);
-}
-
-void
-associations_dialog_button_delete_cb (GtkButton *button, GladePlugin* plugin)
-{
-	GtkTreeView *treeview;
-	GtkTreeSelection *selection;
-	gint selected_count;
-	GtkTreeModel *model;
-
-	g_return_if_fail (plugin->priv->dialog);
-
-	treeview = GTK_TREE_VIEW(gtk_builder_get_object (plugin->priv->xml,
-	                                                 ASSOCIATIONS_TREEVIEW_NAME));
-	g_return_if_fail (treeview);
-
-	selection = gtk_tree_view_get_selection (treeview);
-	selected_count = gtk_tree_selection_count_selected_rows (selection);
-	if (selected_count > 0)
-	{
-		GList *list, *node;
-		gint id;
-		GtkTreeIter iter;
-
-		if (selected_count > 1)
-			designer_associations_lock_notification (plugin->priv->associations);
-
-		node = list = gtk_tree_selection_get_selected_rows (selection, &model);
-		while (node)
-		{
-			/* TODO: remember cursor position */
-			gtk_tree_model_get_iter (model, &iter, node->data);
-			gtk_tree_model_get (model, &iter, ID_COLUMN, &id, -1);
-			designer_associations_remove_item_by_id (plugin->priv->associations, id);
-
-			node = node->next;
-		}
-		g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
-		g_list_free (list);
-
-		if (selected_count > 1)
-			designer_associations_unlock_notification (plugin->priv->associations);
-	}
-}
-
-static void
-glade_plugin_hide_associations_dialog (GladePlugin* plugin)
-{
-	GtkWindow *dialog;
-
-	g_return_if_fail (plugin->priv->dialog);
-	g_return_if_fail (plugin->priv->xml);
-
-	dialog = plugin->priv->dialog;
-	/* Stops listening on association events */
-	plugin->priv->dialog = NULL;
-
-	gtk_widget_hide (GTK_WIDGET(dialog));
-
-	if (plugin->priv->dialog_data->current_item)
-		associations_dialog_commit_all_fields (plugin);
-}
-
-void
-associations_dialog_button_close_cb (GtkButton *button, GladePlugin* plugin)
-{
-	glade_plugin_hide_associations_dialog (plugin);
-}
-
-void
-associations_dialog_button_save_cb (GtkButton *button, GladePlugin* plugin)
-{
-	GError *error = NULL;
-	glade_plugin_do_save_associations (plugin, &error);
-	if (error)
-	{
-		anjuta_util_dialog_error (plugin->priv->dialog,
-		                          "Error: %s", error->message);
-		g_error_free (error);
-	}
-}
-
-static gboolean
-associations_dialog_delete_event_cb (GtkWindow *dialog, GdkEvent *event, GladePlugin* plugin)
-{
-	DEBUG_PRINT ("dialog hidden");
-
-	if (plugin->priv->dialog)
-	{
-		g_return_val_if_fail (plugin->priv->xml, TRUE);
-
-		glade_plugin_hide_associations_dialog (plugin);
-	}
-
-	return TRUE;
-}
-
-static void
-associations_dialog_selection_changed (GtkTreeSelection *selection, GladePlugin* plugin)
-{
-	g_return_if_fail (plugin->priv->dialog);
-	g_return_if_fail (plugin->priv->xml);
-	if (plugin->priv->dialog_data->updating)
-		return;
-
-	/* Changing associations leads to options editor update */
-	associations_dialog_commit_all_fields (plugin);
-	associations_dialog_update_options_editor (plugin);
-}
-
-static void
-associations_dialog_insert_text_column (GtkTreeView *treeview, gchar *title,
-                                        gint column_id, gint column_width)
-{
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *renderer;
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes (title, renderer,
-	                                                  "text", column_id,
-	                                                   NULL);
-	gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-	gtk_tree_view_column_set_resizable (column, TRUE);
-	gtk_tree_view_column_set_fixed_width (column, column_width);
-	gtk_tree_view_insert_column (treeview, column, -1);
-}
-
-static void
-show_associations_dialog (GladePlugin* plugin)
-{
-	GtkBuilder *xml;
-	GtkTreeView *treeview;
-	GtkCellRenderer *renderer;
-	GtkWindow *dialog;
-	GtkComboBox *combobox;
-	AnjutaPlugin *anjuta_plugin = ANJUTA_PLUGIN (plugin);
-
-	if (plugin->priv->dialog)
-	{
-		gtk_window_present (plugin->priv->dialog);
-		return;
-	}
-
-	g_return_if_fail (plugin->priv->xml);
-	xml = plugin->priv->xml;
-
-	plugin->priv->dialog = dialog =
-		GTK_WINDOW (gtk_builder_get_object (xml, ASSOCIATIONS_DIALOG_NAME));
-	if (!dialog || !GTK_IS_WINDOW (dialog))
-	{
-		g_warning (_("Widget not found: %s"), ASSOCIATIONS_DIALOG_NAME);
-		g_object_unref (xml);
-		return;
-	}
-	g_signal_handlers_disconnect_by_func (dialog,
-	                                      G_CALLBACK (associations_dialog_delete_event_cb),
-	                                      plugin);
-	g_signal_connect (dialog, "delete-event",
-	                  G_CALLBACK (associations_dialog_delete_event_cb), plugin);
-	{
-		treeview = plugin->priv->dialog_data->treeview =
-			GTK_TREE_VIEW (gtk_builder_get_object (xml, ASSOCIATIONS_TREEVIEW_NAME));
-		plugin->priv->dialog_data->options_button_save =
-			GTK_WIDGET(gtk_builder_get_object (xml, ASSOCIATIONS_OPTIONS_SAVE_NAME));
-		plugin->priv->dialog_data->options_button_revert =
-			GTK_WIDGET(gtk_builder_get_object (xml, ASSOCIATIONS_OPTIONS_REVERT_NAME));
-		plugin->priv->dialog_data->options_table =
-			GTK_TABLE(gtk_builder_get_object (xml, ASSOCIATIONS_TABLE_OPTIONS_NAME));
-
-		plugin->priv->dialog_data->options_entries[0] =
-			GTK_WIDGET(gtk_builder_get_object (xml, ASSOCIATIONS_SPEC_REGEXP_NAME));
-		plugin->priv->dialog_data->options_entries[1] =
-			GTK_WIDGET(gtk_builder_get_object (xml, ASSOCIATIONS_WIDGET_NAME_NAME));
-		plugin->priv->dialog_data->options_entries[2] =
-			GTK_WIDGET(gtk_builder_get_object (xml, ASSOCIATIONS_POSITION_TYPE_NAME));
-
-		plugin->priv->dialog_data->options_checkboxes[0] =
-			GTK_WIDGET(gtk_builder_get_object (xml, ASSOCIATIONS_SPEC_REGEXP_CHECKBOX_NAME));
-		plugin->priv->dialog_data->options_checkboxes[1] =
-			GTK_WIDGET(gtk_builder_get_object (xml, ASSOCIATIONS_WIDGET_NAME_CHECKBOX_NAME));
-
-	}
-
-	if (!treeview)
-	{
-		g_warning (_("Widget not found: %s"), ASSOCIATIONS_TREEVIEW_NAME);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		g_object_unref (xml);
-		return;
-	}
-	if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(treeview), MODEL_INITED)) == FALSE)
-	{
-		GtkListStore *model;
-		g_object_set_data (G_OBJECT(treeview), MODEL_INITED, GINT_TO_POINTER (TRUE));
-		model = gtk_list_store_new (LAST_COLUMN,
-		                            G_TYPE_INT,
-		                            DESIGNER_TYPE_ASSOCIATIONS_ITEM,
-		                            G_TYPE_STRING,
-		                            G_TYPE_STRING,
-		                            G_TYPE_STRING,
-		                            G_TYPE_STRING);
-		gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (model));
-
-		associations_dialog_insert_text_column (treeview, _("Designer"), DESIGNER_COLUMN, 200);
-		associations_dialog_insert_text_column (treeview, _("Top level widget"), WIDGET_COLUMN, 150);
-		associations_dialog_insert_text_column (treeview, _("Editor"), EDITOR_COLUMN, 200);
-		associations_dialog_insert_text_column (treeview, _("Options"), OPTIONS_COLUMN, 200);
-
-		g_object_set_data (G_OBJECT (dialog), ASSOCIATIONS_TREEVIEW_NAME, treeview);
-		gtk_tree_selection_set_mode (gtk_tree_view_get_selection (treeview),
-		                             GTK_SELECTION_MULTIPLE);
-		g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (treeview)),
-				 "changed", G_CALLBACK (associations_dialog_selection_changed),
-				  plugin);
-	}
-	associations_dialog_update_model (GTK_LIST_STORE(gtk_tree_view_get_model (treeview)),
-	                                  plugin);
-
-	combobox = GTK_COMBO_BOX (plugin->priv->dialog_data->options_entries[2]);
-	if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(combobox), MODEL_INITED)) == FALSE)
-	{
-		GtkListStore *model;
-		g_object_set_data (G_OBJECT(combobox), MODEL_INITED, GINT_TO_POINTER (TRUE));
-		model = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING);
-		gtk_combo_box_set_model (combobox, GTK_TREE_MODEL (model));
-		fill_position_type_combobox_model (model);
-		renderer = gtk_cell_renderer_text_new();
-		gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, TRUE);
-		gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
-		                               "text", 1, NULL);
-	}
-
-	combobox = GTK_COMBO_BOX (gtk_builder_get_object (xml, ASSOCIATIONS_DESIGNERS_LIST_NAME));
-	if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(combobox), MODEL_INITED)) == FALSE)
-	{
-		GtkListStore *model;
-		g_object_set_data (G_OBJECT(combobox), MODEL_INITED, GINT_TO_POINTER (TRUE));
-		model = gtk_list_store_new (2, G_TYPE_FILE, G_TYPE_STRING);
-		gtk_combo_box_set_model (combobox, GTK_TREE_MODEL (model));
-		renderer = gtk_cell_renderer_text_new();
-		gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, TRUE);
-		gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
-		                               "text", 1, NULL);
-	}
-
-	combobox = GTK_COMBO_BOX (gtk_builder_get_object (xml, ASSOCIATIONS_EDITORS_LIST_NAME));
-	if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(combobox), MODEL_INITED)) == FALSE)
-	{
-		GtkListStore *model;
-		g_object_set_data (G_OBJECT(combobox), MODEL_INITED, GINT_TO_POINTER (TRUE));
-		model = gtk_list_store_new (2, G_TYPE_FILE, G_TYPE_STRING);
-		gtk_combo_box_set_model (combobox, GTK_TREE_MODEL (model));
-		renderer = gtk_cell_renderer_text_new();
-		gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, TRUE);
-		gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
-		                               "text", 1, NULL);
-	}
-
-	doc_list_changed (anjuta_plugin);
-
-	associations_dialog_update_options_editor (plugin);
-
-	gtk_window_set_transient_for (dialog, GTK_WINDOW (anjuta_plugin->shell));
-	gtk_window_set_modal (dialog, FALSE);
-
-	gtk_widget_show_all (GTK_WIDGET (dialog));
-}
-
-static void
-on_show_associations_dialog (GtkAction* action, GladePlugin* plugin)
-{
-	if (glade_plugin_get_glade_xml (plugin))
-		show_associations_dialog (plugin);
-}
-
-static void
-on_associations_changed (DesignerAssociations *self, DesignerAssociationsItem *item,
-                         DesignerAssociationsAction action, GladePlugin *plugin)
-{
-	if (plugin->priv->dialog)
-	{
-		GtkTreeView *treeview;
-		GtkTreeModel *model;
-		GtkTreeSelection *selection;
-
-		treeview = GTK_TREE_VIEW (gtk_builder_get_object (plugin->priv->xml,
-		                                                  ASSOCIATIONS_TREEVIEW_NAME));
-		selection = gtk_tree_view_get_selection (treeview);
-		model = gtk_tree_view_get_model (treeview);
-		if (action == DESIGNER_ASSOCIATIONS_CHANGED)
-		{
-			GtkTreeIter iter;
-			gboolean found = FALSE;
-			if (!gtk_tree_model_get_iter_first (model, &iter))
-				return;
-			do
-			{
-				guint id;
-
-				gtk_tree_model_get (model, &iter, ID_COLUMN, &id, -1);
-				if (id == item->id)
-					found = TRUE;
-			} while (!found && gtk_tree_model_iter_next (model, &iter));
-			if (found)
-			{
-				associations_dialog_update_row (item, model, &iter, plugin);
-				if (plugin->priv->dialog_data->current_item)
-				{
-					GtkTreeIter selected_iter;
-					if (gtk_tree_selection_get_one_selected (selection, NULL, &selected_iter))
-					{
-						DesignerAssociationsItem *selected_item;
-						gtk_tree_model_get (model, &selected_iter,
-						                    ITEM_COLUMN, &selected_item, -1);
-						if (selected_item &&
-						    plugin->priv->dialog_data->current_item != selected_item)
-						{
-							/* Do not update editor */
-							return;
-						}
-					}
-				}
-			}
-		}
-		else
-		{
-			GList *list, *node;
-			GList *refs_list = NULL;
-			/* Save selection */
-			list = gtk_tree_selection_get_selected_rows (selection, NULL);
-			for (node = list; node; node = node->next)
-			{
-				refs_list = g_list_prepend (refs_list,
-				                            gtk_tree_row_reference_new (model, node->data));
-			}
-			g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL);
-			g_list_free (list);
-
-			associations_dialog_update_model (GTK_LIST_STORE (gtk_tree_view_get_model (treeview)),
-							  plugin);
-			/* Restore selection */
-			for (node = refs_list; node; node = node->next)
-			{
-				if (node->data)
-				{
-					GtkTreePath *path = gtk_tree_row_reference_get_path (node->data);
-					if (path)
-						gtk_tree_selection_select_path (selection, path);
-					gtk_tree_row_reference_free (node->data);
-					gtk_tree_path_free (path);
-				}
-			}
-		}
-
-		associations_dialog_update_options_editor (plugin);
-	}
-}
-
-static void
-doc_list_changed (AnjutaPlugin *anjuta_plugin)
-{
-	GladePlugin *plugin = ANJUTA_PLUGIN_GLADE(anjuta_plugin);
-	IAnjutaDocumentManager *docman;
-	GList *docwids, *node;
-	GtkListStore *designers, *editors;
-	GtkComboBox *designer_combobox, *editor_combobox;
-	gboolean is_designer;
-	GtkTreeIter iter;
-
-	if (!plugin->priv->dialog)
-		return;
-	g_return_if_fail (plugin->priv->xml);
-
-	designer_combobox = GTK_COMBO_BOX(gtk_builder_get_object (plugin->priv->xml,
-	                                                          ASSOCIATIONS_DESIGNERS_LIST_NAME));
-	g_return_if_fail (designer_combobox);
-	designers = GTK_LIST_STORE(gtk_combo_box_get_model (designer_combobox));
-	g_return_if_fail (designers);
-	gtk_list_store_clear (designers);
-
-	editor_combobox = GTK_COMBO_BOX(gtk_builder_get_object (plugin->priv->xml,
-	                                                        ASSOCIATIONS_EDITORS_LIST_NAME));
-	g_return_if_fail (editor_combobox);
-	editors = GTK_LIST_STORE(gtk_combo_box_get_model (editor_combobox));
-	g_return_if_fail (editors);
-	gtk_list_store_clear (editors);
-
-	docman = anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-	                                     IAnjutaDocumentManager, NULL);
-	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
-	if (docwids)
-	{
-		for (node = docwids; node != NULL; node = g_list_next (node))
-		{
-			is_designer = FALSE;
-			if (ANJUTA_IS_DESIGN_DOCUMENT (node->data))
-				is_designer = TRUE;
-			if (is_designer || IANJUTA_IS_EDITOR (node->data))
-			{
-				GFile* file;
-				file = ianjuta_file_get_file (IANJUTA_FILE (node->data), NULL);
-				if (file != NULL)
+				uri = g_file_get_uri (file);
+				g_object_unref (file);
+				if (uri)
 				{
-					gchar *basename;
-
-					basename = g_file_get_basename (file);
-					if (is_designer)
-					{
-						gtk_list_store_append (designers, &iter);
-						gtk_list_store_set (designers, &iter,
-						                    0, file,
-						                    1, basename, -1);
-						if (plugin->priv->last_designer &&
-						    g_file_equal (file, plugin->priv->last_designer))
-						{
-							gtk_combo_box_set_active_iter (designer_combobox, &iter);
-						}
-					}
-					else
-					{
-						gtk_list_store_append (editors, &iter);
-						gtk_list_store_set (editors, &iter,
-						                    0, file,
-						                    1, basename, -1);
-						if (plugin->priv->last_editor &&
-						    g_file_equal (file, plugin->priv->last_editor))
-						{
-							gtk_combo_box_set_active_iter (editor_combobox, &iter);
-						}
-					}
-					g_free (basename);
+					/ * FIXME only log file if it's still open in docman * /
+					files = g_list_prepend (files, uri);
+					/ * uri is not freed here * /
 				}
-				g_object_unref (file);
-			}
-		}
-		g_list_free (docwids);
-	}
-}
-
-void
-associations_dialog_button_associate_cb (GtkButton *self, GladePlugin *plugin)
-{
-	GtkComboBox *designer_combobox, *editor_combobox;
-	GtkTreeModel *designers, *editors;
-	GtkTreeIter iter;
-	GFile *designer_file, *editor_file;
-
-	g_return_if_fail (plugin->priv->xml);
-
-	designer_combobox = GTK_COMBO_BOX(gtk_builder_get_object (plugin->priv->xml,
-	                                                          ASSOCIATIONS_DESIGNERS_LIST_NAME));
-	g_return_if_fail (designer_combobox);
-	g_return_if_fail (gtk_combo_box_get_active_iter (designer_combobox, &iter));
-	designers = GTK_TREE_MODEL(gtk_combo_box_get_model (designer_combobox));
-	g_return_if_fail (designers);
-	gtk_tree_model_get (designers, &iter, 0, &designer_file, -1);
-
-	editor_combobox = GTK_COMBO_BOX(gtk_builder_get_object (plugin->priv->xml,
-	                                                        ASSOCIATIONS_EDITORS_LIST_NAME));
-	g_return_if_fail (editor_combobox);
-	g_return_if_fail (gtk_combo_box_get_active_iter (editor_combobox, &iter));
-	editors = GTK_TREE_MODEL(gtk_combo_box_get_model (editor_combobox));
-	g_return_if_fail (editors);
-	gtk_tree_model_get (editors, &iter, 0, &editor_file, -1);
-
-	associate_designer_and_editor (plugin->priv->associations,
-	                               designer_file, NULL,
-	                               editor_file,
-	                               plugin->priv->project_root,
-	                               GTK_WINDOW (plugin->priv->dialog),
-	                               plugin);
-
-	g_object_unref (designer_file);
-	g_object_unref (editor_file);
-}
-
-/* ------- End of associations dialog ------- */
-
-
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-static void
-gse_editing_started (GtkEntry *entry, IsVoidFunc callback)
-{
-	if (callback (gtk_entry_get_text (entry)))
-		gtk_entry_set_text (entry, "");
-}
-
-static void
-handler_store_update (GladeSignalEditor *editor,
-                      const gchar *signal_name,
-                      GtkListStore *store)
-{
-	const gchar *handlers[] = {"gtk_widget_show",
-	                           "gtk_widget_hide",
-	                           "gtk_widget_grab_focus",
-	                           "gtk_widget_destroy",
-	                           "gtk_true",
-	                           "gtk_false",
-	                           "gtk_main_quit",
-	                            NULL};
-
-	GtkTreeIter tmp_iter;
-	gint i;
-	gchar *handler, *signal, *name;
-
-	name = (gchar *) glade_widget_get_name (editor->widget);
-
-	signal = g_strdup (signal_name);
-	glade_util_replace (signal, '-', '_');
-
-	gtk_list_store_clear (store);
-
-	gtk_list_store_append (store, &tmp_iter);
-	handler = g_strdup_printf ("on_%s_%s", name, signal);
-	gtk_list_store_set (store, &tmp_iter, 0, handler, -1);
-	g_free (handler);
-
-	gtk_list_store_append (store, &tmp_iter);
-	handler = g_strdup_printf ("%s_%s_cb", name, signal);
-	gtk_list_store_set (store, &tmp_iter, 0, handler, -1);
-	g_free (handler);
-
-	g_free (signal);
-	for (i = 0; handlers[i]; i++)
-	{
-		gtk_list_store_append (store, &tmp_iter);
-		gtk_list_store_set (store, &tmp_iter, 0, handlers[i], -1);
-	}
-}
-
-#define MAX_COMPLETION_STORE_SYMBOLS 500
-
-static void
-append_symbols_to_store (GtkListStore *store, GladePlugin *plugin)
-{
-	GtkTreeIter iter;
-	IAnjutaSymbolManager *symbol_manager;
-	IAnjutaIterable *symbol_iter;
-	IAnjutaSymbol *symbol;
-	GError *error = NULL;
-	int i;
-	AnjutaPlugin *anjuta_plugin = ANJUTA_PLUGIN (plugin);
-
-	symbol_manager = anjuta_shell_get_interface (anjuta_plugin->shell,
-	                                             IAnjutaSymbolManager, NULL);
-	if (!symbol_manager)
-		return;
-
-	symbol_iter =
-		ianjuta_symbol_manager_search (symbol_manager,
-		                               IANJUTA_SYMBOL_TYPE_FUNCTION, TRUE,
-		                               IANJUTA_SYMBOL_FIELD_SIMPLE,
-		                               "", TRUE, IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PRIVATE, FALSE,
-		                               MAX_COMPLETION_STORE_SYMBOLS, -1,
-		                               &error);
-	if (error)
-	{
-		g_warning ("%s", error->message);
-		g_error_free (error);
-	}
-	if (symbol_iter)
-	{
-		/* symbol browser plugin ignores results_limit parameter */
-		i = 0;
-		while (ianjuta_iterable_get_position (symbol_iter, NULL) >= 0)
-		{
-			const gchar *name;
-
-			symbol = IANJUTA_SYMBOL (symbol_iter);
-			name = ianjuta_symbol_get_name (symbol, NULL);
-			gtk_list_store_append (store, &iter);
-			gtk_list_store_set (store, &iter, 0, name, -1);
-
-			i ++;
-			if (i > MAX_COMPLETION_STORE_SYMBOLS)
-				break;
-			if (ianjuta_iterable_next (symbol_iter, NULL) == FALSE)
-				break;
-		}
-	}
-	else
-		DEBUG_PRINT ("No symbols");
-}
-
-static gboolean
-on_handler_editing_started (GladeSignalEditor *editor,
-                            gchar *signal_name,
-                            GtkTreeIter *iter,
-                            GtkCellEditable *editable,
-                            gpointer user_data)
-{
-
-	GtkEntry *entry;
-	GtkEntryCompletion *completion;
-	GtkListStore *completion_store = (GtkListStore *) editor->handler_store;
-	GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (user_data);
-
-	g_return_val_if_fail (GTK_IS_BIN (editable), FALSE);
-	g_return_val_if_fail (GTK_IS_LIST_STORE (completion_store), FALSE);
-
-	entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (editable)));
-
-	gse_editing_started (entry, editor->is_void_handler);
-
-	handler_store_update (editor, signal_name,
-	                      completion_store);
-	append_symbols_to_store (completion_store, plugin);
-
-	completion = gtk_entry_completion_new ();
-	gtk_entry_completion_set_text_column (completion, 0);
-	gtk_entry_completion_set_inline_completion (completion, TRUE);
-	gtk_entry_completion_set_popup_completion (completion, FALSE);
-	gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (completion_store));
-	gtk_entry_set_completion (entry, completion);
-
-	return FALSE;
-}
-#endif /* GLADE_SIGNAL_EDITOR_EXT */
-
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-static gchar *
-make_default_handler_name (const gchar *widget_name, const gchar *signal_name,
-                           GladePlugin *plugin)
-{
-	gchar *retval = NULL;
-
-	switch (plugin->priv->default_handler_template)
-	{
-	case 0:
-		return g_strdup_printf ("on_%s_%s", widget_name, signal_name);
-		break;
-	case 1:
-		return g_strdup_printf ("%s_%s_cb", widget_name, signal_name);
-		break;
-	}
-
-	return retval;
-}
-#endif
-
-static void
-on_signal_row_activated (GtkTreeView       *tree_view,
-                         GtkTreePath       *path,
-                         GtkTreeViewColumn *column,
-                         GladePlugin       *plugin)
-{
-	GtkTreeIter iter, tmp_iter;
-	gchar *signal_handler;
-	GtkTreeModel *model;
-	gboolean slot;
-
-	model = gtk_tree_view_get_model (tree_view);
-	gtk_tree_model_get_iter (model, &iter, path);
-	/* if invalid row */
-	if (!gtk_tree_model_iter_parent (model, &tmp_iter, &iter))
-		return;
-	gtk_tree_model_get (model, &iter, GSE_COLUMN_HANDLER, &signal_handler,
-	                                  GSE_COLUMN_SLOT, &slot, -1);
-	/*if (plugin->priv->last_signal_editor->is_void_handler (signal_handler))*/
-	if (slot)
-	{
-		g_free (signal_handler);
-		signal_handler = NULL;
-	}
-
-	if (signal_handler)
-	{
-		goto_symbol (signal_handler, plugin, TRUE);
-		g_free (signal_handler);
-	}
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-	else
-	{
-		GladeWidget *gwidget;
-		gchar *signal_handler, *signal_name, *norm_signal_name;
-		gboolean handled;
-
-		gwidget = plugin->priv->last_gse->widget;
-		if (gwidget)
-		{
-			if (GTK_IS_TREE_STORE (model))
-			{
-				signal_name = gse_get_signal_name (model, &iter);
-				norm_signal_name = g_strdup (signal_name);
-				glade_util_replace (norm_signal_name, '-', '_');
-
-				signal_handler = make_default_handler_name (gwidget->name, norm_signal_name, plugin);
-
-				gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
-				                    GSE_COLUMN_HANDLER, signal_handler, -1);
-
-				g_signal_emit_by_name (G_OBJECT (plugin->priv->last_gse), "handler-editing-done",
-				                       signal_name, NULL, signal_handler, &iter, &handled);
-
-				g_free (norm_signal_name);
-				g_free (signal_name);
-				g_free (signal_handler);
-			}
-		}
-	}
-#endif
-}
-
-
-#ifdef GLADE_LAYOUT_WIDGET_EVENTS
-
-#define DEFAULT_SIGNAL_NAME_COUNT 16
-gchar* default_signal_name[DEFAULT_SIGNAL_NAME_COUNT][2] = {
-	{"GtkButton", "clicked"},
-	{"GtkToggleButton", "toggled"},
-	{"GtkFontButton", "font-set"},
-	{"GtkColorButton", "color-set"},
-	{"GtkScaleButton", "value-changed"},
-	{"GtkRange", "value-changed"},
-	{"GtkDialog", "response"},
-	{"GtkComboBox", "changed"},
-	{"GtkFileChooserButton", "selection-changed"},
-	{"GtkFileChooserWidget", "file-activated"},
-	{"GtkEntry", "activate"},
-	{"GtkSpinButton", "value-changed"},
-	{"GtkToolButton", "clicked"},
-	{"GtkToggleToolButton", "toggled"},
-	{"GtkMenuItem", "activate"},
-	{"GtkCheckMenuItem", "toggled"},
-};
-
-static gchar *
-search_for_default_signal (const gchar *class_name)
-{
-	gint i;
-
-	for (i=0; i<DEFAULT_SIGNAL_NAME_COUNT; i++)
-		if (g_str_equal (class_name, default_signal_name[i][0]))
-			return g_strdup (default_signal_name[i][1]);
-	return NULL;
-}
-
-static gchar *
-glade_widget_adaptor_get_default_signal (GladeWidgetAdaptor *adaptor)
-{
-	gchar *signal_name;
-
-	while (adaptor)
-	{
-		signal_name = search_for_default_signal (adaptor->name);
-		if (signal_name)
-			return signal_name;
-		adaptor = glade_widget_adaptor_get_parent_adaptor (adaptor);
-	}
-
-	return NULL;
-}
-
-static void
-on_glade_widget_2button_press (GladeProject *project, GladeWidget *gwidget,
-                               GdkEvent *event, GladePlugin *plugin)
-{
-	gboolean found = FALSE;
-	GtkTreeIter iter, child_iter;
-	GtkTreeModel *model;
-	gchar *signal_name, *default_signal_name;
-	GtkTreePath *path;
-	GtkTreeView *treeview;
-
-	default_signal_name = glade_widget_adaptor_get_default_signal (gwidget->adaptor);
-	treeview = GTK_TREE_VIEW (plugin->priv->last_gse->signals_list);
-	model = gtk_tree_view_get_model (treeview);
-	DEBUG_PRINT ("Searching for default signal %s", default_signal_name);
-	if (default_signal_name && gtk_tree_model_get_iter_first (model, &iter))
-		do
-		{
-			gtk_tree_model_iter_nth_child (model, &child_iter, &iter, 0);
-			do
-			{
-				gtk_tree_model_get (model, &child_iter, GSE_COLUMN_SIGNAL, &signal_name, -1);
-				if (signal_name && g_str_equal (signal_name, default_signal_name))
-					found = TRUE;
-				g_free (signal_name);
 			}
-			while (!found && gtk_tree_model_iter_next (model, &child_iter));
 		}
-		while (!found && gtk_tree_model_iter_next (model, &iter));
-
-	g_free (default_signal_name);
-	if (found)
-	{
-		DEBUG_PRINT ("Default signal row found");
-		gtk_tree_selection_select_iter (gtk_tree_view_get_selection (treeview), &child_iter);
-		path = gtk_tree_model_get_path (model, &child_iter);
-		on_signal_row_activated (treeview, path, NULL, plugin);
-		gtk_tree_path_free (path);
-	}
-	else
-	{
-		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                           _("Couldn't find a default signal name"));
+		while (gtk_tree_model_iter_next (model, &iter));
 	}
-}
-
-static gint
-on_glade_designer_widget_event (GladeProject *project, GladeWidget *gwidget,
-                                GdkEvent *event, GladePlugin *glade_plugin)
-{
-	GladeDesignerMode mode;
-
-	g_return_val_if_fail (ANJUTA_IS_PLUGIN_GLADE (glade_plugin), 0);
-	if (event->type != GDK_BUTTON_PRESS && event->type != GDK_2BUTTON_PRESS)
-		return 0;
 
-	if ((((GdkEventButton*)event)->state & GDK_MOD4_MASK) == GDK_MOD4_MASK)
-		mode = GLADE_DESIGNER_PREVIEW;
-	else
-		mode = GLADE_DESIGNER_DESIGN;
-
-	switch (mode)
+	if (files)
 	{
-	case GLADE_DESIGNER_DESIGN:
-		/* will be handled later */
-		return 0;
-
-	case GLADE_DESIGNER_PREVIEW:
-		/* just deliver the signal to widget */
-		return GLADE_WIDGET_EVENT_STOP_EMISSION;
-
-	case GLADE_DESIGNER_DEFAULT:
-		/* cannot handle double-click because of remaining
-		 * problem with composited widgets
-		 */
-		return 0;
-
-	default:
-		return 0;
+		files = g_list_reverse (files);
+		anjuta_session_set_string_list (session, "File Loader", "Files", files);
+		g_list_foreach (files, (GFunc)g_free, NULL);
+		g_list_free (files);
 	}
-}
-
-static gint
-on_glade_designer_widget_event_after (GladeProject *project, GladeWidget *gwidget,
-                                      GdkEvent *event, GladePlugin *glade_plugin)
-{
-	GladeDesignerMode mode;
-
-	g_return_val_if_fail (ANJUTA_IS_PLUGIN_GLADE (glade_plugin), 0);
-	if (event->type != GDK_BUTTON_PRESS && event->type != GDK_2BUTTON_PRESS)
-		return 0;
-
-	if ((((GdkEventButton*)event)->state & GDK_MOD4_MASK) == GDK_MOD4_MASK)
-		mode = GLADE_DESIGNER_PREVIEW;
-	else
-		mode = GLADE_DESIGNER_DESIGN;
-
-	switch (mode)
-	{
-	case GLADE_DESIGNER_DESIGN:
-		/* default handler for ordinary click has been already called */
-		if (event->type == GDK_2BUTTON_PRESS)
-			on_glade_widget_2button_press (project, gwidget,
-			                               event, glade_plugin);
-		/* doesn't allow clicks to reach widgets */
-		return GLADE_WIDGET_EVENT_RETURN_TRUE;
-
-	case GLADE_DESIGNER_PREVIEW:
-		g_assert_not_reached ();
-
-	case GLADE_DESIGNER_DEFAULT:
-		return 0;
-
-	default:
-		return 0;
-	}
-}
-#endif /* GLADE_LAYOUT_WIDGET_EVENTS */
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* * * * * * * *   End of handlers management  * * * * * * * * * * */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-static void
-on_designer_doc_update_save_ui (AnjutaDesignDocument *doc,
-                            GladePlugin *plugin)
-{
-	g_return_if_fail (ANJUTA_IS_DESIGN_DOCUMENT (doc));
-	if (!plugin->priv->separated_designer_layout)
-		return;
-	GladeProject *project;
-	GtkWidget *child;
-	GladeDesignView *view =
-		anjuta_design_document_get_design_view (doc);
-	project = glade_design_view_get_project (view);
-	g_return_if_fail (project);
-	child = gtk_widget_get_parent (GTK_WIDGET (view));
-	g_return_if_fail (child);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (plugin->priv->new_container),
-	                            child,
-	                            gtk_label_new (glade_project_get_name (project)));
+*/
 }
 
 static void
-glade_plugin_add_project (GladePlugin *glade_plugin, GladeProject *project,
-                          const gchar *project_name)
+glade_plugin_add_project (GladePlugin *glade_plugin, GladeProject *project)
 {
-	GtkListStore *store;
-	GtkTreeIter iter;
 	GtkWidget *view;
-	GtkWidget *doc;
 	GladePluginPriv *priv;
-	GladeDesignLayout *layout;
-	IAnjutaDocumentManager* docman =
+	IAnjutaDocumentManager* docman = 
 		anjuta_shell_get_interface(ANJUTA_PLUGIN(glade_plugin)->shell,
 								   IAnjutaDocumentManager, NULL);
-
+	
  	g_return_if_fail (GLADE_IS_PROJECT (project));
+ 	
 	priv = glade_plugin->priv;
-
-	store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->projects_combo)));
-	gtk_list_store_append (store, &iter);
-	gtk_list_store_set (store, &iter,
-	                    NAME_COL, project_name,
-	                    PROJECT_COL, project, -1);
-
- 	view = glade_design_view_new(project);
-
-	if (priv->separated_designer_layout)
-	{
-		GtkContainer *eb = GTK_CONTAINER (gtk_event_box_new());
-		doc = anjuta_design_document_new (glade_plugin,
-		                                  GLADE_DESIGN_VIEW(view),
-		                                  eb);
-		designer_layout_add_doc (ANJUTA_DESIGN_DOCUMENT (doc), eb, glade_plugin, TRUE);
-	}
-	else
-	{
-		doc = anjuta_design_document_new (glade_plugin,
-		                                  GLADE_DESIGN_VIEW(view),
-		                                  NULL);
-		gtk_widget_show_all (doc);
-	}
-
-	g_object_set_data (G_OBJECT(doc), "__project", project);
-	g_signal_connect (G_OBJECT(doc), "destroy",
-	                  G_CALLBACK (on_document_destroy), glade_plugin);
-
-	g_object_set_data (G_OBJECT (project), "design_document", doc);
-
-	ianjuta_document_manager_add_document(docman, IANJUTA_DOCUMENT(doc), NULL);
-
-	g_signal_connect (G_OBJECT (doc), "update-save-ui",
-	                  G_CALLBACK (on_designer_doc_update_save_ui), glade_plugin);
-
-#ifdef GLADE_LAYOUT_WIDGET_EVENTS
-	layout = glade_design_view_get_layout (GLADE_DESIGN_VIEW (view));
-	g_signal_connect (G_OBJECT (layout), "widget-event",
-	                  G_CALLBACK (on_glade_designer_widget_event), glade_plugin);
-	g_signal_connect_after (G_OBJECT (layout), "widget-event",
-	                        G_CALLBACK (on_glade_designer_widget_event_after), glade_plugin);
-#endif
-
-#if 0
-	g_signal_connect (G_OBJECT (project), "resource-added",
-	                  G_CALLBACK (on_glade_resource_added), glade_plugin);
-	g_signal_connect (G_OBJECT (project), "resource-removed",
-	                  G_CALLBACK (on_glade_resource_removed), glade_plugin);
-#endif
-}
-
-static void
-set_default_resource_target (GFile *value, GladePlugin* plugin)
-{
-	g_object_unref (plugin->priv->default_resource_target);
-	if (value == NULL)
-		plugin->priv->default_resource_target = NULL;
-	else
-		plugin->priv->default_resource_target = g_object_ref (value);
-	on_default_resource_target_changed (value, plugin);
-}
-
-static void
-on_set_default_resource_target (GtkAction* action, GladePlugin* plugin)
-{
-	GFile *selected;
-	IAnjutaProjectManager *projman =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-		                            IAnjutaProjectManager, NULL);
-
-	selected = ianjuta_project_manager_get_selected (projman, NULL);
-	set_default_resource_target (selected, plugin);
-	g_object_unref (selected);
-}
-
-#if 0
-static void
-on_glade_verify_project (GtkRadioAction* action, GladePlugin* plugin)
-{
-	GladeProject *project;
-	AnjutaDesignDocument *doc;
-	IAnjutaDocumentManager *docman =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-		                            IAnjutaDocumentManager, NULL);
-
-	doc = find_designer_by_file (docman, plugin->priv->last_designer);
-	project = glade_design_view_get_project (GLADE_DESIGN_VIEW(doc));
-	if (glade_project_verify (project, FALSE))
-	{
-		gchar *name = glade_project_get_name (project);
-		anjuta_util_dialog_info (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                         _("Project %s has no deprecated widgets "
-		                           "or version mismatches."),
-		                         name);
-		g_free (name);
-	}
-}
-#endif
-
-static void
-on_glade_show_version_dialog (GtkAction* action, GladePlugin* plugin)
-{
-	GladeProject *project = glade_app_get_project ();
-	if (project)
-		glade_project_preferences (project);
-	else
-	{
-		anjuta_util_dialog_info (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                         _("There is no Glade project"));
-	}
-}
-
-static void
-glade_plugin_sync_current_doc_with_project (GladePlugin* plugin)
-{
-	IAnjutaDocument *doc;
-	IAnjutaDocumentManager *docman =
-		anjuta_shell_get_interface (ANJUTA_PLUGIN(plugin)->shell,
-		                            IAnjutaDocumentManager, NULL);
-	doc = IANJUTA_DOCUMENT (get_design_document_from_project
-	                        (glade_app_get_project ()));
-	ianjuta_document_manager_set_current_document (docman, doc, NULL);
-}
-
-static void
-on_glade_layout_close (GtkAction* action, GladePlugin* plugin)
-{
-	GtkUIManager *ui;
-	GtkAction *doc_action;
-
-	glade_plugin_sync_current_doc_with_project (plugin);
-	ui = GTK_UI_MANAGER (anjuta_shell_get_ui (ANJUTA_PLUGIN(plugin)->shell, NULL));
-	doc_action = gtk_ui_manager_get_action (ui, "/MenuMain/MenuFile/PlaceholderFileMenus/Close");
-	gtk_action_activate (doc_action);
-}
-
-static void
-on_glade_layout_save (GtkAction* action, GladePlugin* plugin)
-{
-	GtkUIManager *ui;
-	GtkAction *doc_action;
-
-	glade_plugin_sync_current_doc_with_project (plugin);
-	ui = GTK_UI_MANAGER (anjuta_shell_get_ui (ANJUTA_PLUGIN(plugin)->shell, NULL));
-	doc_action = gtk_ui_manager_get_action (ui, "/MenuMain/MenuFile/PlaceholderFileMenus/Save");
-	gtk_action_activate (doc_action);
-}
-
-static void
-on_glade_layout_undo (GtkAction* action, GladePlugin* plugin)
-{
-	g_return_if_fail (glade_app_get_project());
-	glade_app_command_undo ();
-}
-
-static void
-on_glade_layout_redo (GtkAction* action, GladePlugin* plugin)
-{
-	g_return_if_fail (glade_app_get_project());
-	glade_app_command_redo ();
-}
-
-static void
-on_glade_layout_cut (GtkAction* action, GladePlugin* plugin)
-{
-	glade_app_command_cut ();
-}
-
-static void
-on_glade_layout_copy (GtkAction* action, GladePlugin* plugin)
-{
-	glade_app_command_copy ();
-}
-
-static void
-on_glade_layout_paste (GtkAction* action, GladePlugin* plugin)
-{
-	glade_app_command_paste (NULL);
-}
-
-static void
-on_glade_layout_delete (GtkAction* action, GladePlugin* plugin)
-{
-	glade_app_command_delete ();
-}
-
-/* Actions table
- *---------------------------------------------------------------------------*/
-
-static GtkActionEntry actions_glade[] =
-{
-	{
-		"ActionMenuGlade",   /* Action name */
-		NULL,                /* Stock icon, if any */
-		N_("_Glade"),        /* Display label */
-		NULL,                /* short-cut */
-		NULL,                /* Tooltip */
-		NULL                 /* action callback */
-	},
-	{
-		"ActionGladeSwitchDesigner",
-		NULL,
-		N_("Switch between designer/code"),
-		"F12",
-		N_("Switch between designer/code"),
-		G_CALLBACK (on_switch_designer_and_editor)
-	},
-	{
-		"ActionInsertHandlerStub",
-		NULL,
-		N_("Insert handler stub"),
-		NULL,
-		N_("Insert handler stub"),
-		G_CALLBACK (on_insert_handler_stub_manual)
-	},
-	{
-		"ActionInsertAutoHandlerStub",
-		NULL,
-		N_("Insert handler stub, autoposition"),
-		NULL,
-		N_("Insert handler stub, autoposition"),
-		G_CALLBACK (on_insert_handler_stub_auto)
-	},
-	{
-		"ActionAssociateDesignerAndEditor",
-		NULL,
-		N_("Associate last designer and last editor"),
-		NULL,
-		N_("Associate last designer and editor"),
-		G_CALLBACK (on_associate_designer_and_editor)
-	},
-	{
-		"ActionGladeAssociationsDialog",
-		NULL,
-		N_("Associations dialogâ?¦"),
-		NULL,
-		N_("Associations dialogâ?¦"),
-		G_CALLBACK (on_show_associations_dialog)
-	},
-	{
-		"ActionVersionDialog",
-		GTK_STOCK_PROPERTIES,
-		N_("Versioningâ?¦"),
-		NULL,
-		N_("Switch between library versions and check deprecations"),
-		G_CALLBACK (on_glade_show_version_dialog)
-	},
-	{
-		"ActionSetDefaultTarget",
-		NULL,
-		N_("Set as default resource target"),
-		NULL,
-		N_("Set as default resource target"),
-		G_CALLBACK (on_set_default_resource_target)
-	},
-	{
-		"ActionDefaultTarget",
-		NULL,
-		"",
-		NULL,
-		N_("Current default target"),
-		NULL
-	},
-	{
-		"ActionGladeClose",
-		GTK_STOCK_CLOSE,
-		NULL,
-		NULL,
-		N_("Close the current file"),
-		G_CALLBACK (on_glade_layout_close)
-	},
-	{
-		"ActionGladeSave",
-		GTK_STOCK_SAVE,
-		NULL,
-		NULL,
-		N_("Save the current file"),
-		G_CALLBACK (on_glade_layout_save)
-	},
-	{
-		"ActionGladeUndo",
-		GTK_STOCK_UNDO,
-		NULL,
-		NULL,
-		N_("Undo the last action"),
-		G_CALLBACK (on_glade_layout_undo)
-	},
-	{
-		"ActionGladeRedo",
-		GTK_STOCK_REDO,
-		NULL,
-		NULL,
-		N_("Redo the last action"),
-		G_CALLBACK (on_glade_layout_redo)
-	},
-	{
-		"ActionGladeCut",
-		GTK_STOCK_CUT,
-		NULL,
-		NULL,
-		N_("Cut the selection"),
-		G_CALLBACK (on_glade_layout_cut)
-	},
-	{
-		"ActionGladeCopy",
-		GTK_STOCK_COPY,
-		NULL,
-		NULL,
-		N_("Copy the selection"),
-		G_CALLBACK (on_glade_layout_copy)
-	},
-	{
-		"ActionGladePaste",
-		GTK_STOCK_PASTE,
-		NULL,
-		NULL,
-		N_("Paste the clipboard"),
-		G_CALLBACK (on_glade_layout_paste)
-	},
-	{
-		"ActionGladeDelete",
-		GTK_STOCK_DELETE,
-		NULL,
-		NULL,
-		N_("Delete the selection"),
-		G_CALLBACK (on_glade_layout_delete)
-	}
-};
-
-static GtkWidget *
-create_toolbar (GtkUIManager *ui, GladePlugin *plugin)
-{
-	return gtk_ui_manager_get_widget (ui, "/GladeDesignLayoutToolBar");
-}
-
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-
-static void
-on_gse_week_ref (gpointer data, GObject *where_the_object_was)
-{
-	GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (data);
-
-	if (plugin->priv->last_gse == GLADE_SIGNAL_EDITOR (where_the_object_was))
-	{
-		plugin->priv->last_gse = glade_app_get_editor()->signal_editor;
-	}
-}
-
-static void
-on_gse_selection_changed (GtkTreeSelection *treeselection,
-                          gpointer          user_data)
-{
-	gpointer *signal_data = user_data;
-	GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (signal_data[0]);
-	plugin->priv->last_gse = GLADE_SIGNAL_EDITOR (signal_data[1]);
-}
-
-static gboolean
-on_gse_focus_in (GtkWidget     *widget,
-                 GdkEventFocus *event,
-                 gpointer       user_data)
-{
-	gpointer *signal_data = user_data;
-	GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (signal_data[0]);
-	plugin->priv->last_gse = GLADE_SIGNAL_EDITOR (signal_data[1]);
-	return FALSE;
-}
-
-static void
-on_gse_signal_data_free (gpointer data, GClosure *closure)
-{
-	g_slice_free1 (sizeof(gpointer)*2, data);
-}
-
-static void
-on_gse_created (GladeApp *app, GladeSignalEditor *gse, gpointer data)
-{
-	GtkCellRenderer *renderer;
-	GtkTreeModel *completion;
-
-	completion = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
-	renderer = gtk_cell_renderer_combo_new ();
-	g_object_set (G_OBJECT (renderer),
-	             "model", completion,
-	             "text-column", 0,
-	              NULL);
-
-	g_object_set (G_OBJECT (gse), "handler-completion", completion,
-	                              "handler-renderer", renderer,
-	                               NULL);
-}
-
-static void
-on_gse_created_after (GladeApp *app, GladeSignalEditor *gse, gpointer data)
-{
-	GtkTreeView *tree_view;
-	GtkTreeSelection *selection;
-	GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (data);
-	GladePluginPriv *priv = plugin->priv;
-	gpointer *signal_data;
-
-	if (plugin->priv->last_gse == NULL)
-		plugin->priv->last_gse = gse;
-
-	g_signal_connect (G_OBJECT (gse),
-	                 "handler-editing-done",
-	                  G_CALLBACK (on_handler_editing_done),
-	                  plugin);
-	g_signal_connect (G_OBJECT (gse),
-	                 "handler-editing-started",
-	                  G_CALLBACK (on_handler_editing_started),
-	                  plugin);
-	g_signal_connect (G_OBJECT (gse),
-	                 "userdata-editing-started",
-	                  G_CALLBACK (glade_signal_editor_userdata_editing_started_default_impl),
-	                  plugin);
-
-	tree_view = GTK_TREE_VIEW (gse->signals_list);
-	selection = gtk_tree_view_get_selection (tree_view);
-	g_signal_connect (G_OBJECT (tree_view),
-	                 "row-activated",
-	                  G_CALLBACK (on_signal_row_activated),
-	                  plugin);
-	signal_data = g_slice_alloc (sizeof(gpointer)*2);
-	signal_data[0] = plugin;
-	signal_data[1] = gse;
-	g_signal_connect_data (G_OBJECT (selection),
-	                      "changed",
-	                       G_CALLBACK (on_gse_selection_changed),
-	                       signal_data,
-	                       on_gse_signal_data_free,
-	                       0);
-	/* Don't free the "signal_data" twice */
-	g_signal_connect_data (G_OBJECT (tree_view),
-	                      "focus-in-event",
-	                       G_CALLBACK (on_gse_focus_in),
-	                       signal_data,
-	                       NULL,
-	                       0);
-
-	g_object_weak_ref (G_OBJECT (gse), on_gse_week_ref, plugin);
-	priv->gse_list = g_list_prepend (priv->gse_list, gse);
+ 	view = anjuta_design_document_new(glade_plugin, project);
+	g_signal_connect (G_OBJECT(view), "destroy",
+					  G_CALLBACK (on_document_destroy), glade_plugin);
+	gtk_widget_show (view);
+	g_object_set_data (G_OBJECT (project), "design_view", view);
+	ianjuta_document_manager_add_document(docman, IANJUTA_DOCUMENT(view), NULL);
 }
 
 static void
-disconnect_glade_signal_editors (GladePlugin *plugin)
+inspector_item_activated_cb (GladeInspector     *inspector,
+							 AnjutaPlugin       *plugin)
 {
-	GladeSignalEditor *gse;
-	GtkTreeView *tree_view;
-	GtkTreeSelection *selection;
-
-	while (plugin->priv->gse_list)
-	{
-		gse = GLADE_SIGNAL_EDITOR (plugin->priv->gse_list->data);
-		g_object_weak_unref (G_OBJECT (gse), on_gse_week_ref, plugin);
-		plugin->priv->gse_list =
-			g_list_delete_link (plugin->priv->gse_list,
-			                    plugin->priv->gse_list);
-
-		on_gse_week_ref (plugin, G_OBJECT (gse));
-
-		g_signal_handlers_disconnect_by_func (G_OBJECT (gse),
-		                                      G_CALLBACK (on_handler_editing_started), plugin);
-		g_signal_handlers_disconnect_by_func (G_OBJECT (gse),
-		                                      G_CALLBACK (on_handler_editing_done), plugin);
-
-		tree_view = GTK_TREE_VIEW (gse->signals_list);
-		selection = gtk_tree_view_get_selection (tree_view);
-
-		g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view),
-		                                      G_CALLBACK (on_signal_row_activated), plugin);
-		g_signal_handlers_disconnect_by_func (G_OBJECT (selection),
-		                                      G_CALLBACK (on_gse_selection_changed), plugin);
-	}
+	GList *item = glade_inspector_get_selected_items (inspector);
+	g_assert (GLADE_IS_WIDGET (item->data) && (item->next == NULL));
+	
+	/* switch to this widget in the workspace */
+	glade_widget_show (GLADE_WIDGET (item->data));
+	
+	g_list_free (item);
 }
-#endif
 
 static gboolean
 activate_plugin (AnjutaPlugin *plugin)
@@ -4274,42 +390,28 @@ activate_plugin (AnjutaPlugin *plugin)
 	GladePluginPriv *priv;
 	GtkListStore *store;
 	GtkCellRenderer *renderer;
-	GtkAction *action;
-
+	
 	DEBUG_PRINT ("%s", "GladePlugin: Activating Glade pluginâ?¦");
-
+	
 	glade_plugin = ANJUTA_PLUGIN_GLADE (plugin);
-
+	
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	priv = glade_plugin->priv;
-	priv->deactivating = FALSE;
-
-	priv->separated_designer_layout = FALSE;
-
-	priv->dialog_data = g_new0 (AssociationsDialogData, 1);
-
-	/* Add actions */
-	priv->action_group =
-		anjuta_ui_add_action_group_entries (ui,
-			"ActionGroupGlade", _("Glade designer operations"),
-			 actions_glade, G_N_ELEMENTS (actions_glade),
-			 GETTEXT_PACKAGE, TRUE, plugin);
-	priv->uiid = anjuta_ui_merge (ui, UI_FILE);
-
+	
 	register_stock_icons (plugin);
-
+	
 	if (!priv->gpw)
 	{
 		priv->gpw = g_object_new(GLADE_TYPE_APP, NULL);
-
+	
 		glade_app_set_window (GTK_WIDGET (ANJUTA_PLUGIN(plugin)->shell));
 		glade_app_set_transient_parent (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell));
-
+    	
 		/* Create a view for us */
 		priv->view_box = gtk_vbox_new (FALSE, 0);
 		store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING,
 									G_TYPE_POINTER, NULL);
-
+		
 		priv->projects_combo = gtk_combo_box_new ();
 		renderer = gtk_cell_renderer_text_new ();
 		gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->projects_combo),
@@ -4323,40 +425,33 @@ activate_plugin (AnjutaPlugin *plugin)
 							FALSE, FALSE, 0);
 
         priv->inspector = glade_inspector_new ();
-
+        
         g_signal_connect (priv->inspector, "item-activated",
         				  G_CALLBACK (inspector_item_activated_cb),
-        				  plugin);
+        				  plugin);		
 
 		gtk_box_pack_start (GTK_BOX (priv->view_box), GTK_WIDGET (priv->inspector),
 							TRUE, TRUE, 0);
-
+		gtk_box_pack_start (GTK_BOX(priv->view_box), GTK_WIDGET (glade_app_get_editor()),
+		                    TRUE, TRUE, 0);
+		
 		gtk_widget_show_all (priv->view_box);
 		gtk_notebook_set_scrollable (GTK_NOTEBOOK (glade_app_get_editor ()->notebook),
 									 TRUE);
 		gtk_notebook_popup_enable (GTK_NOTEBOOK (glade_app_get_editor ()->notebook));
 	}
-
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-	g_signal_connect       (priv->gpw, "signal-editor-created",
-	                        G_CALLBACK (on_gse_created), glade_plugin);
-	g_signal_connect_after (priv->gpw, "signal-editor-created",
-	                        G_CALLBACK (on_gse_created_after), glade_plugin);
-	glade_editor_set_signal_editor (glade_app_get_editor(),
-	                                glade_signal_editor_new ((gpointer) glade_app_get_editor()));
-#endif
-
+	
 	g_signal_connect(G_OBJECT(plugin->shell), "destroy",
 					 G_CALLBACK(on_shell_destroy), plugin);
-
+	
 	g_signal_connect (G_OBJECT (priv->projects_combo), "changed",
 					  G_CALLBACK (on_glade_project_changed), plugin);
 	g_signal_connect (G_OBJECT (priv->gpw), "update-ui",
 					  G_CALLBACK (glade_update_ui), plugin);
-
+	
 	g_signal_connect(G_OBJECT(glade_app_get_editor()), "gtk-doc-search",
 					 G_CALLBACK(on_api_help), plugin);
-
+	
 	/* FIXME: Glade doesn't want to die these widget, so
 	 * hold a permenent refs on them
 	 */
@@ -4366,58 +461,8 @@ activate_plugin (AnjutaPlugin *plugin)
 
 	gtk_widget_show (GTK_WIDGET (glade_app_get_palette ()));
 	gtk_widget_show (GTK_WIDGET (glade_app_get_editor ()));
-
-	/* Add widgets */
-	priv->designer_layout_box = gtk_event_box_new();
-	gtk_widget_set_events (priv->designer_layout_box,
-	                       gtk_widget_get_events (priv->designer_layout_box) | GDK_ENTER_NOTIFY);
-
-	priv->designer_layout_box_child = gtk_vbox_new (FALSE, 2);
-	priv->new_container = gtk_notebook_new();
-	gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->new_container),
-	                             TRUE);
-
-	priv->designer_toolbar = create_toolbar (GTK_UI_MANAGER (ui), glade_plugin);
-	gtk_box_pack_start (GTK_BOX (priv->designer_layout_box_child),
-	                    priv->designer_toolbar, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (priv->designer_layout_box_child),
-	                    priv->new_container, TRUE, TRUE, 0);
-	gtk_container_add (GTK_CONTAINER (priv->designer_layout_box),
-	                   priv->designer_layout_box_child);
-	gtk_widget_show_all (priv->designer_layout_box);
-
-	priv->button_undo = gtk_menu_tool_button_new_from_stock (GTK_STOCK_UNDO);
-	priv->button_redo = gtk_menu_tool_button_new_from_stock (GTK_STOCK_REDO);
-	gtk_widget_show (GTK_WIDGET (priv->button_undo));
-	gtk_widget_show (GTK_WIDGET (priv->button_redo));
-	gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (priv->button_undo),
-	                                             _("Go back in undo history"));
-	gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (priv->button_redo),
-	                                             _("Go forward in undo history"));
-	/* FIXME: hardcoded buttons position */
-	gtk_toolbar_insert (GTK_TOOLBAR (priv->designer_toolbar), GTK_TOOL_ITEM (priv->button_undo), 6);
-	gtk_toolbar_insert (GTK_TOOLBAR (priv->designer_toolbar), GTK_TOOL_ITEM (priv->button_redo), 7);
-
-	action = gtk_action_group_get_action (priv->action_group, "ActionGladeUndo");
-#if GTK_MINOR_VERSION < 16
-	gtk_action_connect_proxy (action, GTK_WIDGET (priv->button_undo));
-#else
-	gtk_activatable_set_related_action (GTK_ACTIVATABLE (priv->button_undo), action);
-#endif
-
-	action = gtk_action_group_get_action (priv->action_group, "ActionGladeRedo");
-#if GTK_MINOR_VERSION < 16
-	gtk_action_connect_proxy (action, GTK_WIDGET (priv->button_redo));
-#else
-	gtk_activatable_set_related_action (GTK_ACTIVATABLE (priv->button_redo), action);
-#endif
 	
-	if (!GTK_IS_WINDOW (glade_app_get_clipboard_view()))
-		anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell,
-								 GTK_WIDGET (glade_app_get_clipboard_view()),
-								 "AnjutaGladeClipboard", _("Glade Clipboard"),
-								 "glade-plugin-icon",
-								 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
+	/* Add widgets */
 	anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell,
 							 GTK_WIDGET (priv->view_box),
 							 "AnjutaGladeTree", _("Widgets"),
@@ -4428,185 +473,61 @@ activate_plugin (AnjutaPlugin *plugin)
 							 "AnjutaGladePalette", _("Palette"),
 							 "glade-plugin-icon",
 							 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
-	anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell,
-							 GTK_WIDGET (glade_app_get_editor ()),
-							 "AnjutaGladeEditor", _("Properties"),
-							 "glade-plugin-icon",
-							 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
-
-	priv->project_watch_id =
-		anjuta_plugin_add_watch (plugin, IANJUTA_PROJECT_MANAGER_PROJECT_ROOT_URI,
-		                         value_added_project_root_uri,
-		                         value_removed_project_root_uri, NULL);
-	/* nonzero default value */
-	glade_plugin->priv->insert_handler_on_edit = TRUE;
-	glade_plugin->priv->auto_add_resource = TRUE;
-
-#ifndef GLADE_SIGNAL_EDITOR_EXT
-	priv->last_gse = glade_app_get_editor()->signal_editor;
-	g_signal_connect (G_OBJECT (GTK_TREE_VIEW (priv->last_gse->signals_list)),
-	                 "row-activated",
-	                  G_CALLBACK (on_signal_row_activated),
-	                  plugin);
-#endif
-
-	/* Load associations and preferences */
-	glade_plugin_load_associations (glade_plugin);
-
 	/* Connect to save session */
 	g_signal_connect (G_OBJECT (plugin->shell), "save_session",
 					  G_CALLBACK (on_session_save), plugin);
-	g_signal_connect (G_OBJECT (plugin->shell), "load_session",
-					  G_CALLBACK (on_session_load), plugin);
-
-	priv->pm_current_uri_watch_id =
-		anjuta_plugin_add_watch (plugin, IANJUTA_PROJECT_MANAGER_CURRENT_URI,
-		                         value_added_pm_current_uri,
-		                         value_removed_pm_current_uri, NULL);
-	value_removed_pm_current_uri (plugin, NULL, NULL);
+	
 	/* Watch documents */
-	glade_plugin->priv->editor_watch_id =
+	glade_plugin->priv->editor_watch_id = 
 		anjuta_plugin_add_watch (plugin, IANJUTA_DOCUMENT_MANAGER_CURRENT_DOCUMENT,
 								 value_added_current_editor,
 								 value_removed_current_editor, NULL);
-
+	
 	return TRUE;
 }
 
-static void
-glade_close_all (AnjutaPlugin *plugin)
-{
-	GList *docwids, *node;
-	IAnjutaDocumentManager *docman;
-
-	docman = anjuta_shell_get_interface (plugin->shell,
-	                                     IAnjutaDocumentManager, NULL);
-	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
-	if (docwids)
-	{
-		DEBUG_PRINT ("Closing all designer documents");
-		for (node = docwids; node != NULL; node = g_list_next (node))
-		{
-			if (ANJUTA_IS_DESIGN_DOCUMENT (node->data))
-			{
-				ianjuta_document_manager_remove_document (docman,
-				                                          IANJUTA_DOCUMENT(node->data),
-				                                          FALSE, NULL);
-			}
-		}
-		g_list_free (docwids);
-	}
-	else
-		DEBUG_PRINT ("No designer documents opened");
-}
-
 static gboolean
 deactivate_plugin (AnjutaPlugin *plugin)
 {
 	GladePluginPriv *priv;
-	AnjutaUI *ui;
-	GladePlugin *glade_plugin;
-
-	glade_plugin =  ANJUTA_PLUGIN_GLADE (plugin);
-	priv = glade_plugin->priv;
-	if (priv->deactivating)
-		return TRUE;
-	priv->deactivating = TRUE;
-
+	
+	priv = ANJUTA_PLUGIN_GLADE (plugin)->priv;
+		
 	DEBUG_PRINT ("%s", "GladePlugin: Dectivating Glade pluginâ?¦");
-
-	anjuta_plugin_remove_watch (plugin, priv->editor_watch_id, FALSE);
-	anjuta_plugin_remove_watch (plugin, priv->pm_current_uri_watch_id, FALSE);
-	priv->editor_watch_id = 0;
-	priv->pm_current_uri_watch_id = 0;
-
+	
 	/* Disconnect signals */
 	g_signal_handlers_disconnect_by_func (G_OBJECT (plugin->shell),
 										  G_CALLBACK (on_shell_destroy),
 										  plugin);
-
+	
 	g_signal_handlers_disconnect_by_func (G_OBJECT (plugin->shell),
 										  G_CALLBACK (on_session_save), plugin);
-	g_signal_handlers_disconnect_by_func (G_OBJECT (plugin->shell),
-	                                      G_CALLBACK (on_session_load), plugin);
-
+	
 	g_signal_handlers_disconnect_by_func (G_OBJECT (priv->projects_combo),
 										  G_CALLBACK (on_glade_project_changed),
 										  plugin);
 	g_signal_handlers_disconnect_by_func (G_OBJECT (priv->gpw),
 										  G_CALLBACK (glade_update_ui),
 										  plugin);
-
+	
 	g_signal_handlers_disconnect_by_func (G_OBJECT(glade_app_get_editor()),
 										  G_CALLBACK(on_api_help), plugin);
-#ifdef GLADE_SIGNAL_EDITOR_EXT
-	disconnect_glade_signal_editors (glade_plugin);
-#else
-	g_signal_handlers_disconnect_by_func (G_OBJECT(GTK_TREE_VIEW(priv->last_gse->signals_list)),
-	                                      G_CALLBACK (on_signal_row_activated), plugin);
-#endif
 
 	/* Remove widgets */
-	if (glade_plugin->priv->separated_designer_layout)
-	{
-		anjuta_shell_remove_widget (plugin->shell,
-		                            priv->designer_layout_box,
-		                            NULL);
-	}
-	if (!GTK_IS_WINDOW (glade_app_get_clipboard_view()))
-		anjuta_shell_remove_widget (plugin->shell,
-		                            GTK_WIDGET (glade_app_get_clipboard_view()),
-		                            NULL);
 	anjuta_shell_remove_widget (plugin->shell,
 								GTK_WIDGET (glade_app_get_palette ()),
 								NULL);
 	anjuta_shell_remove_widget (plugin->shell,
-								GTK_WIDGET (glade_app_get_editor ()),
-								NULL);
-	anjuta_shell_remove_widget (plugin->shell,
 								GTK_WIDGET (priv->view_box),
 								NULL);
 	/* FIXME: Don't destroy glade, since it doesn't want to */
 	/* g_object_unref (G_OBJECT (priv->gpw)); */
 	/* priv->gpw = NULL */
-
-	glade_close_all (plugin);
-
-	/* Save associations */
-	glade_plugin_save_associations (glade_plugin);
-
-	anjuta_plugin_remove_watch (plugin, priv->project_watch_id, TRUE);
-	priv->project_watch_id = 0;
-
-	ui = anjuta_shell_get_ui (plugin->shell, NULL);
-	anjuta_ui_unmerge (ui, priv->uiid);
-	anjuta_ui_remove_action_group (ui, priv->action_group);
+	
 	priv->uiid = 0;
 	priv->action_group = NULL;
-
-	forget_last_signal (glade_plugin);
-	if (priv->last_designer)
-	{
-		g_object_unref (priv->last_designer);
-		priv->last_designer = NULL;
-	}
-	if (priv->last_editor)
-	{
-		g_object_unref (priv->last_editor);
-		priv->last_editor = NULL;
-	}
-	g_object_unref (priv->default_resource_target);
-	priv->default_resource_target = NULL;
-
-	if (priv->xml)
-	{
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
-	}
-
-	g_free (priv->dialog_data);
-	priv->dialog_data = NULL;
-
+	priv->gpw = NULL;
+	
 	return TRUE;
 }
 
@@ -4614,7 +535,7 @@ static void
 glade_plugin_dispose (GObject *obj)
 {
 	/* GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (obj); */
-
+	
 	/* FIXME: Glade widgets should be destroyed */
 	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
@@ -4632,16 +553,16 @@ glade_plugin_instance_init (GObject *obj)
 {
 	GladePluginPriv *priv;
 	GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (obj);
-
+	
 	plugin->priv = (GladePluginPriv *) g_new0 (GladePluginPriv, 1);
 	priv = plugin->priv;
 	priv->destroying = FALSE;
-
+	
 	DEBUG_PRINT ("%s", "Intializing Glade plugin");
 }
 
 static void
-glade_plugin_class_init (GObjectClass *klass)
+glade_plugin_class_init (GObjectClass *klass) 
 {
 	AnjutaPluginClass *plugin_class = ANJUTA_PLUGIN_CLASS (klass);
 
@@ -4663,17 +584,17 @@ ifile_open (IAnjutaFile *ifile, GFile* file, GError **err)
 {
 	GladePluginPriv *priv;
 	GladeProject *project;
+	GtkListStore *store;
+	GtkTreeIter iter;
 	gchar *filename;
 	IAnjutaDocumentManager* docman;
+	GList* docwids, *node;
 	GList *glade_obj_node;
-	const gchar *project_name;
-	AnjutaDesignDocument *doc;
-	GladePlugin* plugin = ANJUTA_PLUGIN_GLADE (ifile);
-
+	
 	g_return_if_fail (file != NULL);
-
-	priv = plugin->priv;
-
+	
+	priv = ANJUTA_PLUGIN_GLADE (ifile)->priv;
+	
 	filename = g_file_get_path (file);
 	if (!filename)
 	{
@@ -4681,19 +602,36 @@ ifile_open (IAnjutaFile *ifile, GFile* file, GError **err)
 		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN (ifile)->shell),
 								    _("Not local file: %s"), uri);
 		g_free (uri);
-		check_deactivation(plugin);
+		return;
 	}
-
+	
 	docman = anjuta_shell_get_interface(ANJUTA_PLUGIN(ifile)->shell, IAnjutaDocumentManager,
 										NULL);
-	doc = find_designer_by_file (docman, file);
-	if (doc)
+	docwids = ianjuta_document_manager_get_doc_widgets (docman, NULL);
+	if (docwids)
 	{
-		project = get_project_from_design_document (doc);
-		glade_app_set_project (project);
-		check_deactivation(plugin);
+		for (node = docwids; node != NULL; node = g_list_next (node))
+		{
+			if (ANJUTA_IS_DESIGN_DOCUMENT (node->data))
+			{
+				GFile* cur_file;
+				cur_file = ianjuta_file_get_file (IANJUTA_FILE (node->data), NULL);
+				if (cur_file)
+				{
+					if (g_file_equal (file, cur_file))
+					{
+						ianjuta_document_manager_set_current_document (docman,
+							IANJUTA_DOCUMENT (node->data), NULL);
+						g_object_unref (file);
+						return;
+					}
+					g_object_unref (file);
+				}
+			}
+		}
+		g_list_free (docwids);
 	}
-
+	
 	project = glade_project_load (filename);
 	g_free (filename);
 	if (!project)
@@ -4702,11 +640,13 @@ ifile_open (IAnjutaFile *ifile, GFile* file, GError **err)
 		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN (ifile)->shell),
 								    _("Could not open %s"), name);
 		g_free (name);
-		check_deactivation(plugin);
+		return;
 	}
-	project_name = glade_project_get_name(project);
-
-	glade_plugin_add_project (ANJUTA_PLUGIN_GLADE (ifile), project, project_name);
+	store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->projects_combo)));
+	gtk_list_store_append (store, &iter);
+	gtk_list_store_set (store, &iter, NAME_COL, glade_project_get_name(project),
+						PROJECT_COL, project, -1);
+	glade_plugin_add_project (ANJUTA_PLUGIN_GLADE (ifile), project);
 
 	/* Select the first window in the project */
 	for (glade_obj_node = (GList *) glade_project_get_objects (project);
@@ -4715,9 +655,7 @@ ifile_open (IAnjutaFile *ifile, GFile* file, GError **err)
 	{
 		GObject *glade_obj = G_OBJECT (glade_obj_node->data);
 		if (GTK_IS_WINDOW (glade_obj))
-		{
 			glade_widget_show (glade_widget_get_from_gobject (glade_obj));
-		}
 		break;
 	}
 	anjuta_shell_present_widget (ANJUTA_PLUGIN (ifile)->shell, priv->view_box, NULL);
@@ -4743,8 +681,9 @@ iwizard_activate (IAnjutaWizard *iwizard, GError **err)
 {
 	GladePluginPriv *priv;
 	GladeProject *project;
-	const gchar *project_name;
-
+	GtkListStore *store;
+	GtkTreeIter iter;
+	
 	priv = ANJUTA_PLUGIN_GLADE (iwizard)->priv;
 
 	project = glade_project_new ();
@@ -4754,8 +693,11 @@ iwizard_activate (IAnjutaWizard *iwizard, GError **err)
 								    _("Could not create a new glade project."));
 		return;
 	}
-	project_name = glade_project_get_name(project);
-	glade_plugin_add_project (ANJUTA_PLUGIN_GLADE (iwizard), project, project_name);
+	store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->projects_combo)));
+	gtk_list_store_append (store, &iter);
+	gtk_list_store_set (store, &iter, NAME_COL, glade_project_get_name(project),
+ 						PROJECT_COL, project, -1);
+	glade_plugin_add_project (ANJUTA_PLUGIN_GLADE (iwizard), project);
 	anjuta_shell_present_widget (ANJUTA_PLUGIN (iwizard)->shell,
 				     GTK_WIDGET (glade_app_get_palette ()), NULL);
 }
@@ -4766,301 +708,9 @@ iwizard_iface_init(IAnjutaWizardIface *iface)
 	iface->activate = iwizard_activate;
 }
 
-gboolean
-on_preferences_default_resource_entry_focus_out (GtkWidget *widget,
-                                                 GdkEventFocus *event,
-                                                 GladePlugin *plugin);
-void
-on_preferences_default_resource_entry_activate (GtkEntry *entry, GladePlugin *plugin);
-void
-on_set_default_data_signal_template0 (GtkToggleButton *button,
-                                      GladePlugin* plugin);
-void
-on_set_default_data_signal_template1 (GtkToggleButton *button,
-                                      GladePlugin* plugin);
-void
-on_insert_handler_on_edit_toggled (GtkToggleButton *button,
-                                   GladePlugin* plugin);
-void
-on_auto_add_resource_toggled (GtkToggleButton *button,
-                                GladePlugin* plugin);
-void
-on_separated_designer_layout_toggled (GtkToggleButton *button,
-                                      GladePlugin* plugin);
-
-void
-on_set_default_data_signal_template0 (GtkToggleButton *button,
-                                      GladePlugin* plugin)
-{
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON(button));
-	if (!plugin->priv->prefs)
-		return;
-
-	if (gtk_toggle_button_get_active (button))
-		plugin->priv->default_handler_template = 0;
-}
-
-void
-on_set_default_data_signal_template1 (GtkToggleButton *button,
-                                      GladePlugin* plugin)
-{
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON(button));
-	if (!plugin->priv->prefs)
-		return;
-
-	if (gtk_toggle_button_get_active (button))
-		plugin->priv->default_handler_template = 1;
-}
-
-void
-on_insert_handler_on_edit_toggled (GtkToggleButton *button,
-                                   GladePlugin* plugin)
-{
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON(button));
-	if (!plugin->priv->prefs)
-		return;
-
-	plugin->priv->insert_handler_on_edit =
-		gtk_toggle_button_get_active (button);
-}
-
-void
-on_auto_add_resource_toggled (GtkToggleButton *button,
-                                GladePlugin* plugin)
-{
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON(button));
-	if (!plugin->priv->prefs)
-		return;
-
-	plugin->priv->auto_add_resource =
-		gtk_toggle_button_get_active (button);
-}
-
-void
-on_separated_designer_layout_toggled (GtkToggleButton *button,
-                                      GladePlugin* plugin)
-{
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON(button));
-	if (!plugin->priv->prefs)
-		return;
-
-	update_separated_designer_layout (gtk_toggle_button_get_active (button),
-	                                  plugin);
-}
-
-static void
-on_insert_handler_on_edit_changed (GladePlugin* plugin)
-{
-	GtkToggleButton *button;
-
-	if (!plugin->priv->prefs)
-		return;
-	g_return_if_fail (plugin->priv->xml);
-
-	button = GTK_TOGGLE_BUTTON(gtk_builder_get_object (plugin->priv->xml,
-	                                                   INSERT_HANDLER_ON_EDIT_NAME));
-	gtk_toggle_button_set_active (button, plugin->priv->insert_handler_on_edit);
-}
-
-static void
-on_auto_add_resource_changed (GladePlugin* plugin)
-{
-	GtkToggleButton *button;
-
-	if (!plugin->priv->prefs)
-		return;
-	g_return_if_fail (plugin->priv->xml);
-
-	button = GTK_TOGGLE_BUTTON(gtk_builder_get_object (plugin->priv->xml,
-	                                                   AUTO_ADD_RESOURCE_NAME));
-	gtk_toggle_button_set_active (button, plugin->priv->auto_add_resource);
-}
-
-static void
-on_default_handler_template_changed (GladePlugin* plugin)
-{
-	GtkToggleButton *button = NULL;
-
-	if (!plugin->priv->prefs)
-		return;
-	g_return_if_fail (plugin->priv->xml);
-
-	switch (plugin->priv->default_handler_template)
-	{
-	case 0:
-		button = GTK_TOGGLE_BUTTON(gtk_builder_get_object (plugin->priv->xml,
-		                                                   HANDLER_TEMPLATE_BUTTON0_NAME));
-		break;
-	case 1:
-		button = GTK_TOGGLE_BUTTON(gtk_builder_get_object (plugin->priv->xml,
-		                                                   HANDLER_TEMPLATE_BUTTON1_NAME));
-		break;
-	}
-	if (button)
-		gtk_toggle_button_set_active (button, TRUE);
-}
-
-static void
-on_separated_designer_layout_changed (GladePlugin *plugin)
-{
-	GtkToggleButton *button;
-
-	if (!plugin->priv->prefs)
-		return;
-	g_return_if_fail (plugin->priv->xml);
-
-	button = GTK_TOGGLE_BUTTON(gtk_builder_get_object (plugin->priv->xml,
-	                                                   SEPARATED_DESIGNER_LAYOUT_NAME));
-	gtk_toggle_button_set_active (button, plugin->priv->separated_designer_layout);
-}
-
-static void
-update_prefs_page (GladePlugin *plugin)
-{
-	on_insert_handler_on_edit_changed (plugin);
-	on_auto_add_resource_changed (plugin);
-	on_default_handler_template_changed (plugin);
-	on_separated_designer_layout_changed (plugin);
-}
-
-static void
-remove_widget_from_parent (GtkWidget *parent, GtkWidget *widget)
-{
-	g_return_if_fail (parent);
-
-	if (GTK_IS_NOTEBOOK (parent))
-	{
-		gint page_num;
-
-		page_num = gtk_notebook_page_num (GTK_NOTEBOOK (parent), widget);
-		gtk_notebook_remove_page (GTK_NOTEBOOK (parent), page_num);
-	}
-	else
-	{
-		gtk_container_remove (GTK_CONTAINER (parent), widget);
-	}
-}
-
-static void
-glade_plugin_preferences_add_page (AnjutaPreferences* pr, GtkWidget *page,
-                                   const gchar* page_widget_name,
-                                   const gchar* title,
-                                   const gchar *icon_filename)
-{
-	GtkWidget *parent;
-	GdkPixbuf *pixbuf;
-
-	g_return_if_fail (ANJUTA_IS_PREFERENCES (pr));
-	g_return_if_fail (page_widget_name != NULL);
-	g_return_if_fail (icon_filename != NULL);
-
-	g_object_ref (page);
-	parent = gtk_widget_get_parent (page);
-	if (parent && GTK_IS_CONTAINER (parent))
-		remove_widget_from_parent (parent, page);
-	pixbuf = gdk_pixbuf_new_from_file (icon_filename, NULL);
-	anjuta_preferences_dialog_add_page (ANJUTA_PREFERENCES_DIALOG(anjuta_preferences_get_dialog (pr)),
-	                                    page_widget_name, title, pixbuf, page);
-	g_object_unref (page);
-	g_object_unref (pixbuf);
-}
-
-gboolean
-on_preferences_default_resource_entry_focus_out (GtkWidget *entry,
-                                                 GdkEventFocus *event,
-                                                 GladePlugin *plugin)
-{
-	const gchar *value;
-	GFile *file;
-
-	g_return_val_if_fail (plugin->priv->prefs, FALSE);
-	value = gtk_entry_get_text (GTK_ENTRY(entry));
-	file = g_file_new_for_commandline_arg (value);
-	set_default_resource_target (file, plugin);
-	g_object_unref (file);
-
-	return FALSE;
-}
-
-void
-on_preferences_default_resource_entry_activate (GtkEntry *entry, GladePlugin *plugin)
-{
-	const gchar *value;
-	GFile *file;
-
-	g_return_if_fail (plugin->priv->prefs);
-
-	value = gtk_entry_get_text (entry);
-	file = g_file_new_for_commandline_arg (value);
-	set_default_resource_target (file, plugin);
-	g_object_unref (file);
-}
-
-static void
-on_default_resource_target_changed (GFile *file, GladePlugin *plugin)
-{
-	GtkEntry *entry;
-	gchar *value;
-
-	if (!plugin->priv->prefs)
-		return;
-
-	entry = GTK_ENTRY(gtk_builder_get_object (plugin->priv->xml,
-	                                          DEFAULT_RESOURCE_ENTRY_NAME));
-	value = g_file_get_path (file);
-	gtk_entry_set_text (entry, value != NULL ? value : "");
-	g_free (value);
-}
-
-static void
-ipreferences_merge (IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
-{
-	GladePlugin* plugin = ANJUTA_PLUGIN_GLADE (ipref);
-	GtkWidget *page;
-
-	g_return_if_fail (glade_plugin_get_glade_xml (plugin));
-	plugin->priv->prefs = page =
-		GTK_WIDGET (gtk_builder_get_object (plugin->priv->xml, PREFERENCES_PAGE_NAME));
-	glade_plugin_preferences_add_page (prefs, page, "Glade",
-	                                   _("Glade GUI Designer"),
-	                                   PACKAGE_PIXMAPS_DIR"/"ICON_FILE);
-	gtk_widget_show_all (page);
-	g_object_ref (page);
-
-	on_default_handler_template_changed (plugin);
-	on_insert_handler_on_edit_changed (plugin);
-	on_auto_add_resource_changed (plugin);
-	on_default_resource_target_changed (plugin->priv->default_resource_target, plugin);
-	on_separated_designer_layout_changed (plugin);
-}
-
-static void
-ipreferences_unmerge (IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
-{
-	GtkWidget *page;
-	GladePlugin* plugin = ANJUTA_PLUGIN_GLADE (ipref);
-
-	g_return_if_fail (plugin->priv->prefs);
-	page = plugin->priv->prefs;
-	/* Stops watching for preferences */
-	plugin->priv->prefs = NULL;
-
-	remove_widget_from_parent (gtk_widget_get_parent (page), page);
-
-	anjuta_preferences_remove_page(prefs, _("Glade GUI Designer"));
-}
-
-static void
-ipreferences_iface_init(IAnjutaPreferencesIface* iface)
-{
-	iface->merge = ipreferences_merge;
-	iface->unmerge = ipreferences_unmerge;
-}
-
 ANJUTA_PLUGIN_BEGIN (GladePlugin, glade_plugin);
 ANJUTA_PLUGIN_ADD_INTERFACE (ifile, IANJUTA_TYPE_FILE);
 ANJUTA_PLUGIN_ADD_INTERFACE (iwizard, IANJUTA_TYPE_WIZARD);
-ANJUTA_PLUGIN_ADD_INTERFACE (ipreferences, IANJUTA_TYPE_PREFERENCES);
 ANJUTA_PLUGIN_END;
 
 ANJUTA_SIMPLE_PLUGIN (GladePlugin, glade_plugin);
diff --git a/plugins/glade/plugin.h b/plugins/glade/plugin.h
index 98df0fa..f446f08 100644
--- a/plugins/glade/plugin.h
+++ b/plugins/glade/plugin.h
@@ -28,7 +28,6 @@
 #include <gladeui/glade.h>
 #include <gladeui/glade-design-view.h>
 
-extern GType glade_plugin_get_type (GTypeModule *module);
 #define ANJUTA_TYPE_PLUGIN_GLADE         (glade_plugin_get_type (NULL))
 #define ANJUTA_PLUGIN_GLADE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), ANJUTA_TYPE_PLUGIN_GLADE, GladePlugin))
 #define ANJUTA_PLUGIN_GLADE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), ANJUTA_TYPE_PLUGIN_GLADE, GladePluginClass))
@@ -56,37 +55,11 @@ void on_undo_activated (GtkAction *action, GladePlugin *plugin);
 void on_redo_activated (GtkAction *action, GladePlugin *plugin);
 void on_delete_activated (GtkAction *action, GladePlugin *plugin);
 
+extern GType glade_plugin_get_type (GTypeModule *module);
+
 gboolean glade_can_undo(GladePlugin *plugin);
 gboolean glade_can_redo(GladePlugin *plugin);
 
 gchar* glade_get_filename(GladePlugin *plugin);
 
-/* GLADE_SIGNAL_EDITOR_EXT means extensible glade signal editor
- * GLADE_LAYOUT_WIDGET_EVENTS means availability of GladeDesignLayout signal for widget events
- */
-
-#define GLADE_LAYOUT_WIDGET_EVENTS 1
-#define GLADE_SIGNAL_EDITOR_EXT 1
-
-#ifndef GLADE_SIGNAL_EDITOR_EXT
-enum
-{
-	GSE_COLUMN_SIGNAL,
-	GSE_COLUMN_HANDLER,
-	GSE_COLUMN_AFTER,
-	GSE_COLUMN_USERDATA,
-	GSE_COLUMN_LOOKUP,
-
-	GSE_COLUMN_USERDATA_SLOT,
-	GSE_COLUMN_LOOKUP_VISIBLE,
-	GSE_COLUMN_AFTER_VISIBLE,
-	GSE_COLUMN_HANDLER_EDITABLE,
-	GSE_COLUMN_USERDATA_EDITABLE,
-	GSE_COLUMN_SLOT,
-	GSE_COLUMN_BOLD,
-	GSE_NUM_COLUMNS
-};
-#endif
-
-
 #endif
diff --git a/plugins/gtodo/Makefile.am b/plugins/gtodo/Makefile.am
index 9cf801d..41b0349 100644
--- a/plugins/gtodo/Makefile.am
+++ b/plugins/gtodo/Makefile.am
@@ -12,6 +12,7 @@ gtodo_pixmapsdir = $(anjuta_image_dir)
 gtodo_pixmaps_DATA = \
 	anjuta-gtodo-plugin.svg \
 	anjuta-gtodo-plugin-48.png \
+	anjuta-gtodo-plugin-16.png \
 	gtodo-about.png \
 	gtodo-edit.png
 
diff --git a/plugins/gtodo/preferences.c b/plugins/gtodo/preferences.c
index 24d71e6..325da48 100644
--- a/plugins/gtodo/preferences.c
+++ b/plugins/gtodo/preferences.c
@@ -383,6 +383,24 @@ static void  pref_gconf_changed_hl_indays(GConfClient *client)
 	category_changed();
 }
 
+static void  pref_gconf_changed_hide_due(GConfClient *client)
+{
+	settings.hide_due = gconf_client_get_bool(client,"/apps/gtodo/prefs/hide-due",NULL);
+	category_changed();
+}
+
+static void  pref_gconf_changed_hide_done(GConfClient *client)
+{
+	settings.hide_done = gconf_client_get_bool(client,"/apps/gtodo/prefs/hide-done",NULL);
+	category_changed();
+}
+
+static void  pref_gconf_changed_hide_nodate(GConfClient *client)
+{
+	settings.hide_nodate = gconf_client_get_bool(client,"/apps/gtodo/prefs/hide-nodate",NULL);
+	category_changed();
+}
+
 void pref_gconf_set_notifications(GConfClient *client)
 {
 	gconf_client_notify_add(client, "/apps/gtodo/prefs/restore-size",
@@ -433,6 +451,19 @@ void pref_gconf_set_notifications(GConfClient *client)
 	gconf_client_notify_add(client,"/apps/gtodo/prefs/hl-indays",
 			(GConfClientNotifyFunc) pref_gconf_changed_hl_indays,
 			NULL,
+			NULL, NULL);
+	
+	gconf_client_notify_add(client,"/apps/gtodo/prefs/hide-done",
+			(GConfClientNotifyFunc) pref_gconf_changed_hide_done,
+			NULL,
 			NULL, NULL);	
 
+	gconf_client_notify_add(client,"/apps/gtodo/prefs/hide-due",
+			(GConfClientNotifyFunc) pref_gconf_changed_hide_due,
+			NULL,
+			NULL, NULL);	
+	gconf_client_notify_add(client,"/apps/gtodo/prefs/hide-nodate",
+			(GConfClientNotifyFunc) pref_gconf_changed_hide_nodate,
+			NULL,
+			NULL, NULL);
 }
diff --git a/plugins/js-debugger/Makefile.am b/plugins/js-debugger/Makefile.am
index 4e61a0e..66f3d37 100644
--- a/plugins/js-debugger/Makefile.am
+++ b/plugins/js-debugger/Makefile.am
@@ -19,7 +19,7 @@ js_debugger_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 # Include paths
 AM_CPPFLAGS = \
-	-Werror \
+	$(WARN_CFLAGS) \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" \
 	-DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" \
@@ -38,6 +38,8 @@ plugin_LTLIBRARIES = libjs_debugger.la
 # Plugin sources
 libjs_debugger_la_SOURCES = debugger-js.c debugger-js.h debugger-server.c debugger-server.h plugin.c plugin.h
 
+libjs_debugger_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
+
 # Plugin dependencies
 libjs_debugger_la_LIBADD = \
 	$(LIBANJUTA_LIBS) 
diff --git a/plugins/language-support-cpp-java/Makefile.am b/plugins/language-support-cpp-java/Makefile.am
index 98c06b5..16cdc72 100644
--- a/plugins/language-support-cpp-java/Makefile.am
+++ b/plugins/language-support-cpp-java/Makefile.am
@@ -55,11 +55,13 @@ libanjuta_language_cpp_java_la_SOURCES = \
 
 libanjuta_language_cpp_java_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
+# Use C++ linking
+nodist_EXTRA_libanjuta_language_cpp_java_la_SOURCES = dummy.cxx
+
 # Plugin dependencies
 libanjuta_language_cpp_java_la_LIBADD = \
 	$(LIBANJUTA_LIBS) \
-	cxxparser/libcxxparser.la \
-	-lstdc++
+	cxxparser/libcxxparser.la
 	
 prefs_ui_files = anjuta-language-cpp-java.ui
 include $(top_srcdir)/scripts/build-schemas.mk
diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
index 4b5c190..7dc6b4a 100644
--- a/plugins/language-support-cpp-java/cpp-java-assist.c
+++ b/plugins/language-support-cpp-java/cpp-java-assist.c
@@ -309,6 +309,12 @@ cpp_java_assist_is_expression_separator (gchar c, gboolean skip_braces, IAnjutaI
 {
 	IAnjutaEditorAttribute attrib = ianjuta_editor_cell_get_attribute (IANJUTA_EDITOR_CELL(iter),
 	                                                                   NULL);
+	int i;
+	const gchar separators[] = {',', ';', '\n', '\r', '\t', '(',
+	                          '{', '}', '=', '<', '\v', '!',
+	                          '&', '%', '*', '[', ']', '?', '/',
+	                          '+', 0};
+	
 	if (attrib == IANJUTA_EDITOR_STRING ||
 	    attrib == IANJUTA_EDITOR_COMMENT)
 	{
@@ -323,10 +329,10 @@ cpp_java_assist_is_expression_separator (gchar c, gboolean skip_braces, IAnjutaI
 	else if (c == ')' && !skip_braces)
 		return FALSE;
 	
-	if (c == ',' || c == ';' || c == '\n' || c == '\r' || c == '\t' || c == '(' ||
-	    c == '{' || c == '}' || c == '=' || c == '<' || c == '\v' || c == '!')
+	for (i = 0; separators[i] != 0; i++)
 	{
-		return TRUE;
+		if (separators[i] == c)
+			return TRUE;
 	}	
 
 	return FALSE;
@@ -349,7 +355,7 @@ cpp_java_assist_parse_expression (CppJavaAssist* assist, IAnjutaIterable* iter,
 	gboolean op_start = FALSE;
 	gboolean ref_start = FALSE;
 	gchar* stmt = NULL;
-
+	
 	/* Cursor points after the current characters, move back */
 	ianjuta_iterable_previous (cur_pos, NULL);
 	
diff --git a/plugins/language-support-cpp-java/cxxparser/engine-parser.cpp b/plugins/language-support-cpp-java/cxxparser/engine-parser.cpp
index a0be44b..13e35e5 100644
--- a/plugins/language-support-cpp-java/cxxparser/engine-parser.cpp
+++ b/plugins/language-support-cpp-java/cxxparser/engine-parser.cpp
@@ -377,7 +377,8 @@ EngineParser::getCurrentSearchableScope (string &type_name, string &type_scope)
 	// FIXME: case of more results now it's hardcoded to 1
 	IAnjutaIterable *curr_searchable_scope =
 		ianjuta_symbol_manager_search_project (_sym_man, 
-					IANJUTA_SYMBOL_TYPE_SCOPE_CONTAINER,
+		            (IAnjutaSymbolType) (IANJUTA_SYMBOL_TYPE_SCOPE_CONTAINER |
+		            IANJUTA_SYMBOL_TYPE_TYPEDEF),
 		            TRUE,
 		            (IAnjutaSymbolField)(IANJUTA_SYMBOL_FIELD_SIMPLE | IANJUTA_SYMBOL_FIELD_KIND),
 		            type_name.c_str(),
@@ -435,7 +436,7 @@ EngineParser::switchTypedefToStruct (IAnjutaIterable * test,
 	IAnjutaSymbol *node = IANJUTA_SYMBOL (test);	
 	IAnjutaIterable *new_struct;
 
-	DEBUG_PRINT ("Switching TYPEDEF ==> to STRUCT");
+	DEBUG_PRINT ("Switching TYPEDEF (%d) ==> to STRUCT", ianjuta_symbol_get_id (node, NULL));
 	new_struct = ianjuta_symbol_manager_get_parent_scope (_sym_man, node, NULL, sym_info, NULL);
 	                                         
 	if (new_struct != NULL)
@@ -465,7 +466,7 @@ EngineParser::switchMemberToContainer (IAnjutaIterable * test)
 
 	/* hopefully we'll find a new container for the type_name of test param */
 	new_container = ianjuta_symbol_manager_search_project (_sym_man, 
-					IANJUTA_SYMBOL_TYPE_SCOPE_CONTAINER,
+	                IANJUTA_SYMBOL_TYPE_SCOPE_CONTAINER,
 		            TRUE,
 		            (IAnjutaSymbolField)(IANJUTA_SYMBOL_FIELD_SIMPLE | IANJUTA_SYMBOL_FIELD_KIND |
 		                                 IANJUTA_SYMBOL_FIELD_TYPE_NAME),
diff --git a/plugins/language-support-js/Makefile.am b/plugins/language-support-js/Makefile.am
index 58471b0..0d62c03 100644
--- a/plugins/language-support-js/Makefile.am
+++ b/plugins/language-support-js/Makefile.am
@@ -13,7 +13,7 @@ js_support_plugin_pixmapsdir = $(anjuta_image_dir)
 js_support_plugin_pixmaps_DATA = js_support_plugin.png
 
 # Plugin description file
-plugin_in_files = js_support_plugin.plugin.in
+plugin_in_files = js-support-plugin.plugin.in
 %.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 js_support_plugin_plugindir = $(anjuta_plugin_dir)
@@ -29,8 +29,8 @@ js_support_plugin_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 # Include paths
 AM_CPPFLAGS = \
-	-Wall \
-	-Werror \
+	-I$(top_srcdir)/plugins/symbol-db/anjuta-tags/ \
+	$(WARN_CFLAGS) \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" \
 	-DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" \
@@ -41,17 +41,24 @@ AM_CPPFLAGS = \
 	$(LIBANJUTA_CFLAGS) \
 	-DPACKAGE_SRC_DIR=\"$(srcdir)\" \
 	-DGIR_PATH=\"$(girdir)\" \
-	-DGJS_PATH=\"$(gjsdir)\"
+	-DGJS_PATH=\"$(gjsdir)\" \
+	-DG_LOG_DOMAIN=\"language-support-js\"
 
 # Where to install the plugin
 plugindir = $(anjuta_plugin_dir)
 
 # The plugin
-plugin_LTLIBRARIES = libjs_support_plugin.la
+plugin_LTLIBRARIES = libjs-support-plugin.la
 
 # Plugin sources
 libjs_support_plugin_la_SOURCES = plugin.c plugin.h code-completion.c code-completion.h util.c util.h \
-y.tab.c y.tab.h lex.yy.c lex.yy.h js-node.c js-node.h js-context.c js-context.h jsparse.c jsparse.h ijs-symbol.h ijs-symbol.c gir-symbol.c gir-symbol.h gi-symbol.c gi-symbol.h simple-symbol.c simple-symbol.h local-symbol.c local-symbol.h  node-symbol.c node-symbol.h import-symbol.c import-symbol.h dir-symbol.c dir-symbol.h std-symbol.c std-symbol.h database-symbol.c database-symbol.h db-anjuta-symbol.c db-anjuta-symbol.h jstypes.h
+js-parser-y-tab.c js-parser-y-tab.h lex.yy.c lex.yy.h js-node.c js-node.h js-context.c js-context.h jsparse.c jsparse.h \
+ijs-symbol.h ijs-symbol.c gir-symbol.c gir-symbol.h gi-symbol.c gi-symbol.h simple-symbol.c \
+simple-symbol.h local-symbol.c local-symbol.h  node-symbol.c node-symbol.h import-symbol.c \
+import-symbol.h dir-symbol.c dir-symbol.h std-symbol.c std-symbol.h database-symbol.c database-symbol.h \
+db-anjuta-symbol.c db-anjuta-symbol.h jstypes.h
+
+libjs_support_plugin_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
 libjs_support_plugin_la_LIBADD = \
diff --git a/plugins/language-support-js/js-context.c b/plugins/language-support-js/js-context.c
index 1ffdca5..64cec63 120000
--- a/plugins/language-support-js/js-context.c
+++ b/plugins/language-support-js/js-context.c
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/js-context.c
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/js-context.c
\ No newline at end of file
diff --git a/plugins/language-support-js/js-context.h b/plugins/language-support-js/js-context.h
index b38b133..e132a82 120000
--- a/plugins/language-support-js/js-context.h
+++ b/plugins/language-support-js/js-context.h
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/js-context.h
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/js-context.h
\ No newline at end of file
diff --git a/plugins/language-support-js/js-node.c b/plugins/language-support-js/js-node.c
index 370f30c..fa0c558 120000
--- a/plugins/language-support-js/js-node.c
+++ b/plugins/language-support-js/js-node.c
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/js-node.c
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/js-node.c
\ No newline at end of file
diff --git a/plugins/language-support-js/js-node.h b/plugins/language-support-js/js-node.h
index b30b391..e832967 120000
--- a/plugins/language-support-js/js-node.h
+++ b/plugins/language-support-js/js-node.h
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/js-node.h
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/js-node.h
\ No newline at end of file
diff --git a/plugins/language-support-js/jsparse.c b/plugins/language-support-js/jsparse.c
index 1803c94..0c84dde 120000
--- a/plugins/language-support-js/jsparse.c
+++ b/plugins/language-support-js/jsparse.c
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/jsparse.c
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/jsparse.c
\ No newline at end of file
diff --git a/plugins/language-support-js/jsparse.h b/plugins/language-support-js/jsparse.h
index 37f0ae6..1700b7e 120000
--- a/plugins/language-support-js/jsparse.h
+++ b/plugins/language-support-js/jsparse.h
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/jsparse.h
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/jsparse.h
\ No newline at end of file
diff --git a/plugins/language-support-js/jstypes.h b/plugins/language-support-js/jstypes.h
index 2a888dd..999df72 120000
--- a/plugins/language-support-js/jstypes.h
+++ b/plugins/language-support-js/jstypes.h
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/jstypes.h
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/jstypes.h
\ No newline at end of file
diff --git a/plugins/language-support-js/lex.l b/plugins/language-support-js/lex.l
index 837149a..018ca01 120000
--- a/plugins/language-support-js/lex.l
+++ b/plugins/language-support-js/lex.l
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/lex.l
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/lex.l
\ No newline at end of file
diff --git a/plugins/language-support-js/lex.yy.c b/plugins/language-support-js/lex.yy.c
index 27e7c2f..20ac48e 120000
--- a/plugins/language-support-js/lex.yy.c
+++ b/plugins/language-support-js/lex.yy.c
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/lex.yy.c
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/lex.yy.c
\ No newline at end of file
diff --git a/plugins/language-support-js/lex.yy.h b/plugins/language-support-js/lex.yy.h
index aa9432d..0bc0432 120000
--- a/plugins/language-support-js/lex.yy.h
+++ b/plugins/language-support-js/lex.yy.h
@@ -1 +1 @@
-../symbol-db/anjuta-tags/js_parser/lex.yy.h
\ No newline at end of file
+../symbol-db/anjuta-tags/js-parser/lex.yy.h
\ No newline at end of file
diff --git a/plugins/message-view/anjuta-msgman.c b/plugins/message-view/anjuta-msgman.c
index f088328..254c4a3 100644
--- a/plugins/message-view/anjuta-msgman.c
+++ b/plugins/message-view/anjuta-msgman.c
@@ -19,6 +19,7 @@
 #include <libanjuta/anjuta-utils.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-shell.h>
+#include <libanjuta/anjuta-tabber.h>
 
 #include <libanjuta/resources.h>
 #include "anjuta-msgman.h"
@@ -31,7 +32,7 @@ struct _AnjutaMsgmanPriv
 	GtkWidget* tab_popup;
 	GList *views;
 
-	GtkWidget* hbox;
+	GtkWidget* tabber;
 	GSList* button_group;
 };
 
@@ -40,9 +41,7 @@ struct _AnjutaMsgmanPage
 	GtkWidget *widget;
 	GtkWidget *pixmap;
 	GtkWidget *label;
-	GtkWidget *button;
 	GtkWidget *box;
-	GtkWidget *frame;
 	GtkWidget *close_button;
 	GtkWidget *close_icon;
 };
@@ -50,29 +49,6 @@ struct _AnjutaMsgmanPage
 typedef struct _AnjutaMsgmanPage AnjutaMsgmanPage;
 
 static void
-on_page_button_toggled (GtkToggleButton* button,
-                        AnjutaMsgman* msgman)
-{
-	AnjutaMsgmanPage* page;
-	int page_num;
-	
-	page = g_object_get_data (G_OBJECT (button), "__page");
-	page_num = gtk_notebook_page_num (GTK_NOTEBOOK(msgman), page->widget);
-
-	if (page_num == gtk_notebook_get_current_page (GTK_NOTEBOOK(msgman)))
-	{
-		if (!gtk_toggle_button_get_active (button))
-		{
-			g_signal_handlers_block_by_func (button, on_page_button_toggled, msgman);
-			gtk_toggle_button_set_active (button, TRUE);
-			g_signal_handlers_unblock_by_func (button, on_page_button_toggled, msgman);
-		}
-	}
-	else
-		gtk_notebook_set_current_page (GTK_NOTEBOOK(msgman), page_num);	
-}
-
-static void
 on_msgman_close_page (GtkButton* button, 
 									AnjutaMsgman *msgman)
 {
@@ -180,22 +156,12 @@ anjuta_msgman_page_new (GtkWidget * view, const gchar * name,
 						G_CALLBACK(on_msgman_close_page),
 						msgman);
 
-	page->button = gtk_toggle_button_new ();
-	g_signal_connect (page->button, "toggled", G_CALLBACK(on_page_button_toggled),
-	                  msgman);
-	g_object_set_data (G_OBJECT(page->button), "__page", page);
-	gtk_container_add (GTK_CONTAINER (page->button), box);
 
 	page->box = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX(page->box), page->button, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX(page->box), box, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX(page->box), page->close_button, FALSE, FALSE, 0);
-
-	page->frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME(page->frame),
-	                           GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (page->frame), page->box);
 	
-	gtk_widget_show_all (page->frame);
+	gtk_widget_show_all (page->box);
 	
 	return page;
 }
@@ -203,7 +169,6 @@ anjuta_msgman_page_new (GtkWidget * view, const gchar * name,
 static void
 anjuta_msgman_page_destroy (AnjutaMsgmanPage * page)
 {
-	gtk_widget_destroy (page->frame);
 	g_free (page);
 }
 
@@ -229,30 +194,7 @@ on_notebook_switch_page (GtkNotebook * notebook,
 			 GtkNotebookPage * npage,
 			 gint page_num, AnjutaMsgman * msgman)
 {
-	GList* node;
-	AnjutaMsgmanPage* page = anjuta_msgman_page_from_widget(msgman,
-	                                                        MESSAGE_VIEW (gtk_notebook_get_nth_page(GTK_NOTEBOOK(msgman), page_num)));
-	
-	g_return_if_fail (notebook != NULL);
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (msgman != NULL);
-
-	for (node = msgman->priv->views; node != NULL; node = g_list_next (node))
-	{
-		AnjutaMsgmanPage* cur_page = node->data;
-		g_signal_handlers_block_by_func (cur_page->button, on_page_button_toggled, msgman);
-		if (cur_page != page)
-		{
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cur_page->button), FALSE);
-		}
-		else
-		{
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cur_page->button), TRUE);	
-		}
-		g_signal_handlers_unblock_by_func (cur_page->button, on_page_button_toggled, msgman);			
-	}
-
-	anjuta_msgman_set_current_view(msgman, NULL);
+	g_signal_emit_by_name(G_OBJECT(msgman), "view_changed");
 }
 
 static gpointer parent_class;
@@ -279,14 +221,15 @@ anjuta_msgman_finalize (GObject *obj)
 static void
 anjuta_msgman_instance_init (AnjutaMsgman * msgman)
 {
-	g_signal_connect (GTK_NOTEBOOK (msgman), "switch-page",
+	g_signal_connect_after (GTK_NOTEBOOK (msgman), "switch-page",
 			  G_CALLBACK (on_notebook_switch_page), msgman);
 	gtk_notebook_set_scrollable (GTK_NOTEBOOK (msgman), TRUE);
 	msgman->priv = g_new0(AnjutaMsgmanPriv, 1);
 	msgman->priv->views = NULL;
 	msgman->priv->tab_popup = create_tab_popup_menu(msgman);
-	msgman->priv->hbox = gtk_hbox_new (FALSE, 1);
+	msgman->priv->tabber = anjuta_tabber_new (GTK_NOTEBOOK (msgman));
 	msgman->priv->button_group = NULL;
+	
 	g_signal_connect(GTK_OBJECT(msgman), "popup-menu", 
                        G_CALLBACK(on_msgman_popup_menu), msgman);
     g_signal_connect(GTK_OBJECT(msgman), "button-press-event", 
@@ -376,25 +319,12 @@ on_message_view_destroy (MessageView *view, AnjutaMsgman *msgman)
 	g_signal_handlers_disconnect_by_func (G_OBJECT (view),
 					  G_CALLBACK (on_message_view_destroy), msgman);
 
-	g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
-									 G_CALLBACK
-									 (on_notebook_switch_page), msgman);
-
 	page_num =
 		gtk_notebook_page_num (GTK_NOTEBOOK (msgman),
 						       GTK_WIDGET (view));
 	msgman->priv->views = g_list_remove (msgman->priv->views, page);
 	anjuta_msgman_page_destroy (page);
 
-	// gtk_notebook_remove_page (GTK_NOTEBOOK (msgman), page_num);
-	
-	/* This is called to set the next active document */
-	if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (msgman)) == 0)
-		anjuta_msgman_set_current_view (msgman, NULL);
-
-	g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
-									   G_CALLBACK
-									   (on_notebook_switch_page), msgman);
 }
 
 static void
@@ -402,7 +332,6 @@ anjuta_msgman_append_view (AnjutaMsgman * msgman, GtkWidget *mv,
 						   const gchar * name, const gchar * pixmap)
 {
 	AnjutaMsgmanPage *page;
-	int page_num;
 
 	g_return_if_fail (msgman != NULL);
 	g_return_if_fail (mv != NULL);
@@ -411,23 +340,15 @@ anjuta_msgman_append_view (AnjutaMsgman * msgman, GtkWidget *mv,
 	gtk_widget_show_all (mv);
 	page = anjuta_msgman_page_new (mv, name, pixmap, msgman);
 	
-	g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
-									 G_CALLBACK
-									 (on_notebook_switch_page), msgman);
 	msgman->priv->views =
 		g_list_prepend (msgman->priv->views, (gpointer) page);
 
-	page_num = gtk_notebook_append_page (GTK_NOTEBOOK (msgman), mv, NULL);
+	gtk_notebook_append_page (GTK_NOTEBOOK (msgman), mv, NULL);
 
-	gtk_box_pack_start (GTK_BOX(msgman->priv->hbox), page->frame, TRUE, TRUE, 0);
+	anjuta_tabber_add_tab (ANJUTA_TABBER(msgman->priv->tabber), page->box);
 	
 	g_signal_connect (G_OBJECT (mv), "destroy",
 					  G_CALLBACK (on_message_view_destroy), msgman);
-	g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
-									   G_CALLBACK
-									   (on_notebook_switch_page), msgman);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->button), TRUE);	
-	g_signal_emit_by_name(G_OBJECT(msgman), "view_changed");
 }
 
 MessageView *
@@ -467,9 +388,6 @@ anjuta_msgman_remove_all_views (AnjutaMsgman * msgman)
 	GList *views, *node;
 	AnjutaMsgmanPage *page;
 	
-	g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
-									 G_CALLBACK
-									 (on_notebook_switch_page), msgman);
 	views = NULL;
 	node = msgman->priv->views;
 	while (node)
@@ -489,18 +407,16 @@ anjuta_msgman_remove_all_views (AnjutaMsgman * msgman)
 	g_list_free (views);
 	
 	msgman->priv->views = NULL;
-	anjuta_msgman_set_current_view (msgman, NULL);
-	g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
-									   G_CALLBACK
-									   (on_notebook_switch_page), msgman);
 }
 
 MessageView *
 anjuta_msgman_get_current_view (AnjutaMsgman * msgman)
 {
-	gint current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK(msgman));
-	return MESSAGE_VIEW (gtk_notebook_get_nth_page (GTK_NOTEBOOK(msgman),
-													current_page));
+	gint page = gtk_notebook_get_current_page (GTK_NOTEBOOK(msgman));
+	if (page != -1)
+		return MESSAGE_VIEW (gtk_notebook_get_nth_page (GTK_NOTEBOOK(msgman), page));
+	else
+		return NULL;
 }
 
 MessageView *
@@ -542,7 +458,6 @@ anjuta_msgman_set_current_view (AnjutaMsgman * msgman, MessageView * mv)
 					       GTK_WIDGET (mv));
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (msgman), page_num);
 	}
-	g_signal_emit_by_name(G_OBJECT(msgman), "view_changed");
 }
 
 GList *
@@ -641,7 +556,7 @@ anjuta_msgman_deserialize (AnjutaMsgman *msgman, AnjutaSerializer *serializer)
 	return TRUE;
 }
 
-GtkWidget* anjuta_msgman_get_hbox (AnjutaMsgman* msgman)
+GtkWidget* anjuta_msgman_get_tabber (AnjutaMsgman* msgman)
 {
-	return msgman->priv->hbox;
+	return msgman->priv->tabber;
 }
diff --git a/plugins/message-view/anjuta-msgman.h b/plugins/message-view/anjuta-msgman.h
index cdad12c..4f7fff2 100644
--- a/plugins/message-view/anjuta-msgman.h
+++ b/plugins/message-view/anjuta-msgman.h
@@ -79,7 +79,7 @@ gboolean anjuta_msgman_serialize (AnjutaMsgman *msgman,
 gboolean anjuta_msgman_deserialize (AnjutaMsgman *msgman,
 									AnjutaSerializer *serializer);
 
-GtkWidget* anjuta_msgman_get_hbox (AnjutaMsgman* msgman);
+GtkWidget* anjuta_msgman_get_tabber (AnjutaMsgman* msgman);
 
 void
 on_notify_message_pref (AnjutaPreferences* prefs, const gchar* key,
diff --git a/plugins/message-view/message-view.c b/plugins/message-view/message-view.c
index 5047347..733aa00 100644
--- a/plugins/message-view/message-view.c
+++ b/plugins/message-view/message-view.c
@@ -22,7 +22,7 @@
 
 #include "message-view.h"
 #define MESSAGE_TYPE message_get_type()
-
+	
 struct _MessageViewPrivate
 {
 	//guint num_messages;
@@ -36,10 +36,13 @@ struct _MessageViewPrivate
 	
 	gint adj_chgd_hdlr;
 	
-	/* Messages filter buttons */
-	GtkWidget *normal, *info, *warn, *error;
-	guint normal_count, info_count, warn_count, error_count;
-
+	/* Messages filter */
+	MessageViewFlags flags;
+	gint normal_count;
+	gint warn_count;
+	gint error_count;
+	gint info_count;
+	
 	/* Properties */
 	gchar *label;
 	gchar *pixmap;
@@ -324,14 +327,6 @@ on_message_event (GObject* object, GdkEvent* event, gpointer data)
 	return FALSE;
 }
 
-static void
-on_filter_buttons_toggled (GtkToggleButton *toggle, gpointer user_data) 
-{
-	MessageView *msgview = MESSAGE_VIEW (user_data);
-	
-	gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (msgview->privat->filter));
-}
-
 static void 
 on_adjustment_changed (GtkAdjustment* adj, gpointer data)
 {
@@ -463,8 +458,6 @@ message_view_finalize (GObject *obj)
 static void
 message_view_instance_init (MessageView * self)
 {
-	GtkWidget *vbox;
-	GtkWidget *filter_buttons_box;
 	GtkWidget *scrolled_win;
 	GtkCellRenderer *renderer;
 	GtkCellRenderer *renderer_pixbuf;
@@ -479,72 +472,7 @@ message_view_instance_init (MessageView * self)
 
 	/* Init private data */
 	self->privat->line_buffer = g_strdup("");
-	self->privat->normal_count = 0;
-	self->privat->info_count = 0;
-	self->privat->warn_count = 0;
-	self->privat->error_count = 0;
-
-	/* Create filter buttons */
-	vbox = gtk_hbox_new (FALSE, 0);
-	filter_buttons_box = gtk_vbox_new (FALSE, 1);
-	
-	self->privat->normal = gtk_toggle_button_new_with_label (_("No Messages"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->privat->normal), TRUE);
-	gtk_button_set_focus_on_click (GTK_BUTTON (self->privat->normal), FALSE);
-	gtk_button_set_relief (GTK_BUTTON (self->privat->normal), GTK_RELIEF_HALF);
-	gtk_button_set_alignment (GTK_BUTTON (self->privat->normal), 0.0, 0.5);
-	gtk_widget_show (self->privat->normal);
-	g_signal_connect (G_OBJECT (self->privat->normal), "toggled",
-					  G_CALLBACK (on_filter_buttons_toggled), self);
-	
-	self->privat->info = gtk_toggle_button_new_with_label (_("No Infos"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->privat->info), TRUE);
-	gtk_button_set_focus_on_click (GTK_BUTTON (self->privat->info), FALSE);
-	gtk_button_set_relief (GTK_BUTTON (self->privat->info), GTK_RELIEF_HALF);
-	gtk_button_set_alignment (GTK_BUTTON (self->privat->info), 0.0, 0.5);
-	gtk_button_set_image (GTK_BUTTON (self->privat->info), 
-						  gtk_image_new_from_stock (GTK_STOCK_INFO, 
-													GTK_ICON_SIZE_BUTTON));
-	gtk_widget_show (self->privat->info);
-	g_signal_connect (G_OBJECT (self->privat->info), "toggled",
-					  G_CALLBACK (on_filter_buttons_toggled), self);
-	
-	self->privat->warn = gtk_toggle_button_new_with_label (_("No Warnings"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->privat->warn), TRUE);
-	gtk_button_set_focus_on_click (GTK_BUTTON (self->privat->warn), FALSE);
-	gtk_button_set_relief (GTK_BUTTON (self->privat->warn), GTK_RELIEF_HALF);
-	gtk_button_set_alignment (GTK_BUTTON (self->privat->warn), 0.0, 0.5);
-	/* FIXME: There is not GTK_STOCK_DIALOG_WARNING. */
-	gtk_button_set_image (GTK_BUTTON (self->privat->warn), 
-						  gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, 
-													GTK_ICON_SIZE_BUTTON));
-	gtk_widget_show (self->privat->warn);
-	g_signal_connect (G_OBJECT (self->privat->warn), "toggled",
-					  G_CALLBACK (on_filter_buttons_toggled), self);
-	
-	self->privat->error = gtk_toggle_button_new_with_label (_("No Errors"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->privat->error), TRUE);
-	gtk_button_set_focus_on_click (GTK_BUTTON (self->privat->error), FALSE);
-	gtk_button_set_relief (GTK_BUTTON (self->privat->error), GTK_RELIEF_HALF);
-	gtk_button_set_alignment (GTK_BUTTON (self->privat->error), 0.0, 0.5);
-	gtk_button_set_image (GTK_BUTTON (self->privat->error), 
-						  gtk_image_new_from_stock (GTK_STOCK_STOP, 
-													GTK_ICON_SIZE_BUTTON));
-	gtk_widget_show (self->privat->error);
-	g_signal_connect (G_OBJECT (self->privat->error), "toggled",
-					  G_CALLBACK (on_filter_buttons_toggled), self);
-	
-	gtk_box_pack_start (GTK_BOX (filter_buttons_box), GTK_WIDGET (self->privat->normal),
-						FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (filter_buttons_box), GTK_WIDGET (self->privat->info),
-						FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (filter_buttons_box), GTK_WIDGET (self->privat->warn),
-						FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (filter_buttons_box), GTK_WIDGET (self->privat->error),
-						FALSE, FALSE, 0);
-	
-	gtk_widget_show (filter_buttons_box);
-	
+	self->privat->flags = 0xF;
 	
 	/* Create the tree widget */
 	model = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING,
@@ -608,22 +536,8 @@ message_view_instance_init (MessageView * self)
 									 G_CALLBACK (on_adjustment_changed), self);
 	g_signal_connect(G_OBJECT(adj), "value_changed",
 					 G_CALLBACK(on_adjustment_value_changed), self);
-
-	/* Add it to the dockitem */
-	if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_LTR) {
-		gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (scrolled_win),
-							TRUE, TRUE, 0);
-		gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (filter_buttons_box),
-							FALSE, FALSE, 0);
-	} else {
-		gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (filter_buttons_box),
-							FALSE, FALSE, 0);
-		gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (scrolled_win),
-							TRUE, TRUE, 0);
-	}
 	
-	gtk_widget_show (vbox);
-	gtk_container_add (GTK_CONTAINER (self), vbox);
+	gtk_container_add (GTK_CONTAINER (self), scrolled_win);
 	
 	/* Connect signals */
 	g_signal_connect (G_OBJECT(self->privat->tree_view), "event", 
@@ -1092,36 +1006,6 @@ imessage_view_buffer_append (IAnjutaMessageView * message_view,
 	}
 }
 
-static void 
-update_button_labels (MessageView* view)
-{
-	gchar* temp;
-	
-	temp = g_strdup_printf(ngettext ("%d Message", "%d Messages", 
-									 view->privat->normal_count),
-						   view->privat->normal_count);
-	gtk_button_set_label (GTK_BUTTON (view->privat->normal), temp);
-	g_free(temp);
-	
-	temp = g_strdup_printf(ngettext ("%d Info", "%d Infos", 
-									 view->privat->info_count),
-						   view->privat->info_count);
-	gtk_button_set_label (GTK_BUTTON (view->privat->info), temp);
-	g_free (temp);
-	temp = g_strdup_printf(ngettext ("%d Warning", "%d Warnings", 
-									 view->privat->warn_count),
-						   view->privat->warn_count);	
-	gtk_button_set_label (GTK_BUTTON (view->privat->warn), temp);
-	g_free (temp);
-	temp = g_strdup_printf(ngettext ("%d Error", "%d Errors", 
-									 view->privat->error_count),
-						   view->privat->error_count);	
-	gtk_button_set_label (GTK_BUTTON (view->privat->error), temp);
-	g_free (temp);
-	
-}
-
-
 static void
 imessage_view_append (IAnjutaMessageView *message_view,
 					  IAnjutaMessageViewType type,
@@ -1174,7 +1058,6 @@ imessage_view_append (IAnjutaMessageView *message_view,
 				view->privat->normal_count++;
 		}
 	}
-	update_button_labels (view);
 	
 	/* Add the message to the tree */
 	store = GTK_LIST_STORE (view->privat->model);
@@ -1230,12 +1113,6 @@ imessage_view_clear (IAnjutaMessageView *message_view, GError **e)
 	view->privat->info_count = 0;
 	view->privat->warn_count = 0;
 	view->privat->error_count = 0;
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->privat->normal), TRUE);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->privat->info), TRUE);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->privat->warn), TRUE);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->privat->error), TRUE);
-	
-	update_button_labels (view);
 	
 	store = GTK_LIST_STORE (view->privat->model);
 	gtk_list_store_clear (store);
@@ -1365,17 +1242,46 @@ message_view_tree_view_filter (GtkTreeModel *model, GtkTreeIter  *iter,
 
 	if (msg != NULL) {
 		if (msg->type == IANJUTA_MESSAGE_VIEW_TYPE_NORMAL) {
-			return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msgview->privat->normal));
+			return msgview->privat->flags & MESSAGE_VIEW_SHOW_NORMAL;
 		} else if (msg->type == IANJUTA_MESSAGE_VIEW_TYPE_INFO) {
-			return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msgview->privat->info));
+			return msgview->privat->flags & MESSAGE_VIEW_SHOW_INFO;
 		} else if (msg->type == IANJUTA_MESSAGE_VIEW_TYPE_WARNING) {
-			return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msgview->privat->warn));
+			return msgview->privat->flags & MESSAGE_VIEW_SHOW_WARNING;
 		} else if (msg->type == IANJUTA_MESSAGE_VIEW_TYPE_ERROR) {
-			return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msgview->privat->error));
+			return msgview->privat->flags & MESSAGE_VIEW_SHOW_ERROR;
 		} else return TRUE;
 	} else return FALSE;
 }
 
+MessageViewFlags
+message_view_get_flags (MessageView* view)
+{
+	return view->privat->flags;
+}
+
+void message_view_set_flags (MessageView* view, MessageViewFlags flags)
+{
+	view->privat->flags = flags;
+	gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(view->privat->filter));
+}
+
+gint message_view_get_count (MessageView* view, MessageViewFlags flags)
+{
+	switch (flags)
+	{
+		case MESSAGE_VIEW_SHOW_NORMAL:
+			return view->privat->normal_count;
+		case MESSAGE_VIEW_SHOW_INFO:
+			return view->privat->info_count;
+		case MESSAGE_VIEW_SHOW_WARNING:
+			return view->privat->warn_count;
+		case MESSAGE_VIEW_SHOW_ERROR:
+			return view->privat->error_count;
+		default:
+			g_assert_not_reached ();
+	}
+}
+
 ANJUTA_TYPE_BEGIN(MessageView, message_view, GTK_TYPE_HBOX);
 ANJUTA_TYPE_ADD_INTERFACE(imessage_view, IANJUTA_TYPE_MESSAGE_VIEW);
 ANJUTA_TYPE_END;
diff --git a/plugins/message-view/message-view.h b/plugins/message-view/message-view.h
index e4f772d..7287139 100644
--- a/plugins/message-view/message-view.h
+++ b/plugins/message-view/message-view.h
@@ -59,6 +59,14 @@ struct _MessageViewClass
 	GtkHBoxClass parent;
 };	
 
+typedef enum
+{
+	MESSAGE_VIEW_SHOW_NORMAL = 1 << 0,
+	MESSAGE_VIEW_SHOW_INFO = 1 << 1,
+	MESSAGE_VIEW_SHOW_WARNING = 1 << 2,
+	MESSAGE_VIEW_SHOW_ERROR = 1 << 3,	
+} MessageViewFlags;
+
 /* Note: MessageView implements IAnjutaMessageView interface */
 GType message_view_get_type (void);
 GtkWidget* message_view_new (GtkWidget* popup_menu);
@@ -72,6 +80,10 @@ gboolean message_view_serialize (MessageView *view,
 gboolean message_view_deserialize (MessageView *view,
 								   AnjutaSerializer *serializer);
 
+MessageViewFlags message_view_get_flags (MessageView* view);
+void message_view_set_flags (MessageView* view, MessageViewFlags flags);
+gint message_view_get_count (MessageView* view, MessageViewFlags flags);
+
 G_END_DECLS
 
 #endif
diff --git a/plugins/message-view/plugin.c b/plugins/message-view/plugin.c
index f557f34..43d10c1 100644
--- a/plugins/message-view/plugin.c
+++ b/plugins/message-view/plugin.c
@@ -94,6 +94,7 @@ static GtkActionEntry actions_goto[] = {
 
 static void on_view_changed(AnjutaMsgman* msgman, MessageViewPlugin* plugin)
 {
+	MessageView* view = anjuta_msgman_get_current_view (msgman);
 	AnjutaUI* ui = anjuta_shell_get_ui (ANJUTA_PLUGIN(plugin)->shell, NULL);
 	GtkAction* action_next = anjuta_ui_get_action (ui, "ActionGroupGotoMessages",
 								   "ActionMessageNext");
@@ -108,6 +109,21 @@ static void on_view_changed(AnjutaMsgman* msgman, MessageViewPlugin* plugin)
 	g_object_set (G_OBJECT (action_next), "sensitive", sensitive, NULL);
 	g_object_set (G_OBJECT (action_prev), "sensitive", sensitive, NULL);
 	g_object_set (G_OBJECT (action_copy), "sensitive", sensitive, NULL);
+
+	/* Toggle buttons */
+	gtk_widget_set_sensitive (plugin->normal, view != NULL);	
+	gtk_widget_set_sensitive (plugin->info, view != NULL);
+	gtk_widget_set_sensitive (plugin->warn, view != NULL);
+	gtk_widget_set_sensitive (plugin->error, view != NULL);
+	if (view)
+	{
+		MessageViewFlags flags =
+			message_view_get_flags (view);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(plugin->normal), flags & MESSAGE_VIEW_SHOW_NORMAL);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(plugin->info), flags & MESSAGE_VIEW_SHOW_INFO);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(plugin->warn), flags & MESSAGE_VIEW_SHOW_WARNING);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(plugin->error), flags & MESSAGE_VIEW_SHOW_ERROR);
+	}	
 }
 
 static gpointer parent_class;
@@ -308,6 +324,120 @@ message_view_plugin_class_init (GObjectClass *klass)
 	klass->finalize = message_view_plugin_finalize;
 }
 
+static gboolean
+on_filter_button_tooltip (GtkWidget* widget, 
+                          gint        x,
+                          gint        y,
+                          gboolean    keyboard_mode,
+                          GtkTooltip *tooltip,
+                          MessageViewPlugin* plugin)
+{
+	gchar* temp = NULL;
+	MessageView* view = anjuta_msgman_get_current_view (ANJUTA_MSGMAN(plugin->msgman));
+	if (view)
+		return FALSE;
+	if (widget == plugin->normal)
+	{
+		temp = g_strdup_printf(ngettext ("%d Message", "%d Messages", 
+		                                 message_view_get_count (view,
+		                                                         MESSAGE_VIEW_SHOW_NORMAL)),
+		                       message_view_get_count (view,
+		                                               MESSAGE_VIEW_SHOW_NORMAL));
+		gtk_tooltip_set_text (tooltip, temp);
+	}
+	else if (widget == plugin->info)
+	{
+		temp = g_strdup_printf(ngettext ("%d Info", "%d Infos", 
+		                                 message_view_get_count (view,
+		                                                         MESSAGE_VIEW_SHOW_INFO)),
+		                       message_view_get_count (view,
+		                                               MESSAGE_VIEW_SHOW_INFO));
+		gtk_tooltip_set_text (tooltip, temp);
+	}
+	else if (widget == plugin->warn)
+	{
+		temp = g_strdup_printf(ngettext ("%d Warning", "%d Warnings", 
+		                                 message_view_get_count (view,
+		                                                         MESSAGE_VIEW_SHOW_WARNING)),
+		                       message_view_get_count (view,
+		                                               MESSAGE_VIEW_SHOW_WARNING));
+		gtk_tooltip_set_text (tooltip, temp);
+	}
+	else if (widget == plugin->error)
+	{
+		temp = g_strdup_printf(ngettext ("%d Error", "%d Errors", 
+		                                 message_view_get_count (view,
+		                                                         MESSAGE_VIEW_SHOW_ERROR)),
+		                       message_view_get_count (view,
+		                                               MESSAGE_VIEW_SHOW_ERROR));
+		gtk_tooltip_set_text (tooltip, temp);
+	}
+	else
+		g_assert_not_reached ();
+
+	return TRUE;
+}
+
+static void
+on_filter_buttons_toggled (GtkWidget* button, MessageViewPlugin *plugin)
+{
+	MessageViewFlags flags = 0;
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(plugin->normal)))
+		flags |= MESSAGE_VIEW_SHOW_NORMAL;
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(plugin->info)))
+		flags |= MESSAGE_VIEW_SHOW_INFO;
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(plugin->warn)))
+		flags |= MESSAGE_VIEW_SHOW_WARNING;
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(plugin->error)))
+		flags |= MESSAGE_VIEW_SHOW_ERROR;
+	message_view_set_flags (anjuta_msgman_get_current_view (ANJUTA_MSGMAN(plugin->msgman)),
+	                        flags);
+}
+
+static GtkWidget*
+create_mini_button (MessageViewPlugin* plugin, const gchar* stock_id)
+{
+	GtkWidget* button, *image;
+	gint h,w;
+	image = gtk_image_new_from_stock (stock_id, 
+	                                  GTK_ICON_SIZE_MENU);
+	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
+	button = gtk_toggle_button_new ();
+	g_signal_connect (G_OBJECT (button), "toggled",
+					  G_CALLBACK (on_filter_buttons_toggled), plugin);
+	gtk_container_add (GTK_CONTAINER (button), image);
+
+	g_object_set (button, "has-tooltip", TRUE, NULL);
+	g_signal_connect (button, "query-tooltip", 
+	                  G_CALLBACK (on_filter_button_tooltip), plugin);
+	
+	return button;
+}
+
+static void
+create_toggle_buttons (MessageViewPlugin* plugin,
+                       GtkWidget* hbox)
+{
+	GtkWidget* filter_buttons_box = gtk_hbox_new (FALSE, 0);
+	
+	plugin->normal = create_mini_button (plugin, "message-manager-plugin-icon");
+	plugin->info = create_mini_button (plugin, GTK_STOCK_INFO);
+	plugin->warn = create_mini_button (plugin, GTK_STOCK_DIALOG_WARNING);
+	plugin->error = create_mini_button (plugin, GTK_STOCK_DIALOG_ERROR);
+	
+	gtk_box_pack_start (GTK_BOX (filter_buttons_box), GTK_WIDGET (plugin->normal),
+						FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (filter_buttons_box), GTK_WIDGET (plugin->info),
+						FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (filter_buttons_box), GTK_WIDGET (plugin->warn),
+						FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (filter_buttons_box), GTK_WIDGET (plugin->error),
+	                    FALSE, FALSE, 0);
+	
+	gtk_widget_show_all (filter_buttons_box);
+	gtk_box_pack_start (GTK_BOX(hbox), filter_buttons_box, FALSE, FALSE, 0);
+}
+
 /*
  * IAnjutaMessagerManager interface implementation 
  */
@@ -321,13 +451,18 @@ ianjuta_msgman_add_view (IAnjutaMessageManager *plugin,
 	GtkWidget *msgman = ANJUTA_PLUGIN_MESSAGE_VIEW (plugin)->msgman;
 	if (ANJUTA_PLUGIN_MESSAGE_VIEW (plugin)->widget_shown == FALSE)
 	{
+		GtkWidget* hbox = gtk_hbox_new (FALSE, 0);
 		GtkWidget* label = gtk_label_new (_("Messages"));
 		GtkWidget* image = gtk_image_new_from_stock ("message-manager-plugin-icon",
 		                                            GTK_ICON_SIZE_MENU);
-		GtkWidget* hbox = anjuta_msgman_get_hbox (ANJUTA_MSGMAN(msgman));
 		gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
 		gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+		gtk_box_pack_start (GTK_BOX(hbox), anjuta_msgman_get_tabber (ANJUTA_MSGMAN(msgman)),
+		                    TRUE, TRUE, 5);
+	
 		gtk_widget_show_all (hbox);
+
+		create_toggle_buttons (ANJUTA_PLUGIN_MESSAGE_VIEW(plugin), hbox);
 		
 		anjuta_shell_add_widget_custom (shell, msgman,
 							 "AnjutaMessageView", _("Messages"),
diff --git a/plugins/message-view/plugin.h b/plugins/message-view/plugin.h
index 0503bc0..40accd8 100644
--- a/plugins/message-view/plugin.h
+++ b/plugins/message-view/plugin.h
@@ -36,6 +36,12 @@ struct _MessageViewPlugin {
 	GtkWidget* msgman;
 	GtkActionGroup *action_group;
 	gint uiid;
+
+	/* Toggle buttons */
+	GtkWidget* normal;
+	GtkWidget* warn;
+	GtkWidget* error;
+	GtkWidget* info;
 	
 	gboolean widget_shown;
 };
diff --git a/plugins/patch/plugin.c b/plugins/patch/plugin.c
index f16fdaf..559447e 100644
--- a/plugins/patch/plugin.c
+++ b/plugins/patch/plugin.c
@@ -88,11 +88,12 @@ patch_plugin_activate (AnjutaPlugin *plugin)
 
 
 	/* Add all our actions */
-	anjuta_ui_add_action_group_entries (ui, "ActionMenuTools",
-										_("Patch files/directories"),
-										actions_tools,
-										G_N_ELEMENTS (actions_tools),
-										GETTEXT_PACKAGE, TRUE, p_plugin);
+	p_plugin->action_group =
+		anjuta_ui_add_action_group_entries  (ui, "ActionMenuTools",
+											_("Patch files/directories"),
+											actions_tools,
+											G_N_ELEMENTS (actions_tools),
+											GETTEXT_PACKAGE, TRUE, p_plugin);
 
 	p_plugin->uiid = anjuta_ui_merge (ui, UI_FILE);
 	
@@ -107,7 +108,8 @@ patch_plugin_deactivate (AnjutaPlugin *plugin)
 	DEBUG_PRINT ("%s", "AnjutaPatchPlugin: Dectivating Patch plugin â?¦");
 
 	anjuta_ui_unmerge (ui, ANJUTA_PLUGIN_PATCH (plugin)->uiid);
-
+	anjuta_ui_remove_action_group (ui, ANJUTA_PLUGIN_PATCH (plugin)->action_group);
+	
 	/* FIXME: should launcher be unreferenced? */
 	
 	return TRUE;
diff --git a/plugins/patch/plugin.h b/plugins/patch/plugin.h
index 3f9c8d9..e0c88fe 100644
--- a/plugins/patch/plugin.h
+++ b/plugins/patch/plugin.h
@@ -52,6 +52,7 @@ struct _PatchPlugin {
 
 	gboolean executing;
 	gint uiid;
+	GtkActionGroup *action_group;
 };
 
 struct _PatchPluginClass {
diff --git a/plugins/project-manager/Makefile.am b/plugins/project-manager/Makefile.am
index e0da507..72b3c47 100644
--- a/plugins/project-manager/Makefile.am
+++ b/plugins/project-manager/Makefile.am
@@ -11,6 +11,7 @@ project_pixmapsdir = $(anjuta_image_dir)
 project_pixmaps_DATA = \
 	anjuta-project-manager-plugin.svg \
 	anjuta-project-manager-plugin-48.png \
+	anjuta-project-manager-plugin-16.png \
 	gbf-build.png \
 	gbf-install.png
 
diff --git a/plugins/sourceview/sourceview.c b/plugins/sourceview/sourceview.c
index 2fd2003..5d482f3 100644
--- a/plugins/sourceview/sourceview.c
+++ b/plugins/sourceview/sourceview.c
@@ -319,6 +319,28 @@ static void on_backspace (GtkTextView* view,
 	g_signal_emit_by_name(G_OBJECT(sv), "update_ui");
 }
 
+static void
+on_line_mark_activated(GtkTextView* view,
+                       GtkTextIter   *iter,
+                       GdkEventButton *event,
+                       Sourceview* sv)
+{
+	/* proceed only if its a double click with left button*/
+	if( (event->button != 1) || (GDK_2BUTTON_PRESS != event->type) ) {
+		return;
+	}
+
+	/* line number starts with 0, so add 1 */
+	gint line_number = LINE_TO_LOCATION(gtk_text_iter_get_line(iter));
+
+	if (!IANJUTA_IS_EDITOR(sv))
+	{
+		return;
+	}
+	g_signal_emit_by_name(G_OBJECT(sv), "line-marks-gutter-clicked", line_number);
+}
+
+
 /* Open / Save stuff */
 
 /* Callback for dialog below */
@@ -647,6 +669,7 @@ sourceview_instance_init(Sourceview* sv)
 					  G_CALLBACK (on_sourceview_hover_over), sv);
 	g_signal_connect_after(G_OBJECT(sv->priv->view), "backspace", 
 					 G_CALLBACK(on_backspace),sv);
+
 	g_object_set (G_OBJECT (sv->priv->view), "has-tooltip", TRUE, NULL);
 	gtk_source_view_set_smart_home_end(GTK_SOURCE_VIEW(sv->priv->view), FALSE);
 	
@@ -741,6 +764,10 @@ sourceview_new(GFile* file, const gchar* filename, AnjutaPlugin* plugin)
 	DEBUG_PRINT("%s", "============ Creating new editor =============");
 	
 	g_signal_emit_by_name (G_OBJECT(sv), "update-ui");
+	g_signal_connect_after(G_OBJECT(sv->priv->view), "line-mark-activated",
+					 G_CALLBACK(on_line_mark_activated),
+					 G_OBJECT(sv)
+					 );
 	
 	return sv;
 }
diff --git a/plugins/symbol-db/Makefile.am b/plugins/symbol-db/Makefile.am
index 3a3842a..6c2abb8 100644
--- a/plugins/symbol-db/Makefile.am
+++ b/plugins/symbol-db/Makefile.am
@@ -13,7 +13,10 @@ symbol_db_glade_DATA =  anjuta-symbol-db.ui
 
 # Plugin Icon file
 symbol_db_pixmapsdir = $(anjuta_image_dir)
-symbol_db_pixmaps_DATA = anjuta-symbol-db-plugin-48.png
+symbol_db_pixmaps_DATA = \
+	anjuta-symbol-db-plugin.svg \
+	anjuta-symbol-db-plugin-48.png \
+	anjuta-symbol-db-plugin-16.png
 
 # Plugin description file
 plugin_in_files = symbol-db.plugin.in
@@ -119,6 +122,7 @@ EXTRA_DIST = \
 	$(symbol_db_glade_DATA) \
 	$(symbol_db_pixmaps_DATA) \
 	$(symbol_db_data_DATA) \
-	$(symbol_db_ui_DATA)
+	$(symbol_db_ui_DATA) \
+	symbol-db-marshal.list
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/symbol-db/anjuta-symbol-db-plugin-48.png b/plugins/symbol-db/anjuta-symbol-db-plugin-48.png
index 6b1f8a7..a75416d 100644
Binary files a/plugins/symbol-db/anjuta-symbol-db-plugin-48.png and b/plugins/symbol-db/anjuta-symbol-db-plugin-48.png differ
diff --git a/plugins/symbol-db/anjuta-tags/Makefile.am b/plugins/symbol-db/anjuta-tags/Makefile.am
index 0d73de1..1d6f60f 100644
--- a/plugins/symbol-db/anjuta-tags/Makefile.am
+++ b/plugins/symbol-db/anjuta-tags/Makefile.am
@@ -8,25 +8,26 @@ AM_CPPFLAGS = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 
 
 AM_CFLAGS =\
-	 -Wall \
+	 -I$(top_srcdir)/plugins/symbol-db/anjuta-tags/js-parser \
+	 $(WARN_CFLAGS) \
 	 $(GLIB_CFLAGS) \
 	 $(VALA_CFLAGS) \
 	 $(LIBXML_CFLAGS)
 
 bin_PROGRAMS = anjuta-tags
 
-YACCFLAGS = -d -o ./js_parser/y.tab.c
-YACCFILE = ./js_parser/Grammar.y
+YACCFLAGS = -d -o ./js-parser/js-parser-y-tab.c
+YACCFILE = ./js-parser/Grammar.y
 PARSER = bison
 
-js_parser/y.tab.c : ${YACCFILE}
+js-parser/js-parser-y-tab.c : ${YACCFILE}
 	${PARSER} ${YACCFLAGS} ${YACCFILE}
 
 LEXER = flex
-LEXFILE = ./js_parser/lex.l
-LEXCCFLAGS = -Cr -o js_parser/lex.yy.c --yylineno --bison-bridge
+LEXFILE = ./js-parser/lex.l
+LEXCCFLAGS = -Cr -o js-parser/lex.yy.c --yylineno --bison-bridge
 
-js_parser/lex.yy.c : ${LEXFILE}
+js-parser/lex.yy.c : ${LEXFILE}
 	${LEXER} ${LEXCCFLAGS} ${LEXFILE}
 
 ctags-visitor.c: ctags-visitor.vala
@@ -112,17 +113,19 @@ anjuta_tags_SOURCES = \
 	vstring.c        \
 	vstring.h        \
 	yacc.c	\
-	js_parser/y.tab.c	\
-	js_parser/y.tab.h	\
-	js_parser/lex.yy.c   \
-	js_parser/lex.yy.h	\
-	js_parser/jsparse.c   \
-	js_parser/jsparse.h	\
-	js_parser/js-context.c   \
-	js_parser/js-context.h	\
-	js_parser/js-node.c	\
-	js_parser/js-node.h	\
-	js_parser/jstypes.h
+	js-parser/js-parser-y-tab.c \
+	js-parser/js-parser-y-tab.h	\
+	js-parser/lex.yy.c   \
+	js-parser/lex.yy.h	\
+	js-parser/jsparse.c   \
+	js-parser/jsparse.h	\
+	js-parser/js-context.c   \
+	js-parser/js-context.h	\
+	js-parser/js-node.c	\
+	js-parser/js-node.h	\
+	js-parser/jstypes.h     \
+	ctags-utils.c     \
+	ctags-utils.h
 
 anjuta_tags_LDFLAGS = \
 		$(GLIB_LDFLAGS) \
diff --git a/plugins/symbol-db/anjuta-tags/c.c b/plugins/symbol-db/anjuta-tags/c.c
index 71a7067..ccca3a4 100644
--- a/plugins/symbol-db/anjuta-tags/c.c
+++ b/plugins/symbol-db/anjuta-tags/c.c
@@ -48,7 +48,7 @@
 *   DATA DECLARATIONS
 */
 
-enum { NumTokens = 7 };
+enum { NumTokens = 15 };
 
 typedef enum eException {
 	ExceptionNone, ExceptionEOF, ExceptionFormattingError,
@@ -2135,9 +2135,28 @@ static void parseReturnType (statementInfo *const st)
 		return;
 	
 	finding_tok = prevToken (st, 2);
-	
+		
 	if (finding_tok->type == TOKEN_DOUBLE_COLON)
-		lower_bound = 3;
+	{
+		/* get the total number of double colons */
+		int j;
+		int num_colons = 0;
+
+		/* we already are at 2nd token */
+		/* the +=2 means that colons are usually found at even places */
+		for (j = 2; j < NumTokens; j+=2)
+		{
+			tokenInfo *curr_tok;
+			curr_tok = prevToken (st, j);
+			if (curr_tok->type == TOKEN_DOUBLE_COLON)
+				num_colons++;
+			else
+				break;
+		}
+
+		/*printf ("FOUND colons %d\n", num_colons);*/
+		lower_bound = 2 * num_colons + 1;
+	}
 	else
 		lower_bound = 1;
 	
@@ -2169,7 +2188,8 @@ static void parseReturnType (statementInfo *const st)
 				break;
 
 			case TOKEN_KEYWORD:
-				vStringPut (ReturnType, ' ');				
+				vStringPut (ReturnType, ' ');
+				
 			default:
 				vStringCat (ReturnType, curr_tok->name);
 				break;				
@@ -2188,6 +2208,7 @@ static void parseReturnType (statementInfo *const st)
 	/*/
 	printf ("~~~~~ statement ---->\n");
 	ps (st);
+	printf ("NumTokens: %d\n", NumTokens);
 	printf ("FOUND ReturnType: %s\n", vStringValue (ReturnType));	
 	printf ("<~~~~~\n");
 	//*/
diff --git a/plugins/symbol-db/anjuta-tags/ctags-visitor.vala b/plugins/symbol-db/anjuta-tags/ctags-visitor.vala
index d171a5c..51d662d 100644
--- a/plugins/symbol-db/anjuta-tags/ctags-visitor.vala
+++ b/plugins/symbol-db/anjuta-tags/ctags-visitor.vala
@@ -32,6 +32,7 @@ public struct CTagsEntry {
 	public string scope[2];
 	public string signature;
 	public string typeref;
+	public string returntype;
 }
 
 class DummyReport : Report {
@@ -263,7 +264,7 @@ public class CTagsVisitor : CodeVisitor {
 		entry.kind = 'd';
 		entry.access = get_access (d);
 		scope (d, entry.scope);
-		entry.typeref = d.return_type.to_qualified_string();
+		entry.returntype = d.return_type.to_qualified_string();
 		entry.signature = signature(d.get_parameters());
 
 		taglist.append(entry);
@@ -279,7 +280,7 @@ public class CTagsVisitor : CodeVisitor {
 		entry.access = get_access (sig);
 		entry.implementation = implementation(sig);
 		scope (sig, entry.scope);
-		entry.typeref = sig.return_type.to_qualified_string();
+		entry.returntype = sig.return_type.to_qualified_string();
 		entry.signature = signature(sig.get_parameters());
 
 		taglist.append(entry);
@@ -339,7 +340,7 @@ public class CTagsVisitor : CodeVisitor {
 		entry.access = get_access (m);
 		entry.implementation = implementation(m);
 		scope (m, entry.scope);
-		entry.typeref = m.return_type.to_qualified_string();
+		entry.returntype = m.return_type.to_qualified_string();
 		entry.signature = signature(m.get_parameters());
 
 		taglist.append(entry);
diff --git a/plugins/symbol-db/anjuta-tags/gir.c b/plugins/symbol-db/anjuta-tags/gir.c
index 6997675..517472b 100644
--- a/plugins/symbol-db/anjuta-tags/gir.c
+++ b/plugins/symbol-db/anjuta-tags/gir.c
@@ -12,6 +12,7 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
+#include "ctags-utils.h"
 
 static kindOption Kinds [] = {
 	{ TRUE,  'f', "function",	  "functions"},
@@ -27,20 +28,6 @@ initialize (const langType language)
 }
 
 static void
-get_file_pos (gint line, fpos_t *fpos, FILE *f)
-{
-	vString * str = vStringNew ();
-	gint i;
-	g_assert (fseek (f, 0, SEEK_SET) == 0);
-
-	for (i = 0;i < line - 1; i++)
-		if (readLine (str, f) == NULL)
-			return;
-
-	g_assert (fgetpos (f, fpos) == 0);
-}
-
-static void
 parse_function (xmlNode *node, const gchar *parent)
 {
 	xmlNode *i, *k;
@@ -150,13 +137,15 @@ makeTags (xmlNode *node, const gchar *parent)
 			|| strcmp ((const gchar*)node->name, "bitfield") == 0
 			|| strcmp ((const gchar*)node->name, "interface") == 0)
 	{
-		return parse_class (node);
+		parse_class (node);
+		return;
 	}
 	if (strcmp ((const gchar*)node->name, "function") == 0 || strcmp ((const gchar*)node->name, "method") == 0
 			|| strcmp ((const gchar*)node->name, "callback") == 0
 			|| strcmp ((const gchar*)node->name, "constructor") == 0)
 	{
-		return parse_function (node, parent);
+		parse_function (node, parent);
+		return;
 	}
 	if (strcmp ((const gchar*)node->name, "alias") == 0 ||
 			strcmp ((const gchar*)node->name, "constant") == 0 ||
@@ -184,8 +173,6 @@ makeTags (xmlNode *node, const gchar *parent)
 		makeTagEntry (tag);
 		return;
 	}
-//	puts ((const gchar*)node->name);
-//	g_assert_not_reached ();
 }
 
 static void
diff --git a/plugins/symbol-db/anjuta-tags/jscript.c b/plugins/symbol-db/anjuta-tags/jscript.c
old mode 100755
new mode 100644
index a506e93..e7150e9
--- a/plugins/symbol-db/anjuta-tags/jscript.c
+++ b/plugins/symbol-db/anjuta-tags/jscript.c
@@ -25,10 +25,11 @@
 #include "routines.h"
 #include "vstring.h"
 #include <assert.h>
-#include "js_parser/jstypes.h"
+#include "js-parser/jstypes.h"
 #include <glib.h>
-#include "js_parser/jsparse.h"
-#include "js_parser/js-context.h"
+#include "js-parser/jsparse.h"
+#include "js-parser/js-context.h"
+#include "ctags-utils.h"
 
 #include <string.h>
 
@@ -42,20 +43,6 @@ getTagPos (JSNode *node)
 
 #define PROTOTYPE ".prototype"
 
-static void
-get_file_pos (gint line, fpos_t *fpos, FILE *f)
-{
-	vString * str = vStringNew ();
-	gint i;
-	g_assert (fseek (f, 0, SEEK_SET) == 0);
-
-	for (i = 0;i < line - 1; i++)
-		if (readLine (str, f) == NULL)
-			return;
-
-	g_assert (fgetpos (f, fpos) == 0);
-}
-
 static GList *symbols = NULL;
 static GList *tags = NULL;
 
diff --git a/plugins/symbol-db/anjuta-tags/make.c b/plugins/symbol-db/anjuta-tags/make.c
index f468b5a..7b56830 100644
--- a/plugins/symbol-db/anjuta-tags/make.c
+++ b/plugins/symbol-db/anjuta-tags/make.c
@@ -1,5 +1,5 @@
 /*
-*   $Id: make.c 681 2008-10-12 22:43:00Z dhiebert $
+*   $Id: make.c 751 2010-02-27 17:41:57Z elliotth $
 *
 *   Copyright (c) 2000-2005, Darren Hiebert
 *
@@ -100,7 +100,7 @@ static void skipToMatch (const char *const pair)
 			++matchLevel;
 		else if (c == end)
 			--matchLevel;
-		else if (c == '\n')
+		else if (c == '\n' || c == EOF)
 			break;
 	}
 	if (c == EOF)
diff --git a/plugins/symbol-db/anjuta-tags/python.c b/plugins/symbol-db/anjuta-tags/python.c
index 13367d6..a90d072 100644
--- a/plugins/symbol-db/anjuta-tags/python.c
+++ b/plugins/symbol-db/anjuta-tags/python.c
@@ -1,5 +1,5 @@
 /*
-*   $Id: python.c 738 2009-08-26 13:18:03Z elias $
+*   $Id: python.c 752 2010-02-27 17:52:46Z elliotth $
 *
 *   Copyright (c) 2000-2003, Darren Hiebert
 *
@@ -398,7 +398,9 @@ static void parseFunction (const char *cp, vString *const def,
 	cp = parseIdentifier (cp, def);
 	arglist = parseArglist (cp);
 	makeFunctionTag (def, parent, is_class_parent, arglist);
-	eFree (arglist);
+	if (arglist != NULL) {
+		eFree (arglist);
+	}
 }
 
 /* Get the combined name of a nested symbol. Classes are separated with ".",
diff --git a/plugins/symbol-db/anjuta-tags/vala.c b/plugins/symbol-db/anjuta-tags/vala.c
index 66bad97..555ffc5 100644
--- a/plugins/symbol-db/anjuta-tags/vala.c
+++ b/plugins/symbol-db/anjuta-tags/vala.c
@@ -46,6 +46,7 @@ static void make_ctags_entry (CTagsEntry* entry) {
 	tag.extensionFields.scope[0] = entry->scope[0];
 	tag.extensionFields.scope[1] = entry->scope[1];
 	tag.extensionFields.typeRef[0] = entry->typeref;
+	tag.extensionFields.returnType = entry->returntype;
 	tag.extensionFields.signature = entry->signature;
 	makeTagEntry(&tag);
 }
diff --git a/plugins/symbol-db/anjuta-tags/verilog.c b/plugins/symbol-db/anjuta-tags/verilog.c
index 814f5b0..52afc31 100644
--- a/plugins/symbol-db/anjuta-tags/verilog.c
+++ b/plugins/symbol-db/anjuta-tags/verilog.c
@@ -1,5 +1,5 @@
 /*
-*   $Id: verilog.c 573 2007-06-26 05:41:27Z elliotth $
+*   $Id: verilog.c 753 2010-02-27 17:53:32Z elliotth $
 * 
 *   Copyright (c) 2003, Darren Hiebert
 * 
@@ -232,6 +232,7 @@ static void tagNameList (const verilogKind kind, int c)
 		c = skipWhite (c);
 		if (c == '=')
 		{
+			c = skipWhite (vGetc ());
 			if (c == '{')
 				skipPastMatch ("{}");
 			else
diff --git a/plugins/symbol-db/images/Makefile.am b/plugins/symbol-db/images/Makefile.am
index a98ab7f..a14c000 100644
--- a/plugins/symbol-db/images/Makefile.am
+++ b/plugins/symbol-db/images/Makefile.am
@@ -9,10 +9,19 @@ symbol_browser_icons_DATA = \
 	element-field-16.png \
 	element-interface-16.png \
 	element-interface-24.png \
+	element-interface-private-16.png \
+	element-interface-protected-16.png \
+	element-interface-public-16.png \
 	element-method-16.png \
-  element-method-24.png \
+	element-method-private-16.png \
+	element-method-protected-16.png \
+	element-method-public-16.png \
+	element-method-24.png \
 	element-namespace-16.png \
 	element-property-16.png \
+	element-property-private-16.png \
+	element-property-protected-16.png \
+	element-property-public-16.png \
 	element-structure-16.png
 EXTRA_DIST = $(symbol_browser_icons_DATA)
 
diff --git a/plugins/symbol-db/images/element-method-16.png b/plugins/symbol-db/images/element-method-16.png
index cd51507..977f5b8 100644
Binary files a/plugins/symbol-db/images/element-method-16.png and b/plugins/symbol-db/images/element-method-16.png differ
diff --git a/plugins/symbol-db/plugin.c b/plugins/symbol-db/plugin.c
index 82a4a15..685b7cf 100644
--- a/plugins/symbol-db/plugin.c
+++ b/plugins/symbol-db/plugin.c
@@ -27,8 +27,10 @@
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-utils.h>
+#include <libanjuta/anjuta-tabber.h>
 #include <libanjuta/interfaces/ianjuta-document-manager.h>
 #include <libanjuta/interfaces/ianjuta-symbol-manager.h>
+#include <libanjuta/interfaces/ianjuta-symbol.h>
 #include <libanjuta/interfaces/ianjuta-project-manager.h>
 #include <libanjuta/interfaces/ianjuta-file-manager.h>
 #include <libanjuta/interfaces/ianjuta-file.h>
@@ -1342,6 +1344,7 @@ do_update_project_symbols (SymbolDBPlugin *sdb_plugin, const gchar *root_dir)
 	return FALSE;
 }
 
+#if 0
 /**
  * Check the number of languages used by a project and then enable/disable the 
  * global tab in case there's only C files.
@@ -1378,6 +1381,7 @@ do_check_languages_count (SymbolDBPlugin *sdb_plugin)
 		gtk_widget_set_sensitive (sdb_plugin->global_button, TRUE);
 	}
 }
+#endif
 
 /**
  * @return TRUE is a scan process is started, FALSE elsewhere.
@@ -1778,7 +1782,7 @@ on_project_root_added (AnjutaPlugin *plugin, const gchar *name,
 			if (flag_offline == FALSE && flag_update == FALSE)
 			{
 				/* check for the number of languages used in the opened project. */
-				do_check_languages_count (sdb_plugin);				
+				//do_check_languages_count (sdb_plugin);				
 			}				
 		}
 		gtk_progress_bar_set_text (GTK_PROGRESS_BAR (sdb_plugin->progress_bar_project),
@@ -1885,7 +1889,7 @@ on_scan_end_manager (SymbolDBEngine *dbe, gint process_id,
 			gboolean parallel_scan = anjuta_preferences_get_bool (sdb_plugin->prefs, 
 														 PARALLEL_SCAN); 
 			
-			do_check_languages_count (sdb_plugin);
+			//do_check_languages_count (sdb_plugin);
 			
 			/* check the system population has a parallel fashion or not. */			 
 			if (parallel_scan == FALSE)
@@ -1901,7 +1905,7 @@ on_scan_end_manager (SymbolDBEngine *dbe, gint process_id,
 		case TASK_ELEMENT_ADDED:
 			DEBUG_PRINT ("received TASK_ELEMENT_ADDED");
 			sdb_plugin->is_adding_element = FALSE;
-			do_check_languages_count (sdb_plugin);
+			//do_check_languages_count (sdb_plugin);
 			break;
 			
 		case TASK_OFFLINE_CHANGES:		
@@ -1913,7 +1917,7 @@ on_scan_end_manager (SymbolDBEngine *dbe, gint process_id,
 										  
 			sdb_plugin->is_offline_scanning = FALSE;
 			
-			do_check_languages_count (sdb_plugin);
+			//do_check_languages_count (sdb_plugin);
 			break;
 			
 		case TASK_PROJECT_UPDATE:		
@@ -1963,14 +1967,6 @@ on_scan_end_manager (SymbolDBEngine *dbe, gint process_id,
 	}	
 }
 
-static void
-on_notebook_button_toggled (GtkToggleButton *button,
-                            SymbolDBPlugin *sdb_plugin)
-{
-	int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "__page"));
-	gtk_notebook_set_current_page (GTK_NOTEBOOK(sdb_plugin->dbv_notebook), page);
-}
-
 static gboolean
 symbol_db_activate (AnjutaPlugin *plugin)
 {
@@ -2116,52 +2112,34 @@ symbol_db_activate (AnjutaPlugin *plugin)
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (sdb_plugin->dbv_notebook), FALSE);
 	sdb_plugin->dbv_hbox = gtk_hbox_new (FALSE, 1);
 
-	sdb_plugin->local_button = gtk_radio_button_new_with_label_from_widget (NULL, 
-	                                                                        _("Local"));
-	sdb_plugin->global_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (sdb_plugin->local_button),
-	                                                                         _("Global"));
-	sdb_plugin->search_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (sdb_plugin->global_button),
-	                                                                         _("Search"));
-
-	/* Make the radio buttons look and act like toggle buttons */
-	gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (sdb_plugin->local_button), 
-	                            FALSE);
-	gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (sdb_plugin->global_button),
-	                            FALSE);
-	gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (sdb_plugin->search_button),
-	                            FALSE);
-
-	g_object_set_data (G_OBJECT(sdb_plugin->local_button), "__page", GINT_TO_POINTER(0));
-	g_object_set_data (G_OBJECT(sdb_plugin->global_button), "__page", GINT_TO_POINTER(1));
-	g_object_set_data (G_OBJECT(sdb_plugin->search_button), "__page", GINT_TO_POINTER(2));
-
-	g_signal_connect (sdb_plugin->local_button, "toggled",
-	                  G_CALLBACK(on_notebook_button_toggled),
-	                  sdb_plugin);
-	g_signal_connect (sdb_plugin->global_button, "toggled",
-	                  G_CALLBACK(on_notebook_button_toggled),
-	                  sdb_plugin);
-	g_signal_connect (sdb_plugin->search_button, "toggled",
-	                  G_CALLBACK(on_notebook_button_toggled),
-	                  sdb_plugin);
-
 	label = gtk_label_new (_("Symbols"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
-	gtk_label_set_ellipsize (GTK_LABEL (label),
-	                         PANGO_ELLIPSIZE_END);
 	gtk_box_pack_start (GTK_BOX(sdb_plugin->dbv_hbox), 
 	                    gtk_image_new_from_stock ("symbol-db-plugin-icon",
 	                                              GTK_ICON_SIZE_MENU),
 	                    FALSE, FALSE, 0);	
 	gtk_box_pack_start (GTK_BOX(sdb_plugin->dbv_hbox), label,
-	                    TRUE, TRUE, 0);	
-	gtk_box_pack_start (GTK_BOX(sdb_plugin->dbv_hbox), sdb_plugin->local_button,
-	                    FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX(sdb_plugin->dbv_hbox), sdb_plugin->global_button,
-	                    FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX(sdb_plugin->dbv_hbox), sdb_plugin->search_button,
-	                    FALSE, FALSE, 0);
+	                    FALSE, FALSE, 0);	
 
+	sdb_plugin->tabber = anjuta_tabber_new (GTK_NOTEBOOK (sdb_plugin->dbv_notebook));
+	label = gtk_label_new (_("Local"));
+	gtk_label_set_ellipsize (GTK_LABEL (label),
+	                         PANGO_ELLIPSIZE_END);
+	anjuta_tabber_add_tab (ANJUTA_TABBER (sdb_plugin->tabber),
+	                       label);
+	label = gtk_label_new (_("Global"));
+	gtk_label_set_ellipsize (GTK_LABEL (label),
+	                         PANGO_ELLIPSIZE_END);
+	anjuta_tabber_add_tab (ANJUTA_TABBER (sdb_plugin->tabber),
+	                       label);
+	label = gtk_label_new (_("Search"));
+	gtk_label_set_ellipsize (GTK_LABEL (label),
+	                         PANGO_ELLIPSIZE_END);
+	anjuta_tabber_add_tab (ANJUTA_TABBER (sdb_plugin->tabber),
+	                       label);
+	gtk_box_pack_end (GTK_BOX(sdb_plugin->dbv_hbox), sdb_plugin->tabber,
+	                    TRUE, TRUE, 5);
+	
 	gtk_widget_show_all (sdb_plugin->dbv_hbox);
 	
 	sdb_plugin->progress_bar_project = gtk_progress_bar_new();	
diff --git a/plugins/symbol-db/plugin.h b/plugins/symbol-db/plugin.h
index c2ce000..3247ea8 100644
--- a/plugins/symbol-db/plugin.h
+++ b/plugins/symbol-db/plugin.h
@@ -102,9 +102,7 @@ struct _SymbolDBPlugin {
 	 GtkWidget *scrolled_global; */			/* symbol view scrolledwindow for global
 										   	symbols */
 
-	GtkWidget *local_button;
-	GtkWidget *global_button;
-	GtkWidget *search_button;
+	GtkWidget *tabber;
 	
 	/* GtkWidget *scrolled_locals; */
 	GtkWidget *scrolled_search;
diff --git a/plugins/symbol-db/symbol-db-engine-core.c b/plugins/symbol-db/symbol-db-engine-core.c
index ebec55d..ace13d4 100644
--- a/plugins/symbol-db/symbol-db-engine-core.c
+++ b/plugins/symbol-db/symbol-db-engine-core.c
@@ -2262,8 +2262,8 @@ sdb_engine_init (SymbolDBEngine * object)
 	/* -- sym kind -- */
 	STATIC_QUERY_POPULATE_INIT_NODE(sdbe->priv->static_query_list, 
 									PREP_QUERY_SYM_KIND_NEW,
-	 	"INSERT INTO sym_kind (kind_name) VALUES(## /* name:'kindname' "
-	 	"type:gchararray */)");
+	 	"INSERT INTO sym_kind (kind_name, is_container) VALUES(## /* name:'kindname' "
+	 	"type:gchararray */, ## /* name:'container' type:gint */)");
 
 	STATIC_QUERY_POPULATE_INIT_NODE(sdbe->priv->static_query_list, 
 									PREP_QUERY_GET_SYM_KIND_BY_UNIQUE_NAME,
@@ -2491,30 +2491,14 @@ sdb_engine_init (SymbolDBEngine * object)
 	 * DYNAMIC QUERY STRUCTURE INITIALIZE
 	 */
 	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
-									DYN_PREP_QUERY_GET_CLASS_PARENTS,
-									TRUE);
-	
-	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
 									DYN_PREP_QUERY_GET_CLASS_PARENTS_BY_SYMBOL_ID,
 									FALSE);
 	
 	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
-									DYN_PREP_QUERY_GET_GLOBAL_MEMBERS_FILTERED,
-									TRUE);
-	
-	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
-									DYN_PREP_QUERY_GET_SCOPE_MEMBERS,
-									FALSE);
-	
-	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
 									DYN_PREP_QUERY_GET_CURRENT_SCOPE,				
 									FALSE);
 	
 	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
-									DYN_PREP_QUERY_GET_FILE_SYMBOLS,
-									TRUE);
-
-	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
 								 	DYN_PREP_QUERY_GET_SYMBOL_INFO_BY_ID,
 									FALSE);
 
@@ -2539,10 +2523,6 @@ sdb_engine_init (SymbolDBEngine * object)
 									TRUE);
 
 	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
-								 	DYN_PREP_QUERY_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED,
-									TRUE);
-	
-	DYN_QUERY_POPULATE_INIT_NODE(sdbe->priv->dyn_query_list,
 									DYN_PREP_QUERY_GET_FILES_FOR_PROJECT,
 								 	TRUE);
 	
@@ -3203,11 +3183,12 @@ sdb_engine_check_db_version_and_upgrade (SymbolDBEngine *dbe,
 	}
 	
 	/* FIXME: in the future versions, if the changes grow up, add a better 
-	 * automatic upgrading system 
+	 * automatic upgrading system. Deleting & recreating the db is anyway
+	 * the best option to do.
 	 */
-	if (version < 230)
+	if (version < atoi (SYMBOL_DB_VERSION))
 	{
-		DEBUG_PRINT	 ("Upgrading from version %d to 230", version);
+		DEBUG_PRINT	 ("Upgrading from version %d to "SYMBOL_DB_VERSION, version);
 		
 		/* we need a full recreation of db. Because of the sym_kind table
 		 * which changed its data but not its fields, we must recreate the
@@ -4184,6 +4165,9 @@ sdb_engine_add_new_sym_kind (SymbolDBEngine * dbe, const tagEntry * tag_entry)
 		GdaSet *last_inserted;
 		GValue *ret_value;
 		gboolean ret_bool;
+		gint is_container = 0;
+		SymType sym_type;
+		GError * error = NULL;
 
 		/* not found. Go on with inserting  */
 		if ((stmt = sdb_engine_get_statement_by_query_id (dbe, PREP_QUERY_SYM_KIND_NEW))
@@ -4203,9 +4187,24 @@ sdb_engine_add_new_sym_kind (SymbolDBEngine * dbe, const tagEntry * tag_entry)
 		}
 
 		MP_SET_HOLDER_BATCH_STR(priv, param, kind_name, ret_bool, ret_value);
-	
+
+		/* container parameter */
+		if ((param = gda_set_get_holder ((GdaSet*)plist, "container")) == NULL)
+		{
+			g_warning ("param container is NULL from pquery!");
+			return FALSE;
+		}
+
+		sym_type = GPOINTER_TO_SIZE (g_hash_table_lookup (priv->sym_type_conversion_hash, 
+		    									kind_name));
+		
+		if (sym_type & IANJUTA_SYMBOL_TYPE_SCOPE_CONTAINER)
+			is_container = 1;
+		
+		MP_SET_HOLDER_BATCH_INT(priv, param, is_container, ret_bool, ret_value);
+		
 		/* execute the query with parametes just set */
-		if (gda_connection_statement_execute_non_select (priv->db_connection, 
+		if (gda_connection_statement_execute_non_select(priv->db_connection, 
 														 (GdaStatement*)stmt, 
 														 (GdaSet*)plist, &last_inserted,
 														 NULL) == -1)
@@ -4222,6 +4221,12 @@ sdb_engine_add_new_sym_kind (SymbolDBEngine * dbe, const tagEntry * tag_entry)
 		if (last_inserted)
 			g_object_unref (last_inserted);		
 
+		if (error)
+		{
+			g_warning ("SQL error: %s", error->message);
+			g_error_free (error);
+		}
+		
 		MP_RESET_PLIST(plist);
 	}
 
@@ -5353,7 +5358,7 @@ sdb_engine_add_new_symbol (SymbolDBEngine * dbe, const tagEntry * tag_entry,
 															   type_id);
 
 	/* the container scopes can be: union, struct, typeref, class, namespace etc.
-	 * this field will be parse in the second pass.
+	 * this field will be parsed in the second pass.
 	 */
 	scope_id = 0;
 
@@ -6500,3 +6505,43 @@ symbol_db_engine_set_db_case_sensitive (SymbolDBEngine *dbe, gboolean case_sensi
 	else 
 		sdb_engine_execute_unknown_sql (dbe, "PRAGMA case_sensitive_like = 0");
 }
+
+GdaStatement*
+symbol_db_engine_get_statement (SymbolDBEngine *dbe, const gchar *sql_str)
+{
+	GdaStatement* stmt;
+	GError *error = NULL;
+	
+	g_return_val_if_fail (SYMBOL_IS_DB_ENGINE (dbe), NULL);
+	stmt = gda_sql_parser_parse_string (dbe->priv->sql_parser,
+	                                    sql_str,
+	                                    NULL, &error);
+	if (error)
+	{
+		g_warning ("SQL parsing failed: %s: %s", sql_str, error->message);
+		g_error_free (error);
+	}
+	return stmt;
+}
+
+GdaDataModel*
+symbol_db_engine_execute_select (SymbolDBEngine *dbe, GdaStatement *stmt,
+                                 GdaSet *params)
+{
+	GdaDataModel *res;
+	GError *error = NULL;
+	
+	res = gda_connection_statement_execute_select (dbe->priv->db_connection, 
+												   stmt, params, &error);
+	if (error)
+	{
+		gchar *sql_str =
+			gda_statement_to_sql_extended (stmt, dbe->priv->db_connection,
+			                               params, 0, NULL, NULL);
+
+		g_warning ("SQL select exec failed: %s, %s", sql_str, error->message);
+		g_free (sql_str);
+		g_error_free (error);
+	}
+	return res;
+}
diff --git a/plugins/symbol-db/symbol-db-engine-core.h b/plugins/symbol-db/symbol-db-engine-core.h
index 36ea09d..978e2a5 100644
--- a/plugins/symbol-db/symbol-db-engine-core.h
+++ b/plugins/symbol-db/symbol-db-engine-core.h
@@ -269,6 +269,18 @@ symbol_db_engine_update_buffer_symbols (SymbolDBEngine * dbe, const gchar * proj
 void
 symbol_db_engine_set_db_case_sensitive (SymbolDBEngine *dbe, gboolean case_sensitive);
 
+/**
+ * Compiles an sql statement
+ */
+GdaStatement*
+symbol_db_engine_get_statement (SymbolDBEngine *dbe, const gchar *sql_str);
+
+/**
+ * Executes a parameterized sql statement
+ */
+GdaDataModel*
+symbol_db_engine_execute_select (SymbolDBEngine *dbe, GdaStatement *stmt,
+                                 GdaSet *params);
 
 G_END_DECLS
 
diff --git a/plugins/symbol-db/symbol-db-engine-priv.h b/plugins/symbol-db/symbol-db-engine-priv.h
index 48d6b35..5dcd729 100644
--- a/plugins/symbol-db/symbol-db-engine-priv.h
+++ b/plugins/symbol-db/symbol-db-engine-priv.h
@@ -31,17 +31,14 @@
 #include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 
-#ifdef __GNUC__
-#define GNUC_INLINE inline
-#else
-#define GNUC_INLINE 
-#endif
+#include <libanjuta/interfaces/ianjuta-symbol-manager.h>
+#include <libanjuta/interfaces/ianjuta-symbol.h>
 
 /* file should be specified without the ".db" extension. */
 #define ANJUTA_DB_FILE	".anjuta_sym_db"
 
 /* if tables.sql changes or general db structure changes modify also the value here */
-#define SYMBOL_DB_VERSION	"230"
+#define SYMBOL_DB_VERSION	"300"
 
 #define TABLES_SQL			PACKAGE_DATA_DIR"/tables.sql"
 
@@ -202,19 +199,14 @@ typedef struct _static_query_node
 } static_query_node;
 
 typedef enum {
-	DYN_PREP_QUERY_GET_CLASS_PARENTS = 0,
-	DYN_PREP_QUERY_GET_CLASS_PARENTS_BY_SYMBOL_ID,
-	DYN_PREP_QUERY_GET_GLOBAL_MEMBERS_FILTERED,
-	DYN_PREP_QUERY_GET_SCOPE_MEMBERS,
+	DYN_PREP_QUERY_GET_CLASS_PARENTS_BY_SYMBOL_ID = 0,
 	DYN_PREP_QUERY_GET_CURRENT_SCOPE,
-	DYN_PREP_QUERY_GET_FILE_SYMBOLS,
 	DYN_PREP_QUERY_GET_SYMBOL_INFO_BY_ID,
 	DYN_PREP_QUERY_FIND_SYMBOL_NAME_BY_PATTERN,
 	DYN_PREP_QUERY_FIND_SYMBOL_BY_NAME_PATTERN_FILTERED,
 	DYN_PREP_QUERY_FIND_SYMBOL_BY_NAME_PATTERN_FILE,
 	DYN_PREP_QUERY_FIND_SYMBOL_IN_SCOPE,
 	DYN_PREP_QUERY_GET_SCOPE_MEMBERS_BY_SYMBOL_ID,
-	DYN_PREP_QUERY_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED,
 	DYN_PREP_QUERY_GET_FILES_FOR_PROJECT,
 	DYN_PREP_QUERY_COUNT
 		
@@ -274,45 +266,9 @@ typedef enum {
 	
 } SymExtraInfo;
 
-/* WARNING: these must match the ones on libanjuta.idl [IAnjutaSymbol::Type] */
-typedef enum 
-{
-	SYMTYPE_UNDEF = 1,                
-	SYMTYPE_CLASS = 2,                
-	SYMTYPE_ENUM = 4,                 
-	SYMTYPE_ENUMERATOR = 8,           
-	SYMTYPE_FIELD = 16,               
-	SYMTYPE_FUNCTION = 32,            
-	SYMTYPE_INTERFACE = 64,           
-	SYMTYPE_MEMBER = 128,             
-	SYMTYPE_METHOD = 256,             
-	SYMTYPE_NAMESPACE = 512,          
-	SYMTYPE_PACKAGE = 1024,           
-	SYMTYPE_PROTOTYPE = 2048,         
-	SYMTYPE_STRUCT = 4096,            
-	SYMTYPE_TYPEDEF = 8192,           
-	SYMTYPE_UNION = 16384,            
-	SYMTYPE_VARIABLE = 32768,
-	SYMTYPE_EXTERNVAR = 65536,
-	SYMTYPE_MACRO = 131072,
-	SYMTYPE_MACRO_WITH_ARG = 262144,
-	SYMTYPE_FILE = 524288,
-	SYMTYPE_OTHER = 1048576,
-	SYMTYPE_SCOPE_CONTAINER = SYMTYPE_CLASS | SYMTYPE_ENUM | SYMTYPE_ENUMERATOR |
-							SYMTYPE_INTERFACE | SYMTYPE_NAMESPACE | SYMTYPE_PACKAGE |
-							SYMTYPE_STRUCT | SYMTYPE_TYPEDEF | SYMTYPE_UNION,
-	SYMTYPE_MAX = 2097151,	
-		
-} SymType;
 
-/* WARNING: these must match the ones on libanjuta.idl [IAnjutaSymbolManager:SearchFileScope] */
-typedef enum 
-{
-	SYMSEARCH_FILESCOPE_IGNORE = -1,
-	SYMSEARCH_FILESCOPE_PUBLIC = 1,
-	SYMSEARCH_FILESCOPE_PRIVATE = 0
-	
-} SymSearchFileScope;
+typedef IAnjutaSymbolType SymType;
+typedef IAnjutaSymbolManagerSearchFileScope SymSearchFileScope;
 
 /* the SymbolDBEngine Private structure */
 struct _SymbolDBEnginePriv
diff --git a/plugins/symbol-db/symbol-db-engine-queries.c b/plugins/symbol-db/symbol-db-engine-queries.c
index a497d53..b2f4c85 100644
--- a/plugins/symbol-db/symbol-db-engine-queries.c
+++ b/plugins/symbol-db/symbol-db-engine-queries.c
@@ -392,696 +392,14 @@ symbol_db_engine_get_class_parents_by_symbol_id (SymbolDBEngine *dbe,
 												priv->project_directory);	
 }
 
-/** 
- * Returns an iterator to the data retrieved from database. 
- * The iterator, if not null, will contain a list of parent classes for the given 
- * symbol name.
- * scope_path can be NULL.
- */
-#define DYN_GET_CLASS_PARENTS_EXTRA_PAR_FINAL_DEF_ZERO		1
-#define DYN_GET_CLASS_PARENTS_EXTRA_PAR_FINAL_DEF_POSITIVE	2
-
-SymbolDBEngineIterator *
-symbol_db_engine_get_class_parents (SymbolDBEngine *dbe, const gchar *klass_name, 
-									 const GPtrArray *scope_path, SymExtraInfo sym_info)
-{
-	SymbolDBEnginePriv *priv;
-	gchar *query_str;
-	GdaDataModel *data;
-	GdaHolder *param;
-	GString *info_data;
-	GString *join_data;
-	gint final_definition_id;
-	const DynChildQueryNode *dyn_node;
-	GValue *ret_value;
-	gboolean ret_bool;
-	
-	g_return_val_if_fail (dbe != NULL, FALSE);
-	priv = dbe->priv;
-	
-	SDB_LOCK(priv);
-	
-	final_definition_id = -1;
-	if (scope_path != NULL)	
-		final_definition_id = sdb_engine_walk_down_scope_path (dbe, scope_path);
-
-	if ((dyn_node = sdb_engine_get_dyn_query_node_by_id (dbe, 
-					DYN_PREP_QUERY_GET_CLASS_PARENTS, sym_info, 
-					final_definition_id > 0 ? 
-					DYN_GET_CLASS_PARENTS_EXTRA_PAR_FINAL_DEF_POSITIVE :
-					DYN_GET_CLASS_PARENTS_EXTRA_PAR_FINAL_DEF_ZERO)) == NULL)
-	{
-		
-		/* info_data contains the stuff after SELECT and before FROM */
-		info_data = g_string_new ("");
-	
-		/* join_data contains the optionals joins to do to retrieve new data on other
-	 	 * tables.
-	 	 */
-		join_data = g_string_new ("");
-
-		/* fill info_data and join data with optional sql */
-		sdb_engine_prepare_symbol_info_sql (dbe, info_data, join_data, sym_info);
-	
-		if (final_definition_id > 0)
-		{		
-			query_str = g_strdup_printf("SELECT symbol.symbol_id AS symbol_id, "
-				"symbol.name AS name, symbol.file_position AS file_position, "
-				"symbol.is_file_scope AS is_file_scope, symbol.signature AS signature, "
-			    "symbol.returntype AS returntype "
-				"%s FROM heritage "
-				"JOIN symbol ON heritage.symbol_id_base = symbol.symbol_id %s "
-				"WHERE symbol_id_derived = ("
-					"SELECT symbol_id FROM symbol "
-						"JOIN sym_kind ON symbol.kind_id = sym_kind.sym_kind_id "
-						"WHERE symbol.name = ## /* name:'klassname' type:gchararray */ "
-							"AND sym_kind.kind_name = 'class' "
-							"AND symbol.scope_id = ## /* name:'defid' type:gint */"
-					")", info_data->str, join_data->str);
-			
-			dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
-							DYN_PREP_QUERY_GET_CLASS_PARENTS,
-							sym_info, DYN_GET_CLASS_PARENTS_EXTRA_PAR_FINAL_DEF_POSITIVE,
-							query_str);
-		}
-		else 
-		{
-			query_str = g_strdup_printf("SELECT symbol.symbol_id AS symbol_id, "
-				"symbol.name AS name, symbol.file_position AS file_position, "
-				"symbol.is_file_scope AS is_file_scope, "
-				"symbol.signature AS signature, symbol.returntype AS returntype "
-			    "%s FROM heritage "
-				"JOIN symbol ON heritage.symbol_id_base = symbol.symbol_id %s "
-				"WHERE symbol_id_derived = ("
-					"SELECT symbol_id FROM symbol "
-						"JOIN sym_kind ON symbol.kind_id = sym_kind.sym_kind_id "
-						"WHERE symbol.name = ## /* name:'klassname' type:gchararray */ "
-							"AND sym_kind.kind_name = 'class' "
-					")", info_data->str, join_data->str);
-			
-			dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
-							DYN_PREP_QUERY_GET_CLASS_PARENTS,
-							sym_info, DYN_GET_CLASS_PARENTS_EXTRA_PAR_FINAL_DEF_ZERO,
-							query_str);
-		}	
-		
-		g_free (query_str);
-		g_string_free (info_data, TRUE);
-		g_string_free (join_data, TRUE);
-	}
-
-	
-	if (dyn_node == NULL) 
-	{		
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-	
-	if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "klassname")) == NULL)
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-	
-	MP_SET_HOLDER_BATCH_STR(priv, param, klass_name, ret_bool, ret_value);	
-	
-	if (final_definition_id > 0)
-	{
-		if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "defid")) == NULL)
-		{
-			SDB_UNLOCK(priv);
-			return NULL;
-		}
-		
-		MP_SET_HOLDER_BATCH_INT(priv, param, final_definition_id, ret_bool, ret_value);
-	}	
-			
-	/* execute the query with parametes just set */
-	data = gda_connection_statement_execute_select (priv->db_connection, 
-												  (GdaStatement*)dyn_node->stmt, 
-												  (GdaSet*)dyn_node->plist, NULL);
-
-	MP_RESET_PLIST(dyn_node->plist);
-	
-	if (!GDA_IS_DATA_MODEL (data) ||
-		gda_data_model_get_n_rows (GDA_DATA_MODEL (data)) <= 0)
-	{
-		if (data != NULL)
-			g_object_unref (data);
-		
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-
-	SDB_UNLOCK(priv);
-	return (SymbolDBEngineIterator *)symbol_db_engine_iterator_new (data, 
-												priv->sym_type_conversion_hash,
-												priv->project_directory);
-}
-
-/**
- * Personalized GTree mapping:
- * Considering that a gint on a x86 is 4 bytes: we'll reserve:
- * 3 bytes to map the main parameters.
- * 1 byte is for filter_kinds number, so you'll be able to filter up to 255 parameters.
- * |--------------------------------|-------------|
- *        main parameters [3 bytes]  extra [1 byte]
- */
-#define DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_LIMIT					0x0100
-#define DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_OFFSET				0x0200
-#define DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_GROUP_YES				0x0400
-#define DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_GROUP_NO				0x0800
-#define DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_INCLUDE_KINDS_YES 	0x1000
-#define DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_INCLUDE_KINDS_NO	 	0x2000
-
-SymbolDBEngineIterator *
-symbol_db_engine_get_global_members_filtered (SymbolDBEngine *dbe, 
-									SymType filter_kinds,
-									gboolean include_kinds, 
-									gboolean group_them,
-									gint results_limit, 
-									gint results_offset,
-								 	SymExtraInfo sym_info)
-{
-	SymbolDBEnginePriv *priv;
-	GdaDataModel *data;
-	GString *info_data;
-	GString *join_data;
-	GString *filter_str;
-	gchar *query_str;
-	const gchar *group_by_option;
-	gchar *limit = "";
-	gboolean limit_free = FALSE;
-	gchar *offset = "";
-	gboolean offset_free = FALSE;
-	const DynChildQueryNode *dyn_node = NULL;
-	GdaHolder *param;
-	GValue *ret_value;
-	gboolean ret_bool;
-	GPtrArray *filter_kinds_array;
-
-	/* use to merge multiple extra_parameters flags */
-	gint other_parameters = 0;	
-	
-	g_return_val_if_fail (dbe != NULL, NULL);
-	priv = dbe->priv;
-	
-	SDB_LOCK(priv);
-	
-	/* check for an already flagged sym_info with KIND. SYMINFO_KIND on sym_info
-	 * is already contained into the default query infos.
-	 */
-	sym_info = sym_info & ~SYMINFO_KIND;
-
-	/* determine the filter_kinds thing */
-	if (filter_kinds == SYMTYPE_UNDEF)
-		filter_kinds_array = NULL;
-	else
-		filter_kinds_array = symbol_db_util_fill_type_array (filter_kinds);
-	
-	if (group_them == TRUE)
-	{
-		other_parameters |= DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_GROUP_YES;
-		group_by_option = "GROUP BY symbol.name";
-	}
-	else 
-	{
-		other_parameters |= DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_GROUP_NO;
-		group_by_option = "";
-	}
-
-	if (results_limit > 0)
-	{
-		other_parameters |= DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_LIMIT;
-		limit_free = TRUE;
-		limit = g_strdup_printf ("LIMIT ## /* name:'limit' type:gint */");
-	}
-	
-	if (results_offset > 0)
-	{
-		other_parameters |= DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_OFFSET;
-		offset = g_strdup_printf ("OFFSET ## /* name:'offset' type:gint */");
-		offset_free = TRUE;
-	}
-	
-	/* test if user gave an array with more than 255 filter_kinds. In that case
-	 * we'll not be able to save/handle it, so consider it as a NULL array 
-	 */
-	if (filter_kinds_array == NULL || filter_kinds_array->len > 255 || filter_kinds_array->len <= 0) 
-	{
-		if ((dyn_node = sdb_engine_get_dyn_query_node_by_id (dbe, 
-					DYN_PREP_QUERY_GET_GLOBAL_MEMBERS_FILTERED, sym_info,
-					other_parameters)) == NULL)
-		{
-			/* info_data contains the stuff after SELECT and befor FROM */
-			info_data = g_string_new ("");
-	
-			/* join_data contains the optionals joins to do to retrieve new data on other
-	 	 	 * tables.
-	 	 	 */
-			join_data = g_string_new ("");
-
-			/* fill info_data and join data with optional sql */
-			sdb_engine_prepare_symbol_info_sql (dbe, info_data, join_data, sym_info);
-			
-			query_str = g_strdup_printf ("SELECT symbol.symbol_id AS symbol_id, "
-				"symbol.name AS name, symbol.file_position AS file_position, "
-				"symbol.is_file_scope AS is_file_scope, "
-				"symbol.signature AS signature, symbol.returntype AS returntype"
-			    " %s, sym_kind.kind_name AS kind_name FROM symbol "
-					"JOIN sym_kind ON symbol.kind_id = sym_kind.sym_kind_id %s "
-					"WHERE symbol.scope_id <= 0 AND symbol.is_file_scope = 0 "
-							"%s order by name %s %s", info_data->str, join_data->str,
-						 	group_by_option, limit, offset);
-			
-			dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
-							DYN_PREP_QUERY_GET_GLOBAL_MEMBERS_FILTERED,
-							sym_info, other_parameters,
-							query_str);			
-			
-			g_free (query_str);
-			g_string_free (join_data, TRUE);
-			g_string_free (info_data, TRUE);
-		}
-	}
-	else
-	{
-		if (include_kinds == TRUE)
-		{
-			other_parameters |= 
-				DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_INCLUDE_KINDS_YES;
-		}
-		else
-		{
-			other_parameters |= 
-				DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_INCLUDE_KINDS_NO;
-		}
-		
-		/* set the number of parameters in the less important byte */
-		other_parameters |= filter_kinds_array->len;
-		
-		if ((dyn_node = sdb_engine_get_dyn_query_node_by_id (dbe, 
-				DYN_PREP_QUERY_GET_GLOBAL_MEMBERS_FILTERED, sym_info,
-				other_parameters)) == NULL)
-		{		
-			gint i;
-			/* info_data contains the stuff after SELECT and befor FROM */
-			info_data = g_string_new ("");
-	
-			/* join_data contains the optionals joins to do to retrieve new data on other
- 	 	 	 * tables.
- 	 	 	 */
-			join_data = g_string_new ("");
-
-			/* fill info_data and join data with optional sql */
-			sdb_engine_prepare_symbol_info_sql (dbe, info_data, join_data, sym_info);				
-
-			/* prepare the dynamic filter string before the final query */
-			filter_str = g_string_new ("");
-			
-			if (include_kinds == TRUE)
-			{				
-				filter_str = g_string_append (filter_str , 
-					"AND sym_kind.kind_name IN (## /* name:'filter0' type:gchararray */");
-			}
-			else
-			{
-				filter_str = g_string_append (filter_str , 
-					"AND sym_kind.kind_name NOT IN (## /* name:'filter0' type:gchararray */");
-			}
-			
-			for (i = 1; i < filter_kinds_array->len; i++)
-			{				
-				g_string_append_printf (filter_str , 
-						",## /* name:'filter%d' type:gchararray */", i);
-			}
-			filter_str = g_string_append (filter_str , ")");
-			
-			query_str = g_strdup_printf ("SELECT symbol.symbol_id AS symbol_id, "
-				"symbol.name AS name, symbol.file_position AS file_position, "
-				"symbol.is_file_scope AS is_file_scope, symbol.signature AS signature, "
-			    	"symbol.returntype AS returntype "
-			        "%s, sym_kind.kind_name AS kind_name FROM symbol "
-					"%s JOIN sym_kind ON symbol.kind_id = sym_kind.sym_kind_id "
-					"WHERE symbol.scope_id <= 0 AND symbol.is_file_scope = 0 "
-					"%s %s order by name %s %s", info_data->str, join_data->str, 
-							 filter_str->str, group_by_option, limit, offset);
-		
-			dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
-						DYN_PREP_QUERY_GET_GLOBAL_MEMBERS_FILTERED,
-						sym_info, other_parameters,
-						query_str);
-				
-			g_free (query_str);
-			g_string_free (join_data, TRUE);
-			g_string_free (info_data, TRUE);
-			g_string_free (filter_str, TRUE);
-		}
-	}	
-	
-	if (limit_free)
-		g_free (limit);
-	
-	if (offset_free)
-		g_free (offset);
-	
-	if (dyn_node == NULL)
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-	
-	if (other_parameters & DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_LIMIT)
-	{	
-		if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "limit")) == NULL)
-		{
-			SDB_UNLOCK(priv);
-			return NULL;
-		}
-
-		MP_SET_HOLDER_BATCH_INT(priv, param, results_limit, ret_bool, ret_value);
-	}
-
-	if (other_parameters & DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_OFFSET)
-	{	
-		if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "offset")) == NULL)
-		{
-			SDB_UNLOCK(priv);
-			return NULL;
-		}
-
-		MP_SET_HOLDER_BATCH_INT(priv, param, results_offset, ret_bool, ret_value);		
-	}
-	
-	
-	if (other_parameters & DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_INCLUDE_KINDS_YES ||
-		other_parameters & DYN_GET_GLOBAL_MEMBERS_FILTERED_EXTRA_PAR_INCLUDE_KINDS_NO)
-	{	
-		gint i;
-		for (i = 0; i < filter_kinds_array->len; i++)
-		{
-			gchar *curr_str = g_strdup_printf ("filter%d", i);
-			param = gda_set_get_holder ((GdaSet*)dyn_node->plist, curr_str);
-
-			MP_SET_HOLDER_BATCH_STR(priv, param, g_ptr_array_index (filter_kinds_array, i), 
-									ret_bool, ret_value);
-			g_free (curr_str);
-		}
-	}	
-
-	/*DEBUG_PRINT ("symbol_db_engine_get_global_members_filtered  () query_str is %s",
-				 dyn_node->query_str);*/
-
-
-	/* execute the query with parametes just set */
-	data = gda_connection_statement_execute_select (priv->db_connection, 
-												  (GdaStatement*)dyn_node->stmt, 
-												  (GdaSet*)dyn_node->plist, NULL);
-	MP_RESET_PLIST(dyn_node->plist);
-
-	/* free the filter kinds, if it's not null */
-	if (filter_kinds_array)
-	{
-		g_ptr_array_foreach (filter_kinds_array, (GFunc)g_free, NULL);
-		g_ptr_array_free (filter_kinds_array, TRUE);
-	}
-	
-	if (!GDA_IS_DATA_MODEL (data) ||
-		gda_data_model_get_n_rows (GDA_DATA_MODEL (data)) <= 0)
-	{
-		if (data != NULL)
-			g_object_unref (data);
-		
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-
-	SDB_UNLOCK(priv);
-	return (SymbolDBEngineIterator *)symbol_db_engine_iterator_new (data, 
-												priv->sym_type_conversion_hash,
-												priv->project_directory);	
-}
-
-/**
- * Personalized GTree mapping:
- * Considering that a gint on a x86 is 4 bytes: we'll reserve:
- * 3 bytes to map the main parameters.
- * 1 byte is for filter_kinds number, so you'll be able to filter up to 255 parameters.
- * |--------------------------------|-------------|
- *        main parameters [3 bytes]  extra [1 byte] 
- */
-#define DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_LIMIT					0x0100
-#define DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_OFFSET				0x0200
-#define DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_INCLUDE_KINDS_YES		0x0400
-#define DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_INCLUDE_KINDS_NO		0x0800
-
-SymbolDBEngineIterator *
-symbol_db_engine_get_scope_members_by_symbol_id_filtered (SymbolDBEngine *dbe, 
-									gint scope_parent_symbol_id, 
-									SymType filter_kinds,
-									gboolean include_kinds,
-									gint results_limit,
-									gint results_offset,
-									SymExtraInfo sym_info)
-{
-	SymbolDBEnginePriv *priv;
-	gchar *query_str;	
-	GdaDataModel *data;
-	GString *info_data;
-	GString *join_data;
-	GString *filter_str;
-	gchar *limit = "";
-	gboolean limit_free = FALSE;
-	gchar *offset = "";
-	gboolean offset_free = FALSE;
-	gint other_parameters;
-	const DynChildQueryNode *dyn_node = NULL;
-	GdaHolder *param;
-	GValue *ret_value;
-	gboolean ret_bool;
-	GPtrArray *filter_kinds_array;
-	
-	g_return_val_if_fail (dbe != NULL, NULL);
-	priv = dbe->priv;
-
-	SDB_LOCK(priv);
-	
-	if (scope_parent_symbol_id <= 0)
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-	
-	/* syminfo kind is already included in results */
-	sym_info = sym_info & ~SYMINFO_KIND;
-
-	/* determine the filter_kinds thing */
-	if (filter_kinds == SYMTYPE_UNDEF)
-		filter_kinds_array = NULL;
-	else
-		filter_kinds_array = symbol_db_util_fill_type_array (filter_kinds);
-	
-	/* init parameters */
-	other_parameters = 0;	
-
-	if (results_limit > 0)
-	{
-		limit = g_strdup_printf ("LIMIT ## /* name:'limit' type:gint */");
-		limit_free = TRUE;
-		other_parameters |= 
-			DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_LIMIT;
-	}
-	
-	if (results_offset > 0)
-	{
-		offset = g_strdup_printf ("OFFSET ## /* name:'offset' type:gint */");
-		offset_free = TRUE;
-		other_parameters |=
-			DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_OFFSET;
-	}
-		
-	/* build filter string */
-	if (include_kinds == TRUE)
-	{
-		other_parameters |= 
-			DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_INCLUDE_KINDS_YES;
-	}
-	else
-	{
-		other_parameters |= 
-			DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_INCLUDE_KINDS_NO;
-	}
-	
-	/* we'll take into consideration the number of filter_kinds only it the number
-	 * is fillable in a byte.
-	 */
-	if (filter_kinds_array != NULL && filter_kinds_array->len < 255 
-		&& filter_kinds_array->len > 0)
-	{		
-		/* set the number of parameters in the less important byte */
-		other_parameters |= filter_kinds_array->len;	
-	}
-	
-	if ((dyn_node = sdb_engine_get_dyn_query_node_by_id (dbe, 
-				DYN_PREP_QUERY_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED, sym_info, 
-				other_parameters)) == NULL)
-	{	
-		gint i;		
-		
-		/* info_data contains the stuff after SELECT and befor FROM */
-		info_data = g_string_new ("");
-	
-		/* join_data contains the optionals joins to do to retrieve new data on other
-	 	 * tables.
-	 	 */
-		join_data = g_string_new ("");
-			
-		/* fill info_data and join data with optional sql */
-		sdb_engine_prepare_symbol_info_sql (dbe, info_data, join_data, sym_info);
-
-		filter_str = g_string_new ("");
-		if (include_kinds == TRUE)
-		{			
-			filter_str = g_string_append (filter_str , 
-				"AND sym_kind.kind_name IN (## /* name:'filter0' type:gchararray */");
-		}
-		else
-		{
-			filter_str = g_string_append (filter_str , 
-				"AND sym_kind.kind_name NOT IN (## /* name:'filter0' type:gchararray */");
-		}
-		
-		for (i = 1; i < filter_kinds_array->len; i++)
-		{				
-			g_string_append_printf (filter_str , 
-					",## /* name:'filter%d' type:gchararray */", i);
-		}
-		filter_str = g_string_append (filter_str , ")");
-		
-		/* ok, beware that we use an 'alias hack' to accomplish compatibility with 
-	 	 * sdb_engine_prepare_symbol_info_sql () function. In particular we called
-	 	 * the first joining table 'a', the second one 'symbol', where there is the info we
-	 	 * want 
-	 	 */		
-		query_str = g_strdup_printf ("SELECT symbol.symbol_id AS symbol_id, "
-			"symbol.name AS name, "
-			"symbol.file_position AS file_position, "
-			"symbol.is_file_scope AS is_file_scope, symbol.signature AS signature, "
-		    "symbol.returntype AS returntype, "
-			"sym_kind.kind_name AS kind_name %s "
-			"FROM symbol a, symbol symbol "
-			"%s JOIN sym_kind ON symbol.kind_id = sym_kind.sym_kind_id "
-			"WHERE a.symbol_id = ## /* name:'scopeparentsymid' type:gint */ "
-			"AND symbol.scope_id = a.scope_definition_id "
-			"AND symbol.scope_id > 0 %s order by name %s %s", info_data->str, join_data->str,
-									 filter_str->str, limit, offset);		
-									 
-		dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
-							DYN_PREP_QUERY_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED,
-							sym_info, other_parameters,
-							query_str);
-			
-		g_free (query_str);
-		g_string_free (join_data, TRUE);
-		g_string_free (info_data, TRUE);
-		g_string_free (filter_str, TRUE);
-	}	
-	
-	if (limit_free)
-		g_free (limit);
-	
-	if (offset_free)
-		g_free (offset);
-
-	if (dyn_node == NULL)
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
-	}	
-	
-	if (other_parameters & DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_LIMIT)
-	{	
-		if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "limit")) == NULL)
-		{
-			SDB_UNLOCK(priv);
-			return NULL;
-		}
-
-		MP_SET_HOLDER_BATCH_INT(priv, param, results_limit, ret_bool, ret_value);
-	}
-
-	if (other_parameters & DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_OFFSET)
-	{	
-		if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "offset")) == NULL)
-		{
-			SDB_UNLOCK(priv);
-			return NULL;
-		}
-
-		MP_SET_HOLDER_BATCH_INT(priv, param, results_offset, ret_bool, ret_value);
-	}	
-	
-	if (other_parameters & 
-			DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_INCLUDE_KINDS_YES ||
-		other_parameters & 
-			DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_FILTERED_EXTRA_PAR_INCLUDE_KINDS_NO)
-	{	
-		gint i;
-		for (i = 0; i < filter_kinds_array->len; i++)
-		{
-			gchar *curr_str = g_strdup_printf ("filter%d", i);
-			param = gda_set_get_holder ((GdaSet*)dyn_node->plist, curr_str);
-			
-			MP_SET_HOLDER_BATCH_STR(priv, param, g_ptr_array_index (filter_kinds_array, i), 
-									ret_bool, ret_value);
-			g_free (curr_str);
-		}
-	}	
-
-	if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "scopeparentsymid")) == NULL)
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-
-	MP_SET_HOLDER_BATCH_INT(priv, param, scope_parent_symbol_id, ret_bool, ret_value);	
-
-
-	/* execute the query with parametes just set */
-	data = gda_connection_statement_execute_select (priv->db_connection, 
-												  (GdaStatement*)dyn_node->stmt, 
-												  (GdaSet*)dyn_node->plist, NULL);
-	MP_RESET_PLIST(dyn_node->plist);
-
-	/* free the filter kinds, if it's not null */
-	if (filter_kinds_array)
-	{
-		g_ptr_array_foreach (filter_kinds_array, (GFunc)g_free, NULL);
-		g_ptr_array_free (filter_kinds_array, TRUE);
-	}
-	
-	if (!GDA_IS_DATA_MODEL (data) ||
-		gda_data_model_get_n_rows (GDA_DATA_MODEL (data)) <= 0)
-	{
-		if (data != NULL)
-			g_object_unref (data);
-		
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-
-	SDB_UNLOCK(priv);
-	return (SymbolDBEngineIterator *)symbol_db_engine_iterator_new (data, 
-												priv->sym_type_conversion_hash,
-												priv->project_directory);	
-}
-
 #define DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_EXTRA_PAR_LIMIT		1
 #define DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_EXTRA_PAR_OFFSET		2
+#define DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_EXTRA_PAR_FILE_PATH  4
 
 SymbolDBEngineIterator *
 symbol_db_engine_get_scope_members_by_symbol_id (SymbolDBEngine *dbe, 
-									gint scope_parent_symbol_id, 
+									gint scope_parent_symbol_id,
+                                    gchar *scope_file_path,
 									gint results_limit,
 									gint results_offset,
 									SymExtraInfo sym_info)
@@ -1099,11 +417,15 @@ select b.* from symbol a, symbol b where a.symbol_id = 348 and
 	gboolean limit_free = FALSE;
 	gchar *offset = "";
 	gboolean offset_free = FALSE;
+	gchar *file_path = "";
+	gboolean file_path_free = FALSE;
+	gchar *relative_path = NULL;
 	gint other_parameters;
 	const DynChildQueryNode *dyn_node = NULL;
 	GdaHolder *param;
 	GValue *ret_value;
 	gboolean ret_bool;
+	GError *error = NULL;
 	
 	g_return_val_if_fail (dbe != NULL, NULL);
 	priv = dbe->priv;
@@ -1132,6 +454,13 @@ select b.* from symbol a, symbol b where a.symbol_id = 348 and
 		other_parameters |= DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_EXTRA_PAR_OFFSET;
 	}
 	
+	if (scope_file_path)
+	{
+		file_path = g_strdup_printf (" AND file.file_path = ## /* name:'filepath' type:gchararray */");
+		file_path_free = TRUE;
+		other_parameters |= DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_EXTRA_PAR_FILE_PATH;
+	}
+	
 	if ((dyn_node = sdb_engine_get_dyn_query_node_by_id (dbe, 
 				DYN_PREP_QUERY_GET_SCOPE_MEMBERS_BY_SYMBOL_ID, sym_info, 
 				other_parameters)) == NULL)
@@ -1159,9 +488,10 @@ select b.* from symbol a, symbol b where a.symbol_id = 348 and
 		    "symbol.returntype AS returntype "
 			"%s FROM symbol a, symbol symbol "
 			"%s WHERE a.symbol_id = ## /* name:'scopeparentsymid' type:gint */ "
-			"AND symbol.scope_id = a.scope_definition_id "
-			"AND symbol.scope_id > 0 order by name %s %s", info_data->str, join_data->str,
-								 limit, offset);	
+			"AND symbol.scope_id = a.scope_definition_id %s "
+			"AND symbol.scope_id > 0 order by name %s %s",
+		                             info_data->str, join_data->str,
+		                             file_path, limit, offset);	
 		
 		dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
 							DYN_PREP_QUERY_GET_SCOPE_MEMBERS_BY_SYMBOL_ID,
@@ -1179,6 +509,9 @@ select b.* from symbol a, symbol b where a.symbol_id = 348 and
 	if (offset_free)
 		g_free (offset);
 
+	if (file_path_free)
+		g_free (file_path);
+
 	if (dyn_node == NULL) 
 	{		
 		SDB_UNLOCK(priv);
@@ -1216,135 +549,45 @@ select b.* from symbol a, symbol b where a.symbol_id = 348 and
 
 	MP_SET_HOLDER_BATCH_INT(priv, param, scope_parent_symbol_id, ret_bool, ret_value);	
 	
-	/*DEBUG_PRINT ("symbol_db_engine_get_scope_members_by_symbol_id (): %s", 
-				 dyn_node->query_str);*/
-	
-	/* execute the query with parametes just set */
-	data = gda_connection_statement_execute_select (priv->db_connection, 
-												  (GdaStatement*)dyn_node->stmt, 
-												  (GdaSet*)dyn_node->plist, NULL);
-	MP_RESET_PLIST(dyn_node->plist);
-	
-	/*gda_data_model_dump (data, stdout);*/
-	if (!GDA_IS_DATA_MODEL (data) ||
-		gda_data_model_get_n_rows (GDA_DATA_MODEL (data)) <= 0)
+	if (other_parameters & DYN_GET_SCOPE_MEMBERS_BY_SYMBOL_ID_EXTRA_PAR_FILE_PATH)
 	{
-		if (data != NULL)
-			g_object_unref (data);
-		
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-
-	SDB_UNLOCK(priv);
-	return (SymbolDBEngineIterator *)symbol_db_engine_iterator_new (data, 
-												priv->sym_type_conversion_hash,
-												priv->project_directory);	
-}
+		if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "filepath")) == NULL)
+		{
+			SDB_UNLOCK(priv);
+			return NULL;
+		}
 
-SymbolDBEngineIterator *
-symbol_db_engine_get_scope_members_by_path (SymbolDBEngine *dbe, 
-									const GPtrArray* scope_path, 
-									SymExtraInfo sym_info)
-{
-/*
-simple scope 
-	
-select * from symbol where scope_id = (
-	select scope.scope_id from scope
-		inner join sym_type on scope.type_id = sym_type.type_id 
-		where sym_type.type = 'class' 
-			and scope.scope_name = 'MyClass'
-	);
-	
-select * from symbol where scope_id = (
-	select scope.scope_id from scope 
-		inner join sym_type on scope.type_id = sym_type.type_id 
-		where sym_type.type = 'struct' 
-			and scope.scope_name = '_faa_1');
-	
-	
-es. scope_path = First, namespace, Second, namespace, NULL, 
-	symbol_name = Second_1_class	
-*/
-	SymbolDBEnginePriv *priv;
-	gchar *query_str;	
-	GdaDataModel *data;
-	gint final_definition_id;
-	GString *info_data;
-	GString *join_data;
-	GdaHolder *param;
-	GValue *ret_value;
-	gboolean ret_bool;	
-	const DynChildQueryNode *dyn_node;
-	
-	g_return_val_if_fail (dbe != NULL, NULL);
-	priv = dbe->priv;
+		relative_path = symbol_db_util_get_file_db_path (dbe, scope_file_path);
+		if (relative_path == NULL)
+		{
+			SDB_UNLOCK(priv);
+			return NULL;
+		}
 
-	SDB_LOCK(priv);
-	
-	final_definition_id = sdb_engine_walk_down_scope_path (dbe, scope_path);
-	
-	if (final_definition_id <= 0) 
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
+		MP_SET_HOLDER_BATCH_STR(priv, param, relative_path, ret_bool, ret_value);
 	}
-
-	if ((dyn_node = sdb_engine_get_dyn_query_node_by_id (dbe, 
-		DYN_PREP_QUERY_GET_SCOPE_MEMBERS, sym_info, 0)) == NULL)
-	{
-		/* info_data contains the stuff after SELECT and befor FROM */
-		info_data = g_string_new ("");
 	
-		/* join_data contains the optionals joins to do to retrieve new data on other
-	 	 * tables.
-	 	 */
-		join_data = g_string_new ("");
-
-		/* fill info_data and join data with optional sql */
-		sdb_engine_prepare_symbol_info_sql (dbe, info_data, join_data, sym_info);
-	
-		query_str = g_strdup_printf ("SELECT symbol.symbol_id AS symbol_id, "
-			"symbol.name AS name, symbol.file_position AS file_position, "
-			"symbol.is_file_scope AS is_file_scope, symbol.signature AS signature, "
-		    "symbol.returntype AS returntype "
-			"%s FROM symbol "
-			"%s WHERE scope_id = ## /* name:'defid' type:gint */", 
-									 info_data->str, join_data->str);
-		
-		dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
-						DYN_PREP_QUERY_GET_SCOPE_MEMBERS,
-						sym_info, 0,
-						query_str);
-		
-		g_free (query_str);
-		g_string_free (info_data, TRUE);
-		g_string_free (join_data, TRUE);		
-	}
-
-	if (dyn_node == NULL) 
-	{		
-		SDB_UNLOCK(priv);
-		return NULL;
-	}	
+	/*DEBUG_PRINT ("symbol_db_engine_get_scope_members_by_symbol_id (): %s", 
+				 dyn_node->query_str);*/
 	
-	if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "defid")) == NULL)
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-
-	MP_SET_HOLDER_BATCH_INT(priv, param, final_definition_id, ret_bool, ret_value);
-
 	/* execute the query with parametes just set */
 	data = gda_connection_statement_execute_select (priv->db_connection, 
 												  (GdaStatement*)dyn_node->stmt, 
-												  (GdaSet*)dyn_node->plist, NULL);
+												  (GdaSet*)dyn_node->plist,
+	                                                &error);
+	if (error)
+	{
+		g_warning ("SQL error: %s: %s", dyn_node->query_str, error->message);
+		g_error_free (error);
+	}
+	
 	MP_RESET_PLIST(dyn_node->plist);
 	
+	g_free (relative_path);
+	
+	/*gda_data_model_dump (data, stdout);*/
 	if (!GDA_IS_DATA_MODEL (data) ||
-		gda_data_model_get_n_rows (data) <= 0)
+		gda_data_model_get_n_rows (GDA_DATA_MODEL (data)) <= 0)
 	{
 		if (data != NULL)
 			g_object_unref (data);
@@ -1353,7 +596,6 @@ es. scope_path = First, namespace, Second, namespace, NULL,
 		return NULL;
 	}
 
-	
 	SDB_UNLOCK(priv);
 	return (SymbolDBEngineIterator *)symbol_db_engine_iterator_new (data, 
 												priv->sym_type_conversion_hash,
@@ -1476,170 +718,6 @@ symbol_db_engine_get_current_scope (SymbolDBEngine *dbe, const gchar* full_local
 												priv->project_directory);	
 }
 
-#define DYN_GET_FILE_SYMBOLS_EXTRA_PAR_LIMIT		1
-#define DYN_GET_FILE_SYMBOLS_EXTRA_PAR_OFFSET		2
-
-SymbolDBEngineIterator *
-symbol_db_engine_get_file_symbols (SymbolDBEngine *dbe, 
-								   const gchar *file_path, 
-                                   gint results_limit, gint results_offset,
-								   SymExtraInfo sym_info)
-{
-	SymbolDBEnginePriv *priv;
-	gchar *query_str;	
-	GdaDataModel *data;
-	GString *info_data;
-	GString *join_data;
-	GdaHolder *param;
-	const DynChildQueryNode *dyn_node;
-	GValue *ret_value;
-	gboolean ret_bool;
-	gchar *limit = "";
-	gboolean limit_free = FALSE;
-	gchar *offset = "";
-	gboolean offset_free = FALSE;
-	gsize other_parameters;
-	
-	g_return_val_if_fail (dbe != NULL, NULL);
-	g_return_val_if_fail (file_path != NULL, NULL);
-	priv = dbe->priv;	
-	g_return_val_if_fail (priv->db_directory != NULL, NULL);
-
-	SDB_LOCK(priv);
-	
-	/* check for an already flagged sym_info with FILE_PATH. SYMINFO_FILE_PATH on 
-	 * sym_info is already contained into the default query infos.
-	 */
-	sym_info = sym_info & ~SYMINFO_FILE_PATH;
-	
-	other_parameters = 0;
-
-	if (results_limit > 0)
-	{
-		limit = g_strdup_printf ("LIMIT ## /* name:'limit' type:gint */");
-		limit_free = TRUE;
-		other_parameters |= DYN_GET_FILE_SYMBOLS_EXTRA_PAR_LIMIT;
-	}
-	
-	if (results_offset > 0)
-	{
-		offset = g_strdup_printf ("OFFSET ## /* name:'offset' type:gint */");
-		offset_free = TRUE;
-		other_parameters |= DYN_GET_FILE_SYMBOLS_EXTRA_PAR_OFFSET;
-	}
-	
-	gchar *relative_path = symbol_db_util_get_file_db_path (dbe, file_path);
-	if (relative_path == NULL)
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-
-	if ((dyn_node = sdb_engine_get_dyn_query_node_by_id (dbe, 
-		DYN_PREP_QUERY_GET_FILE_SYMBOLS, sym_info, other_parameters)) == NULL)
-	{
-		/* info_data contains the stuff after SELECT and befor FROM */
-		info_data = g_string_new ("");
-
-		/* join_data contains the optionals joins to do to retrieve new data on other
-	 	 * tables.
-	 	 */
-		join_data = g_string_new ("");
-
-		/* fill info_data and join data with optional sql */
-		sdb_engine_prepare_symbol_info_sql (dbe, info_data, join_data, sym_info);
-
-		/* rember to do a file_path + strlen(priv->db_directory): a project relative 
-	 	 * file path 
-	 	 */
-		query_str = g_strdup_printf ("SELECT symbol.symbol_id AS symbol_id, "
-			"symbol.name AS name, symbol.file_position AS file_position, "
-			"symbol.is_file_scope AS is_file_scope, symbol.signature AS signature, "
-		    "symbol.returntype AS returntype, file.file_path AS db_file_path "
-			"%s FROM symbol "
-				"JOIN file ON symbol.file_defined_id = file.file_id "
-			"%s WHERE symbol.scope_id = 0 AND file.file_path = ## /* name:'filepath' type:gchararray */ "
-			"ORDER BY symbol.file_position %s %s", 
-						info_data->str, join_data->str, limit, offset);
-	
-		dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
-						DYN_PREP_QUERY_GET_FILE_SYMBOLS,
-						sym_info, other_parameters,
-						query_str);
-		g_free (query_str);
-		g_string_free (info_data, TRUE);
-		g_string_free (join_data, TRUE);
-	}
-
-	if (limit_free)
-		g_free (limit);
-	
-	if (offset_free)
-		g_free (offset);
-	
-	if (dyn_node == NULL) 
-	{		
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-	
-	/*DEBUG_PRINT ("query for symbol_db_engine_get_file_symbols is %s [filepath: %s]",
-				 dyn_node->query_str, file_path);*/
-	
-	if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "filepath")) == NULL)
-	{
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-	
-	MP_SET_HOLDER_BATCH_STR(priv, param, relative_path, ret_bool, ret_value);		
-
-	if (results_limit > 0)
-	{
-		if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "limit")) == NULL)
-		{
-			SDB_UNLOCK(priv);
-			return NULL;
-		}
-
-		MP_SET_HOLDER_BATCH_INT(priv, param, results_limit, ret_bool, ret_value);
-	}
-
-	if (results_offset > 0)
-	{
-		if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "offset")) == NULL)
-		{
-			SDB_UNLOCK(priv);
-			return NULL;
-		}
-
-		MP_SET_HOLDER_BATCH_INT(priv, param, results_offset, ret_bool, ret_value);
-	}
-	
-	/* execute the query with parametes just set */
-	data = gda_connection_statement_execute_select (priv->db_connection, 
-												  (GdaStatement*)dyn_node->stmt, 
-												  (GdaSet*)dyn_node->plist, NULL);
-	MP_RESET_PLIST(dyn_node->plist);
-	
-	if (!GDA_IS_DATA_MODEL (data) ||
-		gda_data_model_get_n_rows (data) <= 0)
-	{
-		if (data != NULL)
-			g_object_unref (data);
-		
-		SDB_UNLOCK(priv);
-		return NULL;
-	}
-	
-	g_free (relative_path);
-	
-	SDB_UNLOCK(priv);
-	return (SymbolDBEngineIterator *)symbol_db_engine_iterator_new (data, 
-												priv->sym_type_conversion_hash,
-												priv->project_directory);	
-}
-
 #define DYN_FIND_SYMBOL_NAME_BY_PATTERN_EXTRA_PAR_EXACT_MATCH_YES			0x010000
 #define DYN_FIND_SYMBOL_NAME_BY_PATTERN_EXTRA_PAR_EXACT_MATCH_NO			0x020000
 
@@ -2016,23 +1094,6 @@ select * from symbol where scope_definition_id = (
 	return res;
 }
 
-SymbolDBEngineIterator *
-symbol_db_engine_get_parent_scope_by_symbol_id (SymbolDBEngine *dbe, 
-									gint scoped_symbol_id,
-									const gchar* db_file,
-    								SymExtraInfo sym_info)
-{
-	/* no need to lock */
-	gint parent_sym_id = symbol_db_engine_get_parent_scope_id_by_symbol_id (dbe,
-	    								scoped_symbol_id, db_file);
-
-	if (parent_sym_id < 0)
-		return NULL;
-	
-	/* get the info now */
-	return symbol_db_engine_get_symbol_info_by_id (dbe, parent_sym_id, sym_info);
-}
-
 static GdaDataModel *
 sdb_engine_get_symbol_info_by_id_1 (SymbolDBEngine *dbe, 
 									gint sym_id, SymExtraInfo sym_info)
@@ -2129,7 +1190,7 @@ symbol_db_engine_get_symbol_info_by_id (SymbolDBEngine *dbe,
 												priv->project_directory);	
 }
 
-SymbolDBEngineIterator *
+static SymbolDBEngineIterator *
 symbol_db_engine_get_scope_chain (SymbolDBEngine *dbe,
     								gint scoped_symbol_id,
     								const gchar* db_file,
@@ -2299,7 +1360,7 @@ symbol_db_engine_find_symbol_by_name_pattern_on_file (SymbolDBEngine *dbe,
 	dyn_node = NULL;
 
 	/* determine the filter_kinds thing */
-	if (filter_kinds == SYMTYPE_UNDEF)
+	if (filter_kinds == IANJUTA_SYMBOL_TYPE_UNDEF)
 		filter_kinds_array = NULL;
 	else
 		filter_kinds_array = symbol_db_util_fill_type_array (filter_kinds);
@@ -2601,7 +1662,7 @@ symbol_db_engine_find_symbol_in_scope (SymbolDBEngine *dbe,
 	dyn_node = NULL;
 
 	/* determine the filter_kinds thing */
-	if (filter_kinds == SYMTYPE_UNDEF)
+	if (filter_kinds == IANJUTA_SYMBOL_TYPE_UNDEF)
 		filter_kinds_array = NULL;
 	else
 		filter_kinds_array = symbol_db_util_fill_type_array (filter_kinds);
@@ -2927,7 +1988,7 @@ symbol_db_engine_find_symbol_by_name_pattern_filtered (SymbolDBEngine *dbe,
 	dyn_node = NULL;
 
 	/* determine the filter_kinds thing */
-	if (filter_kinds == SYMTYPE_UNDEF)
+	if (filter_kinds == IANJUTA_SYMBOL_TYPE_UNDEF)
 		filter_kinds_array = NULL;
 	else
 		filter_kinds_array = symbol_db_util_fill_type_array (filter_kinds);
@@ -2946,13 +2007,13 @@ symbol_db_engine_find_symbol_by_name_pattern_filtered (SymbolDBEngine *dbe,
 		match_str = " LIKE ## /* name:'pattern' type:gchararray */";
 	}	
 	
-	if (filescope_search == SYMSEARCH_FILESCOPE_PUBLIC)
+	if (filescope_search == IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PUBLIC)
 	{
 		other_parameters |= 
 			DYN_FIND_SYMBOL_BY_NAME_PATTERN_FILTERED_EXTRA_PAR_GLOBAL_SEARCH_YES;
 		file_scope_str = " AND symbol.is_file_scope = 0 ";
 	}
-	else if (filescope_search == SYMSEARCH_FILESCOPE_PRIVATE)
+	else if (filescope_search == IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PRIVATE)
 	{
 		other_parameters |= 
 			DYN_FIND_SYMBOL_BY_NAME_PATTERN_FILTERED_EXTRA_PAR_GLOBAL_SEARCH_NO;
diff --git a/plugins/symbol-db/symbol-db-engine-queries.h b/plugins/symbol-db/symbol-db-engine-queries.h
index bbaaf01..1f2b66a 100644
--- a/plugins/symbol-db/symbol-db-engine-queries.h
+++ b/plugins/symbol-db/symbol-db-engine-queries.h
@@ -136,17 +136,6 @@ symbol_db_engine_find_symbol_in_scope (SymbolDBEngine *dbe,
  */
 
 /**
- * Return an iterator to the data retrieved from database. 
- * The iterator, if not null, will contain a list of parent classes for the 
- * given symbol name.
- */
-SymbolDBEngineIterator *
-symbol_db_engine_get_class_parents (SymbolDBEngine *dbe, 
-    								const gchar *klass_name, 
-									const GPtrArray *scope_path, 
-    								SymExtraInfo sym_info);
-
-/**
  * Use this function to get parent symbols of a given class.
  */
 SymbolDBEngineIterator *
@@ -165,36 +154,6 @@ symbol_db_engine_get_current_scope (SymbolDBEngine *dbe,
     								gulong line, 
 									SymExtraInfo sym_info);
 
-
-/**
- * Use this function to get symbols of a file.
- */
-SymbolDBEngineIterator *
-symbol_db_engine_get_file_symbols (SymbolDBEngine *dbe, 
-								   const gchar *file_path, gint limit,
-                                   gint offset, SymExtraInfo sym_info);
-
-/**
- * Use this function to get global symbols only. I.e. private or file-only scoped symbols
- * will NOT be returned.
- * @param filter_kinds Can be set to SYMTYPE_UNDEF. In that case these filters will not be taken into consideration.
- * at root level [global level]. A maximum of 255 filter_kinds are admitted.
- * @param include_kinds Should we include in the result the filter_kinds or not?
- * @param group_them If TRUE then will be issued a 'group by symbol.name' option.
- * 		If FALSE you can have as result more symbols with the same name but different
- * 		symbols id. See for example more namespaces declared on different files.
- * @param results_limit Limit results to an upper bound. -1 If you don't want to use this par.
- * @param results_offset Skip results_offset results. -1 If you don't want to use this par. 
- */
-SymbolDBEngineIterator *
-symbol_db_engine_get_global_members_filtered (SymbolDBEngine *dbe, 
-									SymType filter_kinds,
-									gboolean include_kinds, 
-									gboolean group_them,
-									gint results_limit, 
-									gint results_offset,
-								 	SymExtraInfo sym_info);
-
 /** 
  * No iterator for now. We need the quickest query possible.
  * @param scoped_symbol_id Symbol you want to know the parent of.
@@ -205,49 +164,6 @@ symbol_db_engine_get_parent_scope_id_by_symbol_id (SymbolDBEngine *dbe,
 									gint scoped_symbol_id,
 									const gchar* db_file);
 
-/** 
- * This is the same version as symbol_db_engine_get_parent_scope_id_by_symbol_id () 
- * but with an Iterator as return type. 
- * It includes the calls to symbol_db_engine_get_parent_scope_id_by_symbol_id () and
- * symbol_db_engine_get_symbol_info_by_id (). It's a sort of facade.
- * @param scoped_symbol_id Symbol you want to know the parent of.
- * @param db_file db-relative filename path. eg. /src/foo.c. Can be NULL for a
- * wider search (i.e. not just limited to that file).
- * @return NULL on error or if nothing is found as parent.
- */
-SymbolDBEngineIterator *
-symbol_db_engine_get_parent_scope_by_symbol_id (SymbolDBEngine *dbe, 
-									gint scoped_symbol_id,
-									const gchar* db_file,
-    								SymExtraInfo sym_info);
-
-/**
- * Walk the path up to the root scope given a scoped_symbol_id parameter.
- * The returned iterator will be populated with SymbolDBEngineIteratorNode(s)
- * so that it could be easily browsed by a client app.
- *
- * e.g.
- * namespace FooBase {
- * class FooKlass {
- *	
- * }
- *
- * void FooKlass::foo_func () {			<-------------- this is the scoped symbol
- *              
- * }
- * 
- * the returned iterator'll contain symbols in this order: foo_func, FooKlass, FooBase.
- *
- * @param db_file db-relative filename path. eg. /src/foo.c. Can be NULL for a
- * wider search (i.e. not just limited to that file).
- * @return NULL on error or if scope isn't found.
- */
-SymbolDBEngineIterator *
-symbol_db_engine_get_scope_chain (SymbolDBEngine *dbe,
-    								gint scoped_symbol_id,
-    								const gchar* db_file,
-    								SymExtraInfo sym_info);
-
 /**
  * Walk the path up to the root scope given a full_local_file_path and a line number.
  * The returned iterator will be populated with SymbolDBEngineIteratorNode(s)
@@ -261,17 +177,6 @@ symbol_db_engine_get_scope_chain_by_file_line (SymbolDBEngine *dbe,
     								gulong line,
     								SymExtraInfo sym_info);
 
-
-/** 
- * scope_path cannot be NULL.
- * scope_path will be something like "scope1_kind", "scope1_name", "scope2_kind", 
- * "scope2_name", NULL 
- */
-SymbolDBEngineIterator *
-symbol_db_engine_get_scope_members_by_path (SymbolDBEngine *dbe, 
-									const GPtrArray* scope_path, 
-									SymExtraInfo sym_info);
-
 /**
  * Sometimes it's useful going to query just with ids [and so integers] to have
  * a little speed improvement.
@@ -281,23 +186,7 @@ symbol_db_engine_get_scope_members_by_path (SymbolDBEngine *dbe,
 SymbolDBEngineIterator *
 symbol_db_engine_get_scope_members_by_symbol_id (SymbolDBEngine *dbe, 
 									gint scope_parent_symbol_id, 
-									gint results_limit,
-									gint results_offset,
-									SymExtraInfo sym_info);
-
-/**
- * A filtered version of the symbol_db_engine_get_scope_members_by_symbol_id ().
- * You can specify which kind of symbols to retrieve, and if to include them or exclude.
- * Kinds are 'namespace', 'class' etc.
- * @param filter_kinds Can be set to SYMTYPE_UNDEF. In that case these filters will not be taken into consideration.
- * @param results_limit Limit results to an upper bound. -1 If you don't want to use this par.
- * @param results_offset Skip results_offset results. -1 If you don't want to use this par. 
- */
-SymbolDBEngineIterator *
-symbol_db_engine_get_scope_members_by_symbol_id_filtered (SymbolDBEngine *dbe, 
-									gint scope_parent_symbol_id, 
-									SymType filter_kinds,
-									gboolean include_kinds,														  
+                                    gchar *scope_file_path,
 									gint results_limit,
 									gint results_offset,
 									SymExtraInfo sym_info);
diff --git a/plugins/symbol-db/symbol-db-engine-utils.c b/plugins/symbol-db/symbol-db-engine-utils.c
index 37466cf..e3e67d3 100644
--- a/plugins/symbol-db/symbol-db-engine-utils.c
+++ b/plugins/symbol-db/symbol-db-engine-utils.c
@@ -211,29 +211,31 @@ sdb_util_load_symbol_pixbufs ()
 	CREATE_SYM_ICON ("privateclass",      "element-class-16.png");
 	CREATE_SYM_ICON ("privateenum",   	  "element-enumeration-16.png");
 	CREATE_SYM_ICON ("privatefield",   	  "element-event-16.png");
-	CREATE_SYM_ICON ("privatefunction",   "element-method-16.png");
-	CREATE_SYM_ICON ("privateinterface",  "element-interface-16.png");	
-	CREATE_SYM_ICON ("privatemember",     "element-property-16.png");	
-	CREATE_SYM_ICON ("privatemethod",     "element-method-16.png");
-	CREATE_SYM_ICON ("privateproperty",   "element-property-16.png");
+	CREATE_SYM_ICON ("privatefunction",   "element-method-private-16.png");
+	CREATE_SYM_ICON ("privateinterface",  "element-interface-private-16.png");	
+	CREATE_SYM_ICON ("privatemember",     "element-property-private-16.png");	
+	CREATE_SYM_ICON ("privatemethod",     "element-method-private-16.png");
+	CREATE_SYM_ICON ("privateproperty",   "element-property-private-16.png");
 	CREATE_SYM_ICON ("privatestruct",     "element-structure-16.png");
-	CREATE_SYM_ICON ("privateprototype",  "element-interface-16.png");
+	CREATE_SYM_ICON ("privateprototype",  "element-interface-private-16.png");
 
 	CREATE_SYM_ICON ("protectedclass",    "element-class-16.png");	
 	CREATE_SYM_ICON ("protectedenum",     "element-enumeration-16.png");
 	CREATE_SYM_ICON ("protectedfield",    "element-event-16.png");	
-	CREATE_SYM_ICON ("protectedmember",   "element-property-16.png");
-	CREATE_SYM_ICON ("protectedmethod",   "element-method-16.png");
-	CREATE_SYM_ICON ("protectedproperty", "element-property-16.png");
-	CREATE_SYM_ICON ("protectedprototype","element-interface-16.png");
+	CREATE_SYM_ICON ("protectedfunction", "element-method-protected-16.png");
+	CREATE_SYM_ICON ("protectedmember",   "element-property-protected-16.png");
+	CREATE_SYM_ICON ("protectedmethod",   "element-method-protected-16.png");
+	CREATE_SYM_ICON ("protectedproperty", "element-property-protected-16.png");
+	CREATE_SYM_ICON ("protectedprototype","element-interface-protected-16.png");
 	
 	CREATE_SYM_ICON ("publicclass",    	  "element-class-16.png");	
 	CREATE_SYM_ICON ("publicenum",    	  "element-enumeration-16.png");	
-	CREATE_SYM_ICON ("publicfunction",    "element-method-16.png");
-	CREATE_SYM_ICON ("publicmember",      "element-method-16.png");
-	CREATE_SYM_ICON ("publicproperty",    "element-property-16.png");
+	CREATE_SYM_ICON ("publicfunction",    "element-method-public-16.png");
+	CREATE_SYM_ICON ("publicmember",      "element-property-public-16.png");
+	CREATE_SYM_ICON ("publicmethod",      "element-method-public-16.png");
+	CREATE_SYM_ICON ("publicproperty",    "element-property-public-16.png");
 	CREATE_SYM_ICON ("publicstruct",      "element-structure-16.png");
-	CREATE_SYM_ICON ("publicprototype",   "element-interface-16.png");
+	CREATE_SYM_ICON ("publicprototype",   "element-interface-public-16.png");
 	
 	/* special icon */
 	CREATE_SYM_ICON ("othersvars",   "element-event-16.png");
@@ -326,112 +328,112 @@ symbol_db_util_fill_type_array (SymType match_types)
 	GPtrArray *filter_array;
 	filter_array = g_ptr_array_new ();
 
-	if (match_types & SYMTYPE_CLASS)
+	if (match_types & IANJUTA_SYMBOL_TYPE_CLASS)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("class"));
 	}
 
-	if (match_types & SYMTYPE_ENUM)
+	if (match_types & IANJUTA_SYMBOL_TYPE_ENUM)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("enum"));
 	}
 	
-	if (match_types & SYMTYPE_ENUMERATOR)
+	if (match_types & IANJUTA_SYMBOL_TYPE_ENUMERATOR)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("enumerator"));
 	}
 	
-	if (match_types & SYMTYPE_FIELD)
+	if (match_types & IANJUTA_SYMBOL_TYPE_FIELD)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("field"));
 	}
 	
-	if (match_types & SYMTYPE_FUNCTION)
+	if (match_types & IANJUTA_SYMBOL_TYPE_FUNCTION)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("function"));
 	}
 	
-	if (match_types & SYMTYPE_INTERFACE)
+	if (match_types & IANJUTA_SYMBOL_TYPE_INTERFACE)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("interface"));
 	}
 	
-	if (match_types & SYMTYPE_MEMBER)
+	if (match_types & IANJUTA_SYMBOL_TYPE_MEMBER)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("member"));
 	}
 	
-	if (match_types & SYMTYPE_METHOD)
+	if (match_types & IANJUTA_SYMBOL_TYPE_METHOD)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("method"));
 	}
 	
-	if (match_types & SYMTYPE_NAMESPACE)
+	if (match_types & IANJUTA_SYMBOL_TYPE_NAMESPACE)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("namespace"));
 	}
 	
-	if (match_types & SYMTYPE_PACKAGE)
+	if (match_types & IANJUTA_SYMBOL_TYPE_PACKAGE)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("package"));
 	}
 	
-	if (match_types & SYMTYPE_PROTOTYPE)
+	if (match_types & IANJUTA_SYMBOL_TYPE_PROTOTYPE)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("prototype"));
 	}
 	
-	if (match_types & SYMTYPE_STRUCT)
+	if (match_types & IANJUTA_SYMBOL_TYPE_STRUCT)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("struct"));
 	}
 
-	if (match_types & SYMTYPE_TYPEDEF)
+	if (match_types & IANJUTA_SYMBOL_TYPE_TYPEDEF)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("typedef"));
 	}
 	
-	if (match_types & SYMTYPE_STRUCT)
+	if (match_types & IANJUTA_SYMBOL_TYPE_STRUCT)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("struct"));
 	}
 	
-	if (match_types & SYMTYPE_UNION)
+	if (match_types & IANJUTA_SYMBOL_TYPE_UNION)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("union"));
 	}
 	
-	if (match_types & SYMTYPE_VARIABLE)
+	if (match_types & IANJUTA_SYMBOL_TYPE_VARIABLE)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("variable"));
 	}
 				
-	if (match_types & SYMTYPE_EXTERNVAR)
+	if (match_types & IANJUTA_SYMBOL_TYPE_EXTERNVAR)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("externvar"));
 	}
 	
-	if (match_types & SYMTYPE_MACRO)
+	if (match_types & IANJUTA_SYMBOL_TYPE_MACRO)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("macro"));
 	}
 	
-	if (match_types & SYMTYPE_MACRO_WITH_ARG)
+	if (match_types & IANJUTA_SYMBOL_TYPE_MACRO_WITH_ARG)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("macro_with_arg"));
 	}
 	
-	if (match_types & SYMTYPE_FILE)
+	if (match_types & IANJUTA_SYMBOL_TYPE_FILE)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("file"));
 	}
 	
-	if (match_types & SYMTYPE_VARIABLE)
+	if (match_types & IANJUTA_SYMBOL_TYPE_VARIABLE)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("variable"));
 	}
 	
-	if (match_types & SYMTYPE_OTHER)
+	if (match_types & IANJUTA_SYMBOL_TYPE_OTHER)
 	{
 		g_ptr_array_add (filter_array, g_strdup ("other"));
 	}
diff --git a/plugins/symbol-db/symbol-db-engine.h b/plugins/symbol-db/symbol-db-engine.h
index 56085cc..1a8d87a 100644
--- a/plugins/symbol-db/symbol-db-engine.h
+++ b/plugins/symbol-db/symbol-db-engine.h
@@ -25,6 +25,13 @@
 #ifndef _SYMBOL_DB_ENGINE_H_
 #define _SYMBOL_DB_ENGINE_H_
 
+#ifdef __GNUC__
+#define GNUC_INLINE inline
+#else
+#define GNUC_INLINE 
+#endif
+
+
 /* if you need to use symbo-db-engine in your program, just include this
  * header file. It'll automatically include all the things needed
  */
diff --git a/plugins/symbol-db/symbol-db-iface.c b/plugins/symbol-db/symbol-db-iface.c
index 92c30af..b57a155 100644
--- a/plugins/symbol-db/symbol-db-iface.c
+++ b/plugins/symbol-db/symbol-db-iface.c
@@ -98,6 +98,7 @@ isymbol_manager_get_members (IAnjutaSymbolManager *sm,
 	
 	iterator = symbol_db_engine_get_scope_members_by_symbol_id (dbe,
 																sym_id,
+	                                                            NULL,
 																-1, 
 																-1,
 																info_fields);
diff --git a/plugins/symbol-db/symbol-db-model-file.c b/plugins/symbol-db/symbol-db-model-file.c
index 57b5d2e..68c4185 100644
--- a/plugins/symbol-db/symbol-db-model-file.c
+++ b/plugins/symbol-db/symbol-db-model-file.c
@@ -20,116 +20,204 @@
 #include "symbol-db-engine.h"
 #include "symbol-db-model-file.h"
 
-typedef struct _SymbolDBModelFilePriv SymbolDBModelFilePriv;
+#define SDB_MODEL_FILE_SQL " \
+	SELECT \
+		symbol.symbol_id, \
+		symbol.name, \
+		symbol.file_position, \
+		symbol.scope_definition_id, \
+		symbol.signature, \
+		symbol.returntype, \
+		file.file_path, \
+		sym_access.access_name, \
+		sym_type.type_type, \
+		sym_type.type_name, \
+		sym_kind.is_container \
+	FROM symbol \
+	LEFT JOIN file ON symbol.file_defined_id = file.file_id \
+	LEFT JOIN sym_access ON symbol.access_kind_id = sym_access.access_kind_id \
+	LEFT JOIN sym_type ON symbol.type_id = sym_type.type_id \
+	LEFT JOIN sym_kind ON symbol.kind_id = sym_kind.sym_kind_id \
+	WHERE \
+	( \
+		file.file_path = ## /* name:'filepath' type:gchararray */ \
+		AND symbol.scope_id = ## /* name:'parent' type:gint */ \
+		AND symbol.kind_id NOT IN \
+		( \
+			SELECT sym_kind_id \
+			FROM sym_kind \
+			WHERE sym_kind.kind_name = 'namespace' \
+		) \
+	) \
+	OR \
+	( \
+		symbol.symbol_id IN \
+		( \
+			SELECT symbol_id \
+			FROM symbol \
+			LEFT JOIN file ON symbol.file_defined_id = file.file_id \
+			WHERE \
+				file.file_path = ## /* name:'filepath' type:gchararray */ \
+				AND symbol.scope_id = ## /* name:'parent' type:gint */ \
+				AND symbol.kind_id IN \
+				( \
+					SELECT sym_kind_id \
+					FROM sym_kind \
+					WHERE sym_kind.kind_name = 'namespace' \
+				) \
+			GROUP BY symbol.scope_definition_id \
+			\
+		) \
+	) \
+	OR \
+	( \
+		symbol.scope_id = ## /* name:'parent' type:gint */ \
+		AND symbol.kind_id NOT IN \
+		( \
+			SELECT sym_kind_id \
+			FROM sym_kind \
+			WHERE sym_kind.kind_name = 'namespace' \
+		) \
+		AND symbol.scope_definition_id IN \
+		( \
+			SELECT scope_id \
+			FROM symbol \
+			JOIN file ON symbol.file_defined_id = file.file_id \
+			WHERE file.file_path = ## /* name:'filepath' type:gchararray */ \
+			GROUP BY symbol.scope_id \
+		) \
+	) \
+	ORDER BY symbol.name \
+	LIMIT ## /* name:'limit' type:gint */ \
+	OFFSET ## /* name:'offset' type:gint */ \
+	"
+
 struct _SymbolDBModelFilePriv
 {
 	gchar *file_path;
+	guint refresh_queue_id;
+	GdaStatement *stmt;
+	GdaSet *params;
+	GdaHolder *param_file_path, *param_parent_id, *param_limit, *param_offset;
 };
 
-#define GET_PRIV(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-						SYMBOL_DB_TYPE_MODEL_FILE, \
-						SymbolDBModelFilePriv))
 enum
 {
 	PROP_0,
 	PROP_SYMBOL_DB_FILE_PATH
 };
 
-G_DEFINE_TYPE (SymbolDBModelFile, symbol_db_model_file,
+G_DEFINE_TYPE (SymbolDBModelFile, sdb_model_file,
                SYMBOL_DB_TYPE_MODEL_PROJECT);
 
-static gint
-symbol_db_model_file_get_n_children (SymbolDBModel *model, gint tree_level,
-                                       GValue column_values[])
+static void
+sdb_model_file_update_sql_stmt (SymbolDBModel *model)
 {
-	gint n_children;
 	SymbolDBEngine *dbe;
 	SymbolDBModelFilePriv *priv;
-	SymbolDBEngineIterator *iter = NULL;
-	
-	g_return_val_if_fail (SYMBOL_DB_IS_MODEL_FILE (model), 0);
-	priv = GET_PRIV (model);
 
-	g_object_get (model, "symbol-db-engine", &dbe, NULL);
+	g_return_if_fail (SYMBOL_DB_IS_MODEL_FILE (model));
+	priv = SYMBOL_DB_MODEL_FILE (model)->priv;
 	
-	/* If engine is not connected, there is nothing we can show */
-	if (!dbe || !symbol_db_engine_is_connected (dbe))
-		return 0;
-	
-	switch (tree_level)
-	{
-	case 0:
-		if (priv->file_path)
-		{
-			iter = symbol_db_engine_get_file_symbols
-				(dbe, priv->file_path, -1, -1, SYMINFO_SIMPLE);
-			if (iter)
-			{
-				n_children = symbol_db_engine_iterator_get_n_items (iter);
-				g_object_unref (iter);
-				return n_children;
-			}
-		}
-		return 0;
-	default:
-		return SYMBOL_DB_MODEL_CLASS (symbol_db_model_file_parent_class)->
-				get_n_children (model, tree_level, column_values);
-	}
+	g_object_get (model, "symbol-db-engine", &dbe, NULL);
+	priv->stmt = symbol_db_engine_get_statement (dbe, SDB_MODEL_FILE_SQL);
+	gda_statement_get_parameters (priv->stmt, &priv->params, NULL);
+	priv->param_file_path = gda_set_get_holder (priv->params, "filepath");
+	priv->param_parent_id = gda_set_get_holder (priv->params, "parent");
+	priv->param_limit = gda_set_get_holder (priv->params, "limit");
+	priv->param_offset = gda_set_get_holder (priv->params, "offset");
 }
 
 static GdaDataModel*
-symbol_db_model_file_get_children (SymbolDBModel *model, gint tree_level,
-                                     GValue column_values[], gint offset,
-                                     gint limit)
+sdb_model_file_get_children (SymbolDBModel *model, gint tree_level,
+                             GValue column_values[], gint offset,
+                             gint limit)
 {
 	SymbolDBEngine *dbe;
 	SymbolDBModelFilePriv *priv;
-	SymbolDBEngineIterator *iter = NULL;
+	gint parent_id = 0;
+	gchar *relative_path = NULL;
+	GValue ival = {0};
+	GValue sval = {0};
 
 	g_return_val_if_fail (SYMBOL_DB_IS_MODEL_FILE (model), 0);
-	priv = GET_PRIV (model);
+	priv = SYMBOL_DB_MODEL_FILE (model)->priv;
 
 	g_object_get (model, "symbol-db-engine", &dbe, NULL);
 	
 	/* If engine is not connected, there is nothing we can show */
-	if (!dbe || !symbol_db_engine_is_connected (dbe))
+	if (!dbe || !symbol_db_engine_is_connected (dbe) || !priv->file_path)
 		return NULL;
-	
+
+	/* Determin node parent */
 	switch (tree_level)
 	{
 	case 0:
-		if (priv->file_path)
-		{
-			iter = symbol_db_engine_get_file_symbols
-				(dbe, priv->file_path, limit, offset,
-				 SYMINFO_SIMPLE | SYMINFO_ACCESS | SYMINFO_TYPE |
-				 SYMINFO_KIND | SYMINFO_FILE_PATH);
-			if (iter)
-			{
-				GdaDataModel *data_model;
-				data_model =
-					GDA_DATA_MODEL (symbol_db_engine_iterator_get_datamodel (iter));
-				g_object_ref (data_model);
-				g_object_unref (iter);
-				return data_model;
-			}
-		}
-		return NULL;
+		parent_id = 0;
+		break;
 	default:
-		return SYMBOL_DB_MODEL_CLASS (symbol_db_model_file_parent_class)->
-				get_children (model, tree_level, column_values, offset, limit);
+		parent_id = g_value_get_int
+				(&column_values[SYMBOL_DB_MODEL_PROJECT_COL_SCOPE_DEFINITION_ID]);
 	}
+
+	if (!priv->stmt)
+		sdb_model_file_update_sql_stmt (model);
+	
+	relative_path = symbol_db_util_get_file_db_path (dbe, priv->file_path);
+	
+	/* Initialize parameters */
+	g_value_init (&ival, G_TYPE_INT);
+	g_value_init (&sval, G_TYPE_STRING);
+	g_value_set_int (&ival, parent_id);
+	gda_holder_set_value (priv->param_parent_id, &ival, NULL);
+	g_value_set_int (&ival, limit);
+	gda_holder_set_value (priv->param_limit, &ival, NULL);
+	g_value_set_int (&ival, offset);
+	gda_holder_set_value (priv->param_offset, &ival, NULL);
+	g_value_take_string (&sval, relative_path);
+	gda_holder_set_value (priv->param_file_path, &sval, NULL);
+	g_value_reset (&sval);
+
+	return symbol_db_engine_execute_select (dbe, priv->stmt, priv->params);
+}
+
+static gint
+sdb_model_file_get_n_children (SymbolDBModel *model, gint tree_level,
+                               GValue column_values[])
+{
+	gint n_children = 0;
+	GdaDataModel *data_model;
+
+	data_model = sdb_model_file_get_children (model, tree_level,
+	                                          column_values, 0,
+	                                          INT_MAX);
+	if (GDA_IS_DATA_MODEL (data_model))
+	{
+		n_children = gda_data_model_get_n_rows (data_model);
+		g_object_unref (data_model);
+	}
+	return n_children;
+}
+
+static gboolean
+sdb_model_file_refresh_idle (gpointer object)
+{
+	SymbolDBModelFilePriv *priv;
+	priv = SYMBOL_DB_MODEL_FILE (object)->priv;
+	symbol_db_model_update (SYMBOL_DB_MODEL (object));
+	priv->refresh_queue_id = 0;
+	return FALSE;
 }
 
 static void
-symbol_db_model_file_set_property (GObject *object, guint prop_id,
-                                     const GValue *value, GParamSpec *pspec)
+sdb_model_file_set_property (GObject *object, guint prop_id,
+                             const GValue *value, GParamSpec *pspec)
 {
 	gchar *old_file_path;
 	SymbolDBModelFilePriv *priv;
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_FILE (object));
-	priv = GET_PRIV (object);
+	priv = SYMBOL_DB_MODEL_FILE (object)->priv;
 	
 	switch (prop_id)
 	{
@@ -137,7 +225,11 @@ symbol_db_model_file_set_property (GObject *object, guint prop_id,
 		old_file_path = priv->file_path;
 		priv->file_path = g_value_dup_string (value);
 		if (g_strcmp0 (old_file_path, priv->file_path) != 0)
-		    symbol_db_model_update (SYMBOL_DB_MODEL (object));
+		{
+			if (!priv->refresh_queue_id)
+				priv->refresh_queue_id =
+					g_idle_add (sdb_model_file_refresh_idle, object);
+		}
 		g_free (old_file_path);
 		break;
 	default:
@@ -147,13 +239,13 @@ symbol_db_model_file_set_property (GObject *object, guint prop_id,
 }
 
 static void
-symbol_db_model_file_get_property (GObject *object, guint prop_id,
-                                     GValue *value, GParamSpec *pspec)
+sdb_model_file_get_property (GObject *object, guint prop_id,
+                             GValue *value, GParamSpec *pspec)
 {
 	SymbolDBModelFilePriv *priv;
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_FILE (object));
-	priv = GET_PRIV (object);
+	priv = SYMBOL_DB_MODEL_FILE (object)->priv;
 	
 	switch (prop_id)
 	{
@@ -167,40 +259,50 @@ symbol_db_model_file_get_property (GObject *object, guint prop_id,
 }
 
 static void
-symbol_db_model_file_finalize (GObject *object)
+sdb_model_file_finalize (GObject *object)
 {
 	SymbolDBModelFilePriv *priv;
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_FILE (object));
-	priv = GET_PRIV (object);
+	priv = SYMBOL_DB_MODEL_FILE (object)->priv;
 	g_free (priv->file_path);
-	G_OBJECT_CLASS (symbol_db_model_file_parent_class)->finalize (object);
+	if (priv->stmt)
+	{
+		g_object_unref (priv->stmt);
+		g_object_unref (priv->params);
+	}
+	if (priv->refresh_queue_id)
+		g_source_remove (priv->refresh_queue_id);
+	g_free (priv);
+	
+	G_OBJECT_CLASS (sdb_model_file_parent_class)->finalize (object);
 }
 
 static void
-symbol_db_model_file_init (SymbolDBModelFile *object)
+sdb_model_file_init (SymbolDBModelFile *object)
 {
 	SymbolDBModelFilePriv *priv;
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_FILE (object));
-	priv = GET_PRIV (object);
+
+	priv = g_new0 (SymbolDBModelFilePriv, 1);
+	object->priv = priv;
+	
 	priv->file_path = NULL;
 }
 
 static void
-symbol_db_model_file_class_init (SymbolDBModelFileClass *klass)
+sdb_model_file_class_init (SymbolDBModelFileClass *klass)
 {
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
 	SymbolDBModelClass* model_class = SYMBOL_DB_MODEL_CLASS (klass);
+	
+	object_class->finalize = sdb_model_file_finalize;
+	object_class->set_property = sdb_model_file_set_property;
+	object_class->get_property = sdb_model_file_get_property;
 
-	g_type_class_add_private (klass, sizeof (SymbolDBModelFilePriv));
-
-	object_class->finalize = symbol_db_model_file_finalize;
-	object_class->set_property = symbol_db_model_file_set_property;
-	object_class->get_property = symbol_db_model_file_get_property;
-
-	model_class->get_n_children = symbol_db_model_file_get_n_children;
-	model_class->get_children =  symbol_db_model_file_get_children;
+	model_class->get_n_children = sdb_model_file_get_n_children;
+	model_class->get_children =  sdb_model_file_get_children;
 	
 	g_object_class_install_property
 		(object_class, PROP_SYMBOL_DB_FILE_PATH,
diff --git a/plugins/symbol-db/symbol-db-model-file.h b/plugins/symbol-db/symbol-db-model-file.h
index 712ddb6..04ffdf0 100644
--- a/plugins/symbol-db/symbol-db-model-file.h
+++ b/plugins/symbol-db/symbol-db-model-file.h
@@ -25,7 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define SYMBOL_DB_TYPE_MODEL_FILE             (symbol_db_model_file_get_type ())
+#define SYMBOL_DB_TYPE_MODEL_FILE             (sdb_model_file_get_type ())
 #define SYMBOL_DB_MODEL_FILE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYMBOL_DB_TYPE_MODEL_FILE, SymbolDBModelFile))
 #define SYMBOL_DB_MODEL_FILE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), SYMBOL_DB_TYPE_MODEL_FILE, SymbolDBModelFileClass))
 #define SYMBOL_DB_IS_MODEL_FILE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYMBOL_DB_TYPE_MODEL_FILE))
@@ -34,6 +34,7 @@ G_BEGIN_DECLS
 
 typedef struct _SymbolDBModelFileClass SymbolDBModelFileClass;
 typedef struct _SymbolDBModelFile SymbolDBModelFile;
+typedef struct _SymbolDBModelFilePriv SymbolDBModelFilePriv;
 
 enum {
 	SYMBOL_DB_MODEL_FILE_COL_SYMBOL_ID,
@@ -51,10 +52,12 @@ struct _SymbolDBModelFileClass
 
 struct _SymbolDBModelFile
 {
-	SymbolDBModel parent_instance;
+	SymbolDBModelProject parent_instance;
+
+	SymbolDBModelFilePriv *priv;
 };
 
-GType symbol_db_model_file_get_type (void) G_GNUC_CONST;
+GType sdb_model_file_get_type (void) G_GNUC_CONST;
 GtkTreeModel* symbol_db_model_file_new (SymbolDBEngine* dbe);
 
 G_END_DECLS
diff --git a/plugins/symbol-db/symbol-db-model-project.c b/plugins/symbol-db/symbol-db-model-project.c
index 9fb2d9d..fd4eeca 100644
--- a/plugins/symbol-db/symbol-db-model-project.c
+++ b/plugins/symbol-db/symbol-db-model-project.c
@@ -20,27 +20,86 @@
 #include "symbol-db-engine.h"
 #include "symbol-db-model-project.h"
 
-typedef struct _SymbolDBModelProjectPriv SymbolDBModelProjectPriv;
+#define SDB_MODEL_PROJECT_SQL " \
+	SELECT \
+		symbol.symbol_id, \
+		symbol.name, \
+		symbol.file_position, \
+		symbol.scope_definition_id, \
+		symbol.signature, \
+		symbol.returntype, \
+		file.file_path, \
+		sym_access.access_name, \
+		sym_type.type_type, \
+		sym_type.type_name, \
+		sym_kind.is_container \
+	FROM symbol \
+	LEFT JOIN file ON symbol.file_defined_id = file.file_id \
+	LEFT JOIN sym_access ON symbol.access_kind_id = sym_access.access_kind_id \
+	LEFT JOIN sym_type ON symbol.type_id = sym_type.type_id \
+	LEFT JOIN sym_kind ON symbol.kind_id = sym_kind.sym_kind_id \
+	WHERE \
+	( \
+		symbol.scope_id = ## /* name:'parent' type:gint */ \
+		AND symbol.kind_id IN \
+		( \
+			SELECT sym_kind_id \
+			FROM sym_kind \
+			WHERE \
+			( \
+				0 = ## /* name:'parent' type:gint */ \
+				AND sym_kind.kind_name IN ('class', 'struct', 'union', 'enum') \
+			) \
+			OR \
+			( \
+				0 != ## /* name:'parent' type:gint */ \
+				AND sym_kind.kind_name != 'namespace' \
+			) \
+		) \
+	) \
+	OR \
+	( \
+		symbol.symbol_id IN \
+		( \
+			SELECT symbol_id \
+			FROM symbol \
+			WHERE \
+				symbol.scope_id = ## /* name:'parent' type:gint */ \
+				AND symbol.kind_id IN \
+				( \
+					SELECT sym_kind_id \
+					FROM sym_kind \
+					WHERE sym_kind.kind_name = 'namespace' \
+				) \
+			GROUP BY symbol.scope_definition_id \
+			\
+		) \
+	) \
+	ORDER BY symbol.name \
+	LIMIT ## /* name:'limit' type:gint */ \
+	OFFSET ## /* name:'offset' type:gint */ \
+	"
+
 struct _SymbolDBModelProjectPriv
 {
 	SymbolDBEngine* dbe;
+	GdaStatement *stmt;
+	GdaSet *params;
+	GdaHolder *param_parent_id, *param_limit, *param_offset;
 };
 
-#define GET_PRIV(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-						SYMBOL_DB_TYPE_MODEL_PROJECT, \
-						SymbolDBModelProjectPriv))
 enum {
 	DATA_COL_SYMBOL_ID,
 	DATA_COL_SYMBOL_NAME,
 	DATA_COL_SYMBOL_FILE_LINE,
-	DATA_COL_SYMBOL_FILE_SCOPE,
+	DATA_COL_SYMBOL_SCOPE_DEFINITION_ID,
 	DATA_COL_SYMBOL_ARGS,
 	DATA_COL_SYMBOL_RETURNTYPE,
 	DATA_COL_SYMBOL_FILE_PATH,
 	DATA_COL_SYMBOL_ACCESS,
 	DATA_COL_SYMBOL_TYPE,
 	DATA_COL_SYMBOL_TYPE_NAME,
-	DATA_COL_SYMBOL_KIND_NAME,
+	DATA_COL_SYMBOL_HAS_CHILD,
 	DATA_N_COLS
 };
 
@@ -50,96 +109,94 @@ enum
 	PROP_SYMBOL_DB_ENGINE
 };
 
-G_DEFINE_TYPE (SymbolDBModelProject, symbol_db_model_project,
+G_DEFINE_TYPE (SymbolDBModelProject, sdb_model_project,
                SYMBOL_DB_TYPE_MODEL);
 
-static gint
-symbol_db_model_project_get_n_children (SymbolDBModel *model, gint tree_level,
-                                       GValue column_values[])
+static void
+sdb_model_project_update_sql_stmt (SymbolDBModel *model)
 {
 	SymbolDBModelProjectPriv *priv;
-	SymbolDBEngineIterator *iter;
-	gint n_children;
-	gint symbol_id;
-	
-	g_return_val_if_fail (SYMBOL_DB_IS_MODEL_PROJECT (model), 0);
-	priv = GET_PRIV (model);
 
-	/* If engine is not connected, there is nothing we can show */
-	if (!priv->dbe || !symbol_db_engine_is_connected (priv->dbe))
-		return 0;
-		
-	switch (tree_level)
-	{
-		case 0:
-			iter = symbol_db_engine_get_global_members_filtered
-				(priv->dbe, SYMTYPE_CLASS | SYMTYPE_ENUM | SYMTYPE_STRUCT|
-				 SYMTYPE_UNION, TRUE, FALSE, -1, -1,
-				 SYMINFO_SIMPLE);
-			break;
-		case 1:
-			symbol_id = g_value_get_int (&column_values[DATA_COL_SYMBOL_ID]);
-			iter = symbol_db_engine_get_scope_members_by_symbol_id
-				(priv->dbe, symbol_id, -1, -1, SYMINFO_SIMPLE);
-			break;
-		default:
-			return 0; /* FIXME */
-	}
-	if (!iter)
-		return 0;
-	n_children = symbol_db_engine_iterator_get_n_items (iter);
-	g_object_unref (iter);
-	return n_children;
+	g_return_if_fail (SYMBOL_DB_IS_MODEL_PROJECT (model));
+	priv = SYMBOL_DB_MODEL_PROJECT (model)->priv;
+	
+	priv->stmt = symbol_db_engine_get_statement (priv->dbe, SDB_MODEL_PROJECT_SQL);
+	gda_statement_get_parameters (priv->stmt, &priv->params, NULL);
+	priv->param_parent_id = gda_set_get_holder (priv->params, "parent");
+	priv->param_limit = gda_set_get_holder (priv->params, "limit");
+	priv->param_offset = gda_set_get_holder (priv->params, "offset");
 }
 
 static GdaDataModel*
-symbol_db_model_project_get_children (SymbolDBModel *model, gint tree_level,
+sdb_model_project_get_children (SymbolDBModel *model, gint tree_level,
                                      GValue column_values[], gint offset,
                                      gint limit)
 {
 	SymbolDBModelProjectPriv *priv;
-	SymbolDBEngineIterator *iter;
-	GdaDataModel *data_model;
-	gint symbol_id;
+	gint parent_id;
+	GValue ival = {0};
 
 	g_return_val_if_fail (SYMBOL_DB_IS_MODEL_PROJECT (model), 0);
-	priv = GET_PRIV (model);
+	priv = SYMBOL_DB_MODEL_PROJECT (model)->priv;
 	
 	/* If engine is not connected, there is nothing we can show */
 	if (!priv->dbe || !symbol_db_engine_is_connected (priv->dbe))
 		return NULL;
 	
+	/* Determin node parent */
 	switch (tree_level)
 	{
-		case 0:
-			iter = symbol_db_engine_get_global_members_filtered
-				(priv->dbe, SYMTYPE_CLASS | SYMTYPE_ENUM | SYMTYPE_STRUCT |
-				 SYMTYPE_UNION, TRUE, FALSE, limit, offset,
-				 SYMINFO_SIMPLE | SYMINFO_ACCESS | SYMINFO_TYPE |
-				 SYMINFO_KIND | SYMINFO_FILE_PATH);
-			break;
-		case 1:
-			symbol_id = g_value_get_int (&column_values[DATA_COL_SYMBOL_ID]);
-			iter = symbol_db_engine_get_scope_members_by_symbol_id
-				(priv->dbe, symbol_id, limit, offset, SYMINFO_SIMPLE |
-				 SYMINFO_KIND | SYMINFO_ACCESS | SYMINFO_TYPE |
-				 SYMINFO_FILE_PATH);
-			break;
-		default:
-			return NULL;
-	}
-	if (iter)
+	case 0:
+		parent_id = 0;
+		break;
+	default:
+		parent_id = g_value_get_int
+				(&column_values[SYMBOL_DB_MODEL_PROJECT_COL_SCOPE_DEFINITION_ID]);
+	}	
+
+	if (!priv->stmt)
+		sdb_model_project_update_sql_stmt (model);
+	
+	/* Initialize parameters */
+	g_value_init (&ival, G_TYPE_INT);
+	g_value_set_int (&ival, parent_id);
+	gda_holder_set_value (priv->param_parent_id, &ival, NULL);
+	g_value_set_int (&ival, limit);
+	gda_holder_set_value (priv->param_limit, &ival, NULL);
+	g_value_set_int (&ival, offset);
+	gda_holder_set_value (priv->param_offset, &ival, NULL);
+
+	return symbol_db_engine_execute_select (priv->dbe, priv->stmt, priv->params);
+}
+
+static gboolean
+sdb_model_project_get_has_child (SymbolDBModel *model, gint tree_level,
+                                 GValue column_values[])
+{
+	return (g_value_get_int
+	        (&column_values[SYMBOL_DB_MODEL_PROJECT_COL_HAS_CHILD]) > 0);
+}
+
+static gint
+sdb_model_project_get_n_children (SymbolDBModel *model, gint tree_level,
+                                       GValue column_values[])
+{
+	gint n_children = 0;
+	GdaDataModel *data_model;
+
+	data_model = sdb_model_project_get_children (model, tree_level,
+	                                             column_values, 0,
+	                                             INT_MAX);
+	if (GDA_IS_DATA_MODEL (data_model))
 	{
-		data_model = (GdaDataModel*)symbol_db_engine_iterator_get_datamodel (iter);
-		g_object_ref (data_model);
-		g_object_unref (iter);
-		return data_model;
+		n_children = gda_data_model_get_n_rows (data_model);
+		g_object_unref (data_model);
 	}
-	return FALSE;
+	return n_children;
 }
 
 static gboolean
-symbol_db_model_project_get_query_value (SymbolDBModel *model,
+sdb_model_project_get_query_value (SymbolDBModel *model,
                                         GdaDataModel *data_model,
                                         GdaDataModelIter *iter,
                                         gint column,
@@ -218,8 +275,8 @@ symbol_db_model_project_get_query_value (SymbolDBModel *model,
 				g_free (escaped);
 			}
 		}
-		g_value_set_string (value, label->str);
-		g_string_free (label, TRUE);
+		g_value_take_string (value, label->str);
+		g_string_free (label, FALSE);
 		return TRUE;
 		break;
 	case SYMBOL_DB_MODEL_PROJECT_COL_ARGS:
@@ -230,36 +287,35 @@ symbol_db_model_project_get_query_value (SymbolDBModel *model,
 		{
 			gchar *escaped =
 				g_markup_escape_text (g_value_get_string (ret_value), -1);
-			g_value_set_string (value, escaped);
-			g_free (escaped);
+			g_value_take_string (value, escaped);
 		}
 		return TRUE;
 		break;
 	default:
-		return SYMBOL_DB_MODEL_CLASS (symbol_db_model_project_parent_class)->
+		return SYMBOL_DB_MODEL_CLASS (sdb_model_project_parent_class)->
 				get_query_value (model, data_model, iter, column, value);
 	}
 }
 
 static void
-on_symbol_db_project_dbe_unref (SymbolDBModelProject *model)
+on_sdb_project_dbe_unref (SymbolDBModelProject *model)
 {
 	SymbolDBModelProjectPriv *priv;
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_PROJECT (model));
-	priv = GET_PRIV (model);
+	priv = SYMBOL_DB_MODEL_PROJECT (model)->priv;
 	priv->dbe = NULL;
 	symbol_db_model_update (SYMBOL_DB_MODEL (model));
 }
 
 static void
-symbol_db_model_project_set_property (GObject *object, guint prop_id,
+sdb_model_project_set_property (GObject *object, guint prop_id,
                                      const GValue *value, GParamSpec *pspec)
 {
 	SymbolDBModelProjectPriv *priv;
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_PROJECT (object));
-	priv = GET_PRIV (object);
+	priv = SYMBOL_DB_MODEL_PROJECT (object)->priv;
 	
 	switch (prop_id)
 	{
@@ -267,7 +323,7 @@ symbol_db_model_project_set_property (GObject *object, guint prop_id,
 		if (priv->dbe)
 		{
 			g_object_weak_unref (G_OBJECT (priv->dbe),
-			                    (GWeakNotify)on_symbol_db_project_dbe_unref,
+			                    (GWeakNotify)on_sdb_project_dbe_unref,
 			                     object);
 			g_signal_handlers_disconnect_by_func (priv->dbe,
 				              G_CALLBACK (symbol_db_model_update),
@@ -281,7 +337,7 @@ symbol_db_model_project_set_property (GObject *object, guint prop_id,
 		}
 		priv->dbe = g_value_dup_object (value);
 		g_object_weak_ref (G_OBJECT (priv->dbe),
-			                    (GWeakNotify)on_symbol_db_project_dbe_unref,
+			                    (GWeakNotify)on_sdb_project_dbe_unref,
 			                     object);
 		g_signal_connect_swapped (priv->dbe, "db-connected",
 		                          G_CALLBACK (symbol_db_model_update),
@@ -303,13 +359,13 @@ symbol_db_model_project_set_property (GObject *object, guint prop_id,
 }
 
 static void
-symbol_db_model_project_get_property (GObject *object, guint prop_id,
+sdb_model_project_get_property (GObject *object, guint prop_id,
                                      GValue *value, GParamSpec *pspec)
 {
 	SymbolDBModelProjectPriv *priv;
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_PROJECT (object));
-	priv = GET_PRIV (object);
+	priv = SYMBOL_DB_MODEL_PROJECT (object)->priv;
 	
 	switch (prop_id)
 	{
@@ -323,17 +379,17 @@ symbol_db_model_project_get_property (GObject *object, guint prop_id,
 }
 
 static void
-symbol_db_model_project_finalize (GObject *object)
+sdb_model_project_finalize (GObject *object)
 {
 	SymbolDBModelProjectPriv *priv;
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_PROJECT (object));
-	priv = GET_PRIV (object);
+	priv = SYMBOL_DB_MODEL_PROJECT (object)->priv;
 	
 	if (priv->dbe)
 	{
 		g_object_weak_unref (G_OBJECT (priv->dbe),
-		                     (GWeakNotify)on_symbol_db_project_dbe_unref,
+		                     (GWeakNotify)on_sdb_project_dbe_unref,
 		                     object);
 		g_signal_handlers_disconnect_by_func (priv->dbe,
 		                  G_CALLBACK (symbol_db_model_update),
@@ -345,11 +401,20 @@ symbol_db_model_project_finalize (GObject *object)
 		                  G_CALLBACK (symbol_db_model_thaw),
 		                  object);
 	}
-	G_OBJECT_CLASS (symbol_db_model_project_parent_class)->finalize (object);
+
+	if (priv->stmt)
+	{
+		g_object_unref (priv->stmt);
+		g_object_unref (priv->params);
+	}
+	
+	g_free (priv);
+	
+	G_OBJECT_CLASS (sdb_model_project_parent_class)->finalize (object);
 }
 
 static void
-symbol_db_model_project_init (SymbolDBModelProject *object)
+sdb_model_project_init (SymbolDBModelProject *object)
 {
 	SymbolDBModelProjectPriv *priv;
 	
@@ -359,7 +424,9 @@ symbol_db_model_project_init (SymbolDBModelProject *object)
 		G_TYPE_STRING,
 		G_TYPE_STRING,
 		G_TYPE_INT,
-		G_TYPE_STRING
+		G_TYPE_STRING,
+		G_TYPE_INT,
+		G_TYPE_INT
 	};
 
 	gint data_cols[] = {
@@ -368,11 +435,15 @@ symbol_db_model_project_init (SymbolDBModelProject *object)
 		-1,
 		DATA_COL_SYMBOL_FILE_PATH,
 		DATA_COL_SYMBOL_FILE_LINE,
-		DATA_COL_SYMBOL_ARGS
+		DATA_COL_SYMBOL_ARGS,
+		DATA_COL_SYMBOL_SCOPE_DEFINITION_ID,
+		DATA_COL_SYMBOL_HAS_CHILD
 	};
 	
 	g_return_if_fail (SYMBOL_DB_IS_MODEL_PROJECT (object));
-	priv = GET_PRIV (object);
+
+	priv = g_new0 (SymbolDBModelProjectPriv, 1);
+	object->priv = priv;
 	
 	priv->dbe = NULL;
 
@@ -383,20 +454,21 @@ symbol_db_model_project_init (SymbolDBModelProject *object)
 }
 
 static void
-symbol_db_model_project_class_init (SymbolDBModelProjectClass *klass)
+sdb_model_project_class_init (SymbolDBModelProjectClass *klass)
 {
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
 	SymbolDBModelClass* parent_class = SYMBOL_DB_MODEL_CLASS (klass);
 
 	g_type_class_add_private (klass, sizeof (SymbolDBModelProjectPriv));
 
-	object_class->finalize = symbol_db_model_project_finalize;
-	object_class->set_property = symbol_db_model_project_set_property;
-	object_class->get_property = symbol_db_model_project_get_property;
+	object_class->finalize = sdb_model_project_finalize;
+	object_class->set_property = sdb_model_project_set_property;
+	object_class->get_property = sdb_model_project_get_property;
 
-	parent_class->get_query_value = symbol_db_model_project_get_query_value;
-	parent_class->get_n_children = symbol_db_model_project_get_n_children;
-	parent_class->get_children =  symbol_db_model_project_get_children;
+	parent_class->get_query_value = sdb_model_project_get_query_value;
+	parent_class->get_has_child = sdb_model_project_get_has_child;
+	parent_class->get_n_children = sdb_model_project_get_n_children;
+	parent_class->get_children =  sdb_model_project_get_children;
 	
 	g_object_class_install_property
 		(object_class, PROP_SYMBOL_DB_ENGINE,
diff --git a/plugins/symbol-db/symbol-db-model-project.h b/plugins/symbol-db/symbol-db-model-project.h
index b6eb3bb..20723fa 100644
--- a/plugins/symbol-db/symbol-db-model-project.h
+++ b/plugins/symbol-db/symbol-db-model-project.h
@@ -25,7 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define SYMBOL_DB_TYPE_MODEL_PROJECT             (symbol_db_model_project_get_type ())
+#define SYMBOL_DB_TYPE_MODEL_PROJECT             (sdb_model_project_get_type ())
 #define SYMBOL_DB_MODEL_PROJECT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYMBOL_DB_TYPE_MODEL_PROJECT, SymbolDBModelProject))
 #define SYMBOL_DB_MODEL_PROJECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), SYMBOL_DB_TYPE_MODEL_PROJECT, SymbolDBModelProjectClass))
 #define SYMBOL_DB_IS_MODEL_PROJECT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYMBOL_DB_TYPE_MODEL_PROJECT))
@@ -34,6 +34,7 @@ G_BEGIN_DECLS
 
 typedef struct _SymbolDBModelProjectClass SymbolDBModelProjectClass;
 typedef struct _SymbolDBModelProject SymbolDBModelProject;
+typedef struct _SymbolDBModelProjectPriv SymbolDBModelProjectPriv;
 
 enum {
 	SYMBOL_DB_MODEL_PROJECT_COL_SYMBOL_ID,
@@ -42,6 +43,8 @@ enum {
 	SYMBOL_DB_MODEL_PROJECT_COL_FILE,
 	SYMBOL_DB_MODEL_PROJECT_COL_LINE,
 	SYMBOL_DB_MODEL_PROJECT_COL_ARGS,
+	SYMBOL_DB_MODEL_PROJECT_COL_SCOPE_DEFINITION_ID,
+	SYMBOL_DB_MODEL_PROJECT_COL_HAS_CHILD,
 	SYMBOL_DB_MODEL_PROJECT_COL_N_COLS
 };
 
@@ -53,9 +56,11 @@ struct _SymbolDBModelProjectClass
 struct _SymbolDBModelProject
 {
 	SymbolDBModel parent_instance;
+
+	SymbolDBModelProjectPriv *priv;
 };
 
-GType symbol_db_model_project_get_type (void) G_GNUC_CONST;
+GType sdb_model_project_get_type (void) G_GNUC_CONST;
 GtkTreeModel* symbol_db_model_project_new (SymbolDBEngine* dbe);
 
 G_END_DECLS
diff --git a/plugins/symbol-db/symbol-db-model.c b/plugins/symbol-db/symbol-db-model.c
index 58fa57d..6236417 100644
--- a/plugins/symbol-db/symbol-db-model.c
+++ b/plugins/symbol-db/symbol-db-model.c
@@ -24,9 +24,6 @@
 
 #define SYMBOL_DB_MODEL_STAMP 5364558
 
-#define GET_PRIV(o) \
-	(G_TYPE_INSTANCE_GET_PRIVATE((o), SYMBOL_DB_TYPE_MODEL, SymbolDBModelPriv))
-
 /* Constants */
 
 #define SYMBOL_DB_MODEL_PAGE_SIZE 50
@@ -43,6 +40,8 @@ struct _SymbolDBModelPage
 typedef struct _SymbolDBModelNode SymbolDBModelNode;
 struct _SymbolDBModelNode {
 
+	gint n_columns;
+	
 	/* Column values of the node. This is an array of GValues of length
 	 * n_column. and holds the values in order of columns given at
 	 * object initialized.
@@ -59,12 +58,14 @@ struct _SymbolDBModelNode {
 
 	/* Children states */
 	gint children_ref_count;
+	gboolean has_child_ensured;
+	gboolean has_child;
 	gboolean children_ensured;
 	guint n_children;
 	SymbolDBModelNode **children;
 };
 
-typedef struct {
+ struct _SymbolDBModelPriv {
 	/* Keeps track of model freeze count. When the model is frozen, it
 	 * avoid retreiving data from backend. It does not freeze the frontend
 	 * view at all and instead use empty data for the duration of freeze.
@@ -75,12 +76,8 @@ typedef struct {
 	GType *column_types; /* Type of each column in the model */
 	gint *query_columns; /* Corresponding GdaDataModel column */
 	
-	/* Idle child-ensure queue */
-	GQueue *ensure_children_queue;
-	guint ensure_children_idle_id;
-	
 	SymbolDBModelNode *root;
-} SymbolDBModelPriv;
+};
 
 enum {
 	SIGNAL_GET_HAS_CHILD,
@@ -93,46 +90,58 @@ static guint symbol_db_model_signals[LAST_SIGNAL] = { 0 };
 
 /* Declarations */
 
-static void symbol_db_model_node_free (SymbolDBModelNode *node, gboolean force);
+static void sdb_model_node_free (SymbolDBModelNode *node, gboolean force);
 
-static void symbol_db_model_tree_model_init (GtkTreeModelIface *iface);
+static void sdb_model_tree_model_init (GtkTreeModelIface *iface);
 
-static gboolean symbol_db_model_get_query_value_at (SymbolDBModel *model,
-                                                    GdaDataModel *data_model,
-                                                    gint position, gint column,
+static gboolean sdb_model_get_query_value_at (SymbolDBModel *model,
+                                              GdaDataModel *data_model,
+                                              gint position, gint column,
+                                              GValue *value);
 
-                                                    GValue *value);
+static gboolean sdb_model_get_query_value (SymbolDBModel *model,
+                                           GdaDataModel *data_model,
+                                           GdaDataModelIter *iter,
+                                           gint column,
+                                           GValue *value);
 
-static gboolean symbol_db_model_get_query_value (SymbolDBModel *model,
-                                                 GdaDataModel *data_model,
-                                                 GdaDataModelIter *iter,
-                                                 gint column,
-                                                 GValue *value);
+static gboolean sdb_model_get_has_child (SymbolDBModel *model,
+                                         SymbolDBModelNode *node);
 
-static gint symbol_db_model_get_n_children (SymbolDBModel *model,
-                                            gint tree_level,
-                                            GValue column_values[]);
+static gint sdb_model_get_n_children (SymbolDBModel *model,
+                                      gint tree_level,
+                                      GValue column_values[]);
 
-static GdaDataModel* symbol_db_model_get_children (SymbolDBModel *model,
-                                                   gint tree_level,
-                                                   GValue column_values[],
-                                                   gint offset, gint limit);
+static GdaDataModel* sdb_model_get_children (SymbolDBModel *model,
+                                             gint tree_level,
+                                             GValue column_values[],
+                                             gint offset, gint limit);
 
-static void symbol_db_model_queue_ensure_node_children (SymbolDBModel *model,
-                                                        SymbolDBModelNode *parent);
-
-static void symbol_db_model_ensure_node_children (SymbolDBModel *model,
-                                                  SymbolDBModelNode *parent,
-                                                  gboolean emit_has_child);
+static void sdb_model_ensure_node_children (SymbolDBModel *model,
+                                            SymbolDBModelNode *parent,
+                                            gboolean emit_has_child,
+                                            gboolean fake_child);
 
 /* Class definition */
-G_DEFINE_TYPE_WITH_CODE (SymbolDBModel, symbol_db_model, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (SymbolDBModel, sdb_model, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
-                                                symbol_db_model_tree_model_init))
+                                                sdb_model_tree_model_init))
 /* Node */
 
-static inline SymbolDBModelNode*
-symbol_db_model_node_get_child (SymbolDBModelNode *node, gint child_offset)
+/**
+ * sdb_model_node_get_child:
+ * @node: The node whose child has to be fetched.
+ * @child_offset: Offset of the child of this node.
+ *
+ * Fetches the content of the @child_offset child of the @node. The return
+ * value can be NULL if the child hasn't been yet cached from backend. Only
+ * when the child node is in cache does this function return a child. If you
+ * you want to fetch the child from backend, call sdb_model_page_fault().
+ * 
+ * Returns: The child node, or NULL if the child hasn't yet been cached.
+ */
+static GNUC_INLINE SymbolDBModelNode*
+sdb_model_node_get_child (SymbolDBModelNode *node, gint child_offset)
 {
 	g_return_val_if_fail (node != NULL, NULL);
 	g_return_val_if_fail (child_offset >= 0 && child_offset < node->n_children, NULL);
@@ -141,9 +150,17 @@ symbol_db_model_node_get_child (SymbolDBModelNode *node, gint child_offset)
 	return NULL;
 }
 
+/**
+ * sdb_model_node_set_child:
+ * @node: The node whose child has to be set.
+ * @child_offset: Offset of the child to set.
+ * @val: Child node to set.
+ * 
+ * Sets the child of @node at @child_offset to @val.
+ */
 static void
-symbol_db_model_node_set_child (SymbolDBModelNode *node, gint child_offset,
-                                SymbolDBModelNode *val)
+sdb_model_node_set_child (SymbolDBModelNode *node, gint child_offset,
+                          SymbolDBModelNode *val)
 {
 	g_return_if_fail (node != NULL);
 	g_return_if_fail (node->children_ensured == TRUE);
@@ -151,15 +168,29 @@ symbol_db_model_node_set_child (SymbolDBModelNode *node, gint child_offset,
 
 	/* If children nodes array hasn't been allocated, now is the time */
 	if (!node->children)
+		node->children = g_new0 (SymbolDBModelNode*, node->n_children);
+	if (val)
 	{
-		node->children = g_new0 (SymbolDBModelNode*,
-			                                 node->n_children);
+		g_warn_if_fail (node->children[child_offset] == NULL);
 	}
 	node->children[child_offset] = val;
 }
 
+/**
+ * sdb_model_node_cleanse:
+ * @node: The node to cleanse
+ * @force: If forcefuly cleansed disregarding references to children
+ * 
+ * It destroys all children of the node and resets the node to not
+ * children-ensured state. Any cache for children nodes is also destroyed.
+ * The node will be in children unensured state, which means the status
+ * of it's children would be unknown. Cleansing only happens if there are
+ * no referenced children nodes, unless it is forced with @force = TRUE.
+ * 
+ * Returns: TRUE if successfully cleansed, otherwise FALSE.
+ */
 static gboolean
-symbol_db_model_node_cleanse (SymbolDBModelNode *node, gboolean force)
+sdb_model_node_cleanse (SymbolDBModelNode *node, gboolean force)
 {
 	SymbolDBModelPage *page, *next;
 	gint i;
@@ -179,7 +210,7 @@ symbol_db_model_node_cleanse (SymbolDBModelNode *node, gboolean force)
 		 */
 		for (i = 0; i < node->n_children; i++)
 		{
-			SymbolDBModelNode *child = symbol_db_model_node_get_child (node, i);
+			SymbolDBModelNode *child = sdb_model_node_get_child (node, i);
 			if (child)
 			{
 				if (!force)
@@ -187,8 +218,8 @@ symbol_db_model_node_cleanse (SymbolDBModelNode *node, gboolean force)
 					/* Assert on nodes with ref count > 0 */
 					g_warn_if_fail (child->children_ref_count == 0);
 				}
-				symbol_db_model_node_free (child, force);
-				symbol_db_model_node_set_child (node, i, NULL);
+				sdb_model_node_free (child, force);
+				sdb_model_node_set_child (node, i, NULL);
 			}
 		}
 	}
@@ -198,7 +229,7 @@ symbol_db_model_node_cleanse (SymbolDBModelNode *node, gboolean force)
 	while (page)
 	{
 		next = page->next;
-		g_free (page);
+		g_slice_free (SymbolDBModelPage, page);
 		page = next;
 	}
 	node->pages = NULL;
@@ -212,19 +243,36 @@ symbol_db_model_node_cleanse (SymbolDBModelNode *node, gboolean force)
 	return TRUE;
 }
 
+/**
+ * sdb_model_node_free:
+ * @node: The node to free.
+ * @force: Force the free despite any referenced children
+ *
+ * Frees the node if there is no referenced children, unless @force is TRUE
+ * in which case it is freed anyways. All children recursively are also
+ * destroyed.
+ */
 static void
-symbol_db_model_node_free (SymbolDBModelNode *node, gboolean force)
+sdb_model_node_free (SymbolDBModelNode *node, gboolean force)
 {
-	if (!symbol_db_model_node_cleanse (node, force))
+	if (!sdb_model_node_cleanse (node, force))
 	    return;
 	
-	g_free (node->values);
-	g_free (node);
+	g_slice_free1 (sizeof(GValue) * node->n_columns, node->values);
+	g_slice_free (SymbolDBModelNode, node);
 }
 
+/**
+ * sdb_model_node_remove_page:
+ * @node: The node with the page
+ * @page: The page to remove
+ *
+ * Removes the cache @page from the @node. The associated nodes are all
+ * destroyed and set to NULL. They could be re-fetched later if needed.
+ */
 static void
-symbol_db_model_node_remove_page (SymbolDBModelNode *node,
-                                  SymbolDBModelPage *page)
+sdb_model_node_remove_page (SymbolDBModelNode *node,
+                            SymbolDBModelPage *page)
 {
 	if (page->prev)
 		page->prev->next = page->next;
@@ -233,12 +281,24 @@ symbol_db_model_node_remove_page (SymbolDBModelNode *node,
 		
 	if (page->next)
 		page->next->prev = page->prev;
+
+	/* FIXME: Destroy the page */
 }
 
+/**
+ * sdb_model_node_insert_page:
+ * @node: The node for which the page is inserted
+ * @page: The page being inserted
+ * @after: The page after which @page is inserted
+ * 
+ * Inserts the @page after @after page. The page should have been already
+ * fetched and their nodes (children of @node) should have been already 
+ * created.
+ */
 static void
-symbol_db_model_node_insert_page (SymbolDBModelNode *node,
-                                  SymbolDBModelPage *page,
-                                  SymbolDBModelPage *after)
+sdb_model_node_insert_page (SymbolDBModelNode *node,
+                            SymbolDBModelPage *page,
+                            SymbolDBModelPage *after)
 {
 	
 	/* Insert the new page after "after" page */
@@ -254,10 +314,23 @@ symbol_db_model_node_insert_page (SymbolDBModelNode *node,
 	}
 }
 
+/**
+ * symbold_db_model_node_find_child_page:
+ * @node: The node
+ * @child_offset: Offset of the child node.
+ * @prev_page: A pointer to page to return previous cache page found
+ *
+ * Find the cache page associated with child node of @node at @child_offset.
+ * If the page is found, it returns the page, otherwise NULL is returned. Also,
+ * if the page is found, prev_page pointer is set to the previous page to
+ * the one found (NULL if it's the first page in the list).
+ *
+ * Returns: The page associated with the child node, or NULL if not found.
+ */
 static SymbolDBModelPage*
-symbol_db_model_node_find_child_page (SymbolDBModelNode *node,
-                                      gint child_offset,
-                                      SymbolDBModelPage **prev_page)
+sdb_model_node_find_child_page (SymbolDBModelNode *node,
+                                gint child_offset,
+                                SymbolDBModelPage **prev_page)
 {
 	SymbolDBModelPage *page;
 	
@@ -285,8 +358,19 @@ symbol_db_model_node_find_child_page (SymbolDBModelNode *node,
 	return NULL;
 }
 
+/**
+ * sdb_model_node_ref_child:
+ * @node: The node whose child is being referenced.
+ * 
+ * References a child of @node and references all its parents recursively.
+ * A referenced node essentially means someone is holding a reference to it
+ * outside the model and we are supposed track its position. Currently, we
+ * don't track reference of nodes themselves but instead maitain their ref
+ * counts in parent @node. Ref counting is currently unused, so there is no
+ * practical thing happening using it at the moment.
+ */
 static void
-symbol_db_model_node_ref_child (SymbolDBModelNode *node)
+sdb_model_node_ref_child (SymbolDBModelNode *node)
 {
 	g_return_if_fail (node != NULL);
 
@@ -295,12 +379,21 @@ symbol_db_model_node_ref_child (SymbolDBModelNode *node)
 	if (node->parent)
 	{
 		/* Increate associated ref count on parent */
-		symbol_db_model_node_ref_child (node->parent);
+		sdb_model_node_ref_child (node->parent);
 	}
 }
 
+/**
+ * sdb_model_node_unref_child:
+ * @node: The node whose child is being unrefed
+ * @child_offset: Offset of the child being unrefed
+ * 
+ * Unrefs the child at @child_offset in @node. Also, unrefs its parents
+ * recursively. currently ref/unref is not used, see
+ * sdb_model_node_ref_child() for more details.
+ */
 static void
-symbol_db_model_node_unref_child (SymbolDBModelNode *node, gint child_offset)
+sdb_model_node_unref_child (SymbolDBModelNode *node, gint child_offset)
 {
 	g_return_if_fail (node != NULL);
 	g_return_if_fail (node->children_ref_count > 0);
@@ -310,29 +403,43 @@ symbol_db_model_node_unref_child (SymbolDBModelNode *node, gint child_offset)
 	/* If ref count reaches 0, cleanse this node */
 	if (node->children_ref_count <= 0)
 	{
-		symbol_db_model_node_cleanse (node, FALSE);
+		sdb_model_node_cleanse (node, FALSE);
 	}
 
 	if (node->parent)
 	{
 		/* Reduce ref count on parent as well */
-		symbol_db_model_node_unref_child (node->parent, node->offset);
+		sdb_model_node_unref_child (node->parent, node->offset);
 	}
 }
 
+/**
+ * sdb_model_node_new:
+ * @model: The model for which the node is being created
+ * @parent: The parent node
+ * @child_offset: Offset of this node as child of @parent
+ * @data_model: The data model from which content of the node is fetched
+ * @data_iter: Iter for @data_model where the content of this node is found
+ *
+ * This creates a new node for @model as a child of @parent at @child_offset
+ * and initilizes the columns content from @data_model at @data_iter.
+ * 
+ * Returns: The newly created node.
+ */
 static SymbolDBModelNode *
-symbol_db_model_node_new (SymbolDBModel *model, SymbolDBModelNode *parent,
-                          gint child_offset, GdaDataModel *data_model,
-                          GdaDataModelIter *data_iter)
+sdb_model_node_new (SymbolDBModel *model, SymbolDBModelNode *parent,
+                    gint child_offset, GdaDataModel *data_model,
+                    GdaDataModelIter *data_iter)
 {
 	gint i;
-	SymbolDBModelPriv *priv = GET_PRIV (model);
-	SymbolDBModelNode* node = g_new0 (SymbolDBModelNode, 1);
-	node->values = g_new0 (GValue, priv->n_columns);
+	SymbolDBModelPriv *priv = model->priv;
+	SymbolDBModelNode* node = g_slice_new0 (SymbolDBModelNode);
+	node->n_columns = priv->n_columns;
+	node->values = g_slice_alloc0 (sizeof (GValue) * priv->n_columns);
 	for (i = 0; i < priv->n_columns; i++)
 	{
 		g_value_init (&(node->values[i]), priv->column_types[i]);
-		symbol_db_model_get_query_value (model,
+		sdb_model_get_query_value (model,
 		                                 data_model,
 		                                 data_iter,
 		                                 i, &(node->values[i]));
@@ -345,8 +452,17 @@ symbol_db_model_node_new (SymbolDBModel *model, SymbolDBModelNode *parent,
 
 /* SymbolDBModel implementation */
 
+/**
+ * sdb_model_iter_is_valid:
+ * @model: The tree model
+ * @iter: An iter for the model
+ *
+ * Checks if the iterator is valid for the model.
+ *
+ * Returns: TRUE if valid, FALSE if not
+ */
 static gboolean
-symbol_db_model_iter_is_valid (GtkTreeModel *model, GtkTreeIter *iter)
+sdb_model_iter_is_valid (GtkTreeModel *model, GtkTreeIter *iter)
 {
 	SymbolDBModelNode *parent_node;
 	gint offset;
@@ -364,10 +480,23 @@ symbol_db_model_iter_is_valid (GtkTreeModel *model, GtkTreeIter *iter)
 	return TRUE;
 }
 
+/**
+ * sdb_model_page_fault:
+ * @parent_node: The node which needs children data fetched
+ * @child_offset: Offset of the child where page fault occured
+ *
+ * Page fault should happen on a child which is not yet available in cache
+ * and needs to be fetched from backend database. Fetch happens in a page
+ * size of SYMBOL_DB_MODEL_PAGE_SIZE chunks before and after the requested
+ * child node. Also, the page will adjust the boundry to any preceeding or
+ * or following pages so that they don't overlap.
+ *
+ * Returns: The newly fetched page
+ */
 static SymbolDBModelPage*
-symbol_db_model_page_fault (SymbolDBModel *model,
-                            SymbolDBModelNode *parent_node,
-                            gint child_offset)
+sdb_model_page_fault (SymbolDBModel *model,
+                      SymbolDBModelNode *parent_node,
+                      gint child_offset)
 {
 	SymbolDBModelPriv *priv;
 	SymbolDBModelPage *page, *prev_page, *page_found;
@@ -376,25 +505,26 @@ symbol_db_model_page_fault (SymbolDBModel *model,
 	GdaDataModel *data_model = NULL;
 
 	/* Insert after prev_page */
-	page_found = symbol_db_model_node_find_child_page (parent_node,
-	                                                   child_offset,
-	                                                   &prev_page);
+	page_found = sdb_model_node_find_child_page (parent_node,
+	                                             child_offset,
+	                                             &prev_page);
 
-	g_return_val_if_fail (page_found == NULL, page_found);
+	if (page_found)
+		return page_found;
 
 	/* If model is frozen, can't fetch data from backend */
-	priv = GET_PRIV (model);
+	priv = model->priv;
 	if (priv->freeze_count > 0)
 		return NULL;
 	
 	/* New page to cover current child_offset */
-	page = g_new0 (SymbolDBModelPage, 1);
+	page = g_slice_new0 (SymbolDBModelPage);
 
 	/* Define page range */
 	page->begin_offset = child_offset - SYMBOL_DB_MODEL_PAGE_SIZE;
 	page->end_offset = child_offset + SYMBOL_DB_MODEL_PAGE_SIZE;
 
-	symbol_db_model_node_insert_page (parent_node, page, prev_page);
+	sdb_model_node_insert_page (parent_node, page, prev_page);
 	
 	/* Adjust boundries not to overlap with preceeding or following page */
 	if (prev_page && prev_page->end_offset > page->begin_offset)
@@ -408,11 +538,10 @@ symbol_db_model_page_fault (SymbolDBModel *model,
 		page->begin_offset = 0;
 	
 	/* Load a page from database */
-	data_model = symbol_db_model_get_children (model, parent_node->level,
-	                                           parent_node->values,
-	                                           page->begin_offset,
-	                                           page->end_offset
-	                                       			- page->begin_offset);
+	data_model = sdb_model_get_children (model, parent_node->level,
+	                                     parent_node->values,
+	                                     page->begin_offset,
+	                                     page->end_offset - page->begin_offset);
 
 	/* Fill up the page */
 	data_iter = gda_data_model_create_iter (data_model);
@@ -426,10 +555,10 @@ symbol_db_model_page_fault (SymbolDBModel *model,
 				break;
 			}
 			SymbolDBModelNode *node =
-				symbol_db_model_node_new (model, parent_node, i,
-				                          data_model, data_iter);
-			g_assert (symbol_db_model_node_get_child (parent_node, i) == NULL);
-			symbol_db_model_node_set_child (parent_node, i, node);
+				sdb_model_node_new (model, parent_node, i,
+				                    data_model, data_iter);
+			g_assert (sdb_model_node_get_child (parent_node, i) == NULL);
+			sdb_model_node_set_child (parent_node, i, node);
 			if (!gda_data_model_iter_move_next (data_iter))
 			{
 				if (i < (page->end_offset - 1))
@@ -449,32 +578,32 @@ symbol_db_model_page_fault (SymbolDBModel *model,
 /* GtkTreeModel implementation */
 
 static GtkTreeModelFlags
-symbol_db_model_get_flags (GtkTreeModel *tree_model)
+sdb_model_get_flags (GtkTreeModel *tree_model)
 {
 	return 0;
 }
 
 static GType
-symbol_db_model_get_column_type (GtkTreeModel *tree_model,
-                                 gint index)
+sdb_model_get_column_type (GtkTreeModel *tree_model,
+                           gint index)
 {
-	SymbolDBModelPriv *priv = GET_PRIV (tree_model);
+	SymbolDBModelPriv *priv = SYMBOL_DB_MODEL (tree_model)->priv;
 	g_return_val_if_fail (index < priv->n_columns, G_TYPE_INVALID);
 	return priv->column_types [index];
 }
 
 static gint
-symbol_db_model_get_n_columns (GtkTreeModel *tree_model)
+sdb_model_get_n_columns (GtkTreeModel *tree_model)
 {
 	SymbolDBModelPriv *priv;
-	priv = GET_PRIV (tree_model);
+	priv = SYMBOL_DB_MODEL (tree_model)->priv;
 	return priv->n_columns;
 }
 
 static gboolean
-symbol_db_model_get_iter (GtkTreeModel *tree_model,
-                          GtkTreeIter *iter,
-                          GtkTreePath *path)
+sdb_model_get_iter (GtkTreeModel *tree_model,
+					GtkTreeIter *iter,
+                    GtkTreePath *path)
 {
 	gint i;
 	SymbolDBModelNode *node, *parent_node;
@@ -491,7 +620,7 @@ symbol_db_model_get_iter (GtkTreeModel *tree_model,
 	depth = gtk_tree_path_get_depth (path);
 	g_return_val_if_fail (depth > 0, FALSE);
 
-	priv = GET_PRIV (tree_model);
+	priv = SYMBOL_DB_MODEL (tree_model)->priv;
 	indx = gtk_tree_path_get_indices (path);
 
 	parent_node = NULL;
@@ -500,8 +629,8 @@ symbol_db_model_get_iter (GtkTreeModel *tree_model,
 	{
 		parent_node = node;
 		if (!node->children_ensured)
-			symbol_db_model_ensure_node_children (SYMBOL_DB_MODEL (tree_model),
-				                                  node, FALSE);
+			sdb_model_ensure_node_children (SYMBOL_DB_MODEL (tree_model),
+				                            node, FALSE, FALSE);
 		if (node->n_children <= 0)
 		{
 			/* No child available. View thinks there is child.
@@ -515,7 +644,7 @@ symbol_db_model_get_iter (GtkTreeModel *tree_model,
 			g_warning ("Invalid path to iter conversion; no children list found at depth %d", i);
 			break;
 		}
-		node = symbol_db_model_node_get_child (node, indx[i]);
+		node = sdb_model_node_get_child (node, indx[i]);
 	}
 	if (i != depth)
 	{
@@ -525,13 +654,13 @@ symbol_db_model_get_iter (GtkTreeModel *tree_model,
 	iter->user_data = parent_node;
 	iter->user_data2 = GINT_TO_POINTER (indx[i-1]);
 
-	g_assert (symbol_db_model_iter_is_valid (tree_model, iter));
+	g_assert (sdb_model_iter_is_valid (tree_model, iter));
 
 	return TRUE;
 }
 
 static GtkTreePath*
-symbol_db_model_get_path (GtkTreeModel *tree_model,
+sdb_model_get_path (GtkTreeModel *tree_model,
                           GtkTreeIter *iter)
 {
 	SymbolDBModelNode *node;
@@ -539,36 +668,36 @@ symbol_db_model_get_path (GtkTreeModel *tree_model,
 	SymbolDBModelPriv *priv;
 	gint offset;
 	
-	g_return_val_if_fail (symbol_db_model_iter_is_valid (tree_model, iter),
+	g_return_val_if_fail (sdb_model_iter_is_valid (tree_model, iter),
 	                      NULL);
 
-	priv = GET_PRIV (tree_model);
+	priv = SYMBOL_DB_MODEL (tree_model)->priv;
 	path = gtk_tree_path_new ();
 
 	node = (SymbolDBModelNode*)iter->user_data;
 	offset = GPOINTER_TO_INT (iter->user_data2);
 	do {
 		gtk_tree_path_prepend_index (path, offset);
-		node = node->parent;
 		if (node)
 			offset = node->offset;
+		node = node->parent;
 	} while (node);
 	return path;
 }
 
 static void
-symbol_db_model_get_value (GtkTreeModel *tree_model,
-                           GtkTreeIter *iter, gint column,
-                           GValue *value)
+sdb_model_get_value (GtkTreeModel *tree_model,
+                     GtkTreeIter *iter, gint column,
+                     GValue *value)
 {
 	SymbolDBModelPriv *priv;
 	SymbolDBModelNode *parent_node, *node;
 	SymbolDBModelPage *page;
 	gint offset;
 	
-	g_return_if_fail (symbol_db_model_iter_is_valid (tree_model, iter));
+	g_return_if_fail (sdb_model_iter_is_valid (tree_model, iter));
 
-	priv = GET_PRIV (tree_model);
+	priv = SYMBOL_DB_MODEL (tree_model)->priv;
 	
 	g_return_if_fail (column >= 0);
 	g_return_if_fail (column < priv->n_columns);
@@ -576,28 +705,26 @@ symbol_db_model_get_value (GtkTreeModel *tree_model,
 	parent_node = (SymbolDBModelNode*) iter->user_data;
 	offset = GPOINTER_TO_INT (iter->user_data2);
 
-	if (symbol_db_model_node_get_child (parent_node, offset) == NULL)
-		page = symbol_db_model_page_fault (SYMBOL_DB_MODEL (tree_model),
-		                                   parent_node, offset);
-	node = symbol_db_model_node_get_child (parent_node, offset);
+	if (sdb_model_node_get_child (parent_node, offset) == NULL)
+		page = sdb_model_page_fault (SYMBOL_DB_MODEL (tree_model),
+		                             parent_node, offset);
+	node = sdb_model_node_get_child (parent_node, offset);
 	g_value_init (value, priv->column_types[column]);
 
-	/* If model is frozen, we don't expect the page fault to work */
-	if (priv->freeze_count > 0 && node == NULL)
+	if (node == NULL)
 		return;
 	
-	g_return_if_fail (node != NULL);
-
 	/* View accessed the node, so update any pending has-child status */
-	if (!node->children_ensured)
-		symbol_db_model_queue_ensure_node_children (SYMBOL_DB_MODEL (tree_model),
-		                                            node);
+	if (!node->has_child_ensured)
+	{
+		sdb_model_get_has_child (SYMBOL_DB_MODEL (tree_model), node);
+	}
 	g_value_copy (&(node->values[column]), value);
 }
 
 static gboolean
-symbol_db_model_iter_next (GtkTreeModel *tree_model,
-                           GtkTreeIter *iter)
+sdb_model_iter_next (GtkTreeModel *tree_model,
+                     GtkTreeIter *iter)
 {
 	SymbolDBModelNode *node;
 	gint offset;
@@ -615,30 +742,29 @@ symbol_db_model_iter_next (GtkTreeModel *tree_model,
 		return FALSE;
 	iter->user_data2 = GINT_TO_POINTER (offset);
 
-	g_assert (symbol_db_model_iter_is_valid (tree_model, iter));
+	g_assert (sdb_model_iter_is_valid (tree_model, iter));
 
 	return TRUE;
 }
 
 static gboolean
-symbol_db_model_iter_children (GtkTreeModel *tree_model,
-                               GtkTreeIter *iter,
-                               GtkTreeIter *parent)
+sdb_model_iter_children (GtkTreeModel *tree_model,
+                         GtkTreeIter *iter,
+                         GtkTreeIter *parent)
 {
 	SymbolDBModelNode *node, *parent_node;
 	SymbolDBModelPriv *priv;
 
 	if (parent)
 	{
-		g_return_val_if_fail (symbol_db_model_iter_is_valid (tree_model,
-		                                                     parent),
+		g_return_val_if_fail (sdb_model_iter_is_valid (tree_model, parent),
 		                      FALSE);
 	}
 	
 	g_return_val_if_fail (SYMBOL_DB_IS_MODEL(tree_model), FALSE);
 	g_return_val_if_fail (iter != NULL, FALSE);
 
-	priv = GET_PRIV (tree_model);
+	priv = SYMBOL_DB_MODEL (tree_model)->priv;
 	if (parent == NULL)
 	{
 		node = priv->root;
@@ -648,77 +774,85 @@ symbol_db_model_iter_children (GtkTreeModel *tree_model,
 		gint offset;
 		parent_node = (SymbolDBModelNode*) parent->user_data;
 		offset = GPOINTER_TO_INT (parent->user_data2);
-		node = symbol_db_model_node_get_child (parent_node, offset);
+		node = sdb_model_node_get_child (parent_node, offset);
 		if (!node)
 		{
-			symbol_db_model_page_fault (SYMBOL_DB_MODEL (tree_model),
-			                            parent_node, offset);
-			node = symbol_db_model_node_get_child (parent_node, offset);
-			if (node)
-				symbol_db_model_ensure_node_children (SYMBOL_DB_MODEL (tree_model),
-						                              node, FALSE);
+			sdb_model_page_fault (SYMBOL_DB_MODEL (tree_model),
+			                      parent_node, offset);
+			node = sdb_model_node_get_child (parent_node, offset);
 		}
 		g_return_val_if_fail (node != NULL, FALSE);
 	}
 
-	/* View trying to access children of childless node seems typical */
-	if (node->n_children <= 0)
+	/* Apparently view can call this funtion without testing has_child first */
+	if (!sdb_model_get_has_child (SYMBOL_DB_MODEL(tree_model), node))
 		return FALSE;
-	
+
+	if (!node->children_ensured)
+		sdb_model_ensure_node_children (SYMBOL_DB_MODEL (tree_model),
+		                                node, FALSE, TRUE);
+
 	iter->user_data = node;
 	iter->user_data2 = GINT_TO_POINTER (0);
 	iter->stamp = SYMBOL_DB_MODEL_STAMP;
 
-	g_assert (symbol_db_model_iter_is_valid (tree_model, iter));
+	/* View trying to access children of childless node seems typical */
+	if (node->n_children <= 0)
+		return FALSE;
+	
+	g_assert (sdb_model_iter_is_valid (tree_model, iter));
 
 	return TRUE;
 }
 
 static gboolean
-symbol_db_model_iter_has_child (GtkTreeModel *tree_model,
+sdb_model_iter_has_child (GtkTreeModel *tree_model,
                                 GtkTreeIter *iter)
 {
 	gint offset;
 	SymbolDBModelNode *node, *parent_node;
 
-	g_return_val_if_fail (symbol_db_model_iter_is_valid (tree_model, iter),
+	g_return_val_if_fail (sdb_model_iter_is_valid (tree_model, iter),
 	                      FALSE);
 	
 	parent_node = (SymbolDBModelNode*) iter->user_data;
 	offset = GPOINTER_TO_INT (iter->user_data2);
 
-	node = symbol_db_model_node_get_child (parent_node, offset);
+	node = sdb_model_node_get_child (parent_node, offset);
 
 	/* If node is not loaded, has-child is defered. See get_value() */
 	if (node == NULL)
 		return FALSE;
-	return (node->n_children > 0);
+	return sdb_model_get_has_child (SYMBOL_DB_MODEL (tree_model), node);
 }
 
 static gint
-symbol_db_model_iter_n_children (GtkTreeModel *tree_model,
-                                 GtkTreeIter *iter)
+sdb_model_iter_n_children (GtkTreeModel *tree_model,
+                           GtkTreeIter *iter)
 {
 	gint offset;
 	SymbolDBModelNode *node, *parent_node;
 	
-	g_return_val_if_fail (symbol_db_model_iter_is_valid (tree_model, iter),
+	g_return_val_if_fail (sdb_model_iter_is_valid (tree_model, iter),
 	                      FALSE);
 	
 	parent_node = (SymbolDBModelNode*) iter->user_data;
 	offset = GPOINTER_TO_INT (iter->user_data2);
 	
-	node = symbol_db_model_node_get_child (parent_node, offset);
+	node = sdb_model_node_get_child (parent_node, offset);
 	if (node == NULL)
 		return 0;
+	if (!node->children_ensured)
+		sdb_model_ensure_node_children (SYMBOL_DB_MODEL (tree_model),
+		                                node, FALSE, FALSE);
 	return node->n_children;
 }
 
 static gboolean
-symbol_db_model_iter_nth_child (GtkTreeModel *tree_model,
-                                GtkTreeIter *iter,
-                                GtkTreeIter *parent,
-                                gint n)
+sdb_model_iter_nth_child (GtkTreeModel *tree_model,
+                          GtkTreeIter *iter,
+                          GtkTreeIter *parent,
+                          gint n)
 {
 	SymbolDBModelNode *node;
 	SymbolDBModelPriv *priv;
@@ -727,29 +861,29 @@ symbol_db_model_iter_nth_child (GtkTreeModel *tree_model,
 	g_return_val_if_fail (iter != NULL, FALSE);
 	g_return_val_if_fail (n >= 0, FALSE);
 
-	if (!symbol_db_model_iter_children (tree_model, iter, parent))
+	if (!sdb_model_iter_children (tree_model, iter, parent))
 		return FALSE;
 	
-	priv = GET_PRIV (tree_model);
+	priv = SYMBOL_DB_MODEL (tree_model)->priv;
 	node = (SymbolDBModelNode*) (iter->user_data);
 
 	g_return_val_if_fail (n < node->n_children, FALSE);
 	
 	iter->user_data2 = GINT_TO_POINTER (n);
 
-	g_assert (symbol_db_model_iter_is_valid (tree_model, iter));
+	g_assert (sdb_model_iter_is_valid (tree_model, iter));
 
 	return TRUE;
 }
 
 static gboolean
-symbol_db_model_iter_parent (GtkTreeModel *tree_model,
-                             GtkTreeIter *iter,
-                             GtkTreeIter *child)
+sdb_model_iter_parent (GtkTreeModel *tree_model,
+                       GtkTreeIter *iter,
+                       GtkTreeIter *child)
 {
 	SymbolDBModelNode *parent_node;
 	
-	g_return_val_if_fail (symbol_db_model_iter_is_valid (tree_model, child),
+	g_return_val_if_fail (sdb_model_iter_is_valid (tree_model, child),
 	                      FALSE);
 	
 	g_return_val_if_fail (iter != NULL, FALSE);
@@ -761,86 +895,63 @@ symbol_db_model_iter_parent (GtkTreeModel *tree_model,
 	iter->user_data2 = GINT_TO_POINTER (parent_node->offset);
 	iter->stamp = SYMBOL_DB_MODEL_STAMP;
 
-	g_assert (symbol_db_model_iter_is_valid (tree_model, iter));
+	g_assert (sdb_model_iter_is_valid (tree_model, iter));
 
 	return TRUE;
 }
 
 static void
-symbol_db_model_iter_ref (GtkTreeModel *tree_model, GtkTreeIter  *iter)
+sdb_model_iter_ref (GtkTreeModel *tree_model, GtkTreeIter  *iter)
 {
 	SymbolDBModelNode *parent_node;
 	gint child_offset;
 	
-	g_return_if_fail (symbol_db_model_iter_is_valid (tree_model, iter));
+	g_return_if_fail (sdb_model_iter_is_valid (tree_model, iter));
 
 	parent_node = (SymbolDBModelNode*) iter->user_data;
 	child_offset = GPOINTER_TO_INT (iter->user_data2);
 
-	symbol_db_model_node_ref_child (parent_node);
+	sdb_model_node_ref_child (parent_node);
 }
 
 static void
-symbol_db_model_iter_unref (GtkTreeModel *tree_model, GtkTreeIter  *iter)
+sdb_model_iter_unref (GtkTreeModel *tree_model, GtkTreeIter  *iter)
 {
 	SymbolDBModelNode *parent_node;
 	gint child_offset;
 	
-	g_return_if_fail (symbol_db_model_iter_is_valid (tree_model, iter));
+	g_return_if_fail (sdb_model_iter_is_valid (tree_model, iter));
 
 	parent_node = (SymbolDBModelNode*) iter->user_data;
 	child_offset = GPOINTER_TO_INT (iter->user_data2);
 
-	symbol_db_model_node_unref_child (parent_node, child_offset);
+	sdb_model_node_unref_child (parent_node, child_offset);
 }
 
 static void
-symbol_db_model_tree_model_init (GtkTreeModelIface *iface)
+sdb_model_tree_model_init (GtkTreeModelIface *iface)
 {
-	iface->get_flags = symbol_db_model_get_flags;
-	iface->get_n_columns = symbol_db_model_get_n_columns;
-	iface->get_column_type = symbol_db_model_get_column_type;
-	iface->get_iter = symbol_db_model_get_iter;
-	iface->get_path = symbol_db_model_get_path;
-	iface->get_value = symbol_db_model_get_value;
-	iface->iter_next = symbol_db_model_iter_next;
-	iface->iter_children = symbol_db_model_iter_children;
-	iface->iter_has_child = symbol_db_model_iter_has_child;
-	iface->iter_n_children = symbol_db_model_iter_n_children;
-	iface->iter_nth_child = symbol_db_model_iter_nth_child;
-	iface->iter_parent = symbol_db_model_iter_parent;
-	iface->ref_node = symbol_db_model_iter_ref;
-	iface->unref_node = symbol_db_model_iter_unref;
+	iface->get_flags = sdb_model_get_flags;
+	iface->get_n_columns = sdb_model_get_n_columns;
+	iface->get_column_type = sdb_model_get_column_type;
+	iface->get_iter = sdb_model_get_iter;
+	iface->get_path = sdb_model_get_path;
+	iface->get_value = sdb_model_get_value;
+	iface->iter_next = sdb_model_iter_next;
+	iface->iter_children = sdb_model_iter_children;
+	iface->iter_has_child = sdb_model_iter_has_child;
+	iface->iter_n_children = sdb_model_iter_n_children;
+	iface->iter_nth_child = sdb_model_iter_nth_child;
+	iface->iter_parent = sdb_model_iter_parent;
+	iface->ref_node = sdb_model_iter_ref;
+	iface->unref_node = sdb_model_iter_unref;
 }
 
 /* SymbolDBModel implementation */
 
 static void
-symbol_db_model_ensure_node_children (SymbolDBModel *model,
-                                      SymbolDBModelNode *node,
-                                      gboolean emit_has_child)
+sdb_model_emit_has_child (SymbolDBModel *model, SymbolDBModelNode *node)
 {
-	SymbolDBModelPriv *priv;
-	
-	g_return_if_fail (node->n_children == 0);
-	g_return_if_fail (node->children == NULL);
-	g_return_if_fail (node->children_ensured == FALSE);
-
-	priv = GET_PRIV (model);
-
-	/* Can not ensure if model is frozen */
-	if (priv->freeze_count > 0)
-		return;
-	
-	/* Initialize children array and count */
-	node->n_children = 
-		symbol_db_model_get_n_children (model, node->level,
-		                                node->values);
-
-	node->children_ensured = TRUE;
-
-	if (emit_has_child && node->n_children > 0)
-	{
 		GtkTreePath *path;
 		GtkTreeIter iter = {0};
 
@@ -848,63 +959,81 @@ symbol_db_model_ensure_node_children (SymbolDBModel *model,
 		iter.user_data = node->parent;
 		iter.user_data2 = GINT_TO_POINTER (node->offset);
 		
-		path = symbol_db_model_get_path (GTK_TREE_MODEL (model), &iter);
+		path = sdb_model_get_path (GTK_TREE_MODEL (model), &iter);
 		gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (model),
 		                                      path, &iter);
 		gtk_tree_path_free (path);
-	}
-}
-
-static gboolean
-on_symbol_db_ensure_node_children_idle (SymbolDBModel *model)
-{
-	gint count;
-	SymbolDBModelNode *node;
-	SymbolDBModelPriv *priv;
-	
-	priv = GET_PRIV (model);
-
-	for (count = 0; count < SYMBOL_DB_MODEL_ENSURE_CHILDREN_BATCH_SIZE; count++)
-	{
-		node = g_queue_pop_head (priv->ensure_children_queue);
-		symbol_db_model_ensure_node_children (model, node, TRUE);
-		if (g_queue_get_length (priv->ensure_children_queue) <= 0)
-		{
-			priv->ensure_children_idle_id = 0;
-			return FALSE;
-		}
-	}
-	return TRUE;
 }
 
+/**
+ * sdb_model_ensure_node_children:
+ * @model: The tree model
+ * @node: The node for which the children are being ensured
+ * @emit_has_child: Should it emit children status change signal to model
+ * 
+ * When a node is initially created, there is no status of its children. This
+ * function determines the number of children of the node and initializes
+ * children array. They children node themselves are not initialized yet.
+ */
 static void
-symbol_db_model_queue_ensure_node_children (SymbolDBModel *model,
-                                            SymbolDBModelNode *node)
+sdb_model_ensure_node_children (SymbolDBModel *model,
+                                SymbolDBModelNode *node,
+                                gboolean emit_has_child,
+                                gboolean fake_child)
 {
 	SymbolDBModelPriv *priv;
+	gboolean old_has_child;
 	
+	g_return_if_fail (node->n_children == 0);
 	g_return_if_fail (node->children == NULL);
 	g_return_if_fail (node->children_ensured == FALSE);
 
-	priv = GET_PRIV (model);
-	if (!g_queue_find (priv->ensure_children_queue, node))
+	priv = model->priv;
+
+	/* Can not ensure if model is frozen */
+	if (priv->freeze_count > 0)
+		return;
+	
+	/* Initialize children array and count */
+	old_has_child = node->has_child;
+	node->n_children = 
+		sdb_model_get_n_children (model, node->level,
+		                          node->values);
+	node->has_child = (node->n_children > 0);
+	node->children_ensured = TRUE;
+	node->has_child_ensured = TRUE;
+
+	if (fake_child && old_has_child && !node->has_child)
+	{
+		node->n_children = 1;
+		node->has_child = TRUE;
+		return;
+	}
+	
+	if ((old_has_child != node->has_child) && node->parent)
 	{
-		g_queue_push_tail (priv->ensure_children_queue, node);
-		if (!priv->ensure_children_idle_id)
-			priv->ensure_children_idle_id =
-				g_idle_add ((GSourceFunc)on_symbol_db_ensure_node_children_idle,
-				            model);
+		sdb_model_emit_has_child (model, node);
 	}
 }
 
+/**
+ * sdb_model_update_node_children:
+ * @model: The model being updated
+ * @node: The node being updated
+ * @emit_has_child: Whether to emit has-child-changed signal
+ * 
+ * Updates the children of @node. All existing children are destroyed and
+ * new ones fetched. Update signals are also emited for the views to know
+ * about updates.
+ */
 static void
-symbol_db_model_update_node_children (SymbolDBModel *model,
-                                      SymbolDBModelNode *node,
-                                      gboolean emit_has_child)
+sdb_model_update_node_children (SymbolDBModel *model,
+                                SymbolDBModelNode *node,
+                                gboolean emit_has_child)
 {
 	SymbolDBModelPriv *priv;
 
-	priv = GET_PRIV (model);
+	priv = model->priv;
 	
 	/* Delete all nodes */
 	if (node->n_children > 0)
@@ -919,7 +1048,7 @@ symbol_db_model_update_node_children (SymbolDBModel *model,
 		iter.user_data2 = GINT_TO_POINTER (0);
 
 		/* Get path to it */
-		path = symbol_db_model_get_path (GTK_TREE_MODEL (model), &iter);
+		path = sdb_model_get_path (GTK_TREE_MODEL (model), &iter);
 
 		/* Delete all children */
 		for (i = 0; i < node->n_children; i++)
@@ -927,8 +1056,8 @@ symbol_db_model_update_node_children (SymbolDBModel *model,
 		gtk_tree_path_free (path);
 	}
 
-	symbol_db_model_node_cleanse (node, TRUE);
-	symbol_db_model_ensure_node_children (model, node, emit_has_child);
+	sdb_model_node_cleanse (node, TRUE);
+	sdb_model_ensure_node_children (model, node, emit_has_child, FALSE);
 	
 	/* Add all new nodes */
 	if (node->n_children > 0)
@@ -940,7 +1069,7 @@ symbol_db_model_update_node_children (SymbolDBModel *model,
 		iter.stamp = SYMBOL_DB_MODEL_STAMP;
 		iter.user_data = node;
 		iter.user_data2 = 0;
-		path = symbol_db_model_get_path (GTK_TREE_MODEL (model), &iter);
+		path = sdb_model_get_path (GTK_TREE_MODEL (model), &iter);
 		if (path == NULL)
 			path = gtk_tree_path_new_first ();
 		for (i = 0; i < node->n_children; i++)
@@ -953,14 +1082,29 @@ symbol_db_model_update_node_children (SymbolDBModel *model,
 	}
 }
 
+/**
+ * sdb_model_get_query_value_real:
+ * @model: The model
+ * @data_model: The backend data model
+ * @iter: The tree model iterator
+ * @column: The model column
+ * @value: Pointer to retun value
+ *
+ * Retrieves model data at row @iter and column @column from backend data
+ * model @data_model. This function retrieves the column data from its map
+ * given at model initialization. It can be overriden in derived classes to
+ * retrive custom column values (based on given data model at the given iter).
+ *
+ * Returns: TRUE if @value set successfully, else FALSE.
+ */
 static gboolean
-symbol_db_model_get_query_value_real (SymbolDBModel *model,
-                                      GdaDataModel *data_model,
-                                      GdaDataModelIter *iter, gint column,
-                                      GValue *value)
+sdb_model_get_query_value_real (SymbolDBModel *model,
+                                GdaDataModel *data_model,
+                                GdaDataModelIter *iter, gint column,
+                                GValue *value)
 {
 	const GValue *ret;
-	SymbolDBModelPriv *priv = GET_PRIV (model);
+	SymbolDBModelPriv *priv = model->priv;
 	gint query_column = priv->query_columns[column];
 
 	if (query_column < 0)
@@ -975,24 +1119,38 @@ symbol_db_model_get_query_value_real (SymbolDBModel *model,
 }
 
 static gboolean
-symbol_db_model_get_query_value (SymbolDBModel *model,
-                                 GdaDataModel *data_model,
-                                 GdaDataModelIter *iter, gint column,
-                                 GValue *value)
+sdb_model_get_query_value (SymbolDBModel *model,
+                           GdaDataModel *data_model,
+                           GdaDataModelIter *iter, gint column,
+                           GValue *value)
 {
 	return SYMBOL_DB_MODEL_GET_CLASS(model)->get_query_value(model, data_model,
 	                                                         iter, column,
 	                                                         value);
 }
 
+/**
+ * sdb_model_get_query_value_at_real:
+ * @model: The model
+ * @data_model: The backend data model where value is derived.
+ * @position: Position of the row.
+ * @column: The column being retrieved.
+ * @value: Return value
+ *
+ * Same as sdb_model_get_query_value_real() except it uses integer index
+ * for row positioning instead of an iter. It will be used when some backend
+ * data model does not support iter.
+ *
+ * Returns: TRUE if @value set successfully, else FALSE.
+ */
 static gboolean
-symbol_db_model_get_query_value_at_real (SymbolDBModel *model,
+sdb_model_get_query_value_at_real (SymbolDBModel *model,
                                          GdaDataModel *data_model,
                                          gint position, gint column,
                                          GValue *value)
 {
 	const GValue *ret;
-	SymbolDBModelPriv *priv = GET_PRIV (model);
+	SymbolDBModelPriv *priv = model->priv;
 	gint query_column = priv->query_columns[column];
 	g_value_init (value, priv->column_types[column]);
 
@@ -1009,9 +1167,9 @@ symbol_db_model_get_query_value_at_real (SymbolDBModel *model,
 }
 
 static gboolean
-symbol_db_model_get_query_value_at (SymbolDBModel *model,
-                                    GdaDataModel *data_model,
-                                    gint position, gint column, GValue *value)
+sdb_model_get_query_value_at (SymbolDBModel *model,
+                              GdaDataModel *data_model,
+                              gint position, gint column, GValue *value)
 {
 	return SYMBOL_DB_MODEL_GET_CLASS(model)->get_query_value_at (model,
 	                                                             data_model,
@@ -1020,9 +1178,57 @@ symbol_db_model_get_query_value_at (SymbolDBModel *model,
 	                                                             value);
 }
 
+/**
+ * sdb_model_get_has_child_real:
+ * @model: The model
+ * @tree_level: The tree level where the node is.
+ * @column_values: The node column values.
+ *
+ * Gets if the node has 1 or more children with given column values.
+ *
+ * Returns: TRUE if node has children, otherwise FALSE
+ */
+static gboolean
+sdb_model_get_has_child_real (SymbolDBModel *model, gint tree_level,
+                              GValue column_values[])
+{
+	gboolean has_child;
+	g_signal_emit_by_name (model, "get-has_child", tree_level, column_values,
+	                       &has_child);
+	return has_child;
+}
+
+static gboolean
+sdb_model_get_has_child (SymbolDBModel *model, SymbolDBModelNode *node)
+{
+	if (node->has_child_ensured)
+		return node->has_child;
+	
+	node->has_child_ensured = TRUE;
+	node->has_child =
+		SYMBOL_DB_MODEL_GET_CLASS(model)->get_has_child (model,
+		                                                 node->level,
+		                                                 node->values);
+	if (node->has_child)
+	{
+		sdb_model_emit_has_child (model, node);
+	}
+	return node->has_child;
+}
+
+/**
+ * sdb_model_get_n_children_real:
+ * @model: The model
+ * @tree_level: The tree level where the node is.
+ * @column_values: The node column values.
+ *
+ * Gets the number of children of the node with given column values.
+ *
+ * Returns: Number of children
+ */
 static gint
-symbol_db_model_get_n_children_real (SymbolDBModel *model, gint tree_level,
-                                     GValue column_values[])
+sdb_model_get_n_children_real (SymbolDBModel *model, gint tree_level,
+                               GValue column_values[])
 {
 	gint n_children;
 	g_signal_emit_by_name (model, "get-n-children", tree_level, column_values,
@@ -1031,17 +1237,31 @@ symbol_db_model_get_n_children_real (SymbolDBModel *model, gint tree_level,
 }
 
 static gint
-symbol_db_model_get_n_children (SymbolDBModel *model, gint tree_level,
-                                GValue column_values[])
+sdb_model_get_n_children (SymbolDBModel *model, gint tree_level,
+                          GValue column_values[])
 {
 	return SYMBOL_DB_MODEL_GET_CLASS(model)->get_n_children (model, tree_level,
 	                                                         column_values);
 }
 
+/**
+ * sdb_model_get_children_real:
+ * @model: The model
+ * @tree_level: The tree level where the node is.
+ * @column_values: The node column values.
+ * @offset: Offset of the start row
+ * @limit: Number of rows to fetch
+ *
+ * Fetches the children data from backend database. The results are returned
+ * as GdaDataModel. The children to fetch starts form @offset and retrieves
+ * @limit amount.
+ *
+ * Returns: Data model holding the rows data, or NULL if there is no data.
+ */
 static GdaDataModel*
-symbol_db_model_get_children_real (SymbolDBModel *model, gint tree_level,
-                                   GValue column_values[], gint offset,
-                                   gint limit)
+sdb_model_get_children_real (SymbolDBModel *model, gint tree_level,
+                             GValue column_values[], gint offset,
+                             gint limit)
 {
 	GdaDataModel *data_model;
 	g_signal_emit_by_name (model, "get-children", tree_level,
@@ -1050,9 +1270,9 @@ symbol_db_model_get_children_real (SymbolDBModel *model, gint tree_level,
 }
 
 static GdaDataModel*
-symbol_db_model_get_children (SymbolDBModel *model, gint tree_level,
-                              GValue column_values[], gint offset,
-                              gint limit)
+sdb_model_get_children (SymbolDBModel *model, gint tree_level,
+                        GValue column_values[], gint offset,
+                        gint limit)
 {
 	return SYMBOL_DB_MODEL_GET_CLASS(model)->
 		get_children (model, tree_level, column_values, offset, limit);
@@ -1061,22 +1281,24 @@ symbol_db_model_get_children (SymbolDBModel *model, gint tree_level,
 /* Object implementation */
 
 static void
-symbol_db_model_finalize (GObject *object)
+sdb_model_finalize (GObject *object)
 {
 	SymbolDBModelPriv *priv;
-	/* FIXME */
 
-	priv = GET_PRIV (object);
-	if (priv->ensure_children_idle_id)
-		g_source_remove (priv->ensure_children_idle_id);
-	g_queue_free (priv->ensure_children_queue);
+	priv = SYMBOL_DB_MODEL (object)->priv;;
+	g_free (priv->column_types);
+	g_free (priv->query_columns);
+	sdb_model_node_cleanse (priv->root, TRUE);
+	g_slice_free (SymbolDBModelNode, priv->root);
+
+	g_free (priv);
 	
-	G_OBJECT_CLASS (symbol_db_model_parent_class)->finalize (object);
+	G_OBJECT_CLASS (sdb_model_parent_class)->finalize (object);
 }
 
 static void
-symbol_db_model_set_property (GObject *object, guint prop_id,
-                              const GValue *value, GParamSpec *pspec)
+sdb_model_set_property (GObject *object, guint prop_id,
+                        const GValue *value, GParamSpec *pspec)
 {
 	g_return_if_fail (SYMBOL_DB_IS_MODEL (object));
 	/* SymbolDBModel* model = SYMBOL_DB_MODEL(object);
@@ -1088,8 +1310,8 @@ symbol_db_model_set_property (GObject *object, guint prop_id,
 }
 
 static void
-symbol_db_model_get_property (GObject *object, guint prop_id, GValue *value,
-                              GParamSpec *pspec)
+sdb_model_get_property (GObject *object, guint prop_id, GValue *value,
+                        GParamSpec *pspec)
 {
 	g_return_if_fail (SYMBOL_DB_IS_MODEL (object));
 	/* SymbolDBModel* model = SYMBOL_DB_MODEL(object);
@@ -1101,33 +1323,35 @@ symbol_db_model_get_property (GObject *object, guint prop_id, GValue *value,
 }
 
 static void
-symbol_db_model_init (SymbolDBModel *object)
+sdb_model_init (SymbolDBModel *object)
 {
-	SymbolDBModelPriv *priv = GET_PRIV (object);
-	priv->root = g_new0 (SymbolDBModelNode, 1);
+	SymbolDBModelPriv *priv;
+
+	priv = g_new0 (SymbolDBModelPriv, 1);
+	object->priv = priv;
+	
+	priv->root = g_slice_new0 (SymbolDBModelNode);
 	priv->freeze_count = 0;
 	priv->n_columns = 0;
 	priv->column_types = NULL;
 	priv->query_columns = NULL;
-	priv->ensure_children_queue = g_queue_new ();
 }
 
 static void
-symbol_db_model_class_init (SymbolDBModelClass *klass)
+sdb_model_class_init (SymbolDBModelClass *klass)
 {
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-	klass->get_query_value = symbol_db_model_get_query_value_real;
-	klass->get_query_value_at = symbol_db_model_get_query_value_at_real;
-	klass->get_n_children = symbol_db_model_get_n_children_real;
-	klass->get_children = symbol_db_model_get_children_real;
+	klass->get_query_value = sdb_model_get_query_value_real;
+	klass->get_query_value_at = sdb_model_get_query_value_at_real;
+	klass->get_has_child = sdb_model_get_has_child_real;
+	klass->get_n_children = sdb_model_get_n_children_real;
+	klass->get_children = sdb_model_get_children_real;
 	
-	object_class->finalize = symbol_db_model_finalize;
-	object_class->set_property = symbol_db_model_set_property;
-	object_class->get_property = symbol_db_model_get_property;
+	object_class->finalize = sdb_model_finalize;
+	object_class->set_property = sdb_model_set_property;
+	object_class->get_property = sdb_model_get_property;
 	
-	g_type_class_add_private (object_class, sizeof(SymbolDBModelPriv));
-
 	/* Signals */
 	symbol_db_model_signals[SIGNAL_GET_HAS_CHILD] =
 		g_signal_new ("get-has-child",
@@ -1172,7 +1396,7 @@ symbol_db_model_set_columns (SymbolDBModel *model, gint n_columns,
 	g_return_if_fail (n_columns > 0);
 	g_return_if_fail (SYMBOL_DB_IS_MODEL (model));
 
-	priv = GET_PRIV (model);
+	priv = model->priv;
 	
 	g_return_if_fail (priv->n_columns <= 0);
 	g_return_if_fail (priv->column_types == NULL);
@@ -1196,7 +1420,7 @@ symbol_db_model_new (gint n_columns, ...)
 	g_return_val_if_fail (n_columns > 0, NULL);
 
 	model = g_object_new (SYMBOL_DB_TYPE_MODEL, NULL);
-	priv = GET_PRIV (model);
+	priv = SYMBOL_DB_MODEL (model)->priv;
 	
 	priv->n_columns = n_columns;
 	priv->column_types = g_new0(GType, n_columns);
@@ -1232,9 +1456,9 @@ symbol_db_model_update (SymbolDBModel *model)
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL (model));
 
-	priv = GET_PRIV (model);
+	priv = model->priv;
 
-	symbol_db_model_update_node_children (model, priv->root, FALSE);
+	sdb_model_update_node_children (model, priv->root, FALSE);
 }
 
 void
@@ -1244,7 +1468,7 @@ symbol_db_model_freeze (SymbolDBModel *model)
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL (model));
 	
-	priv = GET_PRIV (model);
+	priv = model->priv;
 	priv->freeze_count++;
 }
 
@@ -1255,7 +1479,7 @@ symbol_db_model_thaw (SymbolDBModel *model)
 
 	g_return_if_fail (SYMBOL_DB_IS_MODEL (model));
 
-	priv = GET_PRIV (model);
+	priv = model->priv;
 
 	if (priv->freeze_count > 0)
 		priv->freeze_count--;
diff --git a/plugins/symbol-db/symbol-db-model.h b/plugins/symbol-db/symbol-db-model.h
index d8b354a..3c89e73 100644
--- a/plugins/symbol-db/symbol-db-model.h
+++ b/plugins/symbol-db/symbol-db-model.h
@@ -27,7 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define SYMBOL_DB_TYPE_MODEL             (symbol_db_model_get_type ())
+#define SYMBOL_DB_TYPE_MODEL             (sdb_model_get_type ())
 #define SYMBOL_DB_MODEL(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYMBOL_DB_TYPE_MODEL, SymbolDBModel))
 #define SYMBOL_DB_MODEL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), SYMBOL_DB_TYPE_MODEL, SymbolDBModelClass))
 #define SYMBOL_DB_IS_MODEL(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYMBOL_DB_TYPE_MODEL))
@@ -36,6 +36,7 @@ G_BEGIN_DECLS
 
 typedef struct _SymbolDBModelClass SymbolDBModelClass;
 typedef struct _SymbolDBModel SymbolDBModel;
+typedef struct _SymbolDBModelPriv SymbolDBModelPriv;
 
 struct _SymbolDBModelClass
 {
@@ -67,9 +68,11 @@ struct _SymbolDBModelClass
 struct _SymbolDBModel
 {
 	GObject parent_instance;
+
+	SymbolDBModelPriv *priv;
 };
 
-GType symbol_db_model_get_type (void) G_GNUC_CONST;
+GType sdb_model_get_type (void) G_GNUC_CONST;
 
 /* Use this to create the model normally. The "..." part is alternatively GType
  * and gint for column type and corresponding GdaDataModel column.
diff --git a/plugins/symbol-db/symbol-db-system.c b/plugins/symbol-db/symbol-db-system.c
index df094d9..bc2089c 100644
--- a/plugins/symbol-db/symbol-db-system.c
+++ b/plugins/symbol-db/symbol-db-system.c
@@ -436,7 +436,7 @@ prepare_files_to_be_scanned (SymbolDBSystem *sdbs,
 	} while ((node = node->next) != NULL);
 }
 
-static inline void 
+static GNUC_INLINE void 
 sdb_system_do_scan_package_1 (SymbolDBSystem *sdbs,							
 							SingleScanData *ss_data)
 {
@@ -477,7 +477,7 @@ sdb_system_do_scan_next_package (SymbolDBSystem *sdbs)
 	}
 }
 
-static inline void
+static GNUC_INLINE void
 sdb_system_do_engine_scan (SymbolDBSystem *sdbs, EngineScanData *es_data)
 {
 	SymbolDBSystemPriv *priv;
diff --git a/plugins/symbol-db/symbol-db-views.c b/plugins/symbol-db/symbol-db-views.c
index 45a06b7..b25494a 100644
--- a/plugins/symbol-db/symbol-db-views.c
+++ b/plugins/symbol-db/symbol-db-views.c
@@ -71,6 +71,56 @@ on_treeview_row_activated (GtkTreeView *view, GtkTreePath *arg1,
 	}
 }
 
+static void
+on_treeview_row_expanded (GtkTreeView *view, GtkTreeIter *iter,
+                          GtkTreePath *path, SymbolDBPlugin *plugin)
+{
+	gchar* symbol_name;
+	GtkTreeModel *model;
+	GHashTable *expanded_nodes =
+		g_object_get_data (G_OBJECT (view), "__expanded_nodes__");
+
+	model = gtk_tree_view_get_model (view);
+	gtk_tree_model_get (model, iter, SYMBOL_DB_MODEL_PROJECT_COL_LABEL,
+	                    &symbol_name, -1);
+	g_hash_table_insert (expanded_nodes, symbol_name, GINT_TO_POINTER (1));
+}
+
+static void
+on_treeview_row_collapsed (GtkTreeView *view, GtkTreeIter *iter,
+                           GtkTreePath *path, SymbolDBPlugin *plugin)
+{
+	gchar* symbol_name;
+	GtkTreeModel *model;
+	
+	GHashTable *expanded_nodes =
+		g_object_get_data (G_OBJECT (view), "__expanded_nodes__");
+
+	model = gtk_tree_view_get_model (view);
+	gtk_tree_model_get (model, iter, SYMBOL_DB_MODEL_PROJECT_COL_LABEL,
+	                    &symbol_name, -1);
+	g_hash_table_remove (expanded_nodes, symbol_name);
+	g_free (symbol_name);
+}
+
+static void
+on_treeview_has_child_toggled (GtkTreeModel *model,
+                               GtkTreePath  *path,
+                               GtkTreeIter  *iter,
+                               GtkTreeView  *view)
+{
+	gchar* symbol_name;
+	
+	GHashTable *expanded_nodes =
+		g_object_get_data (G_OBJECT (view), "__expanded_nodes__");
+	
+	gtk_tree_model_get (model, iter, SYMBOL_DB_MODEL_PROJECT_COL_LABEL,
+	                    &symbol_name, -1);
+	if (g_hash_table_lookup (expanded_nodes, symbol_name))
+		gtk_tree_view_expand_row (view, path, FALSE);
+	g_free (symbol_name);
+}
+
 GtkWidget*
 symbol_db_view_new (SymbolViewType view_type,
                     SymbolDBEngine *dbe, SymbolDBPlugin *plugin)
@@ -95,7 +145,18 @@ symbol_db_view_new (SymbolViewType view_type,
 
 	g_signal_connect (G_OBJECT (dbv), "row-activated",
 					  G_CALLBACK (on_treeview_row_activated), plugin);
-
+	g_signal_connect (G_OBJECT (dbv), "row-expanded",
+					  G_CALLBACK (on_treeview_row_expanded), plugin);
+	g_signal_connect (G_OBJECT (dbv), "row-collapsed",
+					  G_CALLBACK (on_treeview_row_collapsed), plugin);
+	g_signal_connect (G_OBJECT (model), "row-has-child-toggled",
+					  G_CALLBACK (on_treeview_has_child_toggled), dbv);
+
+	g_object_set_data_full (G_OBJECT (dbv), "__expanded_nodes__",
+	                        g_hash_table_new_full (g_str_hash, g_str_equal,
+	                                               g_free, NULL),
+	                        (GDestroyNotify)g_hash_table_destroy);
+	
 	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dbv), FALSE);
 	gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (dbv), TRUE);
 	gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (dbv),
diff --git a/plugins/symbol-db/tables.sql b/plugins/symbol-db/tables.sql
index 4560078..552f44e 100644
--- a/plugins/symbol-db/tables.sql
+++ b/plugins/symbol-db/tables.sql
@@ -4,20 +4,20 @@
 
 DROP TABLE IF EXISTS workspace;
 CREATE TABLE workspace (workspace_id integer PRIMARY KEY AUTOINCREMENT,
-                        workspace_name varchar (50) not null unique,
-                        analyse_time DATE
+                        workspace_name text not null unique,
+                        analyse_time date
                         );
 
 DROP TABLE IF EXISTS project;
 CREATE TABLE project (project_id integer PRIMARY KEY AUTOINCREMENT,
-                      project_name varchar (50) not null unique,
+                      project_name text not null unique,
                       wrkspace_id integer REFERENCES workspace (workspace_id),
-                      analyse_time DATE
+                      analyse_time date
                       );
 
 DROP TABLE IF EXISTS file_include;
 CREATE TABLE file_include (file_include_id integer PRIMARY KEY AUTOINCREMENT,
-                           file_include_type varchar (10) not null unique
+                           file_include_type text not null unique
                            );
 
 DROP TABLE IF EXISTS ext_include;
@@ -28,7 +28,7 @@ CREATE TABLE ext_include (prj_id integer REFERENCES project (project_id),
 
 DROP TABLE IF EXISTS file_ignore;
 CREATE TABLE file_ignore (file_ignore_id integer PRIMARY KEY AUTOINCREMENT,
-                          file_ignore_type varchar (10) unique                          
+                          file_ignore_type text unique                          
                           );
 
 DROP TABLE IF EXISTS ext_ignore;
@@ -39,24 +39,24 @@ CREATE TABLE ext_ignore (prj_id integer REFERENCES project (project_id),
 
 DROP TABLE IF EXISTS file;
 CREATE TABLE file (file_id integer PRIMARY KEY AUTOINCREMENT,
-                   file_path TEXT not null unique,
+                   file_path text not null unique,
                    prj_id integer REFERENCES project (projec_id),
                    lang_id integer REFERENCES language (language_id),
-                   analyse_time DATE
+                   analyse_time date
                    );
 
 DROP TABLE IF EXISTS language;
 CREATE TABLE language (language_id integer PRIMARY KEY AUTOINCREMENT,
-                       language_name varchar (50) not null unique);
+                       language_name text not null unique);
 
 DROP TABLE IF EXISTS symbol;
 CREATE TABLE symbol (symbol_id integer PRIMARY KEY AUTOINCREMENT,
                      file_defined_id integer not null REFERENCES file (file_id),
-                     name varchar (256) not null,
+                     name text not null,
                      file_position integer,
                      is_file_scope integer,
-                     signature varchar (256),
-                     returntype varchar (256),
+                     signature text,
+                     returntype text,
                      scope_definition_id integer,
                      scope_id integer,
                      type_id integer REFERENCES sym_type (type_id),
@@ -69,24 +69,25 @@ CREATE TABLE symbol (symbol_id integer PRIMARY KEY AUTOINCREMENT,
 
 DROP TABLE IF EXISTS sym_type;
 CREATE TABLE sym_type (type_id integer PRIMARY KEY AUTOINCREMENT,
-                   type_type varchar (256) not null,
-                   type_name varchar (256) not null,
+                   type_type text not null,
+                   type_name text not null,
                    unique (type_type, type_name)
                    );
 
 DROP TABLE IF EXISTS sym_kind;
 CREATE TABLE sym_kind (sym_kind_id integer PRIMARY KEY AUTOINCREMENT,
-                       kind_name varchar (50) not null unique
+                       kind_name text not null unique,
+                       is_container integer default 0
                        );
 
 DROP TABLE IF EXISTS sym_access;
 CREATE TABLE sym_access (access_kind_id integer PRIMARY KEY AUTOINCREMENT,
-                         access_name varchar (50) not null unique
+                         access_name text not null unique
                          );
 
 DROP TABLE IF EXISTS sym_implementation;
 CREATE TABLE sym_implementation (sym_impl_id integer PRIMARY KEY AUTOINCREMENT,
-                                 implementation_name varchar (50) not null unique
+                                 implementation_name text not null unique
                                  );
 
 DROP TABLE IF EXISTS heritage;
@@ -97,7 +98,7 @@ CREATE TABLE heritage (symbol_id_base integer REFERENCES symbol (symbol_id),
 
 DROP TABLE IF EXISTS scope;
 CREATE TABLE scope (scope_id integer PRIMARY KEY AUTOINCREMENT,
-                    scope_name varchar(256) not null,
+                    scope_name text not null,
                     type_id integer,
                     unique (scope_name, type_id)
                     );
@@ -108,13 +109,13 @@ CREATE TABLE version (sdb_version numeric PRIMARY KEY);
 DROP TABLE IF EXISTS __tmp_heritage_scope;
 CREATE TABLE __tmp_heritage_scope (tmp_heritage_scope_id integer PRIMARY KEY AUTOINCREMENT,
                             symbol_referer_id integer not null,
-                            field_inherits varchar(256),
-                            field_struct varchar(256),
-                            field_typeref varchar(256),
-                            field_enum varchar(256),
-                            field_union varchar(256),
-                            field_class varchar(256),
-                            field_namespace varchar(256)
+                            field_inherits text,
+                            field_struct text,
+                            field_typeref text,
+                            field_enum text,
+                            field_union text,
+                            field_class text,
+                            field_namespace text
                             );
 
 DROP TABLE IF EXISTS __tmp_removed;
@@ -122,14 +123,14 @@ CREATE TABLE __tmp_removed (tmp_removed_id integer PRIMARY KEY AUTOINCREMENT,
                             symbol_removed_id integer not null
                             );
 
-DROP INDEX IF EXISTS symbol_idx_3;
-CREATE INDEX symbol_idx_3 ON symbol (name, file_defined_id, type_id);
+DROP INDEX IF EXISTS symbol_idx_1;
+CREATE INDEX symbol_idx_1 ON symbol (name, file_defined_id, type_id);
 
-DROP INDEX IF EXISTS symbol_idx_4;
-CREATE INDEX symbol_idx_4 ON symbol (scope_id);
+DROP INDEX IF EXISTS symbol_idx_2;
+CREATE INDEX symbol_idx_2 ON symbol (scope_id);
 
-DROP INDEX IF EXISTS symbol_idx_5;
-CREATE INDEX symbol_idx_5 ON symbol (type_id);
+DROP INDEX IF EXISTS symbol_idx_3;
+CREATE INDEX symbol_idx_3 ON symbol (type_id);
 
 DROP TRIGGER IF EXISTS delete_file_trg;
 CREATE TRIGGER delete_file_trg BEFORE DELETE ON file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 298031a..6503369 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -25,6 +25,15 @@ libanjuta/anjuta-vcs-status-tree-view.c
 libanjuta/cell-renderer-captioned-image.c
 libanjuta/e-splash.c
 libanjuta/resources.c
+libfoocanvas/foo-canvas.c
+libfoocanvas/foo-canvas-line.c
+libfoocanvas/foo-canvas-pixbuf.c
+libfoocanvas/foo-canvas-polygon.c
+libfoocanvas/foo-canvas-rect-ellipse.c
+libfoocanvas/foo-canvas-text.c
+libfoocanvas/foo-canvas-util.c
+libfoocanvas/foo-canvas-widget.c
+libfoocanvas/libfoocanvastypes.c
 [type: gettext/glade]plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
 plugins/build-basic-autotools/build-options.c
 plugins/build-basic-autotools/configuration-list.c
@@ -40,6 +49,9 @@ plugins/class-gen/plugin.c
 plugins/class-gen/transform.c
 plugins/class-gen/validator.c
 plugins/class-gen/window.c
+plugins/class-inheritance/class-callbacks.c
+plugins/class-inheritance/class-inherit.c
+plugins/class-inheritance/plugin.c
 [type: gettext/glade]plugins/cvs-plugin/anjuta-cvs-plugin.ui
 plugins/cvs-plugin/cvs-actions.c
 plugins/cvs-plugin/cvs-callbacks.c
@@ -236,6 +248,7 @@ plugins/sourceview/plugin.c
 [type: gettext/ini]plugins/gdb/anjuta-gdb.plugin.in
 [type: gettext/ini]plugins/git/git.plugin.in
 [type: gettext/ini]plugins/devhelp/anjuta-devhelp.plugin.in
+[type: gettext/ini]plugins/class-inheritance/anjuta-class-inheritance.plugin.in
 [type: gettext/ini]plugins/document-manager/anjuta-document-manager.plugin.in
 [type: gettext/ini]plugins/file-wizard/anjuta-file-wizard.plugin.in
 [type: gettext/ini]plugins/file-manager/file-manager.plugin.in
@@ -268,6 +281,9 @@ plugins/js-debugger/plugin.c
 plugins/js-debugger/debugger-js.c
 [type: gettext/ini]plugins/js-debugger/js_debugger.plugin.in
 plugins/language-support-js/plugin.c
-[type: gettext/ini]plugins/language-support-js/js_support_plugin.plugin.in
+[type: gettext/ini]plugins/language-support-js/js-support-plugin.plugin.in
 [type: gettext/glade]plugins/language-support-js/anjuta-language-javascript.ui
-plugins/symbol-db/anjuta-tags/js_parser/Grammar.y
+plugins/symbol-db/anjuta-tags/js-parser/Grammar.y
+plugins/language-support-js/js-parser-y-tab.c
+plugins/symbol-db/anjuta-tags/js-parser/js-parser-y-tab.c
+plugins/symbol-db/symbol-db-views.c
diff --git a/po/bg.po b/po/bg.po
index facf254..b9cfc60 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13,10 +13,10 @@
 # Git).  Ð? идеалниÑ? Ñ?лÑ?Ñ?ай би Ñ?Ñ?Ñ?бвало да обÑ?Ñ?дим Ñ?еÑ?миниÑ?е в Ñ?пиÑ?Ñ?ка.
 msgid ""
 msgstr ""
-"Project-Id-Version: anjuta gnome-2-30\n"
+"Project-Id-Version: anjuta master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-24 17:23+0200\n"
-"PO-Revision-Date: 2010-03-24 17:23+0200\n"
+"POT-Creation-Date: 2010-03-24 17:27+0200\n"
+"PO-Revision-Date: 2010-03-24 17:27+0200\n"
 "Last-Translator: Yavor Doganov <yavor gnu org>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
 "MIME-Version: 1.0\n"
@@ -1437,8 +1437,8 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ð?Ñ?енебÑ?егване на Ñ?айла .cvsrc (пÑ?епоÑ?Ñ?Ñ?иÑ?елно)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2327
-#: ../plugins/symbol-db/plugin.c:2397
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2120
+#: ../plugins/symbol-db/plugin.c:2189
 msgid "Local"
 msgstr "Ð?окално"
 
@@ -2634,7 +2634,7 @@ msgid "Search Help:"
 msgstr "ТÑ?Ñ?Ñ?ене в Ñ?Ñ?ководÑ?Ñ?ваÑ?а:"
 
 #: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:239
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:313
+#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:312
 msgid "_Go to"
 msgstr "_Ð?Ñ?иване до"
 
@@ -2675,8 +2675,8 @@ msgstr "СÑ?дÑ?Ñ?жание"
 #: ../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:2331
-#: ../plugins/symbol-db/plugin.c:2447
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2124
+#: ../plugins/symbol-db/plugin.c:2206
 msgid "Search"
 msgstr "ТÑ?Ñ?Ñ?ене"
 
@@ -3697,7 +3697,7 @@ msgid "Filter"
 msgstr "ФилÑ?Ñ?Ñ?"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2329 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2122 ../plugins/symbol-db/plugin.c:2201
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Ð?лобално"
@@ -9072,64 +9072,64 @@ msgstr "Ð?ипÑ?ва: %s"
 msgid "Obstructed: %s"
 msgstr "Ð?Ñ?зпÑ?епÑ?Ñ?Ñ?Ñ?вано: %s"
 
-#: ../plugins/symbol-db/plugin.c:317
+#: ../plugins/symbol-db/plugin.c:316
 msgid "Tag De_claration"
 msgstr "Ð?е_клаÑ?аÑ?иÑ? на еÑ?икеÑ?"
 
-#: ../plugins/symbol-db/plugin.c:319
+#: ../plugins/symbol-db/plugin.c:318
 msgid "Go to symbol declaration"
 msgstr "Скок до деклаÑ?аÑ?иÑ?Ñ?а на Ñ?имвола"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:326
+#: ../plugins/symbol-db/plugin.c:325
 msgid "Tag _Implementation"
 msgstr "_РеализаÑ?иÑ? на еÑ?икеÑ?"
 
-#: ../plugins/symbol-db/plugin.c:328
+#: ../plugins/symbol-db/plugin.c:327
 msgid "Go to symbol definition"
 msgstr "Скок до деÑ?иниÑ?иÑ?Ñ?а на Ñ?имвола"
 
-#: ../plugins/symbol-db/plugin.c:335
+#: ../plugins/symbol-db/plugin.c:334
 msgid "_Find Symbolâ?¦"
 msgstr "_ТÑ?Ñ?Ñ?ене на Ñ?имволâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:336
+#: ../plugins/symbol-db/plugin.c:335
 msgid "Find Symbol"
 msgstr "ТÑ?Ñ?Ñ?ене на Ñ?имвол"
 
-#: ../plugins/symbol-db/plugin.c:1173
+#: ../plugins/symbol-db/plugin.c:1022
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%s: Ð?енеÑ?иÑ?ане на Ñ?наÑ?ледÑ?ваниÑ?Ñ?аâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:1178
+#: ../plugins/symbol-db/plugin.c:1027
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%s: СканиÑ?ани %d Ñ?айла оÑ? обÑ?о %d"
 
-#: ../plugins/symbol-db/plugin.c:1209
+#: ../plugins/symbol-db/plugin.c:1058
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "Ð?енеÑ?иÑ?ане на Ñ?наÑ?ледÑ?ваниÑ?Ñ?аâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:1211
+#: ../plugins/symbol-db/plugin.c:1060
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "СканиÑ?ани %d Ñ?айла оÑ? обÑ?о %d"
 
-#: ../plugins/symbol-db/plugin.c:1979
+#: ../plugins/symbol-db/plugin.c:1785
 msgid "Populating symbol databaseâ?¦"
 msgstr "СÑ?здаване на базаÑ?а оÑ? данни Ñ?Ñ?Ñ? Ñ?имволиâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2148 ../plugins/symbol-db/plugin.c:2232
 msgid "Symbols"
 msgstr "Символи"
 
-#: ../plugins/symbol-db/plugin.c:2489
+#: ../plugins/symbol-db/plugin.c:2241
 msgid "SymbolDb popup actions"
 msgstr "Ð?пеÑ?аÑ?ии по базаÑ?а оÑ? данни Ñ?Ñ?Ñ? Ñ?имволи"
 
-#: ../plugins/symbol-db/plugin.c:2497
+#: ../plugins/symbol-db/plugin.c:2249
 msgid "SymbolDb menu actions"
 msgstr "Ð?енÑ?Ñ?а за базаÑ?а оÑ? данни Ñ?Ñ?Ñ? Ñ?имволи"
 
@@ -9151,15 +9151,6 @@ msgstr "Ð?Ñ?икеÑ?и на API"
 msgid "Resuming glb scan."
 msgstr "Ð?Ñ?зобновÑ?ване на Ñ?каниÑ?анеÑ?о на glib."
 
-#: ../plugins/symbol-db/symbol-db-view-locals.c:326
-#: ../plugins/symbol-db/symbol-db-view.c:1412
-msgid "Symbol"
-msgstr "Символ"
-
-#: ../plugins/symbol-db/symbol-db-view.c:798
-msgid "Loadingâ?¦"
-msgstr "Ð?аÑ?ежданеâ?¦"
-
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
 msgid "Automatically scan project's packages"
 msgstr "Ð?вÑ?омаÑ?иÑ?но Ñ?каниÑ?ане на пакеÑ?иÑ?е на пÑ?оекÑ?а"
@@ -10244,3 +10235,9 @@ msgstr "Ð?Ñ?веÑ?Ñ?ване на липÑ?ваÑ?оÑ?о двоеÑ?оÑ?ие"
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:6
 msgid "Min character for completion "
 msgstr "Ð?нак за авÑ?омаÑ?иÑ?но допиÑ?ване"
+
+#~ msgid "Symbol"
+#~ msgstr "Символ"
+
+#~ msgid "Loadingâ?¦"
+#~ msgstr "Ð?аÑ?ежданеâ?¦"
diff --git a/po/ca.po b/po/ca.po
index 9d95f4c..18cf574 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,9 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-23 22:42+0100\n"
-"PO-Revision-Date: 2010-03-23 22:42+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=anjuta&component=core application\n"
+"POT-Creation-Date: 2010-04-01 19:21+0000\n"
+"PO-Revision-Date: 2010-04-01 21:35+0200\n"
 "Last-Translator: Joan Duran <jodufi gmail com>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
 "MIME-Version: 1.0\n"
@@ -451,8 +452,8 @@ msgstr[0] ""
 "<b>Hi ha %d element amb canvis sense desar. Voleu desar els canvis abans de "
 "tancar?</b>"
 msgstr[1] ""
-"<b>Hi han %d elements amb canvis sense desar. Voleu desar els canvis abans "
-"de tancar?</b>"
+"<b>Hi ha %d elements amb canvis sense desar. Voleu desar els canvis abans de "
+"tancar?</b>"
 
 #: ../libanjuta/anjuta-save-prompt.c:304
 msgid "There is an item with unsaved changes. Save changes before closing?"
@@ -2113,7 +2114,7 @@ msgstr "Carregat"
 
 #: ../plugins/debug-manager/plugin.c:429
 msgid "Runningâ?¦"
-msgstr "S'esta executantâ?¦"
+msgstr "S'està executant�"
 
 #: ../plugins/debug-manager/plugin.c:451
 msgid "Stopped"
@@ -3772,7 +3773,7 @@ msgstr "Fitxer de codi Python"
 
 #: ../plugins/file-wizard/file.c:91
 msgid "Shell Script File"
-msgstr "Fitxer d'script per al intèrpret d'ordres"
+msgstr "Fitxer d'script per a l'intèrpret d'ordres"
 
 #: ../plugins/file-wizard/file.c:92
 msgid "Other"
@@ -8836,7 +8837,7 @@ msgstr "[Cap/còpia de treball]"
 #: ../plugins/subversion/subversion-log-dialog.c:426
 #: ../plugins/subversion/subversion-log-dialog.c:493
 msgid "Subversion: Retrieving diffâ?¦"
-msgstr "Subversion: s'està obtenint les diferències�"
+msgstr "Subversion: s'estan obtenint les diferències�"
 
 #: ../plugins/subversion/subversion-log-dialog.c:119
 msgid "Diff"
@@ -9689,11 +9690,11 @@ msgstr ""
 
 #: ../src/main.c:94
 msgid "Do not open last session on startup"
-msgstr "No s'obrirà l'última sessió al iniciar"
+msgstr "No s'obrirà l'última sessió en iniciar"
 
 #: ../src/main.c:100
 msgid "Do not open last project and files on startup"
-msgstr "No s'obrirà l'últim projecte i fitxers al iniciar"
+msgstr "No s'obrirà l'últim projecte i fitxers en iniciar"
 
 #: ../src/main.c:106
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
diff --git a/po/ca valencia po b/po/ca valencia po
index f6b1880..e809f1f 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -1,18 +1,17 @@
 # Traducció de l'Anjuta de l'equip de Softcatalà.
-# Copyright © 2009 Free Software Foundation, Inc.
+# Copyright © 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the anjuta package.
 # Xavier A. Conde Rueda <xavi conde gmail com>, 2003-2006.
-# Joan Duran <jodufi gmail com>, 2007-2009.
+# Joan Duran <jodufi gmail com>, 2007-2010.
 #
-# Carles Ferrando Garcia <carles ferrando gmail com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 17:32+0100\n"
-"PO-Revision-Date: 2009-10-08 17:17+0200\n"
-"Last-Translator: Carles Ferrando Garcia <carles ferrando gmail com>\n"
-"Language-Team: Catalan (Valencià) <tradgnome softcatala org>\n"
+"POT-Creation-Date: 2010-04-23 00:33+0200\n"
+"PO-Revision-Date: 2010-04-01 21:20+0200\n"
+"Last-Translator: Joan Duran <jodufi gmail com>\n"
+"Language-Team: Catalan <tradgnome softcatala org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,10 +67,10 @@ msgstr "El fitxer que intenteu obrir conté una seqüència de bytes no vàlida.
 #: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
 #, c-format
 msgid ""
-"anjuta was not able to automatically determine the encoding of the file you "
+"Anjuta was not able to automatically determine the encoding of the file you "
 "want to open."
 msgstr ""
-"l'Anjuta no ha pogut determinar automàticament la codificació del fitxer que "
+"L'Anjuta no ha pogut determinar automàticament la codificació del fitxer que "
 "voleu obrir."
 
 #: ../libanjuta/anjuta-encodings.c:137 ../libanjuta/anjuta-encodings.c:182
@@ -88,11 +87,11 @@ msgstr "Occidental"
 #: ../libanjuta/anjuta-encodings.c:153 ../libanjuta/anjuta-encodings.c:225
 #: ../libanjuta/anjuta-encodings.c:262
 msgid "Central European"
-msgstr "Europeu central"
+msgstr "Europa central"
 
 #: ../libanjuta/anjuta-encodings.c:155
 msgid "South European"
-msgstr "Europeu del sud"
+msgstr "Europa del sud"
 
 #: ../libanjuta/anjuta-encodings.c:157 ../libanjuta/anjuta-encodings.c:173
 #: ../libanjuta/anjuta-encodings.c:276
@@ -187,12 +186,15 @@ msgstr "Vietnamita"
 msgid "Thai"
 msgstr "Tailandés"
 
-#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:3204
+#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:193
+#: ../plugins/gbf-am/gbf-am-project.c:3372
 #: ../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-am/gbf-am-properties.c:176
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:191
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3267
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:104
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:148
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:151
+#: ../plugins/dir-project/dir-project.c:802
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -206,11 +208,11 @@ msgstr "No es pot executar l'orde: «%s»"
 msgid "execvp failed"
 msgstr "Ha fallat la crida execvp"
 
-#: ../libanjuta/anjuta-plugin.c:327 ../libanjuta/anjuta-plugin-manager.c:2310
+#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2312
 msgid "Anjuta Shell"
 msgstr "Intèrpret d'ordes de l'Anjuta"
 
-#: ../libanjuta/anjuta-plugin.c:328
+#: ../libanjuta/anjuta-plugin.c:327
 msgid "Anjuta shell that will contain the plugin"
 msgstr "Intèrpret d'ordes de l'Anjuta que contindrà el connector"
 
@@ -238,11 +240,11 @@ msgid "Load"
 msgstr "Carrega"
 
 #: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1941
+#: ../libanjuta/anjuta-plugin-manager.c:1943
 msgid "Available Plugins"
 msgstr "Connectors disponibles"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:736
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:773
 msgid "Preferred plugins"
 msgstr "Connectors preferits"
 
@@ -266,64 +268,64 @@ msgstr "Oblida el connector seleccionat"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1357
 #: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
-#: ../plugins/debug-manager/queue.c:556
+#: ../plugins/debug-manager/queue.c:537
 msgid "Select a plugin"
 msgstr "Seleccioneu un connector"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#: ../plugins/debug-manager/queue.c:557
+#: ../plugins/debug-manager/queue.c:538
 msgid "Please select a plugin to activate"
-msgstr "Seleccioneu un connector per a activar"
+msgstr "Seleccioneu un connector per activar"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1372
 #, c-format
 msgid "No plugin is able to load other plugins in %s"
 msgstr "No existeix cap connector capaç de carregar altres connectors a %s"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1960
+#: ../libanjuta/anjuta-plugin-manager.c:1962
 msgid "Remember this selection"
 msgstr "Recorda esta selecció"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2291
+#: ../libanjuta/anjuta-plugin-manager.c:2293
 msgid "Profiles"
 msgstr "Perfils"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2292
+#: ../libanjuta/anjuta-plugin-manager.c:2294
 msgid "Current stack of profiles"
 msgstr "Pila de perfils actuals"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2297
+#: ../libanjuta/anjuta-plugin-manager.c:2299
 msgid "Available plugins"
 msgstr "Connectors disponibles"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2298
+#: ../libanjuta/anjuta-plugin-manager.c:2300
 msgid "Currently available plugins found in plugin paths"
 msgstr "Connectors trobats actualment en els camins de connectors"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2304
+#: ../libanjuta/anjuta-plugin-manager.c:2306
 msgid "Activated plugins"
 msgstr "Connectors activats"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2305
+#: ../libanjuta/anjuta-plugin-manager.c:2307
 msgid "Currently activated plugins"
 msgstr "Connectors activats actualment"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2311
+#: ../libanjuta/anjuta-plugin-manager.c:2313
 msgid "Anjuta shell for which the plugins are made"
-msgstr "Intèrpret d'ordes de l'Anjuta que contindrà el connector"
+msgstr "Intèrpret d'ordes de l'Anjuta pel qual s'han fet els connectors"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2319
+#: ../libanjuta/anjuta-plugin-manager.c:2321
 msgid "Anjuta Status"
 msgstr "Estat de l'Anjuta"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2320
+#: ../libanjuta/anjuta-plugin-manager.c:2322
 msgid "Anjuta status to use in loading and unloading of plugins"
 msgstr "Estat de l'Anjuta a utilitzar en carregar i descarregar connectors"
 
 #. DEBUG_PRINT ("Icon: %s", icon_path);
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-plugin-manager.c:2480
+#: ../libanjuta/anjuta-plugin-manager.c:2482
 msgid "Loaded:"
 msgstr "Carregats:"
 
@@ -333,7 +335,7 @@ msgstr "Gestor de connectors"
 
 #: ../libanjuta/anjuta-profile.c:255
 msgid "The plugin manager to use for resolving plugins"
-msgstr "El gestor de connectors a utilitzar per a resoldre els connectors"
+msgstr "El gestor de connectors a utilitzar per resoldre els connectors"
 
 #: ../libanjuta/anjuta-profile.c:263
 msgid "Profile Name"
@@ -356,8 +358,8 @@ msgid "Synchronization file"
 msgstr "Fitxer de sincronització"
 
 #: ../libanjuta/anjuta-profile.c:281
-msgid "File to sync the profile xml"
-msgstr "Fitxer on sincronitzar el perfil xml"
+msgid "File to syncronize the profile XML"
+msgstr "Fitxer on sincronitzar el perfil XML"
 
 #: ../libanjuta/anjuta-profile.c:508
 msgid "Please select a plugin from the list"
@@ -366,7 +368,7 @@ msgstr "Seleccioneu un connector de la llista"
 #: ../libanjuta/anjuta-profile.c:672
 #, c-format
 msgid ""
-"Failed to read '%s': XML parse error. Invalid or corrupted anjuta plugins "
+"Failed to read '%s': XML parse error. Invalid or corrupted Anjuta plugins "
 "profile."
 msgstr ""
 "No s'ha pogut llegir «%s»: s'ha produït un error en analitzar l'XML. El "
@@ -409,8 +411,8 @@ msgstr "Categoria"
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4 ../src/anjuta-app.c:723
-#: ../src/preferences.ui.h:10
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:760
+#: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "General"
 
@@ -418,24 +420,24 @@ msgstr "General"
 msgid "Anjuta Preferences"
 msgstr "Preferències de l'Anjuta"
 
-#: ../libanjuta/anjuta-save-prompt.c:158
+#: ../libanjuta/anjuta-save-prompt.c:157
 msgid "Select the items to save:"
 msgstr "Seleccioneu els elements a alçar:"
 
-#: ../libanjuta/anjuta-save-prompt.c:183
+#: ../libanjuta/anjuta-save-prompt.c:182
 msgid "If you do not save, all your changes will be lost."
 msgstr "Si no els alceu, es perdran tots els canvis."
 
-#: ../libanjuta/anjuta-save-prompt.c:190
-#: ../plugins/document-manager/plugin.c:596
+#: ../libanjuta/anjuta-save-prompt.c:189
+#: ../plugins/document-manager/plugin.c:603
 msgid "Save"
 msgstr "Alça"
 
-#: ../libanjuta/anjuta-save-prompt.c:197
+#: ../libanjuta/anjuta-save-prompt.c:196
 msgid "Item"
 msgstr "Element"
 
-#: ../libanjuta/anjuta-save-prompt.c:203
+#: ../libanjuta/anjuta-save-prompt.c:202
 msgid "_Discard changes"
 msgstr "_Descarta els canvis"
 
@@ -449,8 +451,8 @@ msgstr[0] ""
 "<b>Hi ha %d element amb canvis sense alçar. Voleu alçar els canvis abans de "
 "tancar?</b>"
 msgstr[1] ""
-"<b>Hi han %d elements amb canvis sense alçar. Voleu alçar els canvis abans "
-"de tancar?</b>"
+"<b>Hi ha %d elements amb canvis sense alçar. Voleu alçar els canvis abans de "
+"tancar?</b>"
 
 #: ../libanjuta/anjuta-save-prompt.c:304
 msgid "There is an item with unsaved changes. Save changes before closing?"
@@ -476,84 +478,111 @@ msgid "Shortcut"
 msgstr "Drecera"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:355
+#: ../libanjuta/anjuta-utils.c:359
 msgid "System:"
 msgstr "Sistema:"
 
-#: ../libanjuta/anjuta-utils.c:493
+#: ../libanjuta/anjuta-utils.c:505
+msgid ""
+"You do not seem to have PackageKit installed. PackageKit is required for "
+"installing missing packages. Please install \"packagekit-gnome\" package "
+"from your distribution, or install the missing packages manually."
+msgstr ""
+"Pareix que no teniu instal·lat el PackageKit. Cal el PackageKit per "
+"instal·lar els paquets que manquen. Instal·leu el paquet «packagekit-gnome» "
+"de la vostra distribució o bé instal·leu manualment els paquets que manquen."
+
+#: ../libanjuta/anjuta-utils.c:515
+#, c-format
+msgid "Installation failed: %s"
+msgstr "Ha fallat la instal·lació: %s"
+
+#: ../libanjuta/anjuta-utils.c:575
+#, c-format
+msgid ""
+"The \"%s\" package is not installed.\n"
+"Please install it."
+msgstr ""
+"El paquet «%s» no està instal·lat.\n"
+"Hauríeu d'instal·lar-lo."
+
+#: ../libanjuta/anjuta-utils.c:593
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
 "Please install it."
-msgstr "Heu d'instal·lar la utilitat «%s»."
+msgstr ""
+"La utilitat «%s» no està instal·lada.\n"
+"Hauríeu d'instal·lar-la."
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:986
-msgid "Cannot find a terminal, using xterm, even if it may not work"
+#: ../libanjuta/anjuta-utils.c:1086
+msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr ""
 "No es pot trobar un terminal; s'utilitzarà l'xterm, encara que pot ser que "
 "no funcione"
 
-#: ../libanjuta/anjuta-utils.c:1022 ../libanjuta/anjuta-utils.c:1026
-#: ../libanjuta/anjuta-utils.c:1054 ../libanjuta/anjuta-utils.c:1058
+#: ../libanjuta/anjuta-utils.c:1122 ../libanjuta/anjuta-utils.c:1126
+#: ../libanjuta/anjuta-utils.c:1154 ../libanjuta/anjuta-utils.c:1158
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "No es pot executar l'orde: %s (es fa servir l'intèrpret d'ordes %s)\n"
 
-#: ../libanjuta/anjuta-utils.c:1690
+#: ../libanjuta/anjuta-utils.c:1790
 msgid ""
-"Unable to display help. Please make sure Anjuta documentation package is "
-"install. It can be downloaded from http://anjuta.org";
+"Unable to display help. Please make sure the Anjuta documentation package is "
+"installed. It can be downloaded from http://anjuta.org.";
 msgstr ""
 "No es pot mostrar l'ajuda. Assegureu-vos que el paquet de documentació de "
-"l'Anjuta està instal·lat. El podeu baixar de http://anjuta.org";
+"l'Anjuta està instal·lat. El podeu baixar de http://anjuta.org.";
 
-#: ../libanjuta/anjuta-utils.c:2129
+#: ../libanjuta/anjuta-utils.c:2229
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "No es pot carregar el fitxer de la interfície d'usuari: %s"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:92
-#: ../plugins/file-manager/file-view.c:65
+#: ../plugins/file-manager/file-view.c:75
 msgid "Modified"
 msgstr "Modificat"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:95
-#: ../plugins/file-manager/file-view.c:69
+#: ../plugins/file-manager/file-view.c:79
 msgid "Added"
 msgstr "Afegit"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:98
-#: ../plugins/file-manager/file-view.c:67
+#: ../plugins/file-manager/file-view.c:77
 msgid "Deleted"
 msgstr "Suprimit"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:101
-#: ../plugins/file-manager/file-view.c:71
+#: ../plugins/file-manager/file-view.c:81
 msgid "Conflicted"
 msgstr "Amb conflictes"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-msgid "Up to date"
+#: ../plugins/file-manager/file-view.c:83
+msgid "Up-to-date"
 msgstr "Actualitzat"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
-#: ../plugins/file-manager/file-view.c:75
+#: ../plugins/file-manager/file-view.c:85
 msgid "Locked"
 msgstr "Blocat"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:112
-#: ../plugins/file-manager/file-view.c:77
+#: ../plugins/file-manager/file-view.c:87
 msgid "Missing"
 msgstr "Falta"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:115
-#: ../plugins/file-manager/file-view.c:79
+#: ../plugins/file-manager/file-view.c:89
 msgid "Unversioned"
 msgstr "Sense versió"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:119
-#: ../plugins/file-manager/file-view.c:81
+#: ../plugins/file-manager/file-view.c:91
 msgid "Ignored"
 msgstr "Ignorat"
 
@@ -573,8 +602,8 @@ msgstr "Objecte de memòria de píxels"
 msgid "The pixbuf to render."
 msgstr "Memòria de píxels que s'ha de dibuixar."
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3041
-#: ../plugins/glade/plugin.c:3076
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3029
+#: ../plugins/glade/plugin.c:3064
 #, c-format
 msgid "Widget not found: %s"
 msgstr "No s'ha trobat el giny d'interfície gràfica: %s"
@@ -585,67 +614,67 @@ msgid "Could not find application pixmap file: %s"
 msgstr "No s'ha trobat el fitxer de mapa de píxels de l'aplicació: %s"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
-msgid "<b>Build</b>"
-msgstr "<b>Munta</b>"
+#: ../plugins/run-program/anjuta-run-program.ui.h:1
+msgid "Arguments:"
+msgstr "Arguments:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:2
-msgid "<b>Configuration:</b>"
-msgstr "<b>Configuració:</b>"
+msgid "Build"
+msgstr "Munta"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:3
-msgid "<b>Install</b>"
-msgstr "<b>Instal·la</b>"
+msgid "Build Directory:"
+msgstr "Directori de muntatge:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:4
-msgid "<b>Regenerate project</b>"
-msgstr "<b>Torna a generar el projecte</b>"
+msgid "Configuration:"
+msgstr "Configuració:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:5
-msgid "<b>Select Program to run:</b>"
-msgstr "<b>Seleccioneu el programa a executar:</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.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.ui.h:7
-msgid "Build Directory:"
-msgstr "Directori de muntatge:"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Configure Options:"
 msgstr "Configura les opcions:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
 msgid "Configure Project"
 msgstr "Configura el projecte"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
 msgid "Continue on errors"
 msgstr "Continua encara que hi haja errors"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Highlight message locations in editor"
 msgstr "Ressalta les ubicacions dels missatges a l'editor"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+msgid "Install"
+msgstr "Instal·la"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
 msgid "Install as root:"
 msgstr "Instal·la com a superusuari:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
-#: ../plugins/tools/anjuta-tools.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+msgid "Regenerate project"
+msgstr "Torna a generar el projecte"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/tools/anjuta-tools.ui.h:8
 msgid "Run in terminal"
 msgstr "Executa en un terminal"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
 msgid "Run several commands at a time:"
 msgstr "Executa diverses ordes a la vegada:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
 msgid "Select Program"
 msgstr "Selecciona el programa"
 
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+msgid "Select Program to run:"
+msgstr "Seleccioneu el programa a executar:"
+
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:16
 msgid "Select a build directory"
 msgstr "Selecciona un directori de muntatge"
@@ -657,7 +686,7 @@ msgstr "Tradueix missatges"
 #: ../plugins/build-basic-autotools/configuration-list.c:68
 #: ../plugins/class-gen/window.c:525
 #: ../plugins/search/search_preferences.c:523
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2 ../src/preferences.ui.h:2
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "Predeterminat"
 
@@ -678,39 +707,42 @@ msgstr "Optimitzat"
 msgid "No executables in this project!"
 msgstr "No hi ha cap executable en este projecte."
 
-#: ../plugins/build-basic-autotools/executer.c:154
-#: ../plugins/gbf-am/gbf-am-project.c:3194
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3086
+#: ../plugins/build-basic-autotools/executer.c:157
+#: ../plugins/gbf-am/gbf-am-project.c:196
+#: ../plugins/gbf-am/gbf-am-project.c:3362
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:194
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3261
 msgid "Program"
 msgstr "Programa"
 
-#: ../plugins/build-basic-autotools/executer.c:255
+#: ../plugins/build-basic-autotools/executer.c:258
 msgid "No file or project currently opened."
 msgstr "No hi ha cap fitxer o projecte obert."
 
 #. Only local program are supported
-#: ../plugins/build-basic-autotools/executer.c:295
+#: ../plugins/build-basic-autotools/executer.c:298
 #: ../plugins/run-program/execute.c:70
 #, c-format
 msgid "Program '%s' is not a local file"
 msgstr "El programa «%s» no és un fitxer local"
 
-#: ../plugins/build-basic-autotools/executer.c:310
+#: ../plugins/build-basic-autotools/executer.c:313
+#: ../plugins/run-program/execute.c:76
 #, c-format
-msgid "Program '%s' does not exists"
+msgid "Program '%s' does not exist"
 msgstr "No existeix el programa «%s»"
 
-#: ../plugins/build-basic-autotools/executer.c:318
+#: ../plugins/build-basic-autotools/executer.c:321
 #: ../plugins/run-program/execute.c:80
 #, c-format
 msgid "Program '%s' does not have execution permission"
 msgstr "El programa «%s» no té permís d'execució"
 
-#: ../plugins/build-basic-autotools/executer.c:350
+#: ../plugins/build-basic-autotools/executer.c:353
 msgid "No executable for this file."
 msgstr "No hi ha cap executable per a este fitxer."
 
-#: ../plugins/build-basic-autotools/executer.c:356
+#: ../plugins/build-basic-autotools/executer.c:359
 #, c-format
 msgid "Executable '%s' is not up-to-date."
 msgstr "L'executable «%s» no està actualitzat."
@@ -720,11 +752,11 @@ msgstr "L'executable «%s» no està actualitzat."
 #. * 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:167
+#: ../plugins/build-basic-autotools/plugin.c:168
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+S'està\\s+entrant\\s+al\\s+directori\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:168
+#: ../plugins/build-basic-autotools/plugin.c:169
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+S'està\\s+entrant\\s+al\\s+directori\\s+'(.+)'"
 
@@ -733,82 +765,82 @@ msgstr "make(\\[\\d+\\])?:\\s+S'està\\s+entrant\\s+al\\s+directori\\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:176
+#: ../plugins/build-basic-autotools/plugin.c:177
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+S'està\\s+eixint\\s+del\\s+directori\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:177
+#: ../plugins/build-basic-autotools/plugin.c:178
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+S'està\\s+eixint\\s+del\\s+directori\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:827
+#: ../plugins/build-basic-autotools/plugin.c:846
 #, c-format
 msgid "Entering: %s"
 msgstr "S'està entrant: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:863
+#: ../plugins/build-basic-autotools/plugin.c:882
 #, c-format
 msgid "Leaving: %s"
 msgstr "S'està eixint: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:896
+#: ../plugins/build-basic-autotools/plugin.c:915
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "avís:"
 
-#: ../plugins/build-basic-autotools/plugin.c:902
+#: ../plugins/build-basic-autotools/plugin.c:921
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "errors:"
 
-#: ../plugins/build-basic-autotools/plugin.c:1019
+#: ../plugins/build-basic-autotools/plugin.c:1038
 #, c-format
 msgid "Command exited with status %d"
 msgstr "L'orde ha eixit amb l'estat %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1029
-#: ../plugins/build-basic-autotools/plugin.c:1505
+#: ../plugins/build-basic-autotools/plugin.c:1048
+#: ../plugins/build-basic-autotools/plugin.c:1524
 #, c-format
 msgid "Command canceled by user"
 msgstr "Orde cancel·lada per l'usuari"
 
-#: ../plugins/build-basic-autotools/plugin.c:1034
+#: ../plugins/build-basic-autotools/plugin.c:1053
 #, c-format
 msgid "Command aborted by user"
 msgstr "Orde interrompuda per l'usuari"
 
-#: ../plugins/build-basic-autotools/plugin.c:1039
+#: ../plugins/build-basic-autotools/plugin.c:1058
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "L'orde ha acabat amb el senyal %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1047
+#: ../plugins/build-basic-autotools/plugin.c:1066
 msgid "Command terminated for an unknown reason"
 msgstr "Orde acabada per una raó desconeguda"
 
-#: ../plugins/build-basic-autotools/plugin.c:1065
+#: ../plugins/build-basic-autotools/plugin.c:1084
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "Temps total: %lu segons\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1072
+#: ../plugins/build-basic-autotools/plugin.c:1091
 msgid "Completed unsuccessfully\n"
 msgstr "No s'ha completat correctament\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1080
+#: ../plugins/build-basic-autotools/plugin.c:1099
 #: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "S'ha completat correctament\n"
 
 #. Translators: the first number is the number of the build attemp,
 #. the string is the directory where the build takes place
-#: ../plugins/build-basic-autotools/plugin.c:1168
+#: ../plugins/build-basic-autotools/plugin.c:1187
 #, c-format
 msgid "Build %d: %s"
 msgstr "Munta %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1499
+#: ../plugins/build-basic-autotools/plugin.c:1518
 msgid ""
 "Before using this new configuration, the default one needs to be removed. Do "
 "you want to do that ?"
@@ -816,282 +848,282 @@ msgstr ""
 "Si utilitzeu esta configuració nova s'haurà de suprimir la predeterminada. "
 "Voleu fer-ho?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1802
+#: ../plugins/build-basic-autotools/plugin.c:1822
 #, c-format
-msgid "Can not compile \"%s\": No compile rule defined for this file type."
+msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr ""
 "No es pot compilar «%s»: No s'ha definit cap regla de compilació per a este "
 "tipus de fitxer."
 
-#: ../plugins/build-basic-autotools/plugin.c:1928
+#: ../plugins/build-basic-autotools/plugin.c:1957
 #, c-format
-msgid "Can not configure project: Missing configure script in %s."
+msgid "Cannot configure project: Missing configure script in %s."
 msgstr "No es pot configurar el projecte: manca l'script de configuració a %s."
 
-#: ../plugins/build-basic-autotools/plugin.c:2400
-#: ../plugins/build-basic-autotools/plugin.c:2474
-#: ../plugins/build-basic-autotools/plugin.c:2484
-#: ../plugins/build-basic-autotools/plugin.c:2502
+#: ../plugins/build-basic-autotools/plugin.c:2438
 #: ../plugins/build-basic-autotools/plugin.c:2512
-#: ../plugins/build-basic-autotools/plugin.c:2569
+#: ../plugins/build-basic-autotools/plugin.c:2522
+#: ../plugins/build-basic-autotools/plugin.c:2540
+#: ../plugins/build-basic-autotools/plugin.c:2550
+#: ../plugins/build-basic-autotools/plugin.c:2607
 #, c-format
 msgid "_Build"
 msgstr "_Munta"
 
-#: ../plugins/build-basic-autotools/plugin.c:2404
+#: ../plugins/build-basic-autotools/plugin.c:2442
 msgid "_Build Project"
 msgstr "_Munta el projecte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2405
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "Build whole project"
 msgstr "Munta el projecte sencer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2410
+#: ../plugins/build-basic-autotools/plugin.c:2448
 msgid "_Install Project"
 msgstr "_Instal·la el projecte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2411
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "Install whole project"
 msgstr "Instal·la el projecte sencer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2416
+#: ../plugins/build-basic-autotools/plugin.c:2454
 msgid "_Clean Project"
 msgstr "Neteja el proje_cte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2417
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "Clean whole project"
 msgstr "Neteja el projecte sencer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2422
-msgid "C_onfigure Project..."
-msgstr "C_onfigura el projecte..."
+#: ../plugins/build-basic-autotools/plugin.c:2460
+msgid "C_onfigure Projectâ?¦"
+msgstr "C_onfigura el projecteâ?¦"
 
-#: ../plugins/build-basic-autotools/plugin.c:2423
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "Configure project"
 msgstr "Configura el projecte"
 
-#: ../plugins/build-basic-autotools/plugin.c:2428
+#: ../plugins/build-basic-autotools/plugin.c:2466
 msgid "Build _Tarball"
 msgstr "Mun_ta un fitxer tar"
 
-#: ../plugins/build-basic-autotools/plugin.c:2429
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build project tarball distribution"
 msgstr "Munta el fitxer tar de distribució"
 
-#: ../plugins/build-basic-autotools/plugin.c:2434
+#: ../plugins/build-basic-autotools/plugin.c:2472
 msgid "_Build Module"
 msgstr "_Munta el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2435
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "Build module associated with current file"
 msgstr "Munta el mòdul associat al fitxer actual"
 
-#: ../plugins/build-basic-autotools/plugin.c:2440
+#: ../plugins/build-basic-autotools/plugin.c:2478
 msgid "_Install Module"
 msgstr "_Instal·la el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2441
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "Install module associated with current file"
 msgstr "Instal·la el mòdul associat al fitxer actual"
 
-#: ../plugins/build-basic-autotools/plugin.c:2446
+#: ../plugins/build-basic-autotools/plugin.c:2484
 msgid "_Clean Module"
 msgstr "_Neteja el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2447
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "Clean module associated with current file"
 msgstr "Neteja el mòdul associat al fitxer actual"
 
-#: ../plugins/build-basic-autotools/plugin.c:2452
+#: ../plugins/build-basic-autotools/plugin.c:2490
 msgid "Co_mpile File"
 msgstr "Co_mpila el fitxer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2453
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Compile current editor file"
 msgstr "Compila el fitxer actual de l'editor"
 
-#: ../plugins/build-basic-autotools/plugin.c:2458
+#: ../plugins/build-basic-autotools/plugin.c:2496
 msgid "Select Configuration"
 msgstr "Seleccioneu la configuració"
 
-#: ../plugins/build-basic-autotools/plugin.c:2459
+#: ../plugins/build-basic-autotools/plugin.c:2497
 msgid "Select current configuration"
 msgstr "Selecciona la configuració actual"
 
-#: ../plugins/build-basic-autotools/plugin.c:2464
+#: ../plugins/build-basic-autotools/plugin.c:2502
 msgid "Remove Configuration"
 msgstr "Suprimeix la configuració"
 
-#: ../plugins/build-basic-autotools/plugin.c:2465
+#: ../plugins/build-basic-autotools/plugin.c:2503
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr ""
 "Neteja el projecte (distclean) i suprimeix el directori de configuració si "
 "és possible"
 
-#: ../plugins/build-basic-autotools/plugin.c:2478
-#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../plugins/build-basic-autotools/plugin.c:2516
+#: ../plugins/build-basic-autotools/plugin.c:2544
 msgid "_Compile"
 msgstr "_Compila"
 
-#: ../plugins/build-basic-autotools/plugin.c:2479
-#: ../plugins/build-basic-autotools/plugin.c:2507
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "Compile file"
 msgstr "Compila el fitxer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2485
-#: ../plugins/build-basic-autotools/plugin.c:2513
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2551
 msgid "Build module"
 msgstr "Munta el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2490
-#: ../plugins/build-basic-autotools/plugin.c:2518
-#: ../plugins/build-basic-autotools/plugin.c:2576
+#: ../plugins/build-basic-autotools/plugin.c:2528
+#: ../plugins/build-basic-autotools/plugin.c:2556
+#: ../plugins/build-basic-autotools/plugin.c:2614
 #, c-format
 msgid "_Install"
 msgstr "_Instal·la"
 
-#: ../plugins/build-basic-autotools/plugin.c:2491
-#: ../plugins/build-basic-autotools/plugin.c:2519
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
 msgid "Install module"
 msgstr "Instal·la el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2496
-#: ../plugins/build-basic-autotools/plugin.c:2524
-#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2534
+#: ../plugins/build-basic-autotools/plugin.c:2562
+#: ../plugins/build-basic-autotools/plugin.c:2621
 #, c-format
 msgid "_Clean"
 msgstr "Nete_ja"
 
-#: ../plugins/build-basic-autotools/plugin.c:2497
-#: ../plugins/build-basic-autotools/plugin.c:2525
+#: ../plugins/build-basic-autotools/plugin.c:2535
+#: ../plugins/build-basic-autotools/plugin.c:2563
 msgid "Clean module"
 msgstr "Neteja el mòdul"
 
-#: ../plugins/build-basic-autotools/plugin.c:2530
+#: ../plugins/build-basic-autotools/plugin.c:2568
 msgid "_Cancel command"
 msgstr "_Cancel·la l'orde"
 
-#: ../plugins/build-basic-autotools/plugin.c:2531
+#: ../plugins/build-basic-autotools/plugin.c:2569
 msgid "Cancel build command"
 msgstr "Cancel·la l'orde de muntatge"
 
-#: ../plugins/build-basic-autotools/plugin.c:2569
+#: ../plugins/build-basic-autotools/plugin.c:2607
 #, c-format
 msgid "_Build (%s)"
 msgstr "_Munta (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2576
+#: ../plugins/build-basic-autotools/plugin.c:2614
 #, c-format
 msgid "_Install (%s)"
 msgstr "_Instal·la (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2621
 #, c-format
 msgid "_Clean (%s)"
 msgstr "Nete_ja (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2591
+#: ../plugins/build-basic-autotools/plugin.c:2629
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "Co_mpila (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2591
+#: ../plugins/build-basic-autotools/plugin.c:2629
 #, c-format
 msgid "Co_mpile"
 msgstr "Co_mpila"
 
-#: ../plugins/build-basic-autotools/plugin.c:3127
+#: ../plugins/build-basic-autotools/plugin.c:3165
 msgid "Build commands"
-msgstr "Ordes per a muntar"
+msgstr "Ordes per muntar"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3136
+#: ../plugins/build-basic-autotools/plugin.c:3174
 msgid "Build popup commands"
-msgstr "Ordes emergents per a muntar"
+msgstr "Ordes emergents per muntar"
 
-#: ../plugins/build-basic-autotools/plugin.c:3518
-#: ../plugins/build-basic-autotools/plugin.c:3526
+#: ../plugins/build-basic-autotools/plugin.c:3556
+#: ../plugins/build-basic-autotools/plugin.c:3564
 msgid "Build Autotools"
 msgstr "Munta les autotools"
 
-#: ../plugins/build-basic-autotools/program.c:323
+#: ../plugins/build-basic-autotools/program.c:326
 msgid "Command aborted"
 msgstr "Orde interrompuda"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
-msgid "<b>Class Elements</b>"
-msgstr "<b>Elements de la classe</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
-msgid "<b>General Class Properties</b>"
-msgstr "<b>Propietats generals de la classe</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Project"
 msgstr "Afig al projecte"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Repository"
 msgstr "Afig al dipòsit"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
-msgid "Author Email:"
-msgstr "Correu electrònic de l'autor:"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+msgid "Author Email Address:"
+msgstr "Adreça electrònica de l'autor:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Name:"
 msgstr "Nom de l'autor:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author/Date-Time"
 msgstr "Autor/hora i data"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date/Time"
 msgstr "Autor/data/hora"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Base Class Inheritance:"
 msgstr "Herència de la classe base:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class:"
 msgstr "Classe base:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+msgid "Class Elements"
+msgstr "Elements de la classe"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Function Prefix:"
 msgstr "Prefix de la funció de la classe:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
 msgid "Class Generator"
 msgstr "Generador de classes"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 msgid "Class Name:"
 msgstr "Nom de classe:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
 msgid "Class Options:"
 msgstr "Opcions de classe:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Create"
 msgstr "Crea"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "GObject Class\t"
 msgstr "Classe GObject\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
 msgid "GObject Prefix and Type:"
 msgstr "Prefix i tipus del GObject:"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+msgid "General Class Properties"
+msgstr "Propietats generals de la classe"
+
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
-#: ../plugins/file-wizard/file.c:102
-#: ../plugins/project-wizard/templates/translatable-strings.h:47
+#: ../plugins/file-wizard/file.c:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:48
 msgid "General Public License (GPL)"
 msgstr "Llicència pública general (GPL)"
 
@@ -1108,13 +1140,13 @@ msgid "Inline the declaration and implementation"
 msgstr "Insereix en la mateixa línia la declaració i la implementació"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
-#: ../plugins/file-wizard/file.c:103
-#: ../plugins/project-wizard/templates/translatable-strings.h:60
+#: ../plugins/file-wizard/file.c:104
+#: ../plugins/project-wizard/templates/translatable-strings.h:62
 msgid "Lesser General Public License (LGPL)"
 msgstr "Llicència pública general menor (LGPL)"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "Llicència:"
 
@@ -1127,7 +1159,7 @@ msgid "No License"
 msgstr "Sense llicència"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
-#: ../plugins/glade/plugin.c:4446
+#: ../plugins/glade/plugin.c:4433
 msgid "Properties"
 msgstr "Propietats"
 
@@ -1143,18 +1175,6 @@ msgstr "Fitxer de codi:"
 msgid "Source/Header Headings:"
 msgstr "Encapçalaments per als fitxers de capçalera i de codi:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
-msgid "private"
-msgstr "privada"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
-msgid "protected"
-msgstr "protegida"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
-msgid "public"
-msgstr "pública"
-
 #: ../plugins/class-gen/generator.c:132
 #, c-format
 msgid "Header or source file has not been created"
@@ -1177,41 +1197,42 @@ msgstr "Fitxer on s'escriurà la plantilla processada"
 msgid "Failed to write autogen definition file"
 msgstr "No s'ha pogut escriure el fitxer de definició autogen"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1040
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1127
 msgid ""
-"Could not find autogen version 5, please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net";
+"Could not find autogen version 5; please install the autogen package. You "
+"can get it from http://autogen.sourceforge.net.";
 msgstr ""
 "No s'ha pogut trobar la versió 5 de l'autogen. Instal·leu el paquet autogen. "
-"Podeu obtindre-lo de http://autogen.sourceforge.net";
+"Podeu obtindre-lo a http://autogen.sourceforge.net.";
 
-#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:412
+#: ../plugins/class-gen/plugin.c:242 ../plugins/class-gen/plugin.c:410
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "No es pot executar l'autogen: %s"
 
 #: ../plugins/class-gen/window.c:94
 msgid "Guess from type"
-msgstr "Suposició de tipus"
+msgstr "Endevina-ho pel tipus"
 
 #: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+#: ../plugins/search/anjuta-search.ui.h:29
 msgid "Scope"
 msgstr "Abast"
 
 #: ../plugins/class-gen/window.c:500
 msgid "Implementation"
-msgstr "_Implementació"
+msgstr "Implementació"
 
 #: ../plugins/class-gen/window.c:501 ../plugins/class-gen/window.c:511
 #: ../plugins/class-gen/window.c:533
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/breakpoints.c:1914
 #: ../plugins/debug-manager/debug_tree.c:126
 msgid "Type"
 msgstr "Tipus"
 
 #: ../plugins/class-gen/window.c:502 ../plugins/class-gen/window.c:512
 #: ../plugins/class-gen/window.c:520 ../plugins/class-gen/window.c:534
-#: ../plugins/run-program/parameters.c:749
+#: ../plugins/run-program/parameters.c:754
 #: ../plugins/search/search_preferences.c:534
 msgid "Name"
 msgstr "Nom"
@@ -1228,225 +1249,230 @@ msgstr "Sobrenom"
 
 #: ../plugins/class-gen/window.c:522
 msgid "Blurb"
-msgstr "Publicitat"
+msgstr "Ressenya"
 
 #: ../plugins/class-gen/window.c:523
 msgid "GType"
-msgstr "G Tipus"
+msgstr "GType"
 
 #: ../plugins/class-gen/window.c:524
 msgid "ParamSpec"
-msgstr "Paràmetres"
+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 "Senyaladors"
+msgstr "Indicadors"
 
 #: ../plugins/class-gen/window.c:537
 msgid "Marshaller"
-msgstr "Serialitzador"
+msgstr "Marshaller"
 
 #: ../plugins/class-gen/window.c:818
 msgid "XML description of the user interface"
 msgstr "Descripció XML de la interfície d'usuari"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
-msgid "<b>CVS Options</b>"
-msgstr "<b>Opcions del CVS</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:2
-msgid "<b>Module Details:</b>"
-msgstr "<b>Detalls del mòdul:</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:3
-msgid "<b>Options:</b>"
-msgstr "<b>Opcions:</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
-#: ../plugins/git/anjuta-git.ui.h:1 ../plugins/search/anjuta-search.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>Opcions</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
 msgid ""
 "<b>Please note: </b>\n"
 "\n"
-"Pressing OK will delete the file from disk and from CVS. Of course the file "
+"Pressing OK will delete the file from disk and from CVS. Of course, the file "
 "won't be removed from CVS before you use CVS Commit. <b>You have been warned!"
 "</b>"
 msgstr ""
 "<b>Tingueu en compte:</b>\n"
 "\n"
 "En prémer D'acord se suprimirà el fitxer del disc i del CVS. El fitxer no se "
-"suprimirà del CVS fins que publiqueu els canvis al CVS."
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
-msgid "<b>Repository: </b>"
-msgstr "<b>Dipòsit: </b>"
+"suprimirà del CVS fins que publiqueu els canvis al CVS. <b>Esteu avisat!</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
 msgid "Be verbose"
 msgstr "Sigues detallat"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
+#: ../plugins/git/anjuta-git.ui.h:22
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
-#: ../plugins/tools/anjuta-tools.ui.h:2
-msgid "Browse..."
-msgstr "Navega..."
+#: ../plugins/tools/anjuta-tools.ui.h:1
+msgid "Browseâ?¦"
+msgstr "Navegaâ?¦"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:6
+msgid "CVS Options"
+msgstr "Opcions del CVS"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:7
 msgid "CVS Preferences"
 msgstr "Preferències del CVS"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
 msgid "CVS: Add file/directory"
 msgstr "CVS: afig el fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
 msgid "CVS: Commit file/directory"
 msgstr "CVS: publica els canvis a un fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
 msgid "CVS: Diff file/directory"
 msgstr "CVS: diferències de fitxers/directoris"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
 msgid "CVS: Import"
 msgstr "CVS: importa"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
 msgid "CVS: Log file/directory"
 msgstr "CVS: historial de fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
 msgid "CVS: Remove file/directory"
 msgstr "CVS: suprimeix el fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
 msgid "CVS: Status"
 msgstr "CVS: estat"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
 msgid "CVS: Status from file/directory"
 msgstr "CVS: estat del fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
 msgid "CVS: Update file/directory"
 msgstr "CVS: actualitza el fitxer/directori"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
 msgid "CVSROOT:"
 msgstr "CVSROOT:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
 #: ../plugins/subversion/anjuta-subversion.ui.h:5
 msgid "Choose file or directory to add:"
 msgstr "Escolliu el fitxer o directori a afegir:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
 msgid "Choose file or directory to commit:"
 msgstr "Escolliu el fitxer o directori a publicar els canvis:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
 msgid "Choose file or directory to diff:"
 msgstr "Escolliu de quin directori o fitxer obtindre les diferències:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
-msgid "Choose file or directory to get log:"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+msgid "Choose file or directory to get log for:"
 msgstr "Escolliu de quin fitxer o directori obtindre el registre:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
 msgid "Choose file or directory to get the status from:"
 msgstr "Escolliu de quin fitxer o directori obtindre l'estat:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
 msgid "Choose file or directory to remove:"
 msgstr "Escolliu quin fitxer o directori suprimir:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
 #: ../plugins/subversion/anjuta-subversion.ui.h:6
 msgid "Choose file or directory to update:"
 msgstr "Escolliu el fitxer o directori a actualitzar:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
 msgid "Compression Level (0=off, 10=max):"
 msgstr "Nivell de compressió (0=cap, 10=màx):"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
 msgid "Create new directories"
 msgstr "Crea directoris nous"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
 msgid "Delete empty directories"
 msgstr "Suprimeix els directoris buits"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
 #: ../plugins/subversion/anjuta-subversion.ui.h:13
 msgid "Do not act recursively"
 msgstr "No ho faces recursivament"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
 msgid "Extern (rsh)"
 msgstr "Extern (rsh)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "File is binary"
 msgstr "El fitxer és binari"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
 msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ignora el fitxer .cvsrc (recomanat)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
-#: ../plugins/git/anjuta-git.ui.h:62 ../plugins/symbol-db/plugin.c:2333
-#: ../plugins/symbol-db/plugin.c:2397
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2331
+#: ../plugins/symbol-db/plugin.c:2377
 msgid "Local"
 msgstr "Local"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "Missatge de registre:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+msgid "Module Details:"
+msgstr "Detalls del mòdul:"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
 msgid "Module name:"
 msgstr "Nom del mòdul:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/glade/plugin.c:3085
+#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
+#: ../plugins/subversion/anjuta-subversion.ui.h:23
+msgid "Options"
+msgstr "Opcions"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/subversion/anjuta-subversion.ui.h:24
+msgid "Options:"
+msgstr "Opcions:"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
 msgid "Password server (pserver)"
 msgstr "Servidor de contrasenyes (pserver)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
 #: ../plugins/subversion/anjuta-subversion.ui.h:26
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
 msgid "Patch-Style diff"
 msgstr "Diff estil pedaç"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
 msgid "Path to \"cvs\" command"
 msgstr "Camí a l'orde «cvs»"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
 msgid "Project root directory:"
 msgstr "Directori arrel del projecte:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
 msgid "Release tag:"
 msgstr "Etiqueta de la versió:"
 
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+msgid "Repository:"
+msgstr "Dipòsit:"
+
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:45
 msgid "Reset sticky tags"
 msgstr "Reinicia les etiquetes recurrents"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
-#: ../plugins/git/anjuta-git.ui.h:91
-#: ../plugins/subversion/anjuta-subversion.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "Revisió:"
 
@@ -1459,7 +1485,7 @@ msgid "Unified format instead of context format"
 msgstr "Format unificat en comptes del contextual"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:49
-#: ../plugins/subversion/anjuta-subversion.ui.h:54
+#: ../plugins/subversion/anjuta-subversion.ui.h:55
 msgid "Use revision/tag:"
 msgstr "Utilitza la revisió/etiqueta:"
 
@@ -1468,7 +1494,7 @@ msgid "Use revision:"
 msgstr "Utilitza la revisió:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:51
-#: ../plugins/subversion/anjuta-subversion.ui.h:55
+#: ../plugins/subversion/anjuta-subversion.ui.h:56
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
@@ -1477,8 +1503,8 @@ msgid "Vendor tag:"
 msgstr "Etiqueta del proveïdor:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
-#: ../plugins/git/anjuta-git.ui.h:125
-#: ../plugins/subversion/anjuta-subversion.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "Tot el projecte"
 
@@ -1493,7 +1519,7 @@ msgstr "Heu d'omplir el camp: %s"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:78
 msgid "CVS command is running! Please wait until it is finished!"
-msgstr "S'està executant l'orde CVS. Espereu fins que acabe !"
+msgstr "S'està executant l'orde CVS. Espereu fins que acabi"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:152
 msgid "Unable to delete file"
@@ -1512,7 +1538,7 @@ msgid "CVSROOT"
 msgstr "CVSROOT"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:438
-#: ../plugins/gbf-am/gbf-am-properties.c:1234
+#: ../plugins/gbf-am/gbf-am-properties.c:1237
 msgid "Module"
 msgstr "Mòdul"
 
@@ -1529,19 +1555,19 @@ msgid "Are you sure that you do not want a log message?"
 msgstr "Segur que no voleu un missatge de registre?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:125
-msgid "CVS command failed - See above for details"
+msgid "CVS command failed. See above for details"
 msgstr "Ha fallat l'orde CVS. Vegeu a dalt els detalls"
 
 #: ../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"
+msgid "CVS command successful! Time taken: %ld second"
+msgid_plural "CVS command successful! Time taken: %ld seconds"
 msgstr[0] "L'orde CVS s'ha executat correctament. Temps utilitzat: %ld segon"
 msgstr[1] "L'orde CVS s'ha executat correctament. Temps utilitzat: %ld segons"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:221
-msgid "CVS command is running - please wait until it finishes!"
-msgstr "S'està executant l'orde CVS. Espereu fins que acabe !"
+msgid "CVS command is running â?? please wait until it finishes!"
+msgstr "S'està executant l'orde CVS. Espereu fins que acabi"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
 #: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:467
@@ -1601,7 +1627,7 @@ msgstr "Act_ualitza"
 #. Display label
 #. short-cut
 #: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
-msgid "Sync your local copy with the CVS tree"
+msgid "Syncronize your local copy with the CVS tree"
 msgstr "Sincronitzeu la còpia local amb l'arbre CVS"
 
 #. Action name
@@ -1661,21 +1687,13 @@ msgid "CVS popup operations"
 msgstr "Operacions emergents del CVS"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
-msgid "<b>Debugger:</b>"
-msgstr "<b>Depurador:</b>"
-
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:2
-msgid "<b>Remote debugging</b>"
-msgstr "<b>Depuració remota</b>"
-
-#: ../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"
+"program not using the Debug configuration?</span>\n"
 "\n"
 "When optimizations are enabled, the debugger cannot always identify the "
-"source code corresponding to the instructions, some commands can perform in "
-"a strange way, especially steps."
+"source code corresponding to the instructions, so some commands can perform "
+"in a strange way, especially steps."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Segur que voleu depurar un programa "
 "que no utilitza la configuració de depuració?</span>\n"
@@ -1684,116 +1702,124 @@ msgstr ""
 "identificar el codi font al que corresponen les instruccions i algunes ordes "
 "es comportaran de forma estranya, especialment els passos."
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
-msgstr "Afig vigilància"
+msgstr "Afig un seguiment"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:5
 msgid "Address:"
 msgstr "Adreça:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Attach to process"
 msgstr "Adjunta a procés"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
 msgid "Breakpoint properties"
 msgstr "Propietats dels punts de ruptura"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
-#: ../plugins/debug-manager/breakpoints.c:1980
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/breakpoints.c:1987
 msgid "Breakpoints"
 msgstr "Punts de ruptura"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
 msgid "CPU Registers"
 msgstr "Registres de la CPU"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
 msgid "Change Watch"
-msgstr "Canvia una vigilància"
+msgstr "Canvia un seguiment"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
 msgid "Connect to remote target"
 msgstr "Connecta a l'objectiu remot"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Debugger command"
 msgstr "Orde del depurador"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Debugger command:"
 msgstr "Orde del depurador:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
-#: ../plugins/project-wizard/templates/translatable-strings.h:33
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+msgid "Debugger:"
+msgstr "Depurador:"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
+#: ../plugins/project-wizard/templates/translatable-strings.h:34
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
 msgid "Disable"
 msgstr "Inhabilita"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Display process _tree"
 msgstr "Mos_tra l'arbre de processos"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
 msgid "Do not show again"
 msgstr "No ho mostres una altra vegada"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 msgid "Enable _all"
 msgstr "Habilit_a-ho tot"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
 msgid "Enter an address in hexadecimal or select one in the data"
 msgstr "Introduïu una adreça en hexadecimal o seleccioneu-ne una en les dades"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Hide process para_meters"
 msgstr "Oculta els parà_metres del procés"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
 msgid "Inspect"
 msgstr "Inspecciona"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
 msgid "Inspect/Evaluate"
 msgstr "Inspecciona/avalua"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
 #: ../plugins/debug-manager/plugin.c:945
 #: ../plugins/debug-manager/plugin.c:1045
 msgid "Kernel Signals"
 msgstr "Senyals del nucli"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/breakpoints.c:1914
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
 #: ../plugins/debug-manager/memory.c:180
 msgid "Memory"
 msgstr "Memòria"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
 msgid "Pass:"
 msgstr "Passa:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
 msgid "Port:"
 msgstr "Port:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Print:"
 msgstr "Imprimeix:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
 msgid "Program Interrupt"
 msgstr "Interrupció del programa"
 
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+msgid "Remote debugging"
+msgstr "Depuració remota"
+
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:32
 msgid "SIGINT"
 msgstr "SIGINT"
@@ -1836,7 +1862,7 @@ msgid "TCP/IP Connection"
 msgstr "Connexió per TCP/IP"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/project-wizard/property.c:286
+#: ../plugins/project-wizard/property.c:309
 msgid "Yes"
 msgstr "Sí"
 
@@ -1885,165 +1911,165 @@ msgstr "Sup_rimeix-los tots"
 msgid "_Value:"
 msgstr "_Valor:"
 
-#: ../plugins/debug-manager/breakpoints.c:1673
+#: ../plugins/debug-manager/breakpoints.c:1680
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "Segur que voleu suprimir tots els punts de ruptura?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1770
+#: ../plugins/debug-manager/breakpoints.c:1777
 msgid "_Breakpoints"
 msgstr "_Punts de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1778
+#: ../plugins/debug-manager/breakpoints.c:1785
 msgid "Toggle Breakpoint"
 msgstr "Commuta el punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1780
+#: ../plugins/debug-manager/breakpoints.c:1787
 msgid "Toggle breakpoint at the current location"
 msgstr "Commuta el punt de ruptura a la ubicació actual"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1786
-msgid "Add Breakpoint..."
-msgstr "Afig un punt de ruptura..."
+#: ../plugins/debug-manager/breakpoints.c:1793
+msgid "Add Breakpointâ?¦"
+msgstr "Afig un punt de rupturaâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1788
+#: ../plugins/debug-manager/breakpoints.c:1795
 msgid "Add a breakpoint"
 msgstr "Afig un punt de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1794
+#: ../plugins/debug-manager/breakpoints.c:1801
 msgid "Remove Breakpoint"
 msgstr "Suprimeix el punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1796
+#: ../plugins/debug-manager/breakpoints.c:1803
 msgid "Remove a breakpoint"
 msgstr "Suprimeix un punt de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1802
+#: ../plugins/debug-manager/breakpoints.c:1809
 msgid "Edit Breakpoint"
 msgstr "Edita el punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1804
+#: ../plugins/debug-manager/breakpoints.c:1811
 msgid "Edit breakpoint properties"
 msgstr "Edita les propietats del punt de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1810
-#: ../plugins/debug-manager/breakpoints.c:1881
+#: ../plugins/debug-manager/breakpoints.c:1817
+#: ../plugins/debug-manager/breakpoints.c:1888
 msgid "Enable Breakpoint"
 msgstr "Activa el punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1812
-#: ../plugins/debug-manager/breakpoints.c:1882
+#: ../plugins/debug-manager/breakpoints.c:1819
+#: ../plugins/debug-manager/breakpoints.c:1889
 msgid "Enable a breakpoint"
 msgstr "Activa un punt de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1818
+#: ../plugins/debug-manager/breakpoints.c:1825
 msgid "Disable All Breakpoints"
 msgstr "Desactiva tots els punts de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1820
+#: ../plugins/debug-manager/breakpoints.c:1827
 msgid "Deactivate all breakpoints"
 msgstr "Desactiva tots els punts de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1826
+#: ../plugins/debug-manager/breakpoints.c:1833
 msgid "R_emove All Breakpoints"
 msgstr "_Suprimeix tots els punts de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1828
+#: ../plugins/debug-manager/breakpoints.c:1835
 msgid "Remove all breakpoints"
 msgstr "Suprimeix tots els punts de ruptura"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1837
+#: ../plugins/debug-manager/breakpoints.c:1844
 msgid "Jump to Breakpoint"
 msgstr "Salta al punt de ruptura"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1839
+#: ../plugins/debug-manager/breakpoints.c:1846
 msgid "Jump to breakpoint location"
 msgstr "Salta a la ubicació del punt de ruptura"
 
-#: ../plugins/debug-manager/breakpoints.c:1876
+#: ../plugins/debug-manager/breakpoints.c:1883
 msgid "Disable Breakpoint"
 msgstr "Desactiva el punt de ruptura"
 
-#: ../plugins/debug-manager/breakpoints.c:1877
+#: ../plugins/debug-manager/breakpoints.c:1884
 msgid "Disable a breakpoint"
 msgstr "Desactiva el punt de ruptura"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/tools/anjuta-tools.ui.h:6
+#: ../plugins/debug-manager/breakpoints.c:1914
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/breakpoints.c:1914
 #: ../plugins/debug-manager/stack_trace.c:667
 #: ../plugins/debug-manager/threads.c:481
 msgid "Address"
 msgstr "Adreça"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Condition"
 msgstr "Condició"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Pass count"
 msgstr "Número de passades"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "State"
 msgstr "Estat"
 
-#: ../plugins/debug-manager/breakpoints.c:1957
-#: ../plugins/debug-manager/breakpoints.c:1963
+#: ../plugins/debug-manager/breakpoints.c:1964
+#: ../plugins/debug-manager/breakpoints.c:1970
 msgid "Breakpoint operations"
 msgstr "Operacions dels punts de ruptura"
 
 #. create goto menu_item.
-#: ../plugins/debug-manager/data_view.c:390
-#: ../plugins/debug-manager/sparse_view.c:498
-msgid "_Goto address"
+#: ../plugins/debug-manager/data_view.c:386
+#: ../plugins/debug-manager/sparse_view.c:491
+msgid "_Go to address"
 msgstr "_Vés a l'adreça"
 
 #: ../plugins/debug-manager/debug_tree.c:126
-#: ../plugins/gbf-am/gbf-am-properties.c:971 ../plugins/tools/editor.c:468
+#: ../plugins/gbf-am/gbf-am-properties.c:974 ../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:981
-#: ../plugins/run-program/parameters.c:758 ../plugins/tools/editor.c:474
+#: ../plugins/gbf-am/gbf-am-properties.c:984
+#: ../plugins/run-program/parameters.c:763 ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "Valor"
 
@@ -2052,7 +2078,7 @@ msgid "Disassembly"
 msgstr "Desassemblador"
 
 #: ../plugins/debug-manager/info.c:52 ../plugins/debug-manager/info.c:101
-#: ../plugins/project-wizard/druid.c:135
+#: ../plugins/project-wizard/druid.c:138
 msgid "Information"
 msgstr "Informació"
 
@@ -2085,8 +2111,8 @@ msgid "Loaded"
 msgstr "Carregat"
 
 #: ../plugins/debug-manager/plugin.c:429
-msgid "Running..."
-msgstr "S'esta executant..."
+msgid "Runningâ?¦"
+msgstr "S'està executant�"
 
 #: ../plugins/debug-manager/plugin.c:451
 msgid "Stopped"
@@ -2125,16 +2151,16 @@ msgid "Start debugger and load the program"
 msgstr "Inicia el depurador i carrega el programa"
 
 #: ../plugins/debug-manager/plugin.c:853
-msgid "_Debug Process..."
-msgstr "_Depura un procés..."
+msgid "_Debug Processâ?¦"
+msgstr "_Depura un procés�"
 
 #: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
 msgstr "Inicia el depurador i adjunta'l a un programa en execució"
 
 #: ../plugins/debug-manager/plugin.c:861
-msgid "Debug _Remote Target..."
-msgstr "Depura un objectiu _remot..."
+msgid "Debug _Remote Targetâ?¦"
+msgstr "Depura un objectiu _remotâ?¦"
 
 #: ../plugins/debug-manager/plugin.c:863
 msgid "Connect to a remote debugging target"
@@ -2149,8 +2175,8 @@ msgid "Say goodbye to the debugger"
 msgstr "Atureu el depurador"
 
 #: ../plugins/debug-manager/plugin.c:877
-msgid "Add source paths..."
-msgstr "Afig camins de fonts..."
+msgid "Add source pathsâ?¦"
+msgstr "Afig camins de fontsâ?¦"
 
 #: ../plugins/debug-manager/plugin.c:879
 msgid "Add additional source paths"
@@ -2159,8 +2185,8 @@ msgstr "Afegix camins de fonts addicionals"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/plugin.c:889 ../plugins/debug-manager/plugin.c:997
-msgid "Debugger Command..."
-msgstr "Orde del depurador..."
+msgid "Debugger Commandâ?¦"
+msgstr "Orde del depuradorâ?¦"
 
 #. Display label
 #. short-cut
@@ -2207,7 +2233,7 @@ msgstr "Biblioteques compartides"
 
 #: ../plugins/debug-manager/plugin.c:939
 #: ../plugins/debug-manager/plugin.c:1039
-msgid "Show shared libraries mappings"
+msgid "Show shared library mappings"
 msgstr "Mostra les correspondències de les biblioteques compartides"
 
 #: ../plugins/debug-manager/plugin.c:947
@@ -2248,7 +2274,7 @@ msgid "Step _Out"
 msgstr "_Avança"
 
 #: ../plugins/debug-manager/plugin.c:983
-msgid "Single step out of the function"
+msgid "Single step out of function"
 msgstr "Avança fins al final de la funció"
 
 #: ../plugins/debug-manager/plugin.c:989
@@ -2302,12 +2328,11 @@ msgstr "Fes una pausa a l'execució del programa"
 msgid "Debugger operations"
 msgstr "Operacions del depurador"
 
-#: ../plugins/debug-manager/queue.c:543
+#: ../plugins/debug-manager/queue.c:524
 #, c-format
-msgid ""
-"Unable to find one debugger plugin supporting a target with %s mime type"
+msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
 msgstr ""
-"No es pot trobar un connector de depuració que admeta un objectiu per al "
+"No es pot trobar un connector de depuració que admeti un objectiu per al "
 "tipus MIME %s"
 
 #: ../plugins/debug-manager/registers.c:462
@@ -2327,11 +2352,11 @@ msgstr "Actualitza"
 msgid "Shared Object"
 msgstr "Objecte compartit"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
 msgid "From"
 msgstr "De"
 
-#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:116
+#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "A"
 
@@ -2339,7 +2364,7 @@ msgstr "A"
 msgid "Symbols read"
 msgstr "Símbols llegits"
 
-#: ../plugins/debug-manager/sharedlib.c:338
+#: ../plugins/debug-manager/sharedlib.c:341
 msgid "Shared library operations"
 msgstr "Operacions amb biblioteques compartides"
 
@@ -2373,24 +2398,24 @@ msgstr "Envia a un procés"
 msgid "Kernel signals"
 msgstr "Senyals del nucli"
 
-#: ../plugins/debug-manager/signals.c:474
-#: ../plugins/debug-manager/signals.c:480
+#: ../plugins/debug-manager/signals.c:477
+#: ../plugins/debug-manager/signals.c:483
 msgid "Signal operations"
 msgstr "Operacions amb senyals"
 
-#: ../plugins/debug-manager/sparse_view.c:1202
+#: ../plugins/debug-manager/sparse_view.c:1200
 msgid "Show Line Numbers"
 msgstr "Mostra els números de línia"
 
-#: ../plugins/debug-manager/sparse_view.c:1203
+#: ../plugins/debug-manager/sparse_view.c:1201
 msgid "Whether to display line numbers"
 msgstr "Si s'han de mostrar els números de línia"
 
-#: ../plugins/debug-manager/sparse_view.c:1210
+#: ../plugins/debug-manager/sparse_view.c:1208
 msgid "Show Line Markers"
 msgstr "Mostra els marcadors de línia"
 
-#: ../plugins/debug-manager/sparse_view.c:1211
+#: ../plugins/debug-manager/sparse_view.c:1209
 msgid "Whether to display line marker pixbufs"
 msgstr "Si s'han de mostrar les imatges de marcat de línia"
 
@@ -2424,7 +2449,7 @@ msgstr "Fitxer"
 
 #: ../plugins/debug-manager/stack_trace.c:642
 #: ../plugins/debug-manager/threads.c:460
-#: ../plugins/document-manager/plugin.c:921
+#: ../plugins/document-manager/plugin.c:943
 msgid "Line"
 msgstr "Línia"
 
@@ -2441,48 +2466,48 @@ msgstr "Pila"
 msgid "Stack frame operations"
 msgstr "Operacions del marc de la pila"
 
-#: ../plugins/debug-manager/start.c:98
-msgid "Pid"
-msgstr "Identificador de procés"
+#: ../plugins/debug-manager/start.c:99
+msgid "PID"
+msgstr "PID"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "User"
 msgstr "Usuari"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "Time"
-msgstr "Hora"
+msgstr "Temps"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "Command"
 msgstr "Orde"
 
-#: ../plugins/debug-manager/start.c:627
+#: ../plugins/debug-manager/start.c:630
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "No es pot executar: %s."
 
-#: ../plugins/debug-manager/start.c:641
+#: ../plugins/debug-manager/start.c:644
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "No es pot obrir el fitxer: %s\n"
 
-#: ../plugins/debug-manager/start.c:965
+#: ../plugins/debug-manager/start.c:968
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "No es pot obrir %s. No es pot iniciar el depurador."
 
-#: ../plugins/debug-manager/start.c:975
+#: ../plugins/debug-manager/start.c:978
 #, c-format
-msgid "Unable to detect mime-type of %s. Debugger cannot start."
+msgid "Unable to detect MIME type of %s. Debugger cannot start."
 msgstr ""
 "No es pot detectar el tipus MIME de %s. No es pot iniciar el depurador."
 
-#: ../plugins/debug-manager/start.c:1336
+#: ../plugins/debug-manager/start.c:1339
 msgid "Path"
 msgstr "Camí"
 
-#: ../plugins/debug-manager/start.c:1385 ../plugins/gdb/debugger.c:1699
+#: ../plugins/debug-manager/start.c:1388 ../plugins/gdb/debugger.c:1738
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2497,8 +2522,8 @@ msgid "Set current thread"
 msgstr "Estableix el fil actual"
 
 #: ../plugins/debug-manager/threads.c:436
-msgid "Id"
-msgstr "Id"
+msgid "ID"
+msgstr "ID"
 
 #: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
@@ -2511,8 +2536,8 @@ msgstr "Operacions del fil"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/watch.c:372
-msgid "Ins_pect/Evaluate..."
-msgstr "Ins_pecciona/avalua..."
+msgid "Ins_pect/Evaluateâ?¦"
+msgstr "Ins_pecciona/avaluaâ?¦"
 
 #. Display label
 #. short-cut
@@ -2521,16 +2546,16 @@ msgid "Inspect or evaluate an expression or variable"
 msgstr "Inspecciona o avalua una expressió o variable"
 
 #: ../plugins/debug-manager/watch.c:380
-msgid "Add Watch..."
-msgstr "Afig la vigilància..."
+msgid "Add Watchâ?¦"
+msgstr "Afig un seguimentâ?¦"
 
 #: ../plugins/debug-manager/watch.c:388
 msgid "Remove Watch"
-msgstr "Suprimeix la vigilància"
+msgstr "Suprimeix el seguiment"
 
 #: ../plugins/debug-manager/watch.c:396
 msgid "Update Watch"
-msgstr "Actualitza la vigilància"
+msgstr "Actualitza el seguiment"
 
 #: ../plugins/debug-manager/watch.c:404
 msgid "Change Value"
@@ -2552,161 +2577,166 @@ msgstr "Actualització automàtica"
 
 #: ../plugins/debug-manager/watch.c:457 ../plugins/debug-manager/watch.c:463
 msgid "Watch operations"
-msgstr "Operacions de vigilància"
+msgstr "Operacions dels seguiments"
 
 #: ../plugins/debug-manager/watch.c:535
 msgid "Watches"
-msgstr "Vigilància"
+msgstr "Seguiments"
 
-#: ../plugins/devhelp/plugin.c:201
+#: ../plugins/devhelp/plugin.c:202
 msgid "Search Help:"
 msgstr "Cerca ajuda:"
 
-#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:236
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:309
-msgid "_Goto"
+#: ../plugins/devhelp/plugin.c:223 ../plugins/document-manager/plugin.c:239
+#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:314
+msgid "_Go to"
 msgstr "_Vés a"
 
-#: ../plugins/devhelp/plugin.c:231
+#: ../plugins/devhelp/plugin.c:232
 msgid "_API Reference"
 msgstr "_Referències a l'API"
 
-#: ../plugins/devhelp/plugin.c:233
+#: ../plugins/devhelp/plugin.c:234
 msgid "Browse API Pages"
 msgstr "Navega per les pàgines de l'API"
 
-#: ../plugins/devhelp/plugin.c:243
+#: ../plugins/devhelp/plugin.c:244
 msgid "_Context Help"
 msgstr "Ajuda _contextual"
 
-#: ../plugins/devhelp/plugin.c:245
+#: ../plugins/devhelp/plugin.c:246
 msgid "Search help for the current word in the editor"
 msgstr "Cerca ajuda sobre la paraula actual en l'editor"
 
-#: ../plugins/devhelp/plugin.c:251
+#: ../plugins/devhelp/plugin.c:252
 msgid "_Search Help"
 msgstr "_Cerca ajuda"
 
-#: ../plugins/devhelp/plugin.c:253
+#: ../plugins/devhelp/plugin.c:254
 msgid "Search for a term in help"
 msgstr "Cerca un terme a l'ajuda"
 
-#: ../plugins/devhelp/plugin.c:358
+#: ../plugins/devhelp/plugin.c:327
 msgid "Help operations"
 msgstr "Operacions d'ajuda"
 
-#: ../plugins/devhelp/plugin.c:368
+#: ../plugins/devhelp/plugin.c:346 ../plugins/devhelp/plugin.c:464
+#: ../src/anjuta-app.c:502
+msgid "Help"
+msgstr "Ajuda"
+
+#: ../plugins/devhelp/plugin.c:357
 msgid "Contents"
 msgstr "Contingut"
 
-#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
+#: ../plugins/devhelp/plugin.c:363 ../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
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2341
+#: ../plugins/symbol-db/plugin.c:2427
 msgid "Search"
 msgstr "Cerca"
 
-#: ../plugins/devhelp/plugin.c:375 ../plugins/devhelp/plugin.c:495
-#: ../src/anjuta-app.c:502
-msgid "Help"
-msgstr "Ajuda"
-
-#: ../plugins/devhelp/plugin.c:405 ../plugins/devhelp/plugin.c:500
+#: ../plugins/devhelp/plugin.c:381 ../plugins/devhelp/plugin.c:469
 msgid "Help display"
 msgstr "Mostreu l'ajuda"
 
-#: ../plugins/devhelp/plugin.c:422
-msgid "Online"
-msgstr "En línia"
-
-#: ../plugins/document-manager/action-callbacks.c:276
+#: ../plugins/document-manager/action-callbacks.c:277
 #, c-format
 msgid ""
 "Are you sure you want to reload '%s'?\n"
 "Any unsaved changes will be lost."
 msgstr ""
-"Voleu tornar a carregar «%s»?'\n"
-"El canvis sense alçar es perdran."
+"Voleu tornar a carregar «%s»?\n"
+"Els canvis sense alçar es perdran."
 
-#: ../plugins/document-manager/action-callbacks.c:285
+#: ../plugins/document-manager/action-callbacks.c:286
 msgid "_Reload"
 msgstr "_Torna a carregar"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:235
+#: ../plugins/document-manager/anjuta-bookmarks.c:311
 msgid "Add bookmark"
 msgstr "Afig una adreça d'interés"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:241
+#: ../plugins/document-manager/anjuta-bookmarks.c:317
 msgid "Remove bookmark"
 msgstr "Suprimeix l'adreça d'interés"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:255
-#: ../plugins/document-manager/anjuta-bookmarks.c:300
-#: ../plugins/document-manager/plugin.c:411
+#: ../plugins/document-manager/anjuta-bookmarks.c:331
+#: ../plugins/document-manager/anjuta-bookmarks.c:393
+#: ../plugins/document-manager/plugin.c:418
 msgid "Bookmarks"
 msgstr "Adreces d'interés"
 
-#: ../plugins/document-manager/anjuta-docman.c:400
+#: ../plugins/document-manager/anjuta-bookmarks.c:339
+msgid "Rename"
+msgstr "Canvia el nom"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
+#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+msgid "Remove"
+msgstr "Suprimeix"
+
+#: ../plugins/document-manager/anjuta-docman.c:438
 msgid "Close file"
 msgstr "Tanca el fitxer"
 
-#: ../plugins/document-manager/anjuta-docman.c:448
+#: ../plugins/document-manager/anjuta-docman.c:486
 msgid "Path:"
 msgstr "Camí:"
 
-#: ../plugins/document-manager/anjuta-docman.c:565
+#: ../plugins/document-manager/anjuta-docman.c:603
 #: ../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 "Obri un fitxer"
 
-#: ../plugins/document-manager/anjuta-docman.c:584
+#: ../plugins/document-manager/anjuta-docman.c:622
 #: ../plugins/message-view/message-view.c:94
 msgid "Save file as"
 msgstr "Anomena i alça"
 
-#: ../plugins/document-manager/anjuta-docman.c:665
+#: ../plugins/document-manager/anjuta-docman.c:703
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
 "Do you want to replace it with the one you are saving?"
 msgstr ""
 "Ja existeix el fitxer «%s».\n"
-"Voleu reemplaçar-lo amb el que esteu alçant?"
+"Voleu reemplaçar-lo amb el que esteu desant?"
 
-#: ../plugins/document-manager/anjuta-docman.c:674
+#: ../plugins/document-manager/anjuta-docman.c:712
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: ../plugins/document-manager/anjuta-docman.c:1392
+#: ../plugins/document-manager/anjuta-docman.c:1429
 msgid "[read-only]"
 msgstr "[només-lectura]"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:1
-msgid "<b>Autosave</b>"
-msgstr "<b>Alça automàticament</b>"
+msgid "Autosave"
+msgstr "Alça automàticament"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:2
-msgid "<b>Editor tabs</b>"
-msgstr "<b>Pestanyes de l'editor</b>"
-
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
 msgid "Bottom"
 msgstr "Inferior"
 
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
 msgid "Do not show tabs"
 msgstr "No mostres les pestanyes"
 
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+msgid "Editor tabs"
+msgstr "Pestanyes de l'editor"
+
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:5
 msgid "Enable files autosave"
 msgstr "Habilita l'alçat automàtic"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:6
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
 msgid "Left"
 msgstr "Esquerra"
 
@@ -2715,17 +2745,17 @@ msgid "Position:"
 msgstr "Posició:"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:8
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
 msgid "Right"
 msgstr "Dreta"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:9
 msgid "Save files interval in minutes"
-msgstr "Interval en minuts per a alçar fitxers"
+msgstr "Interval en minuts per alçar fitxers"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:10
 msgid "Save session interval in minutes"
-msgstr "Interval en minuts per a alçar la sessió"
+msgstr "Interval en minuts per alçar la sessió"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:11
 msgid "Sorted by most recent use"
@@ -2740,173 +2770,174 @@ msgid "Sorted in opening order"
 msgstr "Ordenats per quan s'obren"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:14
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 msgid "Top"
-msgstr "Superior"
+msgstr "Principi"
 
-#: ../plugins/document-manager/plugin.c:147
+#: ../plugins/document-manager/plugin.c:150
 msgid "_Save"
 msgstr "Al_ça"
 
-#: ../plugins/document-manager/plugin.c:148
+#: ../plugins/document-manager/plugin.c:151
 msgid "Save current file"
 msgstr "Alça el fitxer actual"
 
-#: ../plugins/document-manager/plugin.c:149
-msgid "Save _As..."
-msgstr "_Anomena i alça..."
+#: ../plugins/document-manager/plugin.c:152
+msgid "Save _Asâ?¦"
+msgstr "_Anomena i alça�"
 
-#: ../plugins/document-manager/plugin.c:150
+#: ../plugins/document-manager/plugin.c:153
 msgid "Save the current file with a different name"
 msgstr "Alça el fitxer actual amb un nom diferent"
 
-#: ../plugins/document-manager/plugin.c:152
+#: ../plugins/document-manager/plugin.c:155
 msgid "Save A_ll"
 msgstr "Alça-ho to_t"
 
-#: ../plugins/document-manager/plugin.c:153
+#: ../plugins/document-manager/plugin.c:156
 msgid "Save all currently open files, except new files"
 msgstr "Alça tots els fitxers oberts actualment, excepte els fitxers nous"
 
-#: ../plugins/document-manager/plugin.c:155
+#: ../plugins/document-manager/plugin.c:158
 msgid "_Close File"
 msgstr "Tan_ca el fitxer"
 
-#: ../plugins/document-manager/plugin.c:156
+#: ../plugins/document-manager/plugin.c:159
 msgid "Close current file"
 msgstr "Tanca el fitxer actual"
 
-#: ../plugins/document-manager/plugin.c:158
+#: ../plugins/document-manager/plugin.c:161
 msgid "Close All"
 msgstr "Tanca'ls tots"
 
-#: ../plugins/document-manager/plugin.c:159
+#: ../plugins/document-manager/plugin.c:162
 msgid "Close all files"
 msgstr "Tanca tots els fitxers"
 
-#: ../plugins/document-manager/plugin.c:161
+#: ../plugins/document-manager/plugin.c:164
 msgid "Reload F_ile"
 msgstr "Torna a carregar el f_itxer"
 
-#: ../plugins/document-manager/plugin.c:162
+#: ../plugins/document-manager/plugin.c:165
 msgid "Reload current file"
 msgstr "Torna a carregar el fitxer actual"
 
-#: ../plugins/document-manager/plugin.c:164
+#: ../plugins/document-manager/plugin.c:167
 msgid "Recent _Files"
 msgstr "_Fitxers recents"
 
-#: ../plugins/document-manager/plugin.c:168
-msgid "_Print..."
-msgstr "_Imprimeix..."
+#: ../plugins/document-manager/plugin.c:171
+msgid "_Printâ?¦"
+msgstr "_Imprimeixâ?¦"
 
-#: ../plugins/document-manager/plugin.c:169
+#: ../plugins/document-manager/plugin.c:172
 msgid "Print the current file"
 msgstr "Imprimeix el fitxer actual"
 
-#: ../plugins/document-manager/plugin.c:176
+#: ../plugins/document-manager/plugin.c:179
 msgid "_Print Preview"
 msgstr "_Previsualitza la impressió"
 
-#: ../plugins/document-manager/plugin.c:177
-msgid "Preview the current file in print-format"
+#: ../plugins/document-manager/plugin.c:180
+msgid "Preview the current file in print format"
 msgstr "Previsualitza el fitxer actual en format d'impressió"
 
-#: ../plugins/document-manager/plugin.c:182
+#: ../plugins/document-manager/plugin.c:185
 msgid "_Transform"
 msgstr "_Transforma"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:183
+#: ../plugins/document-manager/plugin.c:186
 msgid "_Make Selection Uppercase"
 msgstr "Converteix la selecció en _majúscules"
 
-#: ../plugins/document-manager/plugin.c:184
+#: ../plugins/document-manager/plugin.c:187
 msgid "Make the selected text uppercase"
 msgstr "Converteix el text seleccionat en majúscules"
 
-#: ../plugins/document-manager/plugin.c:186
+#: ../plugins/document-manager/plugin.c:189
 msgid "Make Selection Lowercase"
 msgstr "Converteix la selecció en minúscules"
 
-#: ../plugins/document-manager/plugin.c:187
+#: ../plugins/document-manager/plugin.c:190
 msgid "Make the selected text lowercase"
 msgstr "Converteix el text seleccionat en minúscules"
 
-#: ../plugins/document-manager/plugin.c:189
+#: ../plugins/document-manager/plugin.c:192
 msgid "Convert EOL to CRLF"
-msgstr "Converteix EOL a CRLF"
+msgstr "Converteix el final de línia a CRLF"
 
-#: ../plugins/document-manager/plugin.c:190
+#: ../plugins/document-manager/plugin.c:193
 msgid "Convert End Of Line characters to DOS EOL (CRLF)"
-msgstr "Converteix els caràcters de fi de línia a tipus DOS (CRLF)"
+msgstr "Converteix els caràcters de final de línia a tipus DOS (CRLF)"
 
-#: ../plugins/document-manager/plugin.c:192
+#: ../plugins/document-manager/plugin.c:195
 msgid "Convert EOL to LF"
-msgstr "Converteix EOL a LF"
+msgstr "Converteix el final de línia a LF"
 
-#: ../plugins/document-manager/plugin.c:193
+#: ../plugins/document-manager/plugin.c:196
 msgid "Convert End Of Line characters to Unix EOL (LF)"
-msgstr "Converteix els caràcters fi de línia a tipus Unix (LF)"
+msgstr "Converteix els caràcters final de línia a tipus Unix (LF)"
 
-#: ../plugins/document-manager/plugin.c:195
+#: ../plugins/document-manager/plugin.c:198
 msgid "Convert EOL to CR"
-msgstr "Converteix EOL a CR"
+msgstr "Converteix el final de línia a CR"
 
-#: ../plugins/document-manager/plugin.c:196
+#: ../plugins/document-manager/plugin.c:199
 msgid "Convert End Of Line characters to Mac OS EOL (CR)"
 msgstr "Converteix caràcters de fi de línia a tipus MacOS (CR)"
 
-#: ../plugins/document-manager/plugin.c:198
+#: ../plugins/document-manager/plugin.c:201
 msgid "Convert EOL to Majority EOL"
-msgstr "Converteix EOL a la majoria d'EOL"
+msgstr "Converteix els finals de línia a la majoria"
 
-#: ../plugins/document-manager/plugin.c:199
-msgid "Convert End Of Line characters to majority of the EOL found in the file"
+#: ../plugins/document-manager/plugin.c:202
+msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr ""
-"Converteix caràcters de fi de línia a la majoria d'EOL trobats al fitxer"
+"Converteix caràcters de final de línia als més habituals que es troben al "
+"fitxer"
 
-#: ../plugins/document-manager/plugin.c:204
+#: ../plugins/document-manager/plugin.c:207
 msgid "_Select"
-msgstr "_Seleccioneu"
+msgstr "_Selecciona"
 
-#: ../plugins/document-manager/plugin.c:206
+#: ../plugins/document-manager/plugin.c:209
 msgid "Select _All"
 msgstr "Seleccion_a-ho tot"
 
-#: ../plugins/document-manager/plugin.c:207
+#: ../plugins/document-manager/plugin.c:210
 msgid "Select all text in the editor"
 msgstr "Selecciona tot el text en l'editor"
 
-#: ../plugins/document-manager/plugin.c:209
+#: ../plugins/document-manager/plugin.c:212
 msgid "Select _Code Block"
 msgstr "Sele_cciona el bloc de codi"
 
-#: ../plugins/document-manager/plugin.c:210
+#: ../plugins/document-manager/plugin.c:213
 msgid "Select the current code block"
 msgstr "Selecciona el bloc de codi actual"
 
-#: ../plugins/document-manager/plugin.c:215
+#: ../plugins/document-manager/plugin.c:218
 msgid "Co_mment"
 msgstr "Co_mentari"
 
 #. Block comment: Uses line-comment (comment that affects only single line
 #. such as '//' or '#') and comments a block of lines.
-#: ../plugins/document-manager/plugin.c:218
+#: ../plugins/document-manager/plugin.c:221
 msgid "_Block Comment/Uncomment"
 msgstr "Comenta/descomenta com a _bloc"
 
-#: ../plugins/document-manager/plugin.c:219
+#: ../plugins/document-manager/plugin.c:222
 msgid "Block comment the selected text"
 msgstr "Comenta el text seleccionat com a bloc"
 
 #. Box comment: Uses stream-comment to comment a block of lines, usually with
 #. some decorations, to give an appearance of box.
-#: ../plugins/document-manager/plugin.c:223
+#: ../plugins/document-manager/plugin.c:226
 msgid "Bo_x Comment/Uncomment"
 msgstr "Comenta/descomenta com a cai_xa"
 
-#: ../plugins/document-manager/plugin.c:224
+#: ../plugins/document-manager/plugin.c:227
 msgid "Box comment the selected text"
 msgstr "Comenta el text seleccionat com a caixa"
 
@@ -2914,432 +2945,440 @@ msgstr "Comenta el text seleccionat com a caixa"
 #. characters -- has start and end comment code) and comments any code from
 #. arbitrary start position to arbitrary end position (can be in middle of
 #. lines).
-#: ../plugins/document-manager/plugin.c:230
+#: ../plugins/document-manager/plugin.c:233
 msgid "_Stream Comment/Uncomment"
 msgstr "Comenta/de_scomenta inici i final"
 
-#: ../plugins/document-manager/plugin.c:231
+#: ../plugins/document-manager/plugin.c:234
 msgid "Stream comment the selected text"
 msgstr "Comenta el text seleccionat a l'inici i al final"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:237
-msgid "_Line Number..."
-msgstr "Número de _línia..."
+#: ../plugins/document-manager/plugin.c:240
+msgid "_Line Numberâ?¦"
+msgstr "Número de _línia�"
 
-#: ../plugins/document-manager/plugin.c:238
+#: ../plugins/document-manager/plugin.c:241
 msgid "Go to a particular line in the editor"
 msgstr "Vés a una línia en concret en l'editor"
 
-#: ../plugins/document-manager/plugin.c:240
+#: ../plugins/document-manager/plugin.c:243
 msgid "Matching _Brace"
 msgstr "Clau o _parèntesi concordant"
 
-#: ../plugins/document-manager/plugin.c:241
+#: ../plugins/document-manager/plugin.c:244
 msgid "Go to the matching brace in the editor"
 msgstr "Vés a la clau o parèntesi concordant en l'editor"
 
-#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/document-manager/plugin.c:246
 msgid "_Start of Block"
 msgstr "_Inici del bloc"
 
-#: ../plugins/document-manager/plugin.c:244
+#: ../plugins/document-manager/plugin.c:247
 msgid "Go to the start of the current block"
 msgstr "Vés a l'inici del bloc actual"
 
-#: ../plugins/document-manager/plugin.c:246
+#: ../plugins/document-manager/plugin.c:249
 msgid "_End of Block"
 msgstr "_Fi del bloc"
 
-#: ../plugins/document-manager/plugin.c:247
+#: ../plugins/document-manager/plugin.c:250
 msgid "Go to the end of the current block"
 msgstr "Vés a la fi del bloc actual"
 
-#: ../plugins/document-manager/plugin.c:249
+#: ../plugins/document-manager/plugin.c:252
 msgid "Previous _History"
 msgstr "_Historial anterior"
 
-#: ../plugins/document-manager/plugin.c:250
-msgid "Goto previous history"
+#: ../plugins/document-manager/plugin.c:253
+msgid "Go to previous history"
 msgstr "Vés a l'historial anterior"
 
-#: ../plugins/document-manager/plugin.c:252
+#: ../plugins/document-manager/plugin.c:255
 msgid "Next Histor_y"
 msgstr "Historial _següent"
 
-#: ../plugins/document-manager/plugin.c:253
-msgid "Goto next history"
+#: ../plugins/document-manager/plugin.c:256
+msgid "Go to next history"
 msgstr "Vés a l'historial següent"
 
-#: ../plugins/document-manager/plugin.c:258 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:261 ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "_Cerca"
 
-#: ../plugins/document-manager/plugin.c:259
+#: ../plugins/document-manager/plugin.c:262
 msgid "_Quick Search"
 msgstr "Cerca _ràpida"
 
-#: ../plugins/document-manager/plugin.c:260
+#: ../plugins/document-manager/plugin.c:263
 msgid "Quick editor embedded search"
 msgstr "Cerca ràpida incrustada a l'editor"
 
-#: ../plugins/document-manager/plugin.c:262
+#: ../plugins/document-manager/plugin.c:265
 msgid "Quick _ReSearch"
 msgstr "_Repeteix la cerca ràpida"
 
-#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/document-manager/plugin.c:266
 msgid "Repeat quick search"
 msgstr "Repeteix la cerca ràpida"
 
-#: ../plugins/document-manager/plugin.c:268 ../plugins/gtodo/interface.c:168
+#: ../plugins/document-manager/plugin.c:271 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1915
+#: ../plugins/language-support-cpp-java/plugin.c:1882
 msgid "_Edit"
 msgstr "_Edita"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:269
+#: ../plugins/document-manager/plugin.c:272
 msgid "_Editor"
 msgstr "_Editor"
 
-#: ../plugins/document-manager/plugin.c:276
+#: ../plugins/document-manager/plugin.c:279
 msgid "_Add Editor View"
 msgstr "_Afig una visualització d'editor"
 
-#: ../plugins/document-manager/plugin.c:277
+#: ../plugins/document-manager/plugin.c:280
 msgid "Add one more view of current document"
 msgstr "Afig una visualització més del document"
 
-#: ../plugins/document-manager/plugin.c:279
+#: ../plugins/document-manager/plugin.c:282
 msgid "_Remove Editor View"
 msgstr "_Suprimeix la visualització de l'editor"
 
-#: ../plugins/document-manager/plugin.c:280
+#: ../plugins/document-manager/plugin.c:283
 msgid "Remove current view of the document"
 msgstr "Suprimeix la visualització actual de l'editor"
 
-#: ../plugins/document-manager/plugin.c:282
+#: ../plugins/document-manager/plugin.c:285
 msgid "U_ndo"
 msgstr "Des_fés"
 
-#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4089
+#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4076
 msgid "Undo the last action"
 msgstr "Desfés l'última acció"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:288
 msgid "_Redo"
 msgstr "_Refés"
 
-#: ../plugins/document-manager/plugin.c:286
+#: ../plugins/document-manager/plugin.c:289
 msgid "Redo the last undone action"
 msgstr "Torna a fer la darrera acció desfeta"
 
-#: ../plugins/document-manager/plugin.c:288
+#: ../plugins/document-manager/plugin.c:291
 msgid "C_ut"
 msgstr "Reta_lla"
 
-#: ../plugins/document-manager/plugin.c:289
+#: ../plugins/document-manager/plugin.c:292
 msgid "Cut the selected text from the editor to the clipboard"
 msgstr "Retalla el text seleccionat de l'editor al porta-retalls"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:592
+#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:609
 msgid "_Copy"
 msgstr "_Copia"
 
-#: ../plugins/document-manager/plugin.c:292
+#: ../plugins/document-manager/plugin.c:295
 msgid "Copy the selected text to the clipboard"
 msgstr "Copia el text seleccionat al porta-retalls"
 
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:600
+#: ../plugins/document-manager/plugin.c:297 ../plugins/terminal/terminal.c:617
 msgid "_Paste"
 msgstr "_Enganxa"
 
-#: ../plugins/document-manager/plugin.c:295
+#: ../plugins/document-manager/plugin.c:298
 msgid "Paste the content of clipboard at the current position"
 msgstr "Enganxa el contingut del porta-retalls a la posició actual"
 
-#: ../plugins/document-manager/plugin.c:303
+#: ../plugins/document-manager/plugin.c:306
 msgid "_Clear"
 msgstr "_Buida"
 
-#: ../plugins/document-manager/plugin.c:304
+#: ../plugins/document-manager/plugin.c:307
 msgid "Delete the selected text from the editor"
 msgstr "Suprimeix el text seleccionat de l'editor"
 
-#: ../plugins/document-manager/plugin.c:309
+#: ../plugins/document-manager/plugin.c:310
+msgid "_Auto-Complete"
+msgstr "Completa _automàticament"
+
+#: ../plugins/document-manager/plugin.c:311
+msgid "Auto-complete the current word"
+msgstr "Completa automàticament la paraula actual"
+
+#: ../plugins/document-manager/plugin.c:316
 msgid "_Line Number Margin"
 msgstr "Marge del número de _línia"
 
-#: ../plugins/document-manager/plugin.c:310
+#: ../plugins/document-manager/plugin.c:317
 msgid "Show/Hide line numbers"
 msgstr "Mostra/oculta el número de línia"
 
-#: ../plugins/document-manager/plugin.c:312
+#: ../plugins/document-manager/plugin.c:319
 msgid "_Marker Margin"
 msgstr "Marge dels _marcadors"
 
-#: ../plugins/document-manager/plugin.c:313
+#: ../plugins/document-manager/plugin.c:320
 msgid "Show/Hide marker margin"
 msgstr "Mostra/oculta el marge dels marcadors"
 
-#: ../plugins/document-manager/plugin.c:315
+#: ../plugins/document-manager/plugin.c:322
 msgid "_Code Fold Margin"
 msgstr "Marge de desplegament de _codi"
 
-#: ../plugins/document-manager/plugin.c:316
+#: ../plugins/document-manager/plugin.c:323
 msgid "Show/Hide code fold margin"
 msgstr "Mostra/oculta el marge de desplegament de codi"
 
-#: ../plugins/document-manager/plugin.c:318
+#: ../plugins/document-manager/plugin.c:325
 msgid "_Indentation Guides"
 msgstr "Gu_ies de sagnat"
 
-#: ../plugins/document-manager/plugin.c:319
+#: ../plugins/document-manager/plugin.c:326
 msgid "Show/Hide indentation guides"
 msgstr "Mostra/oculta les guies de sagnat"
 
-#: ../plugins/document-manager/plugin.c:321
+#: ../plugins/document-manager/plugin.c:328
 msgid "_White Space"
 msgstr "Espais en _blanc"
 
-#: ../plugins/document-manager/plugin.c:322
+#: ../plugins/document-manager/plugin.c:329
 msgid "Show/Hide white spaces"
 msgstr "Mostra/oculta els espais en blanc"
 
-#: ../plugins/document-manager/plugin.c:324
+#: ../plugins/document-manager/plugin.c:331
 msgid "_Line End Characters"
 msgstr "Caràcters final de _línia"
 
-#: ../plugins/document-manager/plugin.c:325
+#: ../plugins/document-manager/plugin.c:332
 msgid "Show/Hide line end characters"
 msgstr "Mostra/oculta els caràcters de final de línia"
 
-#: ../plugins/document-manager/plugin.c:327
+#: ../plugins/document-manager/plugin.c:334
 msgid "Line _Wrapping"
 msgstr "Ajustar de _línia"
 
-#: ../plugins/document-manager/plugin.c:328
+#: ../plugins/document-manager/plugin.c:335
 msgid "Enable/disable line wrapping"
 msgstr "Habilita/inhabilita l'ajust de línia al final"
 
-#: ../plugins/document-manager/plugin.c:333
+#: ../plugins/document-manager/plugin.c:340
 msgid "Zoom In"
 msgstr "Apropa"
 
-#: ../plugins/document-manager/plugin.c:334
+#: ../plugins/document-manager/plugin.c:341
 msgid "Zoom in: Increase font size"
 msgstr "Augmenta la mida de la lletra"
 
-#: ../plugins/document-manager/plugin.c:336
+#: ../plugins/document-manager/plugin.c:343
 msgid "Zoom Out"
 msgstr "Allunya"
 
-#: ../plugins/document-manager/plugin.c:337
+#: ../plugins/document-manager/plugin.c:344
 msgid "Zoom out: Decrease font size"
 msgstr "Redueix la mida de la lletra"
 
-#: ../plugins/document-manager/plugin.c:342
+#: ../plugins/document-manager/plugin.c:349
 msgid "_Highlight Mode"
 msgstr "Mode de _ressaltat"
 
-#: ../plugins/document-manager/plugin.c:346
+#: ../plugins/document-manager/plugin.c:353
 msgid "_Close All Folds"
 msgstr "Plega totes les vistes de _codi"
 
-#: ../plugins/document-manager/plugin.c:347
+#: ../plugins/document-manager/plugin.c:354
 msgid "Close all code folds in the editor"
 msgstr "Plega totes les vistes de codi en l'editor"
 
-#: ../plugins/document-manager/plugin.c:349
+#: ../plugins/document-manager/plugin.c:356
 msgid "_Open All Folds"
 msgstr "Desplega t_otes les vistes de codi"
 
-#: ../plugins/document-manager/plugin.c:350
+#: ../plugins/document-manager/plugin.c:357
 msgid "Open all code folds in the editor"
 msgstr "Desplega totes les vistes de codi en l'editor"
 
-#: ../plugins/document-manager/plugin.c:352
+#: ../plugins/document-manager/plugin.c:359
 msgid "_Toggle Current Fold"
 msgstr "Commu_ta la visualització de codi actual"
 
-#: ../plugins/document-manager/plugin.c:353
+#: ../plugins/document-manager/plugin.c:360
 msgid "Toggle current code fold in the editor"
 msgstr "Commuta la visualització de codi actual en l'editor"
 
-#: ../plugins/document-manager/plugin.c:358
+#: ../plugins/document-manager/plugin.c:365
 msgid "_Documents"
 msgstr "_Documents"
 
-#: ../plugins/document-manager/plugin.c:359
+#: ../plugins/document-manager/plugin.c:366
 msgid "Previous Document"
 msgstr "Document anterior"
 
-#: ../plugins/document-manager/plugin.c:360
+#: ../plugins/document-manager/plugin.c:367
 msgid "Switch to previous document"
 msgstr "Commuta al document anterior"
 
-#: ../plugins/document-manager/plugin.c:362
+#: ../plugins/document-manager/plugin.c:369
 msgid "Next Document"
 msgstr "Document següent"
 
-#: ../plugins/document-manager/plugin.c:363
+#: ../plugins/document-manager/plugin.c:370
 msgid "Switch to next document"
 msgstr "Commuta al document següent"
 
-#: ../plugins/document-manager/plugin.c:368
+#: ../plugins/document-manager/plugin.c:375
 msgid "Bookmar_k"
 msgstr "Adreça d'inte_rès"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:376
 msgid "_Add Bookmark"
 msgstr "_Afig una adreça d'interés"
 
-#: ../plugins/document-manager/plugin.c:370
+#: ../plugins/document-manager/plugin.c:377
 msgid "Add a bookmark at the current line position"
 msgstr "Afig una adreça d'interés a la posició de la línia actual"
 
-#: ../plugins/document-manager/plugin.c:372
+#: ../plugins/document-manager/plugin.c:379
 msgid "_Previous Bookmark"
 msgstr "Adreça d'interés _anterior"
 
-#: ../plugins/document-manager/plugin.c:373
+#: ../plugins/document-manager/plugin.c:380
 msgid "Jump to the previous bookmark in the file"
 msgstr "Vés a l'adreça d'interés anterior del fitxer"
 
-#: ../plugins/document-manager/plugin.c:375
+#: ../plugins/document-manager/plugin.c:382
 msgid "_Next Bookmark"
 msgstr "Adreça d'interés _següent"
 
-#: ../plugins/document-manager/plugin.c:376
+#: ../plugins/document-manager/plugin.c:383
 msgid "Jump to the next bookmark in the file"
 msgstr "Vés a l'adreça d'interés següent del fitxer"
 
-#: ../plugins/document-manager/plugin.c:378
+#: ../plugins/document-manager/plugin.c:385
 msgid "_Clear All Bookmarks"
 msgstr "Neteja totes les adre_ces d'interés"
 
-#: ../plugins/document-manager/plugin.c:379
+#: ../plugins/document-manager/plugin.c:386
 msgid "Clear bookmarks"
 msgstr "Neteja les adreces d'interés"
 
-#: ../plugins/document-manager/plugin.c:398
+#: ../plugins/document-manager/plugin.c:405
 msgid "Editor file operations"
 msgstr "Operacions de fitxer de l'editor"
 
-#: ../plugins/document-manager/plugin.c:399
+#: ../plugins/document-manager/plugin.c:406
 msgid "Editor print operations"
 msgstr "Operacions d'impressió de l'editor"
 
-#: ../plugins/document-manager/plugin.c:400
+#: ../plugins/document-manager/plugin.c:407
 msgid "Editor text transformation"
 msgstr "Transformació del text de l'editor"
 
-#: ../plugins/document-manager/plugin.c:401
+#: ../plugins/document-manager/plugin.c:408
 msgid "Editor text selection"
 msgstr "Selecció de text de l'editor"
 
 #. { actions_insert, G_N_ELEMENTS (actions_insert), "ActionGroupEditorInsert", N_("Editor text insertions") },
-#: ../plugins/document-manager/plugin.c:403
+#: ../plugins/document-manager/plugin.c:410
 msgid "Editor code commenting"
 msgstr "Comentaris del codi de l'editor"
 
-#: ../plugins/document-manager/plugin.c:404
+#: ../plugins/document-manager/plugin.c:411
 msgid "Editor navigations"
 msgstr "Navegacions de l'editor"
 
-#: ../plugins/document-manager/plugin.c:405
+#: ../plugins/document-manager/plugin.c:412
 msgid "Editor edit operations"
 msgstr "Operacions d'edició de l'editor"
 
-#: ../plugins/document-manager/plugin.c:406
+#: ../plugins/document-manager/plugin.c:413
 msgid "Editor zoom operations"
 msgstr "Operacions d'ampliació de l'editor"
 
-#: ../plugins/document-manager/plugin.c:407
+#: ../plugins/document-manager/plugin.c:414
 msgid "Editor syntax highlighting styles"
 msgstr "Estils de ressaltat de sintaxi de l'editor"
 
-#: ../plugins/document-manager/plugin.c:408
+#: ../plugins/document-manager/plugin.c:415
 msgid "Editor text formating"
 msgstr "Format del text de l'editor"
 
-#: ../plugins/document-manager/plugin.c:409
+#: ../plugins/document-manager/plugin.c:416
 msgid "Simple searching"
-msgstr "Cerca senzilla"
+msgstr "Cercant senzilla"
 
-#: ../plugins/document-manager/plugin.c:410
-#: ../plugins/document-manager/plugin.c:1713
-#: ../plugins/document-manager/plugin.c:2130
-#: ../plugins/document-manager/plugin.c:2140
+#: ../plugins/document-manager/plugin.c:417
+#: ../plugins/document-manager/plugin.c:1734
+#: ../plugins/document-manager/plugin.c:2151
+#: ../plugins/document-manager/plugin.c:2161
 msgid "Documents"
 msgstr "Documents"
 
-#: ../plugins/document-manager/plugin.c:415
+#: ../plugins/document-manager/plugin.c:422
 msgid "Editor view settings"
 msgstr "Configuració de la visualització de l'editor"
 
-#: ../plugins/document-manager/plugin.c:600
+#: ../plugins/document-manager/plugin.c:607
 msgid "Reload"
 msgstr "Torna a carregar"
 
-#: ../plugins/document-manager/plugin.c:606
-msgid "Goto"
+#: ../plugins/document-manager/plugin.c:613
+msgid "Go to"
 msgstr "Vés a"
 
-#: ../plugins/document-manager/plugin.c:909
+#: ../plugins/document-manager/plugin.c:928
 msgid "OVR"
 msgstr "SOB"
 
-#: ../plugins/document-manager/plugin.c:913
+#: ../plugins/document-manager/plugin.c:932
 msgid "INS"
 msgstr "INS"
 
-#: ../plugins/document-manager/plugin.c:917
-#: ../plugins/document-manager/plugin.c:919
+#: ../plugins/document-manager/plugin.c:938
+#: ../plugins/document-manager/plugin.c:941
 msgid "Zoom"
 msgstr "Ampliació"
 
-#: ../plugins/document-manager/plugin.c:922
+#: ../plugins/document-manager/plugin.c:944
 msgid "Col"
 msgstr "Col"
 
-#: ../plugins/document-manager/plugin.c:923
+#: ../plugins/document-manager/plugin.c:945
 msgid "Mode"
 msgstr "Mode"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1003
+#: ../plugins/document-manager/plugin.c:1025
 msgid "Automatic"
 msgstr "Automàtic"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1537
+#: ../plugins/document-manager/plugin.c:1558
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "No s'ha pogut alçar automàticament el %s"
 
-#: ../plugins/document-manager/plugin.c:1551
+#: ../plugins/document-manager/plugin.c:1572
 msgid "Autosave completed"
 msgstr "S'ha completat l'alçat automàtic"
 
 #: ../plugins/document-manager/search-box.c:383
 #, c-format
-msgid "Search for \"%s\" reached end and was continued on top."
+msgid "Search for \"%s\" reached the end and was continued at the top."
 msgstr "La cerca de «%s» ha arribat al final i ha continuat pel començament."
 
 #: ../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."
+"Search for \"%s\" reached the end and was continued at the top but no new "
+"match was found."
 msgstr ""
 "La cerca de «%s» ha arribat al final i ha continuat pel començament però no "
 "s'ha trobat cap concordança."
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.ui.h:22
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Match case"
 msgstr "Coincidència de majúscules i minúscules"
 
@@ -3360,7 +3399,7 @@ msgstr "No s'ha trobat cap element"
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:670
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:726
 #, c-format
-msgid "No recently used resource found with URI `%s'"
+msgid "No recently used resource found with URI \"%s\""
 msgstr "No s'ha trobat cap recurs utilitzat recentment amb l'URI «%s»"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:750
@@ -3370,6 +3409,7 @@ msgid "This function is not implemented for widgets of class '%s'"
 msgstr "Esta funció no està implementada per a ginys de la classe «%s»"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:937
+#: ../plugins/starter/starter.c:111
 #, c-format
 msgid "Open '%s'"
 msgstr "Obri «%s»"
@@ -3382,29 +3422,27 @@ msgstr "Element desconegut"
 #. * in a recent files menu. The %d is the number of the item,
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:980
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:978
 #, c-format
-msgid "recent menu label|_%d. %s"
+msgctxt "recent menu label"
+msgid "_%d. %s"
 msgstr "_%d. %s"
 
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:987
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:983
 #, c-format
-msgid "recent menu label|%d. %s"
+msgctxt "recent menu label"
+msgid "%d. %s"
 msgstr "%d. %s"
 
 # Projecte_Mandrake [tm-mandrake.po]
 #: ../plugins/file-loader/plugin.c:116
 #, c-format
 msgid ""
-"Can not open \"%s\".\n"
+"Cannot open \"%s\".\n"
 "\n"
 "%s"
 msgstr ""
@@ -3420,13 +3458,13 @@ msgid ""
 "There is no plugin, default action, or application configured to handle this "
 "file type.\n"
 "\n"
-"Mime type: %s\n"
+"MIME type: %s\n"
 "\n"
 "You may choose to try opening it with the following plugins or applications."
 msgstr ""
 "<b>No es pot obrir «%s»</b>.\n"
 "\n"
-"No hi ha cap connector, acció predeterminada o aplicació configurada per a "
+"No hi ha cap connector, acció predeterminada o aplicació configurada per "
 "gestionar este tipus de fitxer.\n"
 "\n"
 "Tipus MIME: %s.\n"
@@ -3481,11 +3519,11 @@ msgid "Python source files"
 msgstr "Fitxers de codi Python"
 
 #: ../plugins/file-loader/plugin.c:555
-msgid "Hyper text markup files"
+msgid "Hypertext markup files"
 msgstr "Fitxers HTML"
 
 #: ../plugins/file-loader/plugin.c:564
-msgid "Shell scripts files"
+msgid "Shell script files"
 msgstr "Fitxers d'script per a l'intèrpret d'ordes"
 
 #: ../plugins/file-loader/plugin.c:569
@@ -3514,8 +3552,8 @@ msgid "New empty file"
 msgstr "Fitxer buit nou"
 
 #: ../plugins/file-loader/plugin.c:892
-msgid "_Open..."
-msgstr "_Obri..."
+msgid "_Openâ?¦"
+msgstr "_Obriâ?¦"
 
 #: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
@@ -3571,9 +3609,9 @@ msgstr "No s'ha trobat el fitxer"
 #: ../plugins/file-loader/plugin.c:1437
 #, c-format
 msgid "Please select a plugin to open <b>%s</b>."
-msgstr "Seleccioneu un connector per a obrir <b>%s</b>."
+msgstr "Seleccioneu un connector per obrir <b>%s</b>."
 
-#: ../plugins/file-loader/plugin.c:1441
+#: ../plugins/file-loader/plugin.c:1441 ../plugins/project-import/plugin.c:205
 msgid "Open With"
 msgstr "Obri amb"
 
@@ -3602,7 +3640,8 @@ msgid "Filter"
 msgstr "Filtre"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2334 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2336 ../plugins/symbol-db/plugin.c:2403
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Global"
 
@@ -3610,25 +3649,20 @@ msgstr "Global"
 msgid "Root directory if no project is open:"
 msgstr "Directori arrel si no hi ha cap projecte obert:"
 
-#: ../plugins/file-manager/file-model.c:119
-#: ../plugins/symbol-db/symbol-db-view.c:799
+#: ../plugins/file-manager/file-model.c:120
 msgid "Loading..."
 msgstr "S'està carregant..."
 
-#: ../plugins/file-manager/file-view.c:73
-msgid "Up-to-date"
-msgstr "Actualitzat"
-
-#: ../plugins/file-manager/file-view.c:510
+#: ../plugins/file-manager/file-view.c:569
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: ../plugins/file-manager/file-view.c:590
-msgid "Base uri"
+#: ../plugins/file-manager/file-view.c:656
+msgid "Base URI"
 msgstr "URI base"
 
-#: ../plugins/file-manager/file-view.c:591
-msgid "Uri of the top-most path displayed"
+#: ../plugins/file-manager/file-view.c:657
+msgid "URI of the top-most path displayed"
 msgstr "URI del camí que s'ha mostrat més"
 
 #: ../plugins/file-manager/plugin.c:74
@@ -3639,41 +3673,37 @@ msgstr "Canvia el _nom"
 msgid "Rename file or directory"
 msgstr "Canvia el nom del fitxer o directori"
 
-#: ../plugins/file-manager/plugin.c:294
+#: ../plugins/file-manager/plugin.c:298
 msgid "File manager popup actions"
 msgstr "Accions emergents del gestor de fitxers"
 
 # Mozilla 1.3->sidebar.files.label
-#: ../plugins/file-manager/plugin.c:327
+#: ../plugins/file-manager/plugin.c:331
 msgid "Files"
 msgstr "Fitxers"
 
-#: ../plugins/file-manager/plugin.c:456 ../plugins/file-manager/plugin.c:465
+#: ../plugins/file-manager/plugin.c:460 ../plugins/file-manager/plugin.c:469
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "Gestor de fitxers"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:1
-msgid "<b>File Information</b>"
-msgstr "<b>Informació del fitxer</b>"
-
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add License Information"
 msgstr "Afig informació sobre la llicència"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
 msgid "Add to project"
 msgstr "Afig al projecte"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add to repository"
 msgstr "Afig al dipòsit"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
 msgid "Create corresponding header file"
 msgstr "Crea el fitxer de capçalera corresponent"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
 msgid ""
 "Enter the File name.\n"
 "The extension will be added according to the type."
@@ -3681,21 +3711,25 @@ msgstr ""
 "Introduïu el nom del fitxer.\n"
 "Segons el tipus s'afegirà l'extensió."
 
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+msgid "File Information"
+msgstr "Informació del fitxer"
+
 # Winrar 2.9->String:rarlng.dll
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:69 ../plugins/macro/anjuta-macro.ui.h:6
-#: ../plugins/tools/anjuta-tools.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/git/anjuta-git.ui.h:64 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/starter/starter.c:404
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
+#: ../plugins/starter/starter.c:422
 msgid "New File"
 msgstr "Fitxer nou"
 
 #: ../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
+#: ../plugins/gbf-am/gbf-am-properties.c:1527
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:353
 msgid "Type:"
 msgstr "Tipus:"
 
@@ -3703,47 +3737,47 @@ msgstr "Tipus:"
 msgid "Use Template for the Header file"
 msgstr "Utilitza la plantilla per al fitxer de capçalera"
 
-#: ../plugins/file-wizard/file.c:83
+#: ../plugins/file-wizard/file.c:84
 msgid "C Source File"
 msgstr "Fitxer de codi C"
 
-#: ../plugins/file-wizard/file.c:84
+#: ../plugins/file-wizard/file.c:85
 msgid "C/C++ Header File"
 msgstr "Fitxer de capçalera C/C++"
 
-#: ../plugins/file-wizard/file.c:85
+#: ../plugins/file-wizard/file.c:86
 msgid "C++ Source File"
 msgstr "Fitxer de codi C++"
 
-#: ../plugins/file-wizard/file.c:86
+#: ../plugins/file-wizard/file.c:87
 msgid "C# Source File"
 msgstr "Fitxer de codi C#"
 
-#: ../plugins/file-wizard/file.c:87
+#: ../plugins/file-wizard/file.c:88
 msgid "Java Source File"
 msgstr "Fitxer de codi Java"
 
-#: ../plugins/file-wizard/file.c:88
+#: ../plugins/file-wizard/file.c:89
 msgid "Perl Source File"
 msgstr "Fitxer de codi Perl"
 
-#: ../plugins/file-wizard/file.c:89
+#: ../plugins/file-wizard/file.c:90
 msgid "Python Source File"
 msgstr "Fitxer de codi Python"
 
-#: ../plugins/file-wizard/file.c:90
+#: ../plugins/file-wizard/file.c:91
 msgid "Shell Script File"
 msgstr "Fitxer d'script per a l'intèrpret d'ordes"
 
-#: ../plugins/file-wizard/file.c:91
+#: ../plugins/file-wizard/file.c:92
 msgid "Other"
 msgstr "Altres"
 
-#: ../plugins/file-wizard/file.c:104
+#: ../plugins/file-wizard/file.c:105
 msgid "BSD Public License"
 msgstr "Llicència Pública BSD"
 
-#: ../plugins/file-wizard/file.c:182
+#: ../plugins/file-wizard/file.c:183
 msgid "Unable to build user interface for New File"
 msgstr "No es pot muntar la interfície d'usuari per al fitxer nou"
 
@@ -3752,21 +3786,21 @@ msgid "Invalid GbfAmConfigValue type"
 msgstr "El tipus «GbfAmConfigValue» no és vàlid"
 
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
-msgid "<b>Select Package to add:</b>"
-msgstr "<b>Seleccioneu el paquet a afegir:</b>"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _Package"
 msgstr "Afig el _paquet"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _module"
 msgstr "Afig el _mòdul"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4
 msgid "Packages"
 msgstr "Paquets"
 
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+msgid "Select Package to add:"
+msgstr "Seleccioneu el paquet a afegir:"
+
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
 msgid "Select package"
 msgstr "Seleccioneu el paquet"
@@ -3775,232 +3809,294 @@ msgstr "Seleccioneu el paquet"
 msgid "Variables"
 msgstr "Variables"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:199
+#: ../plugins/gbf-am/gbf-am-project.c:3352
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:197
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3253
+msgid "Static Library"
+msgstr "Biblioteca estàtica"
+
+#: ../plugins/gbf-am/gbf-am-project.c:202
+#: ../plugins/gbf-am/gbf-am-project.c:3354
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:200
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3255
+msgid "Shared Library"
+msgstr "Biblioteca compartida"
+
+#: ../plugins/gbf-am/gbf-am-project.c:205
+#: ../plugins/gbf-am/gbf-am-project.c:3358
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:203
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3257
+msgid "Man Documentation"
+msgstr "Documentació man"
+
+#: ../plugins/gbf-am/gbf-am-project.c:208
+#: ../plugins/gbf-am/gbf-am-project.c:3360
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:206
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3259
+msgid "Miscellaneous Data"
+msgstr "Dades diverses"
+
+#: ../plugins/gbf-am/gbf-am-project.c:211
+#: ../plugins/gbf-am/gbf-am-project.c:3364
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:209
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3263
+msgid "Script"
+msgstr "Script"
+
+#: ../plugins/gbf-am/gbf-am-project.c:214
+#: ../plugins/gbf-am/gbf-am-project.c:3366
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:212
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3265
+msgid "Info Documentation"
+msgstr "Documentació info"
+
+#: ../plugins/gbf-am/gbf-am-project.c:217
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:215
+msgid "Lisp Module"
+msgstr "Mòdul Lisp"
+
+#: ../plugins/gbf-am/gbf-am-project.c:220
+#: ../plugins/gbf-am/gbf-am-project.c:3356
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:218
+msgid "Header Files"
+msgstr "Fitxers de capçalera"
+
+#: ../plugins/gbf-am/gbf-am-project.c:223
+#: ../plugins/gbf-am/gbf-am-project.c:3368
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:221
+msgid "Java Module"
+msgstr "Mòdul de Java"
+
+#: ../plugins/gbf-am/gbf-am-project.c:226
+#: ../plugins/gbf-am/gbf-am-project.c:3370
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:224
+msgid "Python Module"
+msgstr "Mòdul de Python"
+
+#: ../plugins/gbf-am/gbf-am-project.c:229
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:227
+msgid "Generic rule"
+msgstr "Regla genèrica"
+
+#: ../plugins/gbf-am/gbf-am-project.c:232
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:230
+msgid "Extra target"
+msgstr "Objectiu addicional"
+
+#: ../plugins/gbf-am/gbf-am-project.c:235
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:233
+msgid "Configure file"
+msgstr "Configura el fitxer"
+
+#: ../plugins/gbf-am/gbf-am-project.c:238
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:236
+msgid "Interface file"
+msgstr "Fitxer d'interfície"
+
+#: ../plugins/gbf-am/gbf-am-project.c:241
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:239
+msgid "GLib mkenums"
+msgstr "mkenums de la GLib"
+
+#: ../plugins/gbf-am/gbf-am-project.c:244
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:242
+msgid "GLib genmarshal"
+msgstr "genmarshal de la GLib"
+
+#: ../plugins/gbf-am/gbf-am-project.c:247
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:245
+msgid "Intl rule"
+msgstr "Regla Intl"
+
+#: ../plugins/gbf-am/gbf-am-project.c:2559
+#: ../plugins/gbf-am/gbf-am-project.c:2637
+#: ../plugins/gbf-am/gbf-am-project.c:2846
+#: ../plugins/gbf-am/gbf-am-project.c:3055
+#: ../plugins/gbf-am/gbf-am-project.c:3205
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2506
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2584
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2812
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2998
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3146
 msgid "Group doesn't exist"
 msgstr "No existeix el grup"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:2579
+#: ../plugins/gbf-am/gbf-am-project.c:2682
+#: ../plugins/gbf-am/gbf-am-project.c:3098
+#: ../plugins/gbf-am/gbf-am-project.c:3320
+#: ../plugins/gbf-am/gbf-am-project.c:3541
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2526
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2629
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3041
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3221
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3407
 msgid "Target doesn't exist"
 msgstr "No existeix l'objectiu"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:2613
+#: ../plugins/gbf-am/gbf-am-project.c:2657
+#: ../plugins/gbf-am/gbf-am-project.c:2700
+#: ../plugins/gbf-am/gbf-am-project.c:3016
+#: ../plugins/gbf-am/gbf-am-project.c:3076
+#: ../plugins/gbf-am/gbf-am-project.c:3280
+#: ../plugins/gbf-am/gbf-am-project.c:3341
+#: ../plugins/gbf-am/gbf-am-project.c:3649
+#: ../plugins/gbf-am/gbf-am-project.c:3710
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2560
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2604
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2647
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2959
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3019
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3182
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3242
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3474
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3535
 msgid "Unable to update project"
-msgstr "No s'ha pogut actualitzar el projecte"
+msgstr "No es pot actualitzar el projecte"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2575
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2517
+#: ../plugins/gbf-am/gbf-am-project.c:2743
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2692
 msgid "Invalid or remote path (only local paths supported)"
 msgstr ""
 "El camí és remot o no és vàlid (només es poden fer servir camins locals)"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2583
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2538
+#: ../plugins/gbf-am/gbf-am-project.c:2751
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2713
+#: ../plugins/dir-project/dir-project.c:693
+#: ../plugins/dir-project/dir-project.c:765
+#, c-format
 msgid "Project doesn't exist or invalid path"
 msgstr "No existeix el projecte o el camí no és vàlid"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2594
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2552
+#: ../plugins/gbf-am/gbf-am-project.c:2762
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2727
 msgid "Malformed project"
 msgstr "Projecte mal format"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2791
+#: ../plugins/gbf-am/gbf-am-project.c:2959
 msgid "Please specify group name"
 msgstr "Especifiqueu el nom del grup"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2805
+#: ../plugins/gbf-am/gbf-am-project.c:2973
 msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr ""
 "El nom del grup només pot contindre caràcters alfanumèrics i els caràcters "
 "«_», «-» o «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2814
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2750
+#: ../plugins/gbf-am/gbf-am-project.c:2982
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2925
 msgid "Parent group doesn't exist"
 msgstr "No existeix el grup pare"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2825
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2761
+#: ../plugins/gbf-am/gbf-am-project.c:2993
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2936
 msgid "Group already exists"
 msgstr "Ja existeix el grup"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:3003
+#: ../plugins/gbf-am/gbf-am-project.c:3030
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2946
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2973
 msgid "Group couldn't be created"
 msgstr "No s'ha pogut crear el grup"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2895
+#: ../plugins/gbf-am/gbf-am-project.c:3063
 msgid "Group couldn't be removed"
 msgstr "No s'ha pogut eliminar el grup"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3045
+#: ../plugins/gbf-am/gbf-am-project.c:3213
 msgid "Please specify target name"
 msgstr "Especifiqueu el nom de l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3059
+#: ../plugins/gbf-am/gbf-am-project.c:3227
 msgid "Target name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr ""
 "L'objectiu només pot contindre caràcters alfanumèrics i els caràcters «_», «-» "
 "o «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3068
+#: ../plugins/gbf-am/gbf-am-project.c:3236
 msgid "Shared library target name must be of the form 'libxxx.la'"
 msgstr ""
 "El nom de la biblioteca compartida objectiu ha de ser de la forma «libxxx.la»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3077
+#: ../plugins/gbf-am/gbf-am-project.c:3245
 msgid "Static library target name must be of the form 'libxxx.a'"
 msgstr ""
 "El nom de la biblioteca estàtica objectiu ha de ser de la forma «libxxx.a»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3089
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2984
+#: ../plugins/gbf-am/gbf-am-project.c:3257
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3159
 msgid "Target already exists"
 msgstr "Ja existeix l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3099
+#: ../plugins/gbf-am/gbf-am-project.c:3267
 msgid "General failure in target creation"
 msgstr "Problema general en crear l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3127
+#: ../plugins/gbf-am/gbf-am-project.c:3295
 msgid "Newly created target could not be identified"
 msgstr "No s'ha pogut identificar l'objectiu que s'acaba de crear"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3160
+#: ../plugins/gbf-am/gbf-am-project.c:3328
 msgid "Target couldn't be removed"
 msgstr "No s'ha pogut suprimir l'objectiu"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3184
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3078
-msgid "Static Library"
-msgstr "Biblioteca estàtica"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3186
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3080
-msgid "Shared Library"
-msgstr "Biblioteca compartida"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3188
-msgid "Header Files"
-msgstr "Fitxers de capçalera"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3190
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3082
-msgid "Man Documentation"
-msgstr "Documentació man"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3192
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3084
-msgid "Miscellaneous Data"
-msgstr "Dades diverses"
-
-#: ../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:3198
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3090
-msgid "Info Documentation"
-msgstr "Documentació info"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3200
-msgid "Java Module"
-msgstr "Mòdul de Java"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3202
-msgid "Python Module"
-msgstr "Mòdul de Python"
-
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:3428
+#: ../plugins/gbf-am/gbf-am-project.c:3687
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3317
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3512
 msgid "Source doesn't exist"
 msgstr "No existeix la font"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3363
+#: ../plugins/gbf-am/gbf-am-project.c:3532
 msgid ""
 "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr ""
 "El nom del fitxer font només pot contindre caràcters alfanumèrics i els "
 "caràcters «_», «-» o «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3440
+#: ../plugins/gbf-am/gbf-am-project.c:3612
 msgid "Source file is already in given target"
 msgstr "El fitxer font ja és a l'objectiu especificat"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3457
+#: ../plugins/gbf-am/gbf-am-project.c:3630
 msgid "General failure in adding source file"
 msgstr "S'ha produït un problema en afegir el fitxer font"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3490
+#: ../plugins/gbf-am/gbf-am-project.c:3664
 msgid "Newly added source file could not be identified"
 msgstr "No s'ha pogut identificar el fitxer font que s'acaba de crear"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3521
+#: ../plugins/gbf-am/gbf-am-project.c:3695
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3520
 msgid "Source couldn't be removed"
 msgstr "No s'ha pogut eliminar la font"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3707
-#: ../plugins/gbf-am/gbf-am-project.c:3708
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3449
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3450
+#: ../plugins/gbf-am/gbf-am-project.c:4111
+#: ../plugins/gbf-am/gbf-am-project.c:4112
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3830
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3831
 msgid "Project directory"
 msgstr "Directori del projecte"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:341
-#: ../plugins/gbf-am/gbf-am-properties.c:393
+#: ../plugins/gbf-am/gbf-am-properties.c:344
+#: ../plugins/gbf-am/gbf-am-properties.c:396
 msgid "Enter new module"
 msgstr "Introduïu el mòdul nou"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:434
-#: ../plugins/gbf-am/gbf-am-properties.c:930
+#: ../plugins/gbf-am/gbf-am-properties.c:437
+#: ../plugins/gbf-am/gbf-am-properties.c:933
 msgid "Module/Packages"
 msgstr "Mòdul/paquets"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:441
-#: ../plugins/gbf-am/gbf-am-properties.c:939
+#: ../plugins/gbf-am/gbf-am-properties.c:444
+#: ../plugins/gbf-am/gbf-am-properties.c:942
 msgid "Version"
 msgstr "Versió"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:527
+#: ../plugins/gbf-am/gbf-am-properties.c:530
 #, c-format
 msgid ""
 "Are you sure you want to remove module \"%s\" and all its associated "
@@ -4008,197 +4104,193 @@ msgid ""
 msgstr ""
 "Segur que voleu suprimir el mòdul «%s» i tots els seus paquets associats?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:529
+#: ../plugins/gbf-am/gbf-am-properties.c:532
 #, c-format
 msgid "Are you sure you want to remove package \"%s\"?"
 msgstr "Segur que voleu suprimir el paquet «%s»?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:587
-#: ../plugins/gbf-am/gbf-am-properties.c:669
+#: ../plugins/gbf-am/gbf-am-properties.c:590
+#: ../plugins/gbf-am/gbf-am-properties.c:672
 msgid "Enter new variable"
 msgstr "Introduïu la variable nova"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:700
+#: ../plugins/gbf-am/gbf-am-properties.c:703
 #, c-format
 msgid "Are you sure you want to remove variable \"%s\"?"
 msgstr "Segur que voleu suprimir la variable «%s»?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:854
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:177
+#: ../plugins/gbf-am/gbf-am-properties.c:857
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:180
 msgid "Project:"
 msgstr "Projecte:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:857
+#: ../plugins/gbf-am/gbf-am-properties.c:860
 msgid "Package name:"
 msgstr "Nom del paquet:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:860
-#: ../plugins/project-wizard/templates/translatable-strings.h:102
+#: ../plugins/gbf-am/gbf-am-properties.c:863
+#: ../plugins/project-wizard/templates/translatable-strings.h:109
 msgid "Version:"
 msgstr "Versió:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:863
-msgid "Url:"
-msgstr "URL:"
+#: ../plugins/gbf-am/gbf-am-properties.c:866
+msgid "URI:"
+msgstr "URI:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1229
+#: ../plugins/gbf-am/gbf-am-properties.c:1232
 msgid "Use"
 msgstr "Ã?s"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1321
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:244
+#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-am/gbf-am-properties.c:1327
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1329
-#: ../plugins/gbf-am/gbf-am-properties.c:1419
+#: ../plugins/gbf-am/gbf-am-properties.c:1332
+#: ../plugins/gbf-am/gbf-am-properties.c:1422
 msgid "C compiler flags:"
 msgstr "Indicadors del compilador de C:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1331
+#: ../plugins/gbf-am/gbf-am-properties.c:1334
 msgid "C preprocessor flags:"
 msgstr "Indicadors del preprocessador de C:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1333
+#: ../plugins/gbf-am/gbf-am-properties.c:1336
 msgid "C++ compiler flags:"
 msgstr "Indicadors del compilador de C++:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1335
+#: ../plugins/gbf-am/gbf-am-properties.c:1338
 msgid "gcj compiler flags (ahead-of-time):"
 msgstr "Indicadors del compilador gcj (ahead-of-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1337
+#: ../plugins/gbf-am/gbf-am-properties.c:1340
 msgid "Java compiler flags (just-in-time):"
 msgstr "Indicadors del compilador de Java (just-in-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1339
-#: ../plugins/gbf-am/gbf-am-properties.c:1427
+#: ../plugins/gbf-am/gbf-am-properties.c:1342
+#: ../plugins/gbf-am/gbf-am-properties.c:1430
 msgid "Fortran compiler flags:"
 msgstr "Indicadors del compilador de Fortran:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1342
+#: ../plugins/gbf-am/gbf-am-properties.c:1345
 msgid "Includes (deprecated):"
 msgstr "Inclusions (obsolet):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1353
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:258
+#: ../plugins/gbf-am/gbf-am-properties.c:1356
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:261
 msgid "Install directories:"
 msgstr "Directoris d'instal·lació:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1421
+#: ../plugins/gbf-am/gbf-am-properties.c:1424
 msgid "C preprocessor flags"
 msgstr "Indicadors del preprocessador de C"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1423
+#: ../plugins/gbf-am/gbf-am-properties.c:1426
 msgid "C++ compiler flags"
 msgstr "Indicadors del compilador de C++"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1425
+#: ../plugins/gbf-am/gbf-am-properties.c:1428
 msgid "gcj compiler flags (ahead-of-time)"
 msgstr "Indicadors del compilador gcj (ahead-of-time)"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1431
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:410
+#: ../plugins/gbf-am/gbf-am-properties.c:1434
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:413
 msgid "Linker flags:"
 msgstr "Indicadors de l'enllaçador:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1437
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:416
+#: ../plugins/gbf-am/gbf-am-properties.c:1440
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:419
 msgid "Libraries:"
 msgstr "Biblioteques:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1443
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:422
+#: ../plugins/gbf-am/gbf-am-properties.c:1446
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:425
 msgid "Dependencies:"
 msgstr "Dependències:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1446
+#: ../plugins/gbf-am/gbf-am-properties.c:1449
 msgid "Advanced options"
 msgstr "Opcions avançades"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1521
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:347
+#: ../plugins/gbf-am/gbf-am-properties.c:1524
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:350
 msgid "Target name:"
 msgstr "Nom de l'objectiu:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1530
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:356
+#: ../plugins/gbf-am/gbf-am-properties.c:1533
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:359
 msgid "Group:"
 msgstr "Grup:"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-properties.c:1551
+#: ../plugins/gbf-am/gbf-am-properties.c:1567
+#: ../plugins/gbf-am/gbf-am-properties.c:1574
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:377
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:394
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:401
 msgid "Install directory:"
 msgstr "Directori d'instal·lació:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1583
-msgid "Advanced..."
-msgstr "Avançat..."
+#: ../plugins/gbf-am/gbf-am-properties.c:1586
+msgid "Advancedâ?¦"
+msgstr "Avançat�"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
 msgid "Invalid GbfMkfileConfigValue type"
 msgstr "El tipus «GbfMkfileConfigValue» no és vàlid"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2524
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2699
 msgid "Project doesn't exist"
 msgstr "No existeix el projecte"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2831
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3006
 msgid "Group coudn't be removed"
 msgstr "No s'ha pogut suprimir el grup"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2994
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3021
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3169
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3196
 msgid "Target couldn't be created"
 msgstr "No s'ha pogut crear l'objectiu"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3054
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3229
 msgid "Target coudn't be removed"
 msgstr "No s'ha pogut suprimir l'objectiu"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3252
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3427
 msgid "Source file must be inside the project directory"
 msgstr "El fitxer font ha de ser dins del directori del projecte"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3264
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3439
 msgid "Source is already in target"
 msgstr "La font ja és a l'objectiu"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3281
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3313
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3456
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3488
 msgid "Source couldn't be added"
 msgstr "No s'ha pogut afegir la font"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
-msgid "Source coudn't be removed"
-msgstr "No s'ha pogut suprimir la font"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:250
 msgid "Includes:"
 msgstr "Inclusions:"
 
 #. The %s argument is a program name, anjuta by example
-#: ../plugins/gdb/debugger.c:691
+#: ../plugins/gdb/debugger.c:712
 #, c-format
 msgid "Loading Executable: %s\n"
 msgstr "S'està carregant l'executable: %s\n"
 
 #. The %s argument is a file name
-#: ../plugins/gdb/debugger.c:722
+#: ../plugins/gdb/debugger.c:743
 #, c-format
 msgid "Loading Core: %s\n"
 msgstr "S'està carregant el nucli: %s\n"
 
-#: ../plugins/gdb/debugger.c:804
+#: ../plugins/gdb/debugger.c:828
 #, c-format
 msgid ""
 "Unable to find: %s.\n"
@@ -4209,59 +4301,58 @@ msgstr ""
 "No es pot inicialitzar el depurador.\n"
 "Assegureu-vos que l'Anjuta està instal·lat correctament."
 
-#: ../plugins/gdb/debugger.c:933
-msgid "Getting ready to start debugging session...\n"
-msgstr "S'està preparant l'inici de la sessió de depuració...\n"
+#: ../plugins/gdb/debugger.c:973
+msgid "Getting ready to start debugging sessionâ?¦\n"
+msgstr "S'està preparant l'inici de la sessió de depuració�\n"
 
-#: ../plugins/gdb/debugger.c:939
+#: ../plugins/gdb/debugger.c:979
 msgid "Loading Executable: "
 msgstr "S'està carregant l'executable: "
 
-#: ../plugins/gdb/debugger.c:948
+#: ../plugins/gdb/debugger.c:988
 msgid "No executable specified.\n"
 msgstr "No s'ha especificat cap executable.\n"
 
-#: ../plugins/gdb/debugger.c:951
+#: ../plugins/gdb/debugger.c:991
 msgid "Open an executable or attach to a process to start debugging.\n"
-msgstr ""
-"Obri un executable o adjunta a un procés per a començar la depuració.\n"
+msgstr "Obri un executable o adjunta a un procés per començar la depuració.\n"
 
-#: ../plugins/gdb/debugger.c:960
+#: ../plugins/gdb/debugger.c:1000
 msgid "There was an error whilst launching the debugger.\n"
 msgstr "S'ha produït un error en llançar el depurador.\n"
 
-#: ../plugins/gdb/debugger.c:964
+#: ../plugins/gdb/debugger.c:1004
 msgid "Make sure 'gdb' is installed on the system.\n"
 msgstr "Assegureu-vos que el «gdb» està instal·lat al sistema.\n"
 
-#: ../plugins/gdb/debugger.c:1255
+#: ../plugins/gdb/debugger.c:1294
 msgid "Program exited normally\n"
 msgstr "El programa ha eixit normalment\n"
 
-#: ../plugins/gdb/debugger.c:1266
+#: ../plugins/gdb/debugger.c:1305
 #, c-format
 msgid "Program exited with error code %s\n"
 msgstr "El programa ha eixit amb el codi d'error %s\n"
 
 #. The program has reached one breakpoint and will stop
-#: ../plugins/gdb/debugger.c:1281
+#: ../plugins/gdb/debugger.c:1320
 #, c-format
 msgid "Breakpoint number %s hit\n"
 msgstr "S'ha arribat al punt de trencament %s\n"
 
-#: ../plugins/gdb/debugger.c:1290
+#: ../plugins/gdb/debugger.c:1329
 msgid "Function finished\n"
 msgstr "S'ha acabat la funció\n"
 
-#: ../plugins/gdb/debugger.c:1296
+#: ../plugins/gdb/debugger.c:1335
 msgid "Stepping finished\n"
 msgstr "S'ha acabat d'avançar\n"
 
-#: ../plugins/gdb/debugger.c:1302
+#: ../plugins/gdb/debugger.c:1341
 msgid "Location reached\n"
 msgstr "S'ha arribat a la ubicació\n"
 
-#: ../plugins/gdb/debugger.c:1696
+#: ../plugins/gdb/debugger.c:1735
 msgid ""
 "The program is attached.\n"
 "Do you still want to stop the debugger?"
@@ -4271,29 +4362,29 @@ msgstr ""
 
 #. The %s argument is an error message returned by gdb.
 #. * It is something like, "No such file or directory"
-#: ../plugins/gdb/debugger.c:1857
+#: ../plugins/gdb/debugger.c:1896
 #, c-format
 msgid ""
 "Unable to connect to remote target, %s\n"
 "Do you want to try again?"
 msgstr ""
-"No s'ha pogut connectar a l'objectiu remot: %s\n"
+"No es pot connectar a l'objectiu remot: %s\n"
 "Voleu tornar-ho a intentar?"
 
-#: ../plugins/gdb/debugger.c:1875
+#: ../plugins/gdb/debugger.c:1914
 msgid "Debugger connected\n"
 msgstr "S'ha connectat el depurador\n"
 
-#: ../plugins/gdb/debugger.c:1949
+#: ../plugins/gdb/debugger.c:1988
 msgid "Program attached\n"
 msgstr "S'ha adjuntat el programa \n"
 
-#: ../plugins/gdb/debugger.c:1970
+#: ../plugins/gdb/debugger.c:2009
 #, c-format
-msgid "Attaching to process: %d...\n"
-msgstr "S'està adjuntant al procés: %d...\n"
+msgid "Attaching to process: %dâ?¦\n"
+msgstr "S'està adjuntant al procés: %d�\n"
 
-#: ../plugins/gdb/debugger.c:1996
+#: ../plugins/gdb/debugger.c:2035
 msgid ""
 "A process is already running.\n"
 "Would you like to terminate it and attach the new process?"
@@ -4301,531 +4392,518 @@ msgstr ""
 "Ja hi ha un procés executant-se.\n"
 "Voleu finalitzar-lo i adjuntar-vos al procés nou?"
 
-#: ../plugins/gdb/debugger.c:2013
+#: ../plugins/gdb/debugger.c:2052
 msgid "Anjuta is unable to attach to itself."
 msgstr "L'Anjuta no pot adjuntar-se a si mateix."
 
-#: ../plugins/gdb/debugger.c:2063
+#: ../plugins/gdb/debugger.c:2102
 msgid "Program terminated\n"
 msgstr "El programa ha acabat\n"
 
-#: ../plugins/gdb/debugger.c:2078
+#: ../plugins/gdb/debugger.c:2117
 msgid "Program detached\n"
 msgstr "El programa s'ha separat\n"
 
-#: ../plugins/gdb/debugger.c:2098
+#: ../plugins/gdb/debugger.c:2137
 #, c-format
-msgid "Detaching the process...\n"
-msgstr "S'està separant el procés...\n"
+msgid "Detaching the processâ?¦\n"
+msgstr "S'està separant el procés�\n"
 
-#: ../plugins/gdb/debugger.c:2119
+#: ../plugins/gdb/debugger.c:2158
 msgid "Interrupting the process\n"
 msgstr "S'està interrompent el procés\n"
 
-#: ../plugins/gdb/debugger.c:3910
+#: ../plugins/gdb/debugger.c:3949
 #, c-format
 msgid "Sending signal %s to the process: %d"
 msgstr "S'està enviant el senyal %s al procés: %d"
 
-#: ../plugins/gdb/debugger.c:3936
+#: ../plugins/gdb/debugger.c:3975
 msgid "Error whilst signaling the process."
 msgstr "Hi ha hagut un error en enviar el senyal al procés."
 
 #: ../plugins/gdb/plugin.c:112
 #, c-format
 msgid ""
-"Failed to create fifo file named %s. The program will run without a terminal."
+"Failed to create FIFO file named %s. The program will run without a terminal."
 msgstr ""
 "No s'ha pogut crear el fitxer FIFO anomenat %s. S'executarà el programa "
 "sense terminal."
 
 #: ../plugins/gdb/plugin.c:198
 msgid "Cannot start terminal for debugging."
-msgstr "No es pot iniciar el terminal per a depurar."
-
-#: ../plugins/git/anjuta-git.ui.h:2
-msgid "<b>Stash Message (Optional)</b>"
-msgstr "<b>Missatge de l'alçat temporal(opcional)</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:3
-msgid "<b>Stash to Apply</b>"
-msgstr "<b>Alçat temporal a aplicar</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:4
-msgid "<b>Tags</b>"
-msgstr "<b>Etiquetes</b>"
+msgstr "No es pot iniciar el terminal per depurar."
 
-#: ../plugins/git/anjuta-git.ui.h:5
+#: ../plugins/git/anjuta-git.ui.h:1
 msgid "Add File"
 msgstr "Afig un fitxer"
 
-#: ../plugins/git/anjuta-git.ui.h:6
+#: ../plugins/git/anjuta-git.ui.h:2
 msgid "Add Remote Branch"
 msgstr "Afig una branca remota"
 
 #. A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.
-#: ../plugins/git/anjuta-git.ui.h:8
-msgid "Add signed off by line"
-msgstr "Afig l'acabament per línia"
-
-#: ../plugins/git/anjuta-git.ui.h:9
-msgid "Add signed-off by line"
-msgstr "Afig l'acabament per línia"
+#: ../plugins/git/anjuta-git.ui.h:4
+msgid "Add signed-off-by line"
+msgstr "Afig l'assignació per línia"
 
-#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:5
 msgid "Amend the previous commit"
 msgstr "Corregeix la publicació anterior"
 
-#: ../plugins/git/anjuta-git.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:6
 msgid "Annotate this tag"
 msgstr "Anota esta etiqueta"
 
 #. Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.
-#: ../plugins/git/anjuta-git.ui.h:13
+#: ../plugins/git/anjuta-git.ui.h:8
 msgid "Append fetch data"
 msgstr "Afig les dades de recollida"
 
-#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/git/anjuta-git.ui.h:9
 msgid "Apply Stash"
 msgstr "Aplica l'alçat temporal"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:15 ../plugins/git/plugin.c:239
+#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "Aplica els fitxers de bústia de correu"
 
-#: ../plugins/git/anjuta-git.ui.h:16
+#: ../plugins/git/anjuta-git.ui.h:11
 msgid "Apply the selected stash"
 msgstr "Aplica l'alçat temporal seleccionat"
 
 #. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
-#: ../plugins/git/anjuta-git.ui.h:18
+#: ../plugins/git/anjuta-git.ui.h:13
 msgid "Author/Grep"
 msgstr "Autor/Grep"
 
-#: ../plugins/git/anjuta-git.ui.h:19
-#: ../plugins/project-wizard/templates/translatable-strings.h:24
+#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/project-wizard/templates/translatable-strings.h:25
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../plugins/git/anjuta-git.ui.h:20
+#: ../plugins/git/anjuta-git.ui.h:15
 msgid "Bad revision:"
 msgstr "Revisió errònia:"
 
-#: ../plugins/git/anjuta-git.ui.h:21
+#: ../plugins/git/anjuta-git.ui.h:16
 msgid "Branch name:"
 msgstr "Nom de la branca:"
 
-#: ../plugins/git/anjuta-git.ui.h:22
+#: ../plugins/git/anjuta-git.ui.h:17
 msgid "Branch to switch to:"
 msgstr "Branca on commutar:"
 
-#: ../plugins/git/anjuta-git.ui.h:23
+#: ../plugins/git/anjuta-git.ui.h:18
 msgid "Branch:"
 msgstr "Branca:"
 
-#: ../plugins/git/anjuta-git.ui.h:24
+#: ../plugins/git/anjuta-git.ui.h:19
 msgid "Branches"
 msgstr "Branques"
 
-#: ../plugins/git/anjuta-git.ui.h:25
+#: ../plugins/git/anjuta-git.ui.h:20
 msgid "Branches must be fully merged"
 msgstr "Les branques s'han d'haver combinat completament"
 
-#: ../plugins/git/anjuta-git.ui.h:26
+#: ../plugins/git/anjuta-git.ui.h:21
 msgid "Branches to delete:"
 msgstr "Branques a suprimir:"
 
-#: ../plugins/git/anjuta-git.ui.h:28
+#: ../plugins/git/anjuta-git.ui.h:23
 #: ../plugins/subversion/anjuta-subversion.ui.h:4
 msgid "Changes:"
 msgstr "Canvis:"
 
-#: ../plugins/git/anjuta-git.ui.h:29
+#: ../plugins/git/anjuta-git.ui.h:24
 msgid "Check Out Files"
 msgstr "Obté els fitxers"
 
-#: ../plugins/git/anjuta-git.ui.h:30
+#: ../plugins/git/anjuta-git.ui.h:25
 msgid "Check out all local changes"
 msgstr "Obtén tots els canvis locals"
 
-#: ../plugins/git/anjuta-git.ui.h:31
+#: ../plugins/git/anjuta-git.ui.h:26
 msgid "Check out the branch after it is created"
 msgstr "Obté la branca després de crear-la"
 
-#: ../plugins/git/anjuta-git.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:27
 msgid "Cherry Pick"
-msgstr "Tria el millor"
+msgstr "Cherry Pick"
 
-#: ../plugins/git/anjuta-git.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:28
 msgid "Clear all stashes"
 msgstr "Neteja tots els alçats temporals"
 
-#: ../plugins/git/anjuta-git.ui.h:34
+#: ../plugins/git/anjuta-git.ui.h:29
 msgid "Column 1"
 msgstr "Columna 1"
 
-#: ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/git/anjuta-git.ui.h:30
 #: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "Publica els canvis"
 
 # FIXME: s'hauria de trobar una traducció per a fast-forward (dpm) - combinacions d'avançament ràpid (tot i que no acaba d'abarcar el sentit de l'operació)?
-#: ../plugins/git/anjuta-git.ui.h:36
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Commit on fast-forward merges"
-msgstr "Pública en combinacions ràpides"
+msgstr "Publica en fer combinacions fast-forward"
 
 # FIXME: s'hauria de trobar una traducció per a cherry-pick (dpm)
-#: ../plugins/git/anjuta-git.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:32
 msgid "Commit to Cherry Pick:"
-msgstr "Publica la millor tria:"
+msgstr "Publica al Cherry Pick:"
 
 # Netscape_4.7->String:RESDLL.DLL
-#: ../plugins/git/anjuta-git.ui.h:38
+#: ../plugins/git/anjuta-git.ui.h:33
 msgid "Commit to revert:"
 msgstr "Publicació a desfer:"
 
-#: ../plugins/git/anjuta-git.ui.h:39
+#: ../plugins/git/anjuta-git.ui.h:34
 msgid "Create Branch"
 msgstr "Crea una branca"
 
-#: ../plugins/git/anjuta-git.ui.h:40
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Create Tag"
 msgstr "Crea una etiqueta"
 
-#: ../plugins/git/anjuta-git.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Create patch series"
 msgstr "Crea una sèrie de pedaços"
 
-#: ../plugins/git/anjuta-git.ui.h:42 ../plugins/git/git-log-dialog.c:189
+#: ../plugins/git/anjuta-git.ui.h:37 ../plugins/git/git-log-dialog.c:189
 #: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/git/anjuta-git.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Delete Branch"
 msgstr "Suprimeix la branca"
 
-#: ../plugins/git/anjuta-git.ui.h:44
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Delete Remote Branch"
 msgstr "Suprimeix la branca remota"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:40
 msgid "Delete Tags"
 msgstr "Suprimeix les etiquetes"
 
-#: ../plugins/git/anjuta-git.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "No publiques"
 
-#: ../plugins/git/anjuta-git.ui.h:47
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "Do not follow tags"
-msgstr "No seguisques les etiquetes"
+msgstr "No seguïsques les etiquetes"
 
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Drop the selected stash"
 msgstr "Descarta l'alçat temporal seleccionat"
 
-#: ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "E-mail:"
 msgstr "Correu electrònic:"
 
-#: ../plugins/git/anjuta-git.ui.h:50
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Fetch remote branches after creation"
 msgstr "Recull les branques remotes després de crear-les"
 
-#: ../plugins/git/anjuta-git.ui.h:51
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Filters"
 msgstr "Filtres"
 
-#: ../plugins/git/anjuta-git.ui.h:52
+#: ../plugins/git/anjuta-git.ui.h:47
 msgid "Folder to create patches in:"
 msgstr "Carpeta on crear els pedaços:"
 
-#: ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/git/anjuta-git.ui.h:48
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "Força"
 
-#: ../plugins/git/anjuta-git.ui.h:55
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "From:"
 msgstr "Des de:"
 
-#: ../plugins/git/anjuta-git.ui.h:56
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Generate patches relative to:"
 msgstr "Genera pedaços relatius a:"
 
-#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Good revision:"
 msgstr "Revisió bona:"
 
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:53
 msgid "Grep:"
 msgstr "Grep:"
 
-#: ../plugins/git/anjuta-git.ui.h:59
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Hard"
 msgstr "Dur"
 
-#: ../plugins/git/anjuta-git.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Head"
 msgstr "Cap"
 
-#: ../plugins/git/anjuta-git.ui.h:61
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Ignore Files"
 msgstr "Fitxers ignorats"
 
-#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/git/anjuta-git.ui.h:58
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "Missatge de registre:"
 
-#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Mailbox file containing patches:"
 msgstr "Fitxer de bústia de correu que conté els pedaços:"
 
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Merge"
 msgstr "Combina"
 
-#: ../plugins/git/anjuta-git.ui.h:67
+#: ../plugins/git/anjuta-git.ui.h:62
 msgid "Mixed"
 msgstr "Barrejat"
 
-#: ../plugins/git/anjuta-git.ui.h:68
+#: ../plugins/git/anjuta-git.ui.h:63
 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 "Opcions"
-
-#: ../plugins/git/anjuta-git.ui.h:71
-#: ../plugins/subversion/anjuta-subversion.ui.h:24
-msgid "Options:"
-msgstr "Opcions:"
-
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Previous commit"
 msgstr "Publicació anterior"
 
-#: ../plugins/git/anjuta-git.ui.h:73
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Pull"
 msgstr "Estira"
 
-#: ../plugins/git/anjuta-git.ui.h:74
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Push"
 msgstr "Empeny"
 
-#: ../plugins/git/anjuta-git.ui.h:75
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "Push all branches and tags"
 msgstr "Empeny totes les branques i etiquetes"
 
-#: ../plugins/git/anjuta-git.ui.h:76
+#: ../plugins/git/anjuta-git.ui.h:71
 msgid "Push all tags"
 msgstr "Empeny totes les etiquetes"
 
-#: ../plugins/git/anjuta-git.ui.h:77
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Rebase"
 msgstr "Ajusta a la base"
 
-#: ../plugins/git/anjuta-git.ui.h:78
+#: ../plugins/git/anjuta-git.ui.h:73
 msgid "Remote"
-msgstr "Remot"
+msgstr "Remota"
 
-#: ../plugins/git/anjuta-git.ui.h:79
+#: ../plugins/git/anjuta-git.ui.h:74
 msgid "Remote branch to rebase from:"
 msgstr "Branca remota a utilitzar com a base:"
 
-#: ../plugins/git/anjuta-git.ui.h:80
+#: ../plugins/git/anjuta-git.ui.h:75
 msgid "Remote to delete:"
 msgstr "Ubicació remota a suprimir:"
 
-#: ../plugins/git/anjuta-git.ui.h:81
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Remove File"
 msgstr "Suprimeix un fitxer"
 
-#: ../plugins/git/anjuta-git.ui.h:82
+#: ../plugins/git/anjuta-git.ui.h:77
 msgid "Repository origin"
 msgstr "Origen del dipòsit"
 
-#: ../plugins/git/anjuta-git.ui.h:83
+#: ../plugins/git/anjuta-git.ui.h:78
 msgid "Repository to pull from:"
 msgstr "Dipòsit des d'on estirar:"
 
-#: ../plugins/git/anjuta-git.ui.h:84
+#: ../plugins/git/anjuta-git.ui.h:79
 msgid "Repository to push to:"
 msgstr "Dipòsit on empènyer:"
 
-#: ../plugins/git/anjuta-git.ui.h:85
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Reset Tree"
 msgstr "Reinicia l'arbre"
 
-#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Reset to:"
 msgstr "Reinicia a:"
 
-#: ../plugins/git/anjuta-git.ui.h:87
+#: ../plugins/git/anjuta-git.ui.h:82
 msgid "Restore index"
 msgstr "Restaura l'arbre"
 
-#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/git/anjuta-git.ui.h:83
 #: ../plugins/subversion/anjuta-subversion.ui.h:35
-msgid "Retrieving status..."
-msgstr "S'està obtenint l'estat..."
+msgid "Retrieving statusâ?¦"
+msgstr "S'està obtenint l'estat�"
 
-#: ../plugins/git/anjuta-git.ui.h:89
+#: ../plugins/git/anjuta-git.ui.h:84
 msgid "Revert Commit"
 msgstr "Desfés la publicació"
 
-#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revision/Tag:"
 msgstr "Revisió/etiqueta:"
 
-#: ../plugins/git/anjuta-git.ui.h:92
-msgid "Select A Folder"
-msgstr "Seleccioneu una carpeta"
-
-#: ../plugins/git/anjuta-git.ui.h:93
+#: ../plugins/git/anjuta-git.ui.h:87
 msgid "Select Files to Check Out:"
 msgstr "Seleccioneu els fitxers a obtindre:"
 
-#: ../plugins/git/anjuta-git.ui.h:94
-#: ../plugins/subversion/anjuta-subversion.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
 msgid "Select Files to Commit:"
 msgstr "Seleccioneu els fitxers a publicar:"
 
-#: ../plugins/git/anjuta-git.ui.h:95
+#: ../plugins/git/anjuta-git.ui.h:89
 msgid "Select Files to Ignore:"
 msgstr "Seleccioneu els fitxers a ignorar:"
 
-#: ../plugins/git/anjuta-git.ui.h:96
-#: ../plugins/subversion/anjuta-subversion.ui.h:42
+#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
 msgid "Select Files to Mark as Resolved:"
 msgstr "Seleccioneu els fitxers a marcar com a resolts:"
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../plugins/git/anjuta-git.ui.h:91
 msgid "Select Files to Unstage:"
 msgstr "Seleccioneu els fitxers a treure de l'índex:"
 
-#: ../plugins/git/anjuta-git.ui.h:98
+#: ../plugins/git/anjuta-git.ui.h:92
 msgid "Select Mailbox File"
 msgstr "Seleccioneu el fitxer de bústia de correu"
 
-#: ../plugins/git/anjuta-git.ui.h:99
+#: ../plugins/git/anjuta-git.ui.h:93
+msgid "Select a Folder"
+msgstr "Seleccioneu una carpeta"
+
+#: ../plugins/git/anjuta-git.ui.h:94
 msgid "Select file to add:"
 msgstr "Seleccioneu el fitxer a afegir:"
 
-#: ../plugins/git/anjuta-git.ui.h:100
+#: ../plugins/git/anjuta-git.ui.h:95
 msgid "Select file to remove:"
 msgstr "Seleccioneu el fitxer a suprimir:"
 
-#: ../plugins/git/anjuta-git.ui.h:101
-#: ../plugins/subversion/anjuta-subversion.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
 msgid "Set Conflicts as Resolved"
 msgstr "Estableix els conflictes com a resolts"
 
-#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/anjuta-git.ui.h:97
 msgid "Show source revision in log message"
 msgstr "Mostra la revisió de la font al missatge de registre"
 
-#: ../plugins/git/anjuta-git.ui.h:103
+#: ../plugins/git/anjuta-git.ui.h:98
 msgid "Show the contents of the selected stash in an editor"
 msgstr "Mostra el contingut del alçat temporal seleccionat en un editor"
 
-#: ../plugins/git/anjuta-git.ui.h:104
+#: ../plugins/git/anjuta-git.ui.h:99
 msgid "Sign this tag"
 msgstr "Signa esta etiqueta"
 
-#: ../plugins/git/anjuta-git.ui.h:105
+#: ../plugins/git/anjuta-git.ui.h:100
 msgid "Soft"
 msgstr "Tou"
 
-#: ../plugins/git/anjuta-git.ui.h:106
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Squash"
 msgstr "Aixafar"
 
-#: ../plugins/git/anjuta-git.ui.h:107 ../plugins/git/plugin.c:811
+#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
 msgid "Stash"
 msgstr "Alça temporalment"
 
-#: ../plugins/git/anjuta-git.ui.h:108
+#: ../plugins/git/anjuta-git.ui.h:103
+msgid "Stash Message (Optional)"
+msgstr "Missatge del alçat temporal (opcional)"
+
+#: ../plugins/git/anjuta-git.ui.h:104
 msgid "Stash Uncommitted Changes"
 msgstr "Alça temporalment els canvis no publicats"
 
-#: ../plugins/git/anjuta-git.ui.h:109
+#: ../plugins/git/anjuta-git.ui.h:105
 msgid "Stash indexed changes"
 msgstr "Alça temporalment els canvis indexats"
 
-#: ../plugins/git/anjuta-git.ui.h:110
+#: ../plugins/git/anjuta-git.ui.h:106
 msgid "Stash the working tree's uncommitted changes"
 msgstr "Alça temporalment els canvis no publicats de l'arbre de treball"
 
-#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/anjuta-git.ui.h:107
+msgid "Stash to Apply"
+msgstr "Alçat temporal a aplicar"
+
+#: ../plugins/git/anjuta-git.ui.h:108
 msgid "Switch to Another Branch"
 msgstr "Commuta a una altra branca"
 
-#: ../plugins/git/anjuta-git.ui.h:112
+#: ../plugins/git/anjuta-git.ui.h:109
 msgid "Tag name:"
 msgstr "Nom de l'etiqueta:"
 
-#: ../plugins/git/anjuta-git.ui.h:113
+#: ../plugins/git/anjuta-git.ui.h:110
 msgid "Tag/Commit"
 msgstr "Etiqueta/publicació"
 
-#: ../plugins/git/anjuta-git.ui.h:114
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+msgid "Tags"
+msgstr "Etiquetes"
+
+#: ../plugins/git/anjuta-git.ui.h:112
 msgid "Tags to delete:"
 msgstr "Etiquetes a suprimir:"
 
-#: ../plugins/git/anjuta-git.ui.h:115
+#: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "Esta publicació finalitza una combinació fallida (utilitzeu -i)"
 
-#: ../plugins/git/anjuta-git.ui.h:117
+#: ../plugins/git/anjuta-git.ui.h:115
 msgid "To:"
 msgstr "A:"
 
-#: ../plugins/git/anjuta-git.ui.h:118
+#: ../plugins/git/anjuta-git.ui.h:116
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/git/anjuta-git.ui.h:119
+#: ../plugins/git/anjuta-git.ui.h:117
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/git/anjuta-git.ui.h:120
+#: ../plugins/git/anjuta-git.ui.h:118
 msgid "Unstage Files"
 msgstr "Treu fitxers de l'índex"
 
-#: ../plugins/git/anjuta-git.ui.h:121
+#: ../plugins/git/anjuta-git.ui.h:119
 msgid "Use a custom log message"
 msgstr "Utilitzeu un missatge de registre personalitzat"
 
-#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/git/anjuta-git.ui.h:120
 msgid "Use custom author information:"
 msgstr "Utilitza informació personalitzada de l'autor:"
 
-#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/git/anjuta-git.ui.h:121
 msgid "View log"
 msgstr "Visualitza el registre"
 
-#: ../plugins/git/anjuta-git.ui.h:124
-#: ../plugins/subversion/anjuta-subversion.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "Visualitza el registre per al fitxer/la carpeta:"
 
-#: ../plugins/git/anjuta-git.ui.h:126
+#: ../plugins/git/anjuta-git.ui.h:124
 msgid "page 1"
 msgstr "pàgina 1"
 
-#: ../plugins/git/anjuta-git.ui.h:127
+#: ../plugins/git/anjuta-git.ui.h:125
 msgid "page 2"
 msgstr "pàgina 2"
 
-#: ../plugins/git/anjuta-git.ui.h:128
+#: ../plugins/git/anjuta-git.ui.h:126
 msgid "page 3"
 msgstr "pàgina 3"
 
@@ -4853,8 +4931,8 @@ msgstr "Introduïu un URL."
 
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetching..."
-msgstr "Git: s'està recollint..."
+msgid "Git: Fetchingâ?¦"
+msgstr "Git: s'està recollint�"
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
 msgid "Please select a mailbox file."
@@ -4910,7 +4988,7 @@ msgstr "Git: s'han suprimit les branques seleccionades."
 
 #: ../plugins/git/git-delete-branch-dialog.c:106
 msgid "Please select branches to delete"
-msgstr "Seleccioneu les branques a esborrar"
+msgstr "Seleccioneu les branques a suprimir"
 
 #: ../plugins/git/git-delete-tag-dialog.c:37
 msgid "Git: Deleted selected tags."
@@ -4934,8 +5012,8 @@ msgid "Author"
 msgstr "Autor"
 
 #: ../plugins/git/git-log-dialog.c:317
-msgid "Git: Retrieving log..."
-msgstr "Git: s'està obtenint el registre..."
+msgid "Git: Retrieving logâ?¦"
+msgstr "Git: s'està obtenint el registre�"
 
 #: ../plugins/git/git-log-dialog.c:360
 #: ../plugins/subversion/subversion-add-dialog.c:65
@@ -4983,7 +5061,7 @@ msgstr "Git: s'ha completat l'estirada."
 #. * user does not properly enter anything
 #: ../plugins/git/git-pull-dialog.c:124
 msgid "Please select a remote to pull from."
-msgstr "Seleccioneu el dipòsit des d'on estirar."
+msgstr "Introduïu la ubicació remota des d'on estirar."
 
 #: ../plugins/git/git-pull-dialog.c:142
 msgid "Please enter the URL of the repository to pull from."
@@ -4991,21 +5069,21 @@ msgstr "Introduïu l'URL del dipòsit des d'on estirar."
 
 #: ../plugins/git/git-push-dialog.c:36
 msgid "Git: Push complete."
-msgstr "Git: s'ha completat la publicació."
+msgstr "Git: s'ha completat l'empenta."
 
 #. The "input widget" is the widget that should receive focus if the
 #. * user does not properly enter anything
-#: ../plugins/git/git-push-dialog.c:141
+#: ../plugins/git/git-push-dialog.c:144
 msgid "Please select a remote to push to."
-msgstr "Seleccioneu el diposit remot per publicar."
+msgstr "Seleccioneu una ubicació remota on empènyer."
 
-#: ../plugins/git/git-push-dialog.c:159
+#: ../plugins/git/git-push-dialog.c:162
 msgid "Please enter the URL of the repository to push to."
 msgstr "Introduïu l'URL del dipòsit on empènyer."
 
-#: ../plugins/git/git-push-dialog.c:193
-msgid "Git: Pushing..."
-msgstr "Git: s'està recollint..."
+#: ../plugins/git/git-push-dialog.c:197
+msgid "Git: Pushingâ?¦"
+msgstr "Git: s'està empenyent�"
 
 #: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
@@ -5021,11 +5099,11 @@ msgstr "Git: s'ha completat la resolució."
 
 #: ../plugins/git/git-stash-widget.c:219
 msgid "Git: Stash dropped."
-msgstr "Git: els canvis alçats temporalment s'han perdut."
+msgstr "Git: s'ha descartat l'alçat temporal."
 
 #: ../plugins/git/git-stash-widget.c:275
 msgid "Git: All stashes cleared."
-msgstr "Git: els canvis alçats temporalment s'han netejat."
+msgstr "Git: s'han descartat tots els alçats temporals."
 
 #: ../plugins/git/git-switch-dialog.c:36
 msgid "Git: Branch checkout complete."
@@ -5038,7 +5116,7 @@ msgstr "Git"
 
 #: ../plugins/git/git-ui-utils.c:158
 msgid "There are no branches available."
-msgstr "No hi branques disponibles."
+msgstr "No hi ha cap branca disponible."
 
 #: ../plugins/git/git-ui-utils.c:194
 msgid "Please select a stash"
@@ -5080,8 +5158,8 @@ msgstr "_Canvis"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
-msgid "_Commit..."
-msgstr "Publica els _canvis..."
+msgid "_Commitâ?¦"
+msgstr "Publica els _canvisâ?¦"
 
 #. Display label
 #. short-cut
@@ -5110,8 +5188,8 @@ msgstr "Al_ça temporalment"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:111
-msgid "_Stash uncommitted changes..."
-msgstr "Al_ça temporalment els canvis no publicats..."
+msgid "_Stash uncommitted changesâ?¦"
+msgstr "Al_ça temporalment els canvis no publicats�"
 
 #. Display label
 #. short-cut
@@ -5122,8 +5200,8 @@ msgstr "Alça els canvis no publicats i torna a aplicar-los després"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:119
-msgid "_Apply stashed changes..."
-msgstr "_Aplica els canvis alçats temporalment..."
+msgid "_Apply stashed changesâ?¦"
+msgstr "_Aplica els canvis alçats temporalment�"
 
 #. Display label
 #. short-cut
@@ -5134,8 +5212,8 @@ msgstr "Aplica els canvis alçats temporalment a l'arbre de treball"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
-msgid "_View log..."
-msgstr "_Visualitza el registre..."
+msgid "_View logâ?¦"
+msgstr "_Visualitza el registreâ?¦"
 
 #. Display label
 #. short-cut
@@ -5147,25 +5225,25 @@ msgstr "Visualitza l'historial de canvis"
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:135
 msgid "_Remote repository"
-msgstr "_Repositori remot"
+msgstr "_Dipòsit remot"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:143
-msgid "_Push..."
-msgstr "_Empeny..."
+msgid "_Pushâ?¦"
+msgstr "Em_penyâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:145
 msgid "Push changes to a remote repository"
-msgstr "Publica els canvis a un dipòsit remot"
+msgstr "Empeny els canvis a un dipòsit remot"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:151
-msgid "_Pull..."
-msgstr "_Estira..."
+msgid "_Pullâ?¦"
+msgstr "Es_tiraâ?¦"
 
 #. Display label
 #. short-cut
@@ -5197,8 +5275,8 @@ msgstr "_Fitxers"
 #: ../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 "_Afig..."
+msgid "_Addâ?¦"
+msgstr "_Afigâ?¦"
 
 #. Display label
 #. short-cut
@@ -5210,8 +5288,8 @@ msgstr "Afig els fitxers al dipòsit"
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
 #: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "_Suprimeix..."
+msgid "_Removeâ?¦"
+msgstr "_Suprimeixâ?¦"
 
 #. Display label
 #. short-cut
@@ -5222,8 +5300,8 @@ msgstr "Suprimeix els fitxers del dipòsit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:191
-msgid "_Ignore..."
-msgstr "_Ignora..."
+msgid "_Ignoreâ?¦"
+msgstr "_Ignoraâ?¦"
 
 #. Display label
 #. short-cut
@@ -5234,8 +5312,8 @@ msgstr "Fitxers ignorats"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:199
-msgid "_Check out files..."
-msgstr "_Obté els fitxers..."
+msgid "_Check out filesâ?¦"
+msgstr "_Obtén els fitxers�"
 
 #. Display label
 #. short-cut
@@ -5246,8 +5324,8 @@ msgstr "Desfés els canvis no publicats als fitxers"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:207
-msgid "_Unstage files..."
-msgstr "_Treu fitxers de l'índex..."
+msgid "_Unstage filesâ?¦"
+msgstr "_Treu fitxers de l'índex�"
 
 #. Display label
 #. short-cut
@@ -5258,8 +5336,8 @@ msgstr "Suprimeix els fitxers de l'índex de publicació"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:215
-msgid "_Resolve conflicts..."
-msgstr "_Resol els conflictes..."
+msgid "_Resolve conflictsâ?¦"
+msgstr "_Resol els conflictesâ?¦"
 
 #. Display label
 #. short-cut
@@ -5276,20 +5354,20 @@ msgstr "Pedaços"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:231
-msgid "Create patch series..."
-msgstr "Crea una sèrie de pedaços..."
+msgid "Create patch seriesâ?¦"
+msgstr "Crea una sèrie de pedaços�"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:233
 msgid "Generate patch files for submission upstream"
-msgstr "Genera fitxers de pedaç per a enviar al projecte original"
+msgstr "Genera fitxers de pedaç per enviar al projecte original"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:247
-msgid "_Apply..."
-msgstr "_Aplica..."
+msgid "_Applyâ?¦"
+msgstr "_Aplicaâ?¦"
 
 #. Display label
 #. short-cut
@@ -5344,8 +5422,8 @@ msgstr "_Branques"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
-msgid "_Create branch..."
-msgstr "_Crea una branca..."
+msgid "_Create branchâ?¦"
+msgstr "_Crea una brancaâ?¦"
 
 #. Display label
 #. short-cut
@@ -5356,8 +5434,8 @@ msgstr "Crea una branca"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:295
-msgid "_Delete branch..."
-msgstr "_Suprimeix una branca..."
+msgid "_Delete branchâ?¦"
+msgstr "_Suprimeix una brancaâ?¦"
 
 #. Display label
 #. short-cut
@@ -5368,8 +5446,8 @@ msgstr "Suprimeix branques"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:303
-msgid "_Switch to another branch..."
-msgstr "_Commuta a una altra branca..."
+msgid "_Switch to another branchâ?¦"
+msgstr "_Commuta a una altra brancaâ?¦"
 
 #. Display label
 #. short-cut
@@ -5380,8 +5458,8 @@ msgstr "Commuta a una altra branca"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:311
-msgid "_Merge..."
-msgstr "_Combina..."
+msgid "_Mergeâ?¦"
+msgstr "Co_mbinaâ?¦"
 
 #. Display label
 #. short-cut
@@ -5404,8 +5482,8 @@ msgstr "Combina els canvis amb una branca remota del projecte original"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
-msgid "_Start..."
-msgstr "_Inicia..."
+msgid "_Startâ?¦"
+msgstr "_Iniciaâ?¦"
 
 #. Display label
 #. short-cut
@@ -5447,8 +5525,8 @@ msgstr ""
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
-msgid "_Cherry pick..."
-msgstr "_Tria el millor..."
+msgid "_Cherry pickâ?¦"
+msgstr "_Cherry pickâ?¦"
 
 #. Display label
 #. short-cut
@@ -5474,8 +5552,8 @@ msgstr "Afig una branca remota"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:383
-msgid "_Delete..."
-msgstr "_Suprimeix..."
+msgid "_Deleteâ?¦"
+msgstr "_Suprimeixâ?¦"
 
 #. Display label
 #. short-cut
@@ -5485,15 +5563,9 @@ msgstr "Suprimeix una branca remota"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:391
-msgid "Tags"
-msgstr "Etiquetes"
-
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
-msgid "_Create tag..."
-msgstr "_Crea una etiqueta..."
+msgid "_Create tagâ?¦"
+msgstr "_Crea una etiquetaâ?¦"
 
 #. Display label
 #. short-cut
@@ -5504,8 +5576,8 @@ msgstr "Crea una etiqueta"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:407
-msgid "_Delete tag..."
-msgstr "_Suprimeix una etiqueta..."
+msgid "_Delete tagâ?¦"
+msgstr "Su_primeix les etiquetesâ?¦"
 
 #. Display label
 #. short-cut
@@ -5517,13 +5589,13 @@ msgstr "Suprimeix les etiquetes"
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:415
 msgid "_Reset/Revert"
-msgstr "_Reinicia/Desfés"
+msgstr "_Reinicia/desfés"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
-msgid "_Reset tree..."
-msgstr "_Reinicia l'arbre..."
+msgid "_Reset treeâ?¦"
+msgstr "_Reinicia l'arbreâ?¦"
 
 #. Display label
 #. short-cut
@@ -5534,14 +5606,14 @@ msgstr "Reinicia la capçalera del dipòsit a qualsevol estat anterior"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
-msgid "_Revert commit..."
-msgstr "_Desfés la publicació..."
+msgid "_Revert commitâ?¦"
+msgstr "_Desfés una publicació�"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:433
 msgid "Revert a commit"
-msgstr "Desfés la publicació"
+msgstr "Desfés una publicació"
 
 #. Action name
 #. Stock icon, if any
@@ -5589,13 +5661,13 @@ msgstr "Marca la revisió de la capçalera actual com a dolenta"
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:479
 msgid "_Initialize repository"
-msgstr "_Inicialitza el dipòsit"
+msgstr "_Inicialitza un dipòsit"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:481
 msgid "Create a new git repository or reinitialize an existing one"
-msgstr "Crea un diposit git nou o reinicialitza un que ja existisca."
+msgstr "Crea un dipòsit de Git nou o torna a inicialitzar-ne un d'existent"
 
 #. Action name
 #. Stock icon, if any
@@ -5701,7 +5773,7 @@ msgstr "Suprimeix este fitxer o carpeta del dipòsit"
 
 #: ../plugins/git/plugin.c:766
 msgid "Top level git menu item"
-msgstr "Element de més nivell del menú git"
+msgstr "Element de nivell superior del menú del Git"
 
 #: ../plugins/git/plugin.c:774
 msgid "Git operations"
@@ -5740,12 +5812,12 @@ msgstr "Associa"
 msgid "Automatically add resources"
 msgstr "Afig recursos automàticament"
 
-#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:763
-#: ../plugins/glade/plugin.c:3094
+#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:762
+#: ../plugins/glade/plugin.c:3082
 msgid "Designer"
 msgstr "Dissenyador"
 
-#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3096
+#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3084
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "Editor"
@@ -5800,235 +5872,235 @@ msgstr "el valor de la propietat %s no és vàlid"
 msgid "Association item filename has no path"
 msgstr "El nom de fitxer de l'element d'associació no té camí"
 
-#: ../plugins/glade/plugin.c:855
+#: ../plugins/glade/plugin.c:856
 #, c-format
-msgid "No associations initialized, nothing to save"
-msgstr "No s'ha inicialitzat cap associació, no hi ha res a alçar"
+msgid "No associations initialized: nothing to save"
+msgstr "No s'ha inicialitzat cap associació: no hi ha res a alçar"
 
-#: ../plugins/glade/plugin.c:862
+#: ../plugins/glade/plugin.c:863
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
 msgstr ""
 "No s'han pogut alçar les associacions perquè no s'ha establit el projecte "
 "arrel"
 
-#: ../plugins/glade/plugin.c:884
+#: ../plugins/glade/plugin.c:885
 #, c-format
 msgid "Failed to save associations"
 msgstr "No s'han pogut alçar les associacions"
 
 #. iptCurrent:
-#: ../plugins/glade/plugin.c:1196
+#: ../plugins/glade/plugin.c:1184
 msgid "Current"
 msgstr "Actual"
 
 #. iptBeforeEnd:
-#: ../plugins/glade/plugin.c:1197
+#: ../plugins/glade/plugin.c:1185
 msgid "Before end"
 msgstr "Abans del final"
 
 #. iptAfterBegin:
-#: ../plugins/glade/plugin.c:1198
+#: ../plugins/glade/plugin.c:1186
 msgid "After begin"
-msgstr "Després de les declaracions"
+msgstr "Després de l'inici"
 
 #. ipEOF:
-#: ../plugins/glade/plugin.c:1199
+#: ../plugins/glade/plugin.c:1187
 msgid "End of file"
-msgstr "Fi del fitxer"
+msgstr "Final del fitxer"
 
-#: ../plugins/glade/plugin.c:1368
+#: ../plugins/glade/plugin.c:1356
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "No s'ha pogut inspeccionar la senyal"
 
-#: ../plugins/glade/plugin.c:1390
+#: ../plugins/glade/plugin.c:1378
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "El llenguatge Python no és compatible encara"
 
-#: ../plugins/glade/plugin.c:1403
+#: ../plugins/glade/plugin.c:1391
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "El llenguatge Vala no és compatible encara"
 
-#: ../plugins/glade/plugin.c:1962
+#: ../plugins/glade/plugin.c:1950
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "No hi ha cap editor associat per al dissenyador"
 
-#: ../plugins/glade/plugin.c:1980
+#: ../plugins/glade/plugin.c:1968
 #, c-format
-msgid "Unknown language of the editor \"%s\""
-msgstr "El llenguatge de l'editor «%s» no és conegut"
+msgid "Unknown editor language \"%s\""
+msgstr "Es desconeix el llenguatge de l'editor «%s»"
 
-#: ../plugins/glade/plugin.c:2047 ../plugins/glade/plugin.c:2124
-#: ../plugins/glade/plugin.c:2249
+#: ../plugins/glade/plugin.c:2035 ../plugins/glade/plugin.c:2112
+#: ../plugins/glade/plugin.c:2237
 #, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "S'ha produït un error en afegir un gestor d'estub nou: %s"
 
-#: ../plugins/glade/plugin.c:2054 ../plugins/glade/plugin.c:2138
-msgid "Couldn't find a signal information"
+#: ../plugins/glade/plugin.c:2042 ../plugins/glade/plugin.c:2126
+msgid "Couldn't find signal information"
 msgstr "No s'ha pogut trobar una senyal d'informació"
 
-#: ../plugins/glade/plugin.c:2081
+#: ../plugins/glade/plugin.c:2069
 msgid "Error while adding a new handler stub: No current editor"
 msgstr ""
 "S'ha produït un error en afegir un gestor d'estub nou: Sense editor actual"
 
-#: ../plugins/glade/plugin.c:2254
+#: ../plugins/glade/plugin.c:2242
 #, c-format
 msgid ""
 "To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
 msgstr ""
-"Per a evitar estos missatges desactiveu l'indicador «%s» a Preferències-"
+"Per evitar estos missatges desactiveu l'indicador «%s» a Preferències-"
 ">Dissenyador d'IGU Glade"
 
-#: ../plugins/glade/plugin.c:2324
+#: ../plugins/glade/plugin.c:2312
 msgid "Couldn't find an associated document"
 msgstr "No s'ha pogut trobar un document associat"
 
-#: ../plugins/glade/plugin.c:2390
+#: ../plugins/glade/plugin.c:2378
 msgid "Those documents are already associated"
 msgstr "Estos documents ja estan associats"
 
-#: ../plugins/glade/plugin.c:2428
+#: ../plugins/glade/plugin.c:2416
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "No es pot llegir el fitxer: %s."
 
-#: ../plugins/glade/plugin.c:3095
+#: ../plugins/glade/plugin.c:3083
 msgid "Top level widget"
-msgstr "Giny de nivell més alt"
+msgstr "Giny de nivell superior"
 
-#: ../plugins/glade/plugin.c:3686
+#: ../plugins/glade/plugin.c:3674
 msgid "Couldn't find a default signal name"
 msgstr "No s'ha pogut trobar un nom de senyal predeterminat"
 
-#: ../plugins/glade/plugin.c:3896
+#: ../plugins/glade/plugin.c:3883
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "El projecte %s no té ginys obsolets o desajustos entre versions."
 
-#: ../plugins/glade/plugin.c:3913
+#: ../plugins/glade/plugin.c:3900
 msgid "There is no Glade project"
 msgstr "No hi ha cap projecte del Glade"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3999
+#: ../plugins/glade/plugin.c:3986
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:4007 ../plugins/glade/plugin.c:4009
+#: ../plugins/glade/plugin.c:3994 ../plugins/glade/plugin.c:3996
 msgid "Switch between designer/code"
 msgstr "Commuta entre dissenyador/codi"
 
-#: ../plugins/glade/plugin.c:4015 ../plugins/glade/plugin.c:4017
+#: ../plugins/glade/plugin.c:4002 ../plugins/glade/plugin.c:4004
 msgid "Insert handler stub"
 msgstr "Insereix un gestor d'estub"
 
-#: ../plugins/glade/plugin.c:4023 ../plugins/glade/plugin.c:4025
+#: ../plugins/glade/plugin.c:4010 ../plugins/glade/plugin.c:4012
 msgid "Insert handler stub, autoposition"
 msgstr "Insereix un gestor d'estub, posiciona automàticament"
 
-#: ../plugins/glade/plugin.c:4031
+#: ../plugins/glade/plugin.c:4018
 msgid "Associate last designer and last editor"
 msgstr "Associa l'últim dissenyador i l'últim editor"
 
-#: ../plugins/glade/plugin.c:4033
+#: ../plugins/glade/plugin.c:4020
 msgid "Associate last designer and editor"
 msgstr "Associa l'últim dissenyador i l'editor"
 
-#: ../plugins/glade/plugin.c:4039 ../plugins/glade/plugin.c:4041
-msgid "Associations dialog..."
-msgstr "Diàleg d'associacions..."
+#: ../plugins/glade/plugin.c:4026 ../plugins/glade/plugin.c:4028
+msgid "Associations dialogâ?¦"
+msgstr "Diàleg d'associacions�"
 
-#: ../plugins/glade/plugin.c:4047
-msgid "Versioning..."
-msgstr "Versionat..."
+#: ../plugins/glade/plugin.c:4034
+msgid "Versioningâ?¦"
+msgstr "Versionamentâ?¦"
 
-#: ../plugins/glade/plugin.c:4049
+#: ../plugins/glade/plugin.c:4036
 msgid "Switch between library versions and check deprecations"
 msgstr ""
 "Commuta entre les versions de les biblioteques i comprova les obsolescències"
 
-#: ../plugins/glade/plugin.c:4055 ../plugins/glade/plugin.c:4057
+#: ../plugins/glade/plugin.c:4042 ../plugins/glade/plugin.c:4044
 msgid "Set as default resource target"
 msgstr "Estableix com a objectiu de recursos predeterminat"
 
-#: ../plugins/glade/plugin.c:4065
+#: ../plugins/glade/plugin.c:4052
 msgid "Current default target"
 msgstr "Objectiu actual predeterminat"
 
-#: ../plugins/glade/plugin.c:4073
+#: ../plugins/glade/plugin.c:4060
 msgid "Close the current file"
 msgstr "Tanca el fitxer actual"
 
-#: ../plugins/glade/plugin.c:4081
+#: ../plugins/glade/plugin.c:4068
 msgid "Save the current file"
 msgstr "Alça el fitxer actual"
 
-#: ../plugins/glade/plugin.c:4097
+#: ../plugins/glade/plugin.c:4084
 msgid "Redo the last action"
 msgstr "Refés l'última acció"
 
-#: ../plugins/glade/plugin.c:4105
+#: ../plugins/glade/plugin.c:4092
 msgid "Cut the selection"
 msgstr "Retalla la selecció"
 
-#: ../plugins/glade/plugin.c:4113
+#: ../plugins/glade/plugin.c:4100
 msgid "Copy the selection"
 msgstr "Copia la selecció"
 
-#: ../plugins/glade/plugin.c:4121
+#: ../plugins/glade/plugin.c:4108
 msgid "Paste the clipboard"
 msgstr "Enganxa el porta-retalls"
 
-#: ../plugins/glade/plugin.c:4129
+#: ../plugins/glade/plugin.c:4116
 msgid "Delete the selection"
 msgstr "Suprimeix la selecció"
 
-#: ../plugins/glade/plugin.c:4307
+#: ../plugins/glade/plugin.c:4294
 msgid "Glade designer operations"
 msgstr "Operacions del dissenyador Glade"
 
-#: ../plugins/glade/plugin.c:4407
+#: ../plugins/glade/plugin.c:4394
 msgid "Go back in undo history"
 msgstr "Vés arrere a l'historial de desfer"
 
-#: ../plugins/glade/plugin.c:4409
+#: ../plugins/glade/plugin.c:4396
 msgid "Go forward in undo history"
 msgstr "Vés avant a l'historial de desfer"
 
-#: ../plugins/glade/plugin.c:4431
+#: ../plugins/glade/plugin.c:4418
 msgid "Glade Clipboard"
 msgstr "Porta-retalls del Glade"
 
-#: ../plugins/glade/plugin.c:4436
+#: ../plugins/glade/plugin.c:4423
 msgid "Widgets"
 msgstr "Ginys"
 
-#: ../plugins/glade/plugin.c:4441
+#: ../plugins/glade/plugin.c:4428
 msgid "Palette"
 msgstr "Paleta"
 
-#: ../plugins/glade/plugin.c:4695
+#: ../plugins/glade/plugin.c:4682
 #, c-format
 msgid "Not local file: %s"
 msgstr "No és un fitxer local: %s"
 
-#: ../plugins/glade/plugin.c:4716
+#: ../plugins/glade/plugin.c:4703
 #, c-format
 msgid "Could not open %s"
 msgstr "No s'ha pogut obrir %s"
 
-#: ../plugins/glade/plugin.c:4767
+#: ../plugins/glade/plugin.c:4754
 msgid "Could not create a new glade project."
 msgstr "No s'ha pogut crear un projecte nou del Glade."
 
-#: ../plugins/glade/plugin.c:5029 ../plugins/glade/plugin.c:5054
+#: ../plugins/glade/plugin.c:5025 ../plugins/glade/plugin.c:5050
 msgid "Glade GUI Designer"
 msgstr "Dissenyador d'IGU Glade"
 
@@ -6040,7 +6112,7 @@ msgstr "S'ha alçat el projecte «%s» de Glade"
 
 #: ../plugins/glade/anjuta-design-document.c:379
 #: ../plugins/glade/anjuta-design-document.c:406
-msgid "Invalid glade file name"
+msgid "Invalid Glade file name"
 msgstr "El nom del fitxer Glade no és vàlid"
 
 #: ../plugins/gtodo/add_edit_item.c:99
@@ -6061,7 +6133,7 @@ msgid "Summary:"
 msgstr "Resum:"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:4
+#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
 msgid "Category:"
 msgstr "Categoria:"
 
@@ -6102,8 +6174,8 @@ msgstr "iniciat:"
 #: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:296
 #: ../plugins/gtodo/add_edit_item.c:332 ../plugins/gtodo/add_edit_item.c:333
 #, c-format
-msgid "n/a"
-msgstr "n/d"
+msgid "N/A"
+msgstr "N/D"
 
 #: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
@@ -6111,29 +6183,26 @@ msgid "stopped:"
 msgstr "aturat:"
 
 #: ../plugins/gtodo/callback.c:17
-msgid "You need to select a todo item before you can remove it"
+msgid "You need to select a to-do item before you can remove it"
 msgstr "Heu de seleccionar un element per fer abans de suprimir-lo"
 
 #: ../plugins/gtodo/callback.c:20
-msgid "Are you sure you want to remove the selected todo item?"
-msgstr "Segur que voleu suprimir l'element per fer?"
-
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
-msgid "Remove"
-msgstr "Suprimeix"
+msgid "Are you sure you want to remove the selected to-do item?"
+msgstr "Segur que voleu suprimir l'element per fer seleccionat?"
 
 #: ../plugins/gtodo/callback.c:98
 #, c-format
-msgid "Are you sure you want to remove all the completed todo items?"
+msgid "Are you sure you want to remove all the completed to-do items?"
 msgstr "Segur que voleu suprimir tots els elements per fer completats?"
 
 #: ../plugins/gtodo/callback.c:99
 #, c-format
 msgid ""
-"Are you sure you want to remove all the completed todo items in the category "
-"\"%s\"?"
+"Are you sure you want to remove all the completed to-do items in the "
+"category \"%s\"?"
 msgstr ""
-"Segur que voleu suprimir tots els elements  completats de la categoria «%s»?"
+"Segur que voleu suprimir tots els elements per fer completats de la "
+"categoria «%s»?"
 
 #: ../plugins/gtodo/export.c:47
 msgid "Export task list"
@@ -6145,7 +6214,7 @@ msgstr "XML"
 
 #: ../plugins/gtodo/export.c:159
 msgid "Plain Text"
-msgstr "Text pla"
+msgstr "Text net"
 
 #: ../plugins/gtodo/export.c:160
 msgid "HTML"
@@ -6195,7 +6264,7 @@ msgstr "Resum"
 #: ../plugins/gtodo/libgtodo.c:603
 #, c-format
 msgid "No permission to read the file."
-msgstr "No teniu permís per a llegir el fitxer."
+msgstr "No teniu permís per llegir el fitxer."
 
 #: ../plugins/gtodo/libgtodo.c:618
 #, c-format
@@ -6204,8 +6273,8 @@ msgstr "No s'ha pogut llegir el fitxer"
 
 #: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
 #, c-format
-msgid "Failed to parse xml structure"
-msgstr "No s'ha pogut analitzar l'estructura xml"
+msgid "Failed to parse XML structure"
+msgstr "No s'ha pogut analitzar l'estructura XML"
 
 #: ../plugins/gtodo/libgtodo.c:646
 #, c-format
@@ -6228,7 +6297,7 @@ msgstr "Sense emplenar"
 #: ../plugins/gtodo/libgtodo.c:755
 #, c-format
 msgid "No Gtodo Client to save."
-msgstr "No hi ha cap client Gtodo per a alçar."
+msgstr "No hi ha cap client Gtodo per alçar."
 
 #: ../plugins/gtodo/libgtodo.c:846
 #, c-format
@@ -6262,19 +6331,19 @@ msgstr "Suprimeix"
 msgid "<New category (%d)>"
 msgstr "<Categoria nova (%d)>"
 
-#: ../plugins/gtodo/notification.c:67
+#: ../plugins/gtodo/notification.c:68
 #, c-format
 msgid "The following item is due in %i minute:"
 msgid_plural "The following item is due in %i minutes:"
 msgstr[0] "L'element següent venç d'ací a %i minut:"
 msgstr[1] "L'element següent venç d'ací a %i minuts:"
 
-#: ../plugins/gtodo/notification.c:76
+#: ../plugins/gtodo/notification.c:77
 msgid "The following item is due:"
 msgstr "L'element següent venç:"
 
 #. gtk_container_set_border_width(GTK_CONTAINER(hbox), 9);
-#: ../plugins/gtodo/notification.c:116
+#: ../plugins/gtodo/notification.c:118
 msgid "_Do not show again"
 msgstr "No ho mostres una altra vega_da"
 
@@ -6287,7 +6356,7 @@ msgid "Hide _Completed Items"
 msgstr "Oculta elements _completats"
 
 #: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed todo items"
+msgid "Hide completed to-do items"
 msgstr "Oculta els elements per fer completats"
 
 #: ../plugins/gtodo/plugin.c:83
@@ -6307,11 +6376,11 @@ msgid "Hide items without an end date"
 msgstr "Oculta els elements sense data de venciment"
 
 #: ../plugins/gtodo/plugin.c:122
-msgid "Tasks manager"
+msgid "Task manager"
 msgstr "Gestor de tasques"
 
 #: ../plugins/gtodo/plugin.c:128
-msgid "Tasks manager view"
+msgid "Task manager view"
 msgstr "Visualitzador del gestor de tasques"
 
 #: ../plugins/gtodo/plugin.c:134
@@ -6319,11 +6388,11 @@ msgid "Tasks"
 msgstr "Tasques"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "Todo Manager"
+msgid "To-do Manager"
 msgstr "Gestor de la llista per fer"
 
 #: ../plugins/gtodo/preferences.c:21
-msgid "Todo List Preferences"
+msgid "To-do List Preferences"
 msgstr "Preferències de la llista de tasques per fer"
 
 #: ../plugins/gtodo/preferences.c:84
@@ -6373,11 +6442,11 @@ msgstr[0] "Elements que venceran d'ací %i dia"
 msgstr[1] "Elements que venceran d'ací %i dies"
 
 #: ../plugins/gtodo/preferences.c:168
-msgid "Misc"
+msgid "Miscellaneous"
 msgstr "Miscel·lània"
 
 #: ../plugins/gtodo/preferences.c:171
-msgid "Auto purge completed items"
+msgid "Auto-purge completed items"
 msgstr "Elimina automàticament els elements completats"
 
 #. Translators: First part of the sentence "Purge items after %d days"
@@ -6391,7 +6460,7 @@ msgid "days."
 msgstr "dies."
 
 #: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
-msgid "Auto Purge"
+msgid "Auto-Purge"
 msgstr "Eliminació automàtica"
 
 #: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
@@ -6400,8 +6469,8 @@ msgstr "Notificació"
 
 #: ../plugins/gtodo/preferences.c:218
 #, c-format
-msgid "Allow todo items to notifiy me when they are due in %i minute"
-msgid_plural "Allow todo items to notifiy me when they are due in %i minutes"
+msgid "Allow to-do items to notify me when they are due in %i minute"
+msgid_plural "Allow to-do items to notify me when they are due in %i minutes"
 msgstr[0] ""
 "Habilita la notificació dels elements per fer quan vencen en %i minut"
 msgstr[1] ""
@@ -6419,29 +6488,29 @@ msgstr "Crea una llista de tasques"
 msgid "No Date"
 msgstr "Sense data"
 
-#: ../plugins/macro/anjuta-macro.ui.h:1
-msgid "<b>Macro details:</b>"
-msgstr "<b>Detalls de la macro:</b>"
-
 #: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "<b>Macro text:</b>"
-msgstr "<b>Text de la macro:</b>"
+msgid "Editâ?¦"
+msgstr "Editaâ?¦"
 
 #: ../plugins/macro/anjuta-macro.ui.h:3
-msgid "<b>Macros:</b>"
-msgstr "<b>Macros:</b>"
+msgid "Macro details:"
+msgstr "Detalls de la macro:"
+
+#: ../plugins/macro/anjuta-macro.ui.h:4
+msgid "Macro text:"
+msgstr "Text de la macro:"
 
 #: ../plugins/macro/anjuta-macro.ui.h:5
-msgid "Edit..."
-msgstr "Edita..."
+msgid "Macros:"
+msgstr "Macros:"
 
 #: ../plugins/macro/anjuta-macro.ui.h:7
 msgid "Shortcut:"
 msgstr "Drecera:"
 
 #: ../plugins/macro/macro-actions.c:127
-msgid "Press macro shortcut..."
-msgstr "Premeu la drecera per a la macro..."
+msgid "Press macro shortcutâ?¦"
+msgstr "Premeu la drecera per a la macroâ?¦"
 
 #: ../plugins/macro/macro-actions.c:134
 msgid "Press shortcut"
@@ -6466,15 +6535,15 @@ msgstr ""
 "Categoria:\t %s\n"
 "Drecera:\t %c\n"
 
-#: ../plugins/macro/macro-dialog.c:276
+#: ../plugins/macro/macro-dialog.c:277
 msgid "Insert"
 msgstr "Insereix"
 
-#: ../plugins/macro/macro-dialog.c:279
+#: ../plugins/macro/macro-dialog.c:280
 msgid "Insert macro"
 msgstr "Insereix una macro"
 
-#: ../plugins/macro/macro-edit.c:211
+#: ../plugins/macro/macro-edit.c:207
 msgid "Add/Edit macro"
 msgstr "Afig/edita una macro"
 
@@ -6493,24 +6562,24 @@ msgid "Macros"
 msgstr "Macros"
 
 #: ../plugins/macro/plugin.c:42
-msgid "_Insert Macro..."
-msgstr "_Insereix una macro..."
+msgid "_Insert Macroâ?¦"
+msgstr "_Insereix una macroâ?¦"
 
 #: ../plugins/macro/plugin.c:44
 msgid "Insert a macro using a shortcut"
-msgstr "Insereix una macro que utilitza una drecera de teclat"
+msgstr "Insereix una macro que fa servir una drecera de teclat"
 
 #: ../plugins/macro/plugin.c:49
-msgid "_Add Macro..."
-msgstr "_Afig una macro..."
+msgid "_Add Macroâ?¦"
+msgstr "_Afig una macroâ?¦"
 
 #: ../plugins/macro/plugin.c:51
 msgid "Add a macro"
 msgstr "Afig una macro"
 
 #: ../plugins/macro/plugin.c:56
-msgid "Macros..."
-msgstr "Macros..."
+msgid "Macrosâ?¦"
+msgstr "Macrosâ?¦"
 
 #: ../plugins/macro/plugin.c:58
 msgid "Add/Edit/Remove macros"
@@ -6520,131 +6589,136 @@ msgstr "Afig/edita/suprimeix macros"
 msgid "Macro operations"
 msgstr "Operacions de macro"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
-msgid "<b>Indicators</b>"
-msgstr "<b>Indicadors</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:2
-msgid "<b>Message colors</b>"
-msgstr "<b>Colors dels missatges</b>"
-
+#. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
-msgid "<b>Messages options</b>"
-msgstr "<b>Opcions dels missatges</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Diagonal"
 msgstr "Diagonal"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
 msgid "Error message indicator style:"
 msgstr "Estil de l'indicador de missatge d'error:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Errors:"
 msgstr "Errors:"
 
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+msgid "Indicators"
+msgstr "Indicadors"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+msgid "Message colors"
+msgstr "Colors dels missatges"
+
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:9
+msgid "Messages options"
+msgstr "Opcions dels missatges"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Normal message indicator style:"
 msgstr "Estil de l'indicador de missatge normal:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
 msgid "Number of first characters to show:"
 msgstr "Quantitat de caràcters inicials que s'han de mostrar:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
 msgid "Number of last characters to show:"
 msgstr "Quantitat de caràcters finals que s'han de mostrar:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 msgid "Strike-Out"
-msgstr "Ix"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
-msgid "Tabs position:"
-msgstr "Posició de les pestanyes:"
+msgstr "Ratllat"
 
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+msgid "Tab position:"
+msgstr "Posició de la pestanya:"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
 msgid "Truncate long messages"
 msgstr "Redueix missatges llargs"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Underline-Plain"
 msgstr "Subratllat de línia recta"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:22
 msgid "Underline-Squiggle"
 msgstr "Subratllat de línies mogudes"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
+#. text style in editor, TT is for typewriter text
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:24
 msgid "Underline-TT"
 msgstr "Subratllat-TT"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:25
 msgid "Warning message indicator style:"
 msgstr "Estil d'indicador de missatge d'avís:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:26
 msgid "Warnings:"
 msgstr "Avisos:"
 
-#: ../plugins/message-view/anjuta-msgman.c:99
+#: ../plugins/message-view/anjuta-msgman.c:76
 msgid "Close all message tabs"
 msgstr "Tanca totes les pestanyes de missatges"
 
-#: ../plugins/message-view/message-view.c:490
+#: ../plugins/message-view/message-view.c:491
 msgid "No Messages"
 msgstr "No hi ha missatges"
 
-#: ../plugins/message-view/message-view.c:499
+#: ../plugins/message-view/message-view.c:500
 msgid "No Infos"
 msgstr "No hi ha informació"
 
-#: ../plugins/message-view/message-view.c:511
+#: ../plugins/message-view/message-view.c:512
 msgid "No Warnings"
 msgstr "No hi ha avisos"
 
-#: ../plugins/message-view/message-view.c:524
+#: ../plugins/message-view/message-view.c:525
 msgid "No Errors"
 msgstr "No hi ha errors"
 
-#: ../plugins/message-view/message-view.c:569
+#: ../plugins/message-view/message-view.c:570
 msgid "Icon"
 msgstr "Icona"
 
-#: ../plugins/message-view/message-view.c:583
+#: ../plugins/message-view/message-view.c:584
 #: ../plugins/message-view/plugin.c:324 ../plugins/message-view/plugin.c:333
 #: ../plugins/message-view/plugin.c:453 ../plugins/message-view/plugin.c:465
 msgid "Messages"
 msgstr "Missatges"
 
-#: ../plugins/message-view/message-view.c:942
+#: ../plugins/message-view/message-view.c:943
 #, c-format
 msgid "Error writing %s"
 msgstr "S'ha produït un error en escriure %s"
 
-#: ../plugins/message-view/message-view.c:1099
+#: ../plugins/message-view/message-view.c:1100
 #, c-format
 msgid "%d Message"
 msgid_plural "%d Messages"
 msgstr[0] "%d missatge"
 msgstr[1] "%d missatges"
 
-#: ../plugins/message-view/message-view.c:1105
+#: ../plugins/message-view/message-view.c:1106
 #, c-format
 msgid "%d Info"
 msgid_plural "%d Infos"
 msgstr[0] "%d informació"
 msgstr[1] "%d informacions"
 
-#: ../plugins/message-view/message-view.c:1110
+#: ../plugins/message-view/message-view.c:1111
 #, c-format
 msgid "%d Warning"
 msgid_plural "%d Warnings"
 msgstr[0] "%d avís"
 msgstr[1] "%d avisos"
 
-#: ../plugins/message-view/message-view.c:1115
+#: ../plugins/message-view/message-view.c:1116
 #, c-format
 msgid "%d Error"
 msgid_plural "%d Errors"
@@ -6709,16 +6783,16 @@ msgid "Patching %s using %s\n"
 msgstr "S'està aplicant el pedaç a %s fent servir %s\n"
 
 #: ../plugins/patch/patch-plugin.c:209
-msgid "Patching...\n"
-msgstr "Aplicant pedaços...\n"
+msgid "Patchingâ?¦\n"
+msgstr "S'estan aplicant pedaços�\n"
 
 #: ../plugins/patch/patch-plugin.c:219
-msgid "Patching..."
-msgstr "Aplicant pedaços..."
+msgid "Patchingâ?¦"
+msgstr "S'estan aplicant pedaços�"
 
 #: ../plugins/patch/patch-plugin.c:224
-msgid "There are unfinished jobs, please wait until they are finished."
-msgstr "Hi ha tasques sense finalitzar, espereu fins que hagen finalitzat."
+msgid "There are unfinished jobs: please wait until they are finished."
+msgstr "Hi ha tasques sense finalitzar: espereu fins que hagen finalitzat."
 
 #: ../plugins/patch/patch-plugin.c:266
 msgid ""
@@ -6760,80 +6834,85 @@ msgstr "_Eines"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
-msgid "_Patch..."
-msgstr "_Pedaç..."
+msgid "_Patchâ?¦"
+msgstr "_Pedaç�"
 
 #: ../plugins/patch/plugin.c:92
 msgid "Patch files/directories"
 msgstr "Aplica un pedaç a fitxers/directoris"
 
-#: ../plugins/project-import/plugin.c:66
+#: ../plugins/project-import/plugin.c:68
 msgid ""
 "Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up to date."
+"template to use. Please make sure your version of Anjuta is up-to-date."
 msgstr ""
 "No s'ha pogut generar el fitxer del projecte. No s'ha pogut trobar una "
 "plantilla de projecte adequada. Assegureu-vos que teniu l'última versió de "
 "l'Anjuta."
 
-#: ../plugins/project-import/plugin.c:86
+#: ../plugins/project-import/plugin.c:88
 #, c-format
 msgid "A file named \"%s\" already exists. Do you want to replace it?"
 msgstr "Ja existeix un fitxer anomenat «%s». Voleu sobreescriure'l?"
 
-#: ../plugins/project-import/plugin.c:134
+#: ../plugins/project-import/plugin.c:136
 #, c-format
 msgid ""
-"A file named \"%s\" cannot be written: %s.  Check if you have write access "
-"to the project directory."
+"A file named \"%s\" cannot be written: %s. Check if you have write access to "
+"the project directory."
 msgstr ""
-"No es pot escriure el fitxer «%s»: %s. Comproveu que teniu accés per a "
-"escriure al directori del projecte."
+"No es pot escriure el fitxer «%s»: %s. Comproveu que teniu accés per escriure "
+"al directori del projecte."
 
-#: ../plugins/project-import/plugin.c:204
+#: ../plugins/project-import/plugin.c:200
+#, c-format
+msgid "Please select a project backend to open %s."
+msgstr "Seleccioneu un rerefons de projecte per obrir %s."
+
+#: ../plugins/project-import/plugin.c:220
 #, c-format
 msgid ""
-"Could not find a valid project backend for the directory given (%s). Please "
+"Could not find a valid project backend for the given directory (%s). Please "
 "select a different directory, or try upgrading to a newer version of Anjuta."
 msgstr ""
 "No s'ha pogut trobar un rerefons de projecte vàlid per al directori donat (%"
 "s). Seleccioneu un directori diferent, o proveu d'actualitzar-vos a una "
 "versió més recent de l'Anjuta."
 
-#: ../plugins/project-import/plugin.c:274
-#: ../plugins/project-import/plugin.c:330
+#: ../plugins/project-import/plugin.c:290
+#: ../plugins/project-import/plugin.c:346
 #, c-format
 msgid ""
-"Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
+"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
 msgstr ""
 "No s'ha pogut obtindre l'URI proporcionat «%s», l'error retornat ha sigut: «%s»"
 
 #: ../plugins/project-import/project-import.ui.h:1
-msgid "<b>Import options</b>"
-msgstr "<b>Opcions d'importació</b>"
-
-#: ../plugins/project-import/project-import.ui.h:2
-msgid "<b>Project name</b>"
-msgstr "<b>Nom del projecte</b>"
-
-#: ../plugins/project-import/project-import.ui.h:3
-#: ../plugins/project-wizard/templates/translatable-strings.h:34
+#: ../plugins/project-wizard/templates/translatable-strings.h:35
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "Destinació:"
 
-#: ../plugins/project-import/project-import.ui.h:4
+#: ../plugins/project-import/project-import.ui.h:2
 msgid "Import from folder"
 msgstr "Importa des d'una carpeta"
 
-#: ../plugins/project-import/project-import.ui.h:5
+#: ../plugins/project-import/project-import.ui.h:3
 msgid "Import from version control system"
 msgstr "Importa des d'un sistema de control de versions"
 
-#: ../plugins/project-import/project-import.ui.h:6
+#: ../plugins/project-import/project-import.ui.h:4
+msgid "Import options"
+msgstr "Opcions d'importació"
+
+#: ../plugins/project-import/project-import.ui.h:5
 msgid "Location:"
 msgstr "Ubicació:"
 
+#: ../plugins/project-import/project-import.ui.h:6
+msgid "Project name"
+msgstr "Nom del projecte"
+
 #: ../plugins/project-import/project-import-dialog.c:292
 msgid "Import project"
 msgstr "Importa un projecte"
@@ -6887,130 +6966,151 @@ msgid "_Group name:"
 msgstr "_Nom del grup:"
 
 #: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to add..."
-msgstr "_Seleccioneu un fitxer a afegir..."
+msgid "_Select file to addâ?¦"
+msgstr "_Seleccioneu el fitxer a afegirâ?¦"
 
-#: ../plugins/project-manager/gbf-project-model.c:233
-#: ../plugins/project-manager/plugin.c:1301
-#: ../plugins/project-manager/plugin.c:1384
-#: ../plugins/project-manager/plugin.c:1557
+#: ../plugins/project-manager/gbf-project-model.c:231
+#: ../plugins/project-manager/plugin.c:1430
+#: ../plugins/project-manager/plugin.c:1513
+#: ../plugins/project-manager/plugin.c:1689
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "Projecte"
 
-#: ../plugins/project-manager/gbf-project-model.c:234
+#: ../plugins/project-manager/gbf-project-model.c:232
 msgid "GbfProject Object"
 msgstr "Objecte GbfProject"
 
-#: ../plugins/project-manager/gbf-project-model.c:251
+#: ../plugins/project-manager/gbf-project-model.c:677
 msgid "No project loaded"
 msgstr "No s'ha carregat cap projecte"
 
+#: ../plugins/project-manager/gbf-project-util.c:229
 #: ../plugins/project-manager/gbf-project-util.c:236
-#: ../plugins/project-manager/gbf-project-util.c:244
-msgid "Can not add group"
+msgid "Cannot add group"
 msgstr "No es pot afegir el grup"
 
-#: ../plugins/project-manager/gbf-project-util.c:245
+#: ../plugins/project-manager/gbf-project-util.c:237
 msgid "No parent group selected"
 msgstr "No s'ha seleccionat cap grup pare"
 
-#: ../plugins/project-manager/gbf-project-util.c:417
-#: ../plugins/project-manager/gbf-project-util.c:426
-msgid "Can not add target"
+#: ../plugins/project-manager/gbf-project-util.c:407
+#: ../plugins/project-manager/gbf-project-util.c:414
+msgid "Cannot add target"
 msgstr "No es pot afegir l'objectiu"
 
-#: ../plugins/project-manager/gbf-project-util.c:427
+#: ../plugins/project-manager/gbf-project-util.c:415
 msgid "No group selected"
 msgstr "No s'ha seleccionat cap grup"
 
-#: ../plugins/project-manager/gbf-project-util.c:532
-msgid "Select sources..."
-msgstr "Seleccioneu els fitxers font..."
+#: ../plugins/project-manager/gbf-project-util.c:510
+msgid "Select sourcesâ?¦"
+msgstr "Seleccioneu els fitxers fontâ?¦"
 
-#: ../plugins/project-manager/gbf-project-util.c:772
-#: ../plugins/project-manager/gbf-project-util.c:779
-msgid "Can not add source files"
+#: ../plugins/project-manager/gbf-project-util.c:744
+#: ../plugins/project-manager/gbf-project-util.c:751
+msgid "Cannot add source files"
 msgstr "No es poden afegir els fitxers font"
 
-#: ../plugins/project-manager/gbf-project-util.c:780
+#: ../plugins/project-manager/gbf-project-util.c:752
 msgid "No target has been selected"
 msgstr "No s'ha seleccionat cap objectiu"
 
-#: ../plugins/project-manager/plugin.c:425
-#: ../plugins/project-manager/plugin.c:826
-msgid "Project properties"
-msgstr "Propietats del projecte"
+#: ../plugins/project-manager/plugin.c:437
+msgid "Group properties"
+msgstr "Propietats del grup"
+
+#: ../plugins/project-manager/plugin.c:446
+msgid "No properties available for this group"
+msgstr "No hi ha propietats disponibles per a este grup"
 
-#: ../plugins/project-manager/plugin.c:430
+#: ../plugins/project-manager/plugin.c:451
 msgid "Target properties"
 msgstr "Propietats de l'objectiu"
 
-#: ../plugins/project-manager/plugin.c:435
-msgid "Group properties"
-msgstr "Propietats del grup"
-
-#: ../plugins/project-manager/plugin.c:459
+#: ../plugins/project-manager/plugin.c:460
 msgid "No properties available for this target"
 msgstr "No hi ha propietats disponibles per a este objectiu"
 
-#: ../plugins/project-manager/plugin.c:485
+#: ../plugins/project-manager/plugin.c:492
+#: ../plugins/project-manager/plugin.c:907
+msgid "Project properties"
+msgstr "Propietats del projecte"
+
+#: ../plugins/project-manager/plugin.c:511
+msgid "Refreshing symbol treeâ?¦"
+msgstr "S'està actualitzant l'arbre de símbols�"
+
+#: ../plugins/project-manager/plugin.c:518
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "No es pot actualitzar el projecte: %s"
 
-#: ../plugins/project-manager/plugin.c:663
+#: ../plugins/project-manager/plugin.c:696
 msgid ""
-"Are you sure you want to remove the following group from project?\n"
+"Are you sure you want to remove the following group from the project?\n"
 "\n"
 msgstr ""
 "Segur que voleu suprimir el grup següent del projecte?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:664
-#, c-format
+#: ../plugins/project-manager/plugin.c:699
 msgid ""
-"Group: %s\n"
-"\n"
-"The group will not be deleted from file system."
-msgstr ""
-"Grup: %s\n"
-"\n"
-"No se suprimirà el grup del sistema de fitxers."
-
-#: ../plugins/project-manager/plugin.c:667
-msgid ""
-"Are you sure you want to remove the following target from project?\n"
+"Are you sure you want to remove the following target from the project?\n"
 "\n"
 msgstr ""
 "Segur que voleu suprimir l'objectiu següent del projecte?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:668
-#, c-format
-msgid "Target: %s"
-msgstr "Objectiu: %s"
-
-#: ../plugins/project-manager/plugin.c:671
+#: ../plugins/project-manager/plugin.c:702
 msgid ""
-"Are you sure you want to remove the following source file from project?\n"
+"Are you sure you want to remove the following source file from the project?\n"
 "\n"
 msgstr ""
 "Segur que voleu suprimir el fitxer de codi següent del projecte?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:672
-#, c-format
+#: ../plugins/project-manager/plugin.c:705
 msgid ""
-"Source: %s\n"
+"Are you sure you want to remove the following elements from the project?\n"
 "\n"
-"The source file will not be deleted from file system."
 msgstr ""
-"Font: %s\n"
+"Segur que voleu suprimir els elements següents del projecte?\n"
 "\n"
-"No se suprimirà el fitxer de codi del sistema de fitxers."
 
-#: ../plugins/project-manager/plugin.c:727
+#: ../plugins/project-manager/plugin.c:722
+#, c-format
+msgid "Group: %s\n"
+msgstr "Grup: %s\n"
+
+#: ../plugins/project-manager/plugin.c:725
+#, c-format
+msgid "Target: %s\n"
+msgstr "Objectiu: %s\n"
+
+#: ../plugins/project-manager/plugin.c:728
+#, c-format
+msgid "Source: %s\n"
+msgstr "Font: %s\n"
+
+#: ../plugins/project-manager/plugin.c:731
+#, c-format
+msgid "Shortcut: %s\n"
+msgstr "Drecera: %s\n"
+
+#: ../plugins/project-manager/plugin.c:743
+msgid "The group will not be deleted from the file system."
+msgstr "No se suprimirà el grup del sistema de fitxers."
+
+#: ../plugins/project-manager/plugin.c:745
+msgid "The source file will not be deleted from the file system."
+msgstr "No se suprimirà el fitxer de codi del sistema de fitxers."
+
+#: ../plugins/project-manager/plugin.c:750
+msgid "Confirm remove"
+msgstr "Confirmeu la supressió"
+
+#: ../plugins/project-manager/plugin.c:795
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -7019,102 +7119,102 @@ msgstr ""
 "No es pot suprimir «%s»:\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:784
+#: ../plugins/project-manager/plugin.c:865
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "No s'ha pogut obtindre la informació de l'URI de %s: %s"
 
-#: ../plugins/project-manager/plugin.c:822
+#: ../plugins/project-manager/plugin.c:903
 msgid "_Project"
 msgstr "_Projecte"
 
-#: ../plugins/project-manager/plugin.c:826
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:907
+#: ../plugins/project-manager/plugin.c:941
 msgid "_Properties"
 msgstr "_Propietats"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:912
 msgid "_Refresh"
 msgstr "_Actualitza"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:912
 msgid "Refresh project manager tree"
 msgstr "Actualitza l'arbre del gestor de projectes"
 
-#: ../plugins/project-manager/plugin.c:836
-msgid "Add _Group..."
-msgstr "Afig un _grup..."
+#: ../plugins/project-manager/plugin.c:917
+msgid "Add _Groupâ?¦"
+msgstr "Afig un _grupâ?¦"
 
-#: ../plugins/project-manager/plugin.c:836
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:917
+#: ../plugins/project-manager/plugin.c:951
 msgid "Add a group to project"
 msgstr "Afig un grup al projecte"
 
-#: ../plugins/project-manager/plugin.c:841
-msgid "Add _Target..."
-msgstr "Afig un _objectiu..."
+#: ../plugins/project-manager/plugin.c:922
+msgid "Add _Targetâ?¦"
+msgstr "Afig un _objectiuâ?¦"
 
-#: ../plugins/project-manager/plugin.c:841
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:922
+#: ../plugins/project-manager/plugin.c:956
 msgid "Add a target to project"
 msgstr "Afig un objectiu al projecte"
 
-#: ../plugins/project-manager/plugin.c:846
-msgid "Add _Source File..."
-msgstr "Afig un fitxer de _codi..."
+#: ../plugins/project-manager/plugin.c:927
+msgid "Add _Source Fileâ?¦"
+msgstr "Afig un fitxer de _codiâ?¦"
 
-#: ../plugins/project-manager/plugin.c:846
-#: ../plugins/project-manager/plugin.c:865
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:927
+#: ../plugins/project-manager/plugin.c:946
+#: ../plugins/project-manager/plugin.c:961
 msgid "Add a source file to project"
 msgstr "Afig un fitxer de codi al projecte"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:932
 msgid "Close Pro_ject"
 msgstr "Tanca el pro_jecte"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:932
 msgid "Close project"
 msgstr "Tanca el projecte"
 
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:941
 msgid "Properties of group/target/source"
 msgstr "Propietats del grup/objecte/font"
 
-#: ../plugins/project-manager/plugin.c:865
-msgid "_Add To Project"
+#: ../plugins/project-manager/plugin.c:946
+msgid "_Add to Project"
 msgstr "_Afig al projecte"
 
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:951
 msgid "Add _Group"
 msgstr "Afig un _grup"
 
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:956
 msgid "Add _Target"
 msgstr "Afig un _objectiu"
 
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:961
 msgid "Add _Source File"
 msgstr "Afig un fitxer de _codi"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:966
 msgid "Re_move"
 msgstr "Supri_meix"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:966
 msgid "Remove from project"
 msgstr "Suprimeix-lo del projecte"
 
-#: ../plugins/project-manager/plugin.c:1259
+#: ../plugins/project-manager/plugin.c:1387
 #, c-format
 msgid "Loading project: %s"
 msgstr "S'està carregant el projecte: %s"
 
-#: ../plugins/project-manager/plugin.c:1267
-msgid "Created project view..."
-msgstr "S'ha creat la visualització del projecte..."
+#: ../plugins/project-manager/plugin.c:1395
+msgid "Created project viewâ?¦"
+msgstr "S'ha creat la visualització del projecte�"
 
-#: ../plugins/project-manager/plugin.c:1280
+#: ../plugins/project-manager/plugin.c:1408
 #, c-format
 msgid ""
 "Failed to parse project (the project is opened, but there will be no project "
@@ -7123,49 +7223,45 @@ msgstr ""
 "No s'ha pogut analitzar el projecte (el projecte està obert però no hi haurà "
 "cap visualització de projecte) %s: %s\n"
 
-#: ../plugins/project-manager/plugin.c:1472
+#: ../plugins/project-manager/plugin.c:1601
 #, c-format
 msgid "Error closing project: %s"
 msgstr "S'ha produït un error en tancar el projecte: %s"
 
-#: ../plugins/project-manager/plugin.c:1536
+#: ../plugins/project-manager/plugin.c:1668
 msgid "Project manager actions"
 msgstr "Accions del gestor de projectes"
 
-#: ../plugins/project-manager/plugin.c:1544
+#: ../plugins/project-manager/plugin.c:1676
 msgid "Project manager popup actions"
 msgstr "Accions emergents del gestor de projectes"
 
-#: ../plugins/project-manager/plugin.c:2641
-msgid "Initializing Project..."
-msgstr "S'està inicialitzant el projecte..."
+#: ../plugins/project-manager/plugin.c:2471
+msgid "Initializing Projectâ?¦"
+msgstr "S'està inicialitzant el projecte�"
 
-#: ../plugins/project-manager/plugin.c:2644
+#: ../plugins/project-manager/plugin.c:2474
 msgid "Project Loaded"
 msgstr "S'ha carregat el projecte"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Detalls</b>"
+msgid "Details"
+msgstr "Detalls"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:2
-#: ../plugins/project-wizard/druid.c:147
+#: ../plugins/project-wizard/druid.c:150
 msgid "Error"
 msgstr "Error"
 
-#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:3
-msgid "Select project type"
-msgstr "Seleccioneu el tipus de projecte"
-
-#: ../plugins/project-wizard/druid.c:139 ../plugins/project-wizard/druid.c:143
+#: ../plugins/project-wizard/druid.c:142 ../plugins/project-wizard/druid.c:146
 msgid "Warning"
 msgstr "Avís"
 
-#: ../plugins/project-wizard/druid.c:150
+#: ../plugins/project-wizard/druid.c:153
 msgid "Message"
 msgstr "Missatge"
 
-#: ../plugins/project-wizard/druid.c:216
+#: ../plugins/project-wizard/druid.c:232
 msgid ""
 "<b>Confirm the following information:</b>\n"
 "\n"
@@ -7175,17 +7271,17 @@ msgstr ""
 
 #. The project type is translated too, it is something like
 #. * generic, GNOME applet, Makefile project...
-#: ../plugins/project-wizard/druid.c:220
+#: ../plugins/project-wizard/druid.c:236
 #, c-format
 msgid "Project Type: %s\n"
 msgstr "Tipus de projecte: %s\n"
 
-#: ../plugins/project-wizard/druid.c:374
+#: ../plugins/project-wizard/druid.c:393
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "No es pot trobar cap plantilla de projecte a %s"
 
-#: ../plugins/project-wizard/druid.c:575
+#: ../plugins/project-wizard/druid.c:594
 #, c-format
 msgid ""
 "\n"
@@ -7194,22 +7290,32 @@ msgstr ""
 "\n"
 "El camp «%s» és obligatori. Introduïu-lo."
 
-#: ../plugins/project-wizard/druid.c:590
+#: ../plugins/project-wizard/druid.c:609
 #, c-format
 msgid ""
-"Field \"%s\" must start with a letter, a digit or an underscore and contains "
+"Field \"%s\" must start with a letter, a digit or an underscore and contain "
 "only letters, digits, underscore, minus and dot. Please fix it."
 msgstr ""
 "El camp «%s» ha de començar amb una lletra, un dígit o una ratlla baixa i "
-"només pot contindre lletres, dígits, ratlles baixes, guions i punts. "
-"Arregleu-lo."
+"només pot contindre lletres, dígits, ratlles baixes, guions i punts."
+
+#: ../plugins/project-wizard/druid.c:614
+#, c-format
+msgid ""
+"Field \"%s\" must start with a letter, a digit, an underscore or a directory "
+"separator and contain only letters, digits, underscore, directory separator, "
+"minus and dot. Please fix it."
+msgstr ""
+"El camp «%s» ha de començar amb una lletra, un dígit, una ratlla baixa o un "
+"separador de directori i només pot contindre lletres, dígits, ratlles "
+"baixes, separador de directori, guions i punts."
 
-#: ../plugins/project-wizard/druid.c:595
+#: ../plugins/project-wizard/druid.c:619
 #, c-format
 msgid "Unknown error."
 msgstr "Error desconegut."
 
-#: ../plugins/project-wizard/druid.c:622
+#: ../plugins/project-wizard/druid.c:646
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
@@ -7218,20 +7324,20 @@ msgstr ""
 "Ja existeix el directori «%s». Pot fallar la creació del projecte si no es "
 "poden escriure alguns fitxers. Voleu continuar?"
 
-#: ../plugins/project-wizard/druid.c:624
+#: ../plugins/project-wizard/druid.c:648
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "Ja existeix el fitxer «%s». Voleu sobreescriure'l?"
 
-#: ../plugins/project-wizard/druid.c:655
+#: ../plugins/project-wizard/druid.c:679
 msgid "Invalid entry"
 msgstr "Entrada no vàlida"
 
-#: ../plugins/project-wizard/druid.c:666
+#: ../plugins/project-wizard/druid.c:690
 msgid "Dubious entry"
 msgstr "Entrada dubtosa"
 
-#: ../plugins/project-wizard/druid.c:776
+#: ../plugins/project-wizard/druid.c:851
 #, c-format
 msgid ""
 "\n"
@@ -7240,7 +7346,7 @@ msgstr ""
 "\n"
 "Programes que falten: %s."
 
-#: ../plugins/project-wizard/druid.c:787
+#: ../plugins/project-wizard/druid.c:862
 #, c-format
 msgid ""
 "\n"
@@ -7249,41 +7355,45 @@ msgstr ""
 "\n"
 "Paquets que falten: %s."
 
-#: ../plugins/project-wizard/druid.c:795
+#: ../plugins/project-wizard/druid.c:871
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
 "generating the project.\n"
 msgstr ""
 "Falten alguns programes o paquets de desenvolupament importants que es "
-"necessiten per a muntar este projecte. Assegureu-vos que estan instal·lats "
+"necessiten per muntar este projecte. Assegureu-vos que estan instal·lats "
 "adequadament abans de generar el projecte.\n"
 
-#: ../plugins/project-wizard/druid.c:801
+#: ../plugins/project-wizard/druid.c:879
+msgid "Install missing packages"
+msgstr "Instal·la els paquets que falten"
+
+#: ../plugins/project-wizard/druid.c:887
 msgid ""
 "The missing programs are usually part of some distrubution packages and can "
-"be searched in your Application Manager. Similarly, the development packages "
-"are contained in special packages that your distribution provide to allow "
-"development of projects based on them. They usually end with -dev or -devel "
-"suffix in package names and can be found by searching in your Application "
-"Manager."
+"be searched for in your Application Manager. Similarly, the development "
+"packages are contained in special packages that your distribution provides "
+"to allow development of projects based on them. They usually end with a \"-"
+"dev\" or \"-devel\" suffix in package names and can be found by searching in "
+"your Application Manager."
 msgstr ""
 "Generalment els programes que falten són part d'alguna distribució de "
 "paquets i els podeu cercar en el Gestor d'aplicacions. De la mateixa manera, "
 "els paquets de desenvolupament estan continguts en paquets especials que "
-"proporciona la distribució per a permetre el desenvolupament de projectes "
-"basats en estos. Normalment estos finalitzen amb el sufix -dev o -devel en "
+"proporciona la distribució per permetre el desenvolupament de projectes "
+"basats en estos. Normalment estos finalitzen amb el sufix «-dev» o «-devel» en "
 "el nom del paquet i es poden trobar en cercar en el Gestor d'aplicacions."
 
-#: ../plugins/project-wizard/druid.c:809
+#: ../plugins/project-wizard/druid.c:895
 msgid "Missing components"
 msgstr "Components que manquen"
 
-#: ../plugins/project-wizard/druid.c:941
+#: ../plugins/project-wizard/druid.c:1027
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr ""
-"No s'ha pogut muntar la interfície d'usuari per a l'auxiliar del projecte a "
+"No es pot muntar la interfície d'usuari per a l'auxiliar del projecte a "
 "partir de %s."
 
 #: ../plugins/project-wizard/install.c:406
@@ -7301,18 +7411,18 @@ msgstr "S'ignorarà %s: ja existeix el fitxer"
 
 #: ../plugins/project-wizard/install.c:503
 #, c-format
-msgid "Creating %s ... Fail to create directory"
-msgstr "S'està creant %s... No s'ha pogut crear el directori"
+msgid "Creating %s â?¦ Failed to create directory"
+msgstr "S'està creant %s� No s'ha pogut crear el directori"
 
 #: ../plugins/project-wizard/install.c:519
 #, c-format
-msgid "Creating %s (using AutoGen)... %s"
-msgstr "S'està creant %s (fent servir AutoGen)... %s"
+msgid "Creating %s (using AutoGen)â?¦ %s"
+msgstr "S'està creant %s (fent servir AutoGen)� %s"
 
 #: ../plugins/project-wizard/install.c:524
 #, c-format
-msgid "Creating %s ... %s"
-msgstr "S'està creant %s ... %s"
+msgid "Creating %s â?¦ %s"
+msgstr "S'està creant %s� %s"
 
 #. The %s is a name of a unix command line, by example
 #. * cp foobar.c project
@@ -7325,36 +7435,36 @@ msgstr "S'està executant: %s"
 msgid "New Project Assistant"
 msgstr "Auxiliar de projecte nou"
 
-#: ../plugins/project-wizard/property.c:288
-#: ../plugins/project-wizard/property.c:401
+#: ../plugins/project-wizard/property.c:311
+#: ../plugins/project-wizard/property.c:424
 msgid "No"
 msgstr "No"
 
-#: ../plugins/project-wizard/property.c:299
+#: ../plugins/project-wizard/property.c:322
 msgid "Select directory"
 msgstr "Seleccioneu el directori"
 
 # source\euro\euro.src string MESSAGES+2
 # Projecte_Open_Office_1.1 [wizards.po]
-#: ../plugins/project-wizard/property.c:307
+#: ../plugins/project-wizard/property.c:330
 msgid "Select file"
 msgstr "Seleccioneu un fitxer"
 
-#: ../plugins/project-wizard/property.c:359 ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:382 ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "Seleccioneu un fitxer d'imatge"
 
-#: ../plugins/project-wizard/property.c:384
-#: ../plugins/project-wizard/property.c:474 ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:407
+#: ../plugins/project-wizard/property.c:497 ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "Escolliu una icona"
 
-#: ../plugins/project-wizard/property.c:444
+#: ../plugins/project-wizard/property.c:467
 msgid "Choose directory"
 msgstr "Escolliu un directori"
 
-#: ../plugins/project-wizard/property.c:448
+#: ../plugins/project-wizard/property.c:471
 msgid "Choose file"
 msgstr "Escolliu un fitxer"
 
@@ -7385,7 +7495,7 @@ msgstr "Un projecte genèric d'Xlib"
 #: ../plugins/project-wizard/templates/translatable-strings.h:7
 msgid "A generic java project using automake project management"
 msgstr ""
-"Un projecte genèric de Java utilitzant la gestió de projectes de l'automake"
+"Un projecte genèric en Java que utilitza la gestió de projectes de l'automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:8
 msgid "A generic minimal and flat project"
@@ -7396,7 +7506,7 @@ msgid ""
 "A generic natively compiled java project using the GNU Java Compiler (gcj)"
 msgstr ""
 "Un projecte genèric compilat en Java nadiu utilitzant el compilador de Java "
-"de GNU (gcj)"
+"del GNU (gcj)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:10
 msgid "A generic project"
@@ -7405,44 +7515,48 @@ msgstr "Un projecte genèric"
 #: ../plugins/project-wizard/templates/translatable-strings.h:11
 msgid "A generic python project using automake project management"
 msgstr ""
-"Un projecte genèric de Python utilitzant la gestió de projectes de l'automake"
+"Un projecte genèric en Python que utilitza la gestió de projectes de "
+"l'automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:12
 msgid "A generic wx Widgets project"
-msgstr "Un projecte genèric de wx Widgets"
+msgstr "Un projecte genèric del wxWidgets"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:13
 msgid "A sample SDL project"
 msgstr "Un projecte de mostra SDL"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:14
+msgid "A shared or a static library project"
+msgstr "Un projecte de biblioteca compartida o estàtica"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:15
 msgid "Add C++ support:"
 msgstr "Afig compatibilitat C++:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:15
+#: ../plugins/project-wizard/templates/translatable-strings.h:16
 msgid "Add gtk-doc system:"
 msgstr "Afig el sistema gtk-doc:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:16
+#: ../plugins/project-wizard/templates/translatable-strings.h:17
 msgid "Add internationalization:"
 msgstr "Afig internacionalització:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:17
+#: ../plugins/project-wizard/templates/translatable-strings.h:18
 msgid "Add shared library support:"
 msgstr "Afig compatibilitat per a les biblioteques compartides:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:18
+#: ../plugins/project-wizard/templates/translatable-strings.h:19
 msgid "Adds C++ support to the project so that C++ source files can be built"
 msgstr ""
 "Afig compatibilitat C++ al projecte de manera que es puguen construir els "
 "fitxers de codi C++"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:19
+#: ../plugins/project-wizard/templates/translatable-strings.h:20
 msgid "Adds support for building shared libraries in your project"
-msgstr ""
-"Afig compatibilitat per a muntar biblioteques compartides en el projecte"
+msgstr "Afig compatibilitat per muntar biblioteques compartides en el projecte"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:20
+#: ../plugins/project-wizard/templates/translatable-strings.h:21
 msgid ""
 "Adds support for internationalization so that your project can have "
 "translations in different languages"
@@ -7450,129 +7564,133 @@ msgstr ""
 "Afig compatibilitat per a la internacionalització de manera que el projecte "
 "puga traduir-se en diferents idiomes"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:21
+#: ../plugins/project-wizard/templates/translatable-strings.h:22
 msgid "Anjuta Plugin"
 msgstr "Connector de l'Anjuta"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:22
+#: ../plugins/project-wizard/templates/translatable-strings.h:23
 msgid "Anjuta plugin project that uses libanjuta framework"
 msgstr ""
 "Projecte de connector de l'Anjuta que utilitza l'entorn de treball libanjuta"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:23
+#: ../plugins/project-wizard/templates/translatable-strings.h:24
 msgid "Applet Title:"
 msgstr "Títol de la miniaplicació:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:25
+#: ../plugins/project-wizard/templates/translatable-strings.h:26
 msgid "Basic information"
 msgstr "Informació bàsica"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:26
+#: ../plugins/project-wizard/templates/translatable-strings.h:27
 msgid "Berkeley Software Distribution License (BSD)"
 msgstr "Llicència de distribució de programari Berkeley (BSD)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:27
+#: ../plugins/project-wizard/templates/translatable-strings.h:28
+msgid "Build library as"
+msgstr "Munta la biblioteca com a"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:29
 msgid ""
 "Comma separated, other plugins that this plugin depends on. It could be "
 "either primary interface name or plugin location (library:class)"
 msgstr ""
-"Separats per una coma, els altres connectors dels quals depèn este "
-"connector. Pot ser el nom de l'interfície primària o la ubicació del "
-"connector (biblioteca:classe)"
+"Els altres connectors dels quals depèn este connector, separats per comes. "
+"Poden ser el nom de la interfície primària o la ubicació del connector "
+"(biblioteca:classe)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:28
+#: ../plugins/project-wizard/templates/translatable-strings.h:30
 msgid "Configure external packages"
 msgstr "Configura els paquets externs"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:29
+#: ../plugins/project-wizard/templates/translatable-strings.h:31
 msgid "Configure external packages:"
 msgstr "Configura els paquets externs:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:30
+#: ../plugins/project-wizard/templates/translatable-strings.h:32
 msgid "Create Gtk Builder interface file"
-msgstr "Crea un fitxer d'interfície GTK Builder"
+msgstr "Crea un fitxer d'interfície GtkBuilder"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:31
+#: ../plugins/project-wizard/templates/translatable-strings.h:33
 msgid "Create a template Gtk Builder interface file"
-msgstr "Crea un fitxer de plantilla d'interfície GTK Builder"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:32
-msgid "Create a template gtk builder interface file"
-msgstr "Crea un fitxer de plantilla d'interfície GTK Builder"
+msgstr "Crea un fitxer de plantilla d'interfície GtkBuilder"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:35
+#: ../plugins/project-wizard/templates/translatable-strings.h:36
 msgid "Display description of the applet"
 msgstr "Mostra la descripció de la miniaplicació"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:36
+#: ../plugins/project-wizard/templates/translatable-strings.h:37
 msgid "Display description of the plugin"
 msgstr "Mostra la descripció del connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:37
+#: ../plugins/project-wizard/templates/translatable-strings.h:38
 msgid "Display title of the applet"
 msgstr "Mostra el títol de la miniaplicació"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:38
+#: ../plugins/project-wizard/templates/translatable-strings.h:39
 msgid "Display title of the plugin"
 msgstr "Mostra el títol del connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:39
+#: ../plugins/project-wizard/templates/translatable-strings.h:40
 msgid "Django Project"
 msgstr "Projecte Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:40
+#: ../plugins/project-wizard/templates/translatable-strings.h:41
 msgid "Django Project information"
 msgstr "Informació del projecte Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:41
+#: ../plugins/project-wizard/templates/translatable-strings.h:42
 msgid "Email address:"
 msgstr "Adreça de correu electrònic:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:42
+#: ../plugins/project-wizard/templates/translatable-strings.h:43
 msgid "GCJ needs to know which class contains the main() function"
 msgstr "El GCJ necessita saber quina classe conté la funció main()"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:43
+#: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GNOME Applet"
 msgstr "Miniaplicació del GNOME"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
+#: ../plugins/project-wizard/templates/translatable-strings.h:45
 msgid "GTK+"
 msgstr "GTK+"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
+#: ../plugins/project-wizard/templates/translatable-strings.h:46
 msgid "GTKmm"
 msgstr "GTKmm"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
+#: ../plugins/project-wizard/templates/translatable-strings.h:47
 msgid "General Project Information"
 msgstr "Informació general del projecte"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
+#: ../plugins/project-wizard/templates/translatable-strings.h:49
 msgid "Generic"
 msgstr "Genèric"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
+#: ../plugins/project-wizard/templates/translatable-strings.h:50
 msgid "Generic (Minimal)"
 msgstr "Genèric (mínim)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
+#: ../plugins/project-wizard/templates/translatable-strings.h:51
 msgid "Generic C++"
 msgstr "C++ genèric"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
+#: ../plugins/project-wizard/templates/translatable-strings.h:52
+msgid "Generic JavaScript"
+msgstr "JavaScript genèric"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:53
 msgid "Generic gcj compiled java"
-msgstr "Java genèric compilat amb gcj"
+msgstr "Java genèric compilat amb el gcj"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
+#: ../plugins/project-wizard/templates/translatable-strings.h:54
 msgid "Generic java (automake)"
 msgstr "Java genèric (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
+#: ../plugins/project-wizard/templates/translatable-strings.h:55
 msgid "Generic python (automake)"
 msgstr "Python genèric (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
+#: ../plugins/project-wizard/templates/translatable-strings.h:56
 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 "
@@ -7582,103 +7700,115 @@ msgstr ""
 "és la versió necessària del paquet. Per exemple, «libgnomeui-2.0» o "
 "«libgnomeui-2.0 >= 2.2.0»"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
+#: ../plugins/project-wizard/templates/translatable-strings.h:57
 msgid "Icon File:"
 msgstr "Fitxer de la icona:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
+#: ../plugins/project-wizard/templates/translatable-strings.h:58
 msgid "Icon file for the plugin"
 msgstr "Fitxer de la icona per al connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
+#: ../plugins/project-wizard/templates/translatable-strings.h:59
 msgid "Implement plugin interfaces"
 msgstr "Implementa les interfícies del connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
+#: ../plugins/project-wizard/templates/translatable-strings.h:60
 msgid "Interface implemented by the plugin"
 msgstr "Interfície implementada pel connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
+#: ../plugins/project-wizard/templates/translatable-strings.h:61
 msgid "Interface:"
 msgstr "Interfície:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
+#: ../plugins/project-wizard/templates/translatable-strings.h:63
+msgid "Library"
+msgstr "Biblioteca"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:64
 msgid "License"
 msgstr "Llicència"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
+#: ../plugins/project-wizard/templates/translatable-strings.h:65
 msgid "Main Class:"
 msgstr "Classe principal:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
+#: ../plugins/project-wizard/templates/translatable-strings.h:66
 msgid "Main class"
 msgstr "Classe principal"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
+#: ../plugins/project-wizard/templates/translatable-strings.h:67
 msgid "Makefile project"
 msgstr "Projecte makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
+#: ../plugins/project-wizard/templates/translatable-strings.h:68
 msgid "Makefile-based project"
 msgstr "Projecte basat en el makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
+#: ../plugins/project-wizard/templates/translatable-strings.h:69
 msgid "Mininum SDL version required"
 msgstr "Versió mínima necessària de l'SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
+#: ../plugins/project-wizard/templates/translatable-strings.h:70
 msgid "Name of the value to watch"
 msgstr "Nom del valor a vigilar"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
+#: ../plugins/project-wizard/templates/translatable-strings.h:71
 msgid "No license"
 msgstr "Sense llicència"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
+#: ../plugins/project-wizard/templates/translatable-strings.h:72
+msgid "Only Shared"
+msgstr "Només compartida"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:73
+msgid "Only Static"
+msgstr "Només estàtica"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:74
 msgid "Options for project build system"
 msgstr "Opcions per al sistema de muntatge del projecte"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
+#: ../plugins/project-wizard/templates/translatable-strings.h:75
 msgid "Plugin Class Name:"
 msgstr "Nom de la classe del connector:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
+#: ../plugins/project-wizard/templates/translatable-strings.h:76
 msgid "Plugin Dependencies:"
 msgstr "Dependències del connector:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
+#: ../plugins/project-wizard/templates/translatable-strings.h:77
 msgid "Plugin Description:"
 msgstr "Descripció del connector:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
+#: ../plugins/project-wizard/templates/translatable-strings.h:78
 msgid "Plugin Title:"
 msgstr "Títol del connector:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
+#: ../plugins/project-wizard/templates/translatable-strings.h:79
 msgid "Plugin class name"
 msgstr "Nom de la classe del connector"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
+#: ../plugins/project-wizard/templates/translatable-strings.h:80
 msgid "Plugin has menus or/and toolbars"
 msgstr "El connector té menús i/o barres d'eines"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
+#: ../plugins/project-wizard/templates/translatable-strings.h:81
 msgid "Plugin interfaces to implement"
 msgstr "Interfícies del connector a implementar"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
+#: ../plugins/project-wizard/templates/translatable-strings.h:82
 msgid "Project Name:"
 msgstr "Nom del projecte:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
+#: ../plugins/project-wizard/templates/translatable-strings.h:83
 msgid "Project directory, output file etc."
 msgstr "Directori del projecte, fitxer d'eixida, etc."
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
+#: ../plugins/project-wizard/templates/translatable-strings.h:84
 msgid "Project directory:"
 msgstr "Directori del projecte:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
+#: ../plugins/project-wizard/templates/translatable-strings.h:85
 msgid ""
 "Project name must not contain spaces, because it will be the name of the "
 "project build target (executable, library etc.)"
@@ -7686,115 +7816,123 @@ msgstr ""
 "El nom del projecte no pot contindre espais perquè serà el nom del projecte "
 "objectiu a muntar (executable, biblioteca, etc.)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
+#: ../plugins/project-wizard/templates/translatable-strings.h:86
 msgid "Project name:"
 msgstr "Nom del projecte:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
+#: ../plugins/project-wizard/templates/translatable-strings.h:87
 msgid "Project options"
 msgstr "Opcions del projecte"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
+#: ../plugins/project-wizard/templates/translatable-strings.h:88
 msgid "Python webproject using Django Web Framework"
-msgstr "Projecte web Python que utilitza l'entorn de treball web Django"
+msgstr "Projecte web en Python que utilitza l'entorn de treball web Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
+#: ../plugins/project-wizard/templates/translatable-strings.h:89
 msgid "Require Package:"
 msgstr "Necessita el paquet:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
+#: ../plugins/project-wizard/templates/translatable-strings.h:90
 msgid "Require SDL version:"
 msgstr "Necessita la versió SDL:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
+#: ../plugins/project-wizard/templates/translatable-strings.h:91
 msgid "Require SDL_gfx library"
 msgstr "Necessita la biblioteca SDL_gfx"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
+#: ../plugins/project-wizard/templates/translatable-strings.h:92
 msgid "Require SDL_gfx:"
 msgstr "Necessita la SDL_gfx:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
+#: ../plugins/project-wizard/templates/translatable-strings.h:93
 msgid "Require SDL_image library"
 msgstr "Necessita la biblioteca SDL_image"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
+#: ../plugins/project-wizard/templates/translatable-strings.h:94
 msgid "Require SDL_image:"
 msgstr "Necessita la SDL_image:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
+#: ../plugins/project-wizard/templates/translatable-strings.h:95
 msgid "Require SDL_mixer library"
 msgstr "Necessita la biblioteca SDL_mixer"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
+#: ../plugins/project-wizard/templates/translatable-strings.h:96
 msgid "Require SDL_mixer:"
 msgstr "Necessita la SDL_mixer:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
+#: ../plugins/project-wizard/templates/translatable-strings.h:97
 msgid "Require SDL_net library"
 msgstr "Necessita la biblioteca SDL_net"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
+#: ../plugins/project-wizard/templates/translatable-strings.h:98
 msgid "Require SDL_net:"
 msgstr "Necessita el SDL_net:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
+#: ../plugins/project-wizard/templates/translatable-strings.h:99
 msgid "Require SDL_ttf library"
 msgstr "Necessita la biblioteca SDL_ttf"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
+#: ../plugins/project-wizard/templates/translatable-strings.h:100
 msgid "Require SDL_ttf:"
 msgstr "Necessita la SDL_ttf:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
+#: ../plugins/project-wizard/templates/translatable-strings.h:101
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
+#: ../plugins/project-wizard/templates/translatable-strings.h:102
 msgid "Select code license"
 msgstr "Selecciona la llicència del codi"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
+#: ../plugins/project-wizard/templates/translatable-strings.h:103
+msgid "Select library type to build"
+msgstr "Seleccioneu el tipus de biblioteca a muntar"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:104
+msgid "Shared and Static library"
+msgstr "Biblioteca compartida i estàtica"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:105
 msgid "Shell values to watch"
 msgstr "Valors de l'intèrpret d'ordes a vigilar"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
+#: ../plugins/project-wizard/templates/translatable-strings.h:106
 msgid "Use pkg-config to add library support from other packages"
 msgstr ""
-"Utilitzeu el pkg-config per a afegir compatibilitat per a biblioteques des "
+"Utilitzeu el pkg-config per afegir compatibilitat per a biblioteques des "
 "d'altres paquets"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
+#: ../plugins/project-wizard/templates/translatable-strings.h:107
 msgid "Value Name:"
 msgstr "Nom del valor:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
+#: ../plugins/project-wizard/templates/translatable-strings.h:108
 msgid "Values to watch"
 msgstr "Valors a vigilar"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:110
 msgid "Whether the plugin has menus or toolbars"
 msgstr "Si el connector té menú o barres d'eines"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:104
+#: ../plugins/project-wizard/templates/translatable-strings.h:111
 msgid "Wx Widgets"
 msgstr "Wx Widgets"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:105
+#: ../plugins/project-wizard/templates/translatable-strings.h:112
 msgid "Xlib"
 msgstr "Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
+#: ../plugins/project-wizard/templates/translatable-strings.h:113
 msgid "Xlib dock"
 msgstr "Acoblador Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:107
+#: ../plugins/project-wizard/templates/translatable-strings.h:114
 msgid "gtk-doc is used to compile API documentations for GObject based classes"
 msgstr ""
-"El gtk-doc s'utilitza per a compilar la documentació de l'API per a les "
-"classes basades en GObject"
+"El gtk-doc s'utilitza per compilar la documentació de l'API per a les "
+"classes basades en el GObject"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:108
+#: ../plugins/project-wizard/templates/translatable-strings.h:115
 msgid "project name"
 msgstr "nom del projecte"
 
@@ -7815,18 +7953,13 @@ msgid "Program:"
 msgstr "Programa:"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:6
-msgid "Run In Terminal"
+msgid "Run in Terminal"
 msgstr "Executa en un terminal"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:7
 msgid "Working Directory:"
 msgstr "Directori de treball:"
 
-#: ../plugins/run-program/execute.c:76
-#, c-format
-msgid "Program '%s' does not exist"
-msgstr "No existeix el programa «%s»"
-
 #. Only local directory are supported
 #: ../plugins/run-program/execute.c:107
 #, c-format
@@ -7837,7 +7970,7 @@ msgstr "El directori del programa «%s» no és local"
 msgid "Load Target to run"
 msgstr "Carrega l'objectiu a executar"
 
-#: ../plugins/run-program/parameters.c:616
+#: ../plugins/run-program/parameters.c:617
 #, c-format
 msgid "Missing file %s"
 msgstr "Falta el fitxer %s"
@@ -7852,191 +7985,190 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/run-program/plugin.c:229
+#: ../plugins/run-program/plugin.c:231
 msgid "_Run"
 msgstr "_Executa"
 
-#: ../plugins/run-program/plugin.c:237
+#: ../plugins/run-program/plugin.c:239
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in.h:3
 msgid "Execute"
 msgstr "Executa"
 
-#: ../plugins/run-program/plugin.c:239
+#: ../plugins/run-program/plugin.c:241
 msgid "Run program without debugger"
 msgstr "Executa el programa sense depurador"
 
-#: ../plugins/run-program/plugin.c:245
+#: ../plugins/run-program/plugin.c:247
 msgid "Stop Program"
 msgstr "Atura el programa"
 
-#: ../plugins/run-program/plugin.c:247
+#: ../plugins/run-program/plugin.c:249
 msgid "Kill program"
 msgstr "Mata el programa"
 
-#: ../plugins/run-program/plugin.c:253
-msgid "Program Parameters..."
-msgstr "Paràmetres del programa..."
-
 #: ../plugins/run-program/plugin.c:255
-msgid "Set current program, arguments and so on"
-msgstr "Estableix el programa actual, els arguments i altres paràmetres"
+msgid "Program Parametersâ?¦"
+msgstr "Paràmetres del programa�"
 
-#: ../plugins/run-program/plugin.c:280
+#: ../plugins/run-program/plugin.c:257
+msgid "Set current program, arguments, etc."
+msgstr "Estableix el programa actual, els arguments, etc."
+
+#: ../plugins/run-program/plugin.c:282
 msgid "Run operations"
 msgstr "Executa les operacions"
 
 #: ../plugins/search/anjuta-search.ui.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Accions</b>"
+msgid "Actions"
+msgstr "Accions"
 
 #: ../plugins/search/anjuta-search.ui.h:2
-msgid "<b>File Filter</b>"
-msgstr "<b>Filtre de fitxers</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:4
-msgid "<b>Parameters</b>"
-msgstr "<b>Paràmetres</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:5
-msgid "<b>Scope</b>"
-msgstr "<b>Abast</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:6
-msgid "<b>Search variable</b>"
-msgstr "<b>Variable de cerca</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:7
 #: ../plugins/search/search-replace.c:92
 msgid "Backward"
 msgstr "Arrere"
 
-#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/anjuta-search.ui.h:3
 msgid "Basic Search & Replace"
 msgstr "Cerca i reemplaçament bàsic"
 
-#: ../plugins/search/anjuta-search.ui.h:9
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Directories:"
 msgstr "Escolliu els directoris:"
 
-#: ../plugins/search/anjuta-search.ui.h:10
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "Choose Files:"
 msgstr "Escolliu els fitxers:"
 
-#: ../plugins/search/anjuta-search.ui.h:11
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "Expand regex back references"
 msgstr "Expandeix les referències d'expressions regulars"
 
-#: ../plugins/search/anjuta-search.ui.h:12
+#: ../plugins/search/anjuta-search.ui.h:7
+msgid "File Filter"
+msgstr "Filtre de fitxers"
+
+#: ../plugins/search/anjuta-search.ui.h:8
 msgid "Find & Replace"
 msgstr "Cerca i reemplaça"
 
-#: ../plugins/search/anjuta-search.ui.h:13
+#: ../plugins/search/anjuta-search.ui.h:9
 #: ../plugins/search/search-replace.c:91
 msgid "Forward"
 msgstr "Avant"
 
 #. the order of these matters - it must match the order of the corresponding
 #. radio buttons on another page
-#: ../plugins/search/anjuta-search.ui.h:14
+#: ../plugins/search/anjuta-search.ui.h:10
 #: ../plugins/search/search-replace.c:90
 msgid "Full Buffer"
 msgstr "Memòria intermèdia completa"
 
-#: ../plugins/search/anjuta-search.ui.h:15
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Greedy matching"
 msgstr "Cerca voraç"
 
-#: ../plugins/search/anjuta-search.ui.h:16
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Ignore Binary Files"
 msgstr "Ignora els fitxers binaris"
 
-#: ../plugins/search/anjuta-search.ui.h:17
+#: ../plugins/search/anjuta-search.ui.h:13
 msgid "Ignore Directories:"
 msgstr "Ignora els directoris:"
 
-#: ../plugins/search/anjuta-search.ui.h:18
+#: ../plugins/search/anjuta-search.ui.h:14
 msgid "Ignore Files:"
 msgstr "Ignora els fitxers:"
 
-#: ../plugins/search/anjuta-search.ui.h:19
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Ignore Hidden Directories"
 msgstr "Ignora els directoris ocults"
 
-#: ../plugins/search/anjuta-search.ui.h:20
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Ignore Hidden Files"
 msgstr "Ignora els fitxers ocults"
 
-#: ../plugins/search/anjuta-search.ui.h:21
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Match at start of word"
 msgstr "Concorda al començament de la paraula"
 
-#: ../plugins/search/anjuta-search.ui.h:23
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Match complete lines"
 msgstr "Concorda amb línies senceres"
 
-#: ../plugins/search/anjuta-search.ui.h:24
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Match complete words"
 msgstr "Concorda amb paraules senceres"
 
-#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "Maximum Actions"
 msgstr "Accions màximes"
 
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/search/anjuta-search.ui.h:22
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../plugins/search/anjuta-search.ui.h:27
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "New Name:"
 msgstr "Nom nou:"
 
-#: ../plugins/search/anjuta-search.ui.h:28
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "No Limit"
 msgstr "Cap límit"
 
-#: ../plugins/search/anjuta-search.ui.h:29
+#: ../plugins/search/anjuta-search.ui.h:26
+msgid "Parameters"
+msgstr "Paràmetres"
+
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Regular expression"
 msgstr "Expressió regular"
 
-#: ../plugins/search/anjuta-search.ui.h:30
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Replace With:"
 msgstr "Reemplaça amb:"
 
-#: ../plugins/search/anjuta-search.ui.h:31
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Search Action:"
 msgstr "Acció de la cerca:"
 
-#: ../plugins/search/anjuta-search.ui.h:32
+#: ../plugins/search/anjuta-search.ui.h:31
 msgid "Search Direction:"
 msgstr "Direcció de la cerca:"
 
+#. This is "the search expression" (noun)
 #: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search Expression"
 msgstr "Expressió a cercar"
 
-#: ../plugins/search/anjuta-search.ui.h:34
+#. This is "the search expression" (noun)
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search Expression:"
 msgstr "Expressió a cercar:"
 
-#: ../plugins/search/anjuta-search.ui.h:35
+#: ../plugins/search/anjuta-search.ui.h:36
 msgid "Search In:"
 msgstr "Cerca a:"
 
-#: ../plugins/search/anjuta-search.ui.h:36
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search Recursively"
 msgstr "Cerca recursiva"
 
-#: ../plugins/search/anjuta-search.ui.h:37
+#: ../plugins/search/anjuta-search.ui.h:38
 msgid "Search Target"
 msgstr "Objectiu de la cerca"
 
-#: ../plugins/search/anjuta-search.ui.h:38
+#. User can select variables that contain lists of files, so this is a combined noun
+#: ../plugins/search/anjuta-search.ui.h:40
+msgid "Search variable"
+msgstr "Variable de cerca"
+
+#: ../plugins/search/anjuta-search.ui.h:41
 msgid "Setting"
 msgstr "Paràmetres"
 
 #: ../plugins/search/plugin.c:68
-msgid "_Find..."
-msgstr "Ce_rca..."
+msgid "_Findâ?¦"
+msgstr "Ce_rcaâ?¦"
 
 #: ../plugins/search/plugin.c:69
 msgid "Search for a string or regular expression in the editor"
@@ -8055,8 +8187,8 @@ msgid "Find _Previous"
 msgstr "_Troba l'anterior"
 
 #: ../plugins/search/plugin.c:78
-msgid "Find and R_eplace..."
-msgstr "C_erca i reemplaça..."
+msgid "Find and R_eplaceâ?¦"
+msgstr "C_erca i reemplaça�"
 
 #: ../plugins/search/plugin.c:80
 msgid ""
@@ -8069,16 +8201,16 @@ msgid "Search and Replace"
 msgstr "Cerca i reemplaça"
 
 #: ../plugins/search/plugin.c:85
-msgid "Fin_d in Files..."
-msgstr "Cerca a fit_xers..."
+msgid "Fin_d in Filesâ?¦"
+msgstr "Cerca a fit_xersâ?¦"
 
 #: ../plugins/search/plugin.c:86
 msgid "Search for a string in multiple files or directories"
 msgstr "Cerca una cadena a múltiples fitxers o directoris"
 
 #: ../plugins/search/plugin.c:102
-msgid "Searching..."
-msgstr "S'està cercant..."
+msgid "Searchingâ?¦"
+msgstr "S'està cercant�"
 
 #: ../plugins/search/search_preferences.c:44
 msgid "Basic Search"
@@ -8177,59 +8309,59 @@ msgstr[0] "s'ha reemplaçat %d concordança."
 msgstr[1] "s'han reemplaçat %d concordances."
 
 #: ../plugins/search/search-replace.c:1298
-msgid "Unable to build user interface for Search And Replace"
-msgstr "No es pot muntar la interfície d'usuari per a cercar i reemplaçar"
+msgid "Unable to build user interface for Search and Replace"
+msgstr "No es pot muntar la interfície d'usuari per cercar i reemplaçar"
 
-#: ../plugins/sourceview/sourceview.c:364
+#: ../plugins/sourceview/sourceview.c:374
 #, c-format
 msgid ""
-"The file '%s' on the disk is more recent than the current buffer.\n"
+"The file \"%s\" on the disk is more recent than the current buffer.\n"
 "Do you want to reload it?"
 msgstr ""
-"�s més nova la còpia del fitxer «%s» al disc que\n"
-"no pas la carregada a la memòria intermèdia.\n"
+"�s més nova la còpia del fitxer «%s» al disc que no pas la carregada a la "
+"memòria intermèdia.\n"
 "Voleu tornar-lo a carregar?"
 
-#: ../plugins/sourceview/sourceview.c:401
+#: ../plugins/sourceview/sourceview.c:411
 #, c-format
 msgid ""
-"The file '%s' has been deleted on the disk.\n"
+"The file \"%s\" has been deleted on the disk.\n"
 "Do you want to close it?"
 msgstr ""
 "S'ha suprimit el fitxer «%s» del disc.\n"
 "Voleu tancar-lo?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:438
+#: ../plugins/sourceview/sourceview.c:448
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "No s'ha pogut obrir %s: %s"
 
-#: ../plugins/sourceview/sourceview.c:492
+#: ../plugins/sourceview/sourceview.c:502
 #, c-format
-msgid "The file '%s' is read-only! Edit anyway?"
+msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "El fitxer «%s» només és de lectura. El voleu editar igualment?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:551
+#: ../plugins/sourceview/sourceview.c:561
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "No s'ha pogut alçar %s: %s"
 
-#: ../plugins/sourceview/sourceview-io.c:274
+#: ../plugins/sourceview/sourceview-io.c:273
 #, c-format
 msgid "Could not save file because filename not yet specified"
 msgstr ""
 "No s'ha pogut alçar el fitxer perquè encara no se n'ha especificat el nom"
 
-#: ../plugins/sourceview/sourceview-io.c:504
+#: ../plugins/sourceview/sourceview-io.c:503
 #, c-format
 msgid "New file %d"
 msgstr "Fitxer nou %d"
 
 #: ../plugins/sourceview/sourceview-print.c:47
 msgid "Preparing pages for printing"
-msgstr "S'estan preparant les pàgines per a imprimir"
+msgstr "S'estan preparant les pàgines per imprimir"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:1
 msgid "Color scheme:"
@@ -8240,113 +8372,117 @@ msgid "Create backup files"
 msgstr "Crea fitxers de còpia de seguretat"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
+msgid "Enable autocompletion for document words"
+msgstr "Habilita la compleció automàtica per a paraules del document"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
 msgid "Font"
 msgstr "Tipus de lletra"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
 msgid "Font:"
 msgstr "Tipus de lletra:"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
 msgid "Highlight current line"
 msgstr "Ressalta la línia actual"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
 msgid "Highlight matching brackets"
 msgstr "Ressalta les claus i parèntesis concordants"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
 msgid "Highlight syntax"
 msgstr "Ressaltat de sintaxi"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
 msgid "Indentation and auto-format options"
 msgstr "Opcions de sagnat i de format automàtic"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
-msgid "Print Linenumbers"
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+msgid "Print line numbers"
 msgstr "Imprimeix els números de línia"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
 msgid "Print options"
 msgstr "Opcions d'impressió"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
 msgid "Print page footer"
 msgstr "Imprimeix el peu de pàgina"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
 msgid "Print page header"
 msgstr "Imprimeix la capçalera de pàgina"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
 msgid "Printing"
 msgstr "Impressió"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Right margin position in characters"
 msgstr "Posició del marge dret en caràcters"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
 msgid "Show line numbers"
 msgstr "Mostra els números de línia"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
 msgid "Show marks"
 msgstr "Mostra els marcadors"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
 msgid "Show right margin"
 msgstr "Mostra el marge dret"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
 msgid "Tab size in spaces:"
 msgstr "Mida de tabulació en espais:"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
 msgid "Use tabs for indentation"
 msgstr "Utilitza el tabulador per sagnar"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
 msgid "Use theme font"
 msgstr "Utilitza el tipus de lletra del tema"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
 #: ../src/anjuta-app.c:493 ../src/anjuta-app.c:498
 msgid "View"
 msgstr "Visualitza"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:25
 msgid "Wrap long lines to fit on paper"
 msgstr "Ajusta les línies llargues a l'amplada del paper"
 
-#: ../plugins/starter/plugin.c:50 ../plugins/starter/starter.c:344
+#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:362
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "Iniciador"
 
-#: ../plugins/starter/starter.c:385
+#: ../plugins/starter/starter.c:403
 msgid "Create File/Project"
 msgstr "Crea un fitxer/projecte"
 
-#: ../plugins/starter/starter.c:419
+#: ../plugins/starter/starter.c:437
 msgid "Recent Projects"
 msgstr "Projectes recents"
 
-#: ../plugins/starter/starter.c:450
+#: ../plugins/starter/starter.c:468
 msgid "Links"
 msgstr "Enllaços"
 
-#: ../plugins/starter/starter.c:469
+#: ../plugins/starter/starter.c:487
 msgid "Anjuta Home Page"
 msgstr "Pàgina inicial de l'Anjuta"
 
-#: ../plugins/starter/starter.c:475
+#: ../plugins/starter/starter.c:493
 msgid "Anjuta Manual"
 msgstr "Manual de l'Anjuta"
 
-#: ../plugins/starter/starter.c:481
-msgid "Gnome Online API Documentation"
+#: ../plugins/starter/starter.c:499
+msgid "GNOME Online API Documentation"
 msgstr "Documentació en línia de l'API del GNOME"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:1
@@ -8434,82 +8570,86 @@ msgid "Repository authorization"
 msgstr "Autorització del dipòsit"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:36
+msgid "Retrieving status��"
+msgstr "S'està obtenint l'estat�"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:37
 msgid "Revert Changes"
 msgstr "Desfés els canvis"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:38
+#: ../plugins/subversion/anjuta-subversion.ui.h:39
 msgid "Save open files before diffing"
 msgstr "Alça els fitxers oberts abans de diferenciar"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:39
+#: ../plugins/subversion/anjuta-subversion.ui.h:40
 msgid "Second Path:"
 msgstr "Segon camí:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:41
 msgid "Select Changes to Revert:"
 msgstr "Seleccioneu els canvis a desfer:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:44
+#: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source/Destination Paths:"
 msgstr "Camins font/destinació:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:45
+#: ../plugins/subversion/anjuta-subversion.ui.h:46
 msgid "Source:"
 msgstr "Font:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:46
+#: ../plugins/subversion/anjuta-subversion.ui.h:47
 msgid "Start Revision:"
 msgstr "Revisió inicial:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:47
+#: ../plugins/subversion/anjuta-subversion.ui.h:48
 msgid "Subversion Options"
 msgstr "Opcions del Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:48
+#: ../plugins/subversion/anjuta-subversion.ui.h:49
 msgid "Subversion Preferences"
 msgstr "Preferències del Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:50
 msgid "Switch to branch/tag"
 msgstr "Commuta a la branca/etiqueta"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:50
+#: ../plugins/subversion/anjuta-subversion.ui.h:51
 msgid "Trust server"
 msgstr "Confieu en el servidor"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:52
 msgid "Update file/directory"
 msgstr "Actualitza el fitxer/directori"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:52
+#: ../plugins/subversion/anjuta-subversion.ui.h:53
 msgid "Use first path"
 msgstr "Utilitza el primer camí"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:54
 msgid "Use previous message"
 msgstr "Utilitza el missatge anterior"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:56
+#: ../plugins/subversion/anjuta-subversion.ui.h:57
 msgid "View Log"
 msgstr "Visualitza el registre"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:57
+#: ../plugins/subversion/anjuta-subversion.ui.h:58
 msgid "View Selected Revision"
 msgstr "Visualitza la revisió seleccionada"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:59
+#: ../plugins/subversion/anjuta-subversion.ui.h:60
 msgid "Whole Project"
 msgstr "Tot el projecte"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:61
+#: ../plugins/subversion/anjuta-subversion.ui.h:62
 msgid "Working Copy"
 msgstr "Còpia de treball"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:62
+#: ../plugins/subversion/anjuta-subversion.ui.h:63
 msgid "Working Copy Path:"
 msgstr "Camí de la còpia de treball:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:63
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
 msgstr "regne"
 
@@ -8540,8 +8680,8 @@ msgstr "Publiqueu els canvis a l'arbre subversion"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
-msgid "_Revert..."
-msgstr "_Desfés..."
+msgid "_Revertâ?¦"
+msgstr "_Desfés�"
 
 #. Display label
 #. short-cut
@@ -8552,8 +8692,8 @@ msgstr "Desfés els canvis a la còpia de treball."
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
-msgid "_Resolve Conflicts..."
-msgstr "_Resol els conflictes..."
+msgid "_Resolve Conflictsâ?¦"
+msgstr "_Resol els conflictesâ?¦"
 
 #. Display label
 #. short-cut
@@ -8564,20 +8704,20 @@ msgstr "Resol els conflictes en la còpia de treball."
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
-msgid "_Update..."
-msgstr "Act_ualitza..."
+msgid "_Updateâ?¦"
+msgstr "Act_ualitzaâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
-msgid "Sync your local copy with the Subversion tree"
+msgid "Syncronize your local copy with the Subversion tree"
 msgstr "Sincronitzeu la còpia local amb l'arbre del Subversion"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:108
-msgid "Copy Files/Folders..."
-msgstr "Copia fitxers/carpetes..."
+msgid "Copy Files/Foldersâ?¦"
+msgstr "Copia fitxers/carpetesâ?¦"
 
 #. Display label
 #. short-cut
@@ -8588,8 +8728,8 @@ msgstr "Copia els fitxers/carpetes del dipòsit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:116
-msgid "Switch to a Branch/Tag..."
-msgstr "Commuta a una branca/etiqueta"
+msgid "Switch to a Branch/Tagâ?¦"
+msgstr "Commuta a una branca/etiquetaâ?¦"
 
 #. Display label
 #. short-cut
@@ -8600,8 +8740,8 @@ msgstr "Commuta la còpia local a una branca o etiqueta del dipòsit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
-msgid "Merge..."
-msgstr "Combina..."
+msgid "Mergeâ?¦"
+msgstr "Combinaâ?¦"
 
 #. Display label
 #. short-cut
@@ -8612,8 +8752,8 @@ msgstr "Combina els canvis amb la còpia de treball"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
-msgid "_View Log..."
-msgstr "_Visualitza el registre..."
+msgid "_View Logâ?¦"
+msgstr "_Visualitza el registreâ?¦"
 
 #. Display label
 #. short-cut
@@ -8624,8 +8764,8 @@ msgstr "Visualitza l'historial del fitxer"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
-msgid "_Diff..."
-msgstr "_Diferències..."
+msgid "_Diffâ?¦"
+msgstr "_Diferències�"
 
 #. Display label
 #. short-cut
@@ -8636,14 +8776,14 @@ msgstr "Feu les diferències de l'arbre local amb el del dipòsit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:199
-msgid "Copy..."
-msgstr "Copia..."
+msgid "Copyâ?¦"
+msgstr "Copiaâ?¦"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:207
-msgid "Diff..."
-msgstr "Diferències..."
+msgid "Diffâ?¦"
+msgstr "Diferència�"
 
 #: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
@@ -8666,8 +8806,8 @@ msgid "Subversion: Commit complete."
 msgstr "Subversion: publicació completa."
 
 #: ../plugins/subversion/subversion-commit-dialog.c:123
-msgid "Subversion: Committing changes to the repository..."
-msgstr "Subversion: s'estan publicant els canvis al dipòsit..."
+msgid "Subversion: Committing changes to the repositoryâ?¦"
+msgstr "Subversion: s'estan publicant els canvis al dipòsit�"
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
 msgid "Subversion: Copy complete."
@@ -8688,8 +8828,8 @@ msgstr "[Cap/còpia de treball]"
 #: ../plugins/subversion/subversion-diff-dialog.c:61
 #: ../plugins/subversion/subversion-log-dialog.c:426
 #: ../plugins/subversion/subversion-log-dialog.c:493
-msgid "Subversion: Retrieving diff..."
-msgstr "Subversion: s'està obtenint les diferències..."
+msgid "Subversion: Retrieving diffâ?¦"
+msgstr "Subversion: s'estan obtenint les diferències�"
 
 #: ../plugins/subversion/subversion-log-dialog.c:119
 msgid "Diff"
@@ -8704,16 +8844,16 @@ msgid "Short Log"
 msgstr "Registre curt"
 
 #: ../plugins/subversion/subversion-log-dialog.c:257
-msgid "Subversion: Retrieving log..."
-msgstr "Subversion: s'està obtenint el registre..."
+msgid "Subversion: Retrieving logâ?¦"
+msgstr "Subversion: s'està obtenint el registre�"
 
 #: ../plugins/subversion/subversion-log-dialog.c:309
 msgid "Subversion: File retrieved."
 msgstr "Subversion: fitxer obtingut."
 
 #: ../plugins/subversion/subversion-log-dialog.c:351
-msgid "Subversion: Retrieving file..."
-msgstr "Subversion: s'està obtenint el fitxer..."
+msgid "Subversion: Retrieving fileâ?¦"
+msgstr "Subversion: s'està obtenint el fitxer�"
 
 #: ../plugins/subversion/subversion-merge-dialog.c:38
 msgid "Subversion: Merge complete."
@@ -8855,64 +8995,64 @@ msgstr "Falta: %s"
 msgid "Obstructed: %s"
 msgstr "Obstruït: %s"
 
-#: ../plugins/symbol-db/plugin.c:313
+#: ../plugins/symbol-db/plugin.c:318
 msgid "Tag De_claration"
 msgstr "De_claració d'etiqueta"
 
-#: ../plugins/symbol-db/plugin.c:315
-msgid "Goto symbol declaration"
+#: ../plugins/symbol-db/plugin.c:320
+msgid "Go to symbol declaration"
 msgstr "Vés a la declaració del símbol"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:322
+#: ../plugins/symbol-db/plugin.c:327
 msgid "Tag _Implementation"
 msgstr "_Implementació d'etiqueta"
 
-#: ../plugins/symbol-db/plugin.c:324
-msgid "Goto symbol definition"
+#: ../plugins/symbol-db/plugin.c:329
+msgid "Go to symbol definition"
 msgstr "Vés a la definició del símbol"
 
-#: ../plugins/symbol-db/plugin.c:331
-msgid "_Find Symbol..."
-msgstr "Ce_rca un símbol..."
+#: ../plugins/symbol-db/plugin.c:336
+msgid "_Find Symbolâ?¦"
+msgstr "_Cerca un símbol�"
 
-#: ../plugins/symbol-db/plugin.c:332
+#: ../plugins/symbol-db/plugin.c:337
 msgid "Find Symbol"
 msgstr "Cerca un símbol"
 
-#: ../plugins/symbol-db/plugin.c:1170
+#: ../plugins/symbol-db/plugin.c:1174
 #, c-format
-msgid "%s: Generating inheritances..."
-msgstr "%s: S'estan generant les herències..."
+msgid "%s: Generating inheritancesâ?¦"
+msgstr "%s: S'estan generant les herències�"
 
-#: ../plugins/symbol-db/plugin.c:1175
+#: ../plugins/symbol-db/plugin.c:1179
 #, c-format
 msgid "%s: %d files scanned out of %d"
-msgstr "%s: %d fitxers escanejats de %d"
+msgstr "%s: %d fitxers analitzats de %d"
 
-#: ../plugins/symbol-db/plugin.c:1206
+#: ../plugins/symbol-db/plugin.c:1210
 #, c-format
-msgid "Generating inheritances..."
-msgstr "S'estan generant les herències..."
+msgid "Generating inheritancesâ?¦"
+msgstr "S'estan generant les herències�"
 
-#: ../plugins/symbol-db/plugin.c:1208
+#: ../plugins/symbol-db/plugin.c:1212
 #, c-format
 msgid "%d files scanned out of %d"
-msgstr "%d fitxers escanejats de %d"
+msgstr "%d fitxers analitzats de %d"
 
-#: ../plugins/symbol-db/plugin.c:1968
-msgid "Populating symbols' db..."
-msgstr "S'està creant la base de dades de símbols..."
+#: ../plugins/symbol-db/plugin.c:1982
+msgid "Populating symbol databaseâ?¦"
+msgstr "S'està creant la base de dades de símbols�"
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2321 ../plugins/symbol-db/plugin.c:2460
 msgid "Symbols"
 msgstr "Símbols"
 
-#: ../plugins/symbol-db/plugin.c:2489
+#: ../plugins/symbol-db/plugin.c:2469
 msgid "SymbolDb popup actions"
 msgstr "Accions emergents de la base de dades de símbols"
 
-#: ../plugins/symbol-db/plugin.c:2497
+#: ../plugins/symbol-db/plugin.c:2477
 msgid "SymbolDb menu actions"
 msgstr "Accions del menú de la base de dades de símbols"
 
@@ -8935,128 +9075,141 @@ msgid "Resuming glb scan."
 msgstr "S'està reprenent l'escaneig glb."
 
 #: ../plugins/symbol-db/symbol-db-view-locals.c:326
-#: ../plugins/symbol-db/symbol-db-view.c:1413
+#: ../plugins/symbol-db/symbol-db-view.c:1412
 msgid "Symbol"
 msgstr "Símbol"
 
+#: ../plugins/symbol-db/symbol-db-view.c:798
+msgid "Loadingâ?¦"
+msgstr "S'està carregant�"
+
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
-msgid "<b>Available API tags</b>"
-msgstr "<b>Etiquetes de l'API disponibles</b>"
+msgid "Automatically scan project's packages"
+msgstr "Escaneja automàticament els paquets del projecte"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
-msgid "<b>Global</b>"
-msgstr "<b>Global</b>"
+msgid "Automatically update symbols without saving file"
+msgstr "Actualitza automàticament els símbols sense alçar el fitxer"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid "Automatically scan project's packages"
-msgstr "Escaneja automàticament els paquets del projecte"
+msgid ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by the user."
+msgstr ""
+"Actualitza automàticament els símbols dels fitxers sense alçar-los. "
+"L'actualització succeeix després de 10 segons si l'usuari no prem cap tecla."
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
-msgid "Automatically update symbols without saving file"
-msgstr "Actualitza automàticament els símbols sense alçar el fitxer"
+msgid "Available API tags"
+msgstr "Etiquetes de l'API disponibles"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
-msgid "Checking if package is parseable..."
-msgstr "S'està comprovant si es pot analitzar el paquet..."
+msgid "Checking if package is parseableâ?¦"
+msgstr "S'està comprovant si es pot analitzar el paquet�"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "Escaneja en paral·lel el projecte i els símbols globals"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
 msgid ""
 "This option enables the default packages required by your opened project, e."
-"g. glib and gtk+ if you create a Gtk+ project (may require more cpu work)"
+"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
 msgstr ""
 "Esta opció habilita els paquets predeterminats que calen al projecte que heu "
-"obert, per exemple la Glib i la Gtk+ si creeu un projecte GTK+ (pot requerir "
+"obert, per exemple la Glib i la GTK+ si creeu un projecte GTK+ (pot caldre "
 "més treball de la CPU)"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
 msgid ""
 "This option means that the global system packages will be scanned "
-"contemporary with the project's ones"
+"simultaneously with the project's ones"
 msgstr ""
 "Esta opció significa que els paquets globals del sistema s'analitzaran al "
 "mateix moment que els del projecte"
 
-#: ../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 ""
-"Actualitza automàticament els símbols dels fitxers sense alçar-los. "
-"L'actualització succeeix després de 10 segons si l'usuari no prem cap tecla."
-
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
-msgid "<b>Terminal options</b>"
-msgstr "<b>Opcions del terminal</b>"
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
+msgid "Terminal options"
+msgstr "Opcions del terminal"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:3
-msgid "Use GNOME terminal profile:"
+msgid "Use GNOME Terminal profile:"
 msgstr "Utilitza el perfil del terminal del GNOME:"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:4
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "Fes servir el perfil actual del terminal del GNOME"
 
-#: ../plugins/terminal/terminal.c:739
+#: ../plugins/terminal/terminal.c:626
+msgid "Ctrl-C"
+msgstr "Ctrl-C"
+
+#: ../plugins/terminal/terminal.c:634
+msgid "Ctrl-X"
+msgstr "Ctrl-X"
+
+#: ../plugins/terminal/terminal.c:642
+msgid "Ctrl-Z"
+msgstr "Ctrl-Z"
+
+#: ../plugins/terminal/terminal.c:781
 msgid "terminal operations"
 msgstr "operacions del terminal"
 
-#: ../plugins/terminal/terminal.c:757 ../plugins/terminal/terminal.c:926
-#: ../plugins/terminal/terminal.c:979
+#: ../plugins/terminal/terminal.c:799 ../plugins/terminal/terminal.c:968
+#: ../plugins/terminal/terminal.c:1021
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../plugins/tools/anjuta-tools.ui.h:1
-msgid "<b>Tools</b>"
-msgstr "<b>Eines</b>"
-
-#: ../plugins/tools/anjuta-tools.ui.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:2
 msgid "Command:"
 msgstr "Orde:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:4
+#: ../plugins/tools/anjuta-tools.ui.h:3
 msgid "Edit as script"
 msgstr "Edita com a script"
 
-#: ../plugins/tools/anjuta-tools.ui.h:5
+#: ../plugins/tools/anjuta-tools.ui.h:4
 msgid "Edit command as script in Anjuta on close"
 msgstr "Editeu l'orde com un script de l'Anjuta en tancar"
 
-#: ../plugins/tools/anjuta-tools.ui.h:8
+#: ../plugins/tools/anjuta-tools.ui.h:7
 msgid "Parameters:"
 msgstr "Paràmetres:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:10
+#: ../plugins/tools/anjuta-tools.ui.h:9
 msgid "Save all files"
 msgstr "Alça tots els fitxers"
 
-#: ../plugins/tools/anjuta-tools.ui.h:11
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Short cut:"
 msgstr "Drecera:"
 
 #. This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:13
+#: ../plugins/tools/anjuta-tools.ui.h:12
 msgid "Standard error:"
 msgstr "Error estàndard:"
 
 #. This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:15
+#: ../plugins/tools/anjuta-tools.ui.h:14
 msgid "Standard input:"
 msgstr "Entrada estàndard:"
 
 #. This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:17
+#: ../plugins/tools/anjuta-tools.ui.h:16
 msgid "Standard output:"
 msgstr "Eixida estàndard:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:18
+#: ../plugins/tools/anjuta-tools.ui.h:17
 msgid "Tool Editor"
 msgstr "Editor d'eines"
 
+#: ../plugins/tools/anjuta-tools.ui.h:18 ../plugins/tools/plugin.c:256
+#: ../plugins/tools/plugin.c:263 ../plugins/tools/anjuta-tools.plugin.in.h:1
+msgid "Tools"
+msgstr "Eines"
+
 #: ../plugins/tools/anjuta-tools.ui.h:19
 msgid "Variable list"
 msgstr "Llista de variables"
@@ -9066,8 +9219,8 @@ msgid "Working directory:"
 msgstr "Directori de treball:"
 
 #: ../plugins/tools/anjuta-tools.ui.h:21
-msgid "_Variable..."
-msgstr "_Variable..."
+msgid "_Variableâ?¦"
+msgstr "_Variableâ?¦"
 
 #: ../plugins/tools/dialog.c:177
 #, c-format
@@ -9104,7 +9257,7 @@ msgstr "Heu de proporcionar una orde d'eina"
 
 #: ../plugins/tools/editor.c:807
 msgid "A tool with the same name already exists!"
-msgstr "Ja existeix una eina amb este nom !"
+msgstr "Ja existeix una eina amb este nom"
 
 #: ../plugins/tools/editor.c:824
 msgid ""
@@ -9119,8 +9272,8 @@ msgid "Unable to edit script"
 msgstr "No es pot editar l'script"
 
 #: ../plugins/tools/editor.c:1044
-msgid "New accelerator..."
-msgstr "Accelerador nou..."
+msgid "New acceleratorâ?¦"
+msgstr "Accelerador nouâ?¦"
 
 #: ../plugins/tools/execute.c:314
 #, c-format
@@ -9146,8 +9299,8 @@ msgstr "(error)"
 #. Display the name of the command
 #: ../plugins/tools/execute.c:469
 #, c-format
-msgid "Running command: %s...\n"
-msgstr "S'està executant l'orde: %s...\n"
+msgid "Running command: %sâ?¦\n"
+msgstr "S'està executant l'orde: %s�\n"
 
 #: ../plugins/tools/execute.c:509
 #, c-format
@@ -9155,12 +9308,12 @@ msgid "Completed unsuccessfully with status code %d\n"
 msgstr "No s'ha completat correctament, codi d'estat: %d\n"
 
 #: ../plugins/tools/execute.c:629
-msgid "Unable to create a buffer, command aborted"
-msgstr "No es pot crear la memòria intermèdia. S'ha anul·lat l'orde"
+msgid "Unable to create a buffer: command aborted"
+msgstr "No es pot crear la memòria intermèdia: s'ha anul·lat l'orde"
 
 #: ../plugins/tools/execute.c:641
-msgid "No document currently open, command aborted"
-msgstr "No hi ha cap document obert. S'ha anul·lat l'orde"
+msgid "No document currently open: command aborted"
+msgstr "No hi ha cap document obert: s'ha anul·lat l'orde"
 
 #: ../plugins/tools/execute.c:1019
 #, c-format
@@ -9183,17 +9336,12 @@ msgstr "S'ha produït un error en carregar les eines externes"
 #: ../plugins/tools/fileop.c:703
 #, c-format
 msgid "Unable to open %s for writing"
-msgstr "No es pot obrir %s per a escriure"
+msgstr "No es pot obrir %s per escriure"
 
 #: ../plugins/tools/plugin.c:179
 msgid "Tool operations"
 msgstr "Operacions d'eina"
 
-#: ../plugins/tools/plugin.c:256 ../plugins/tools/plugin.c:263
-#: ../plugins/tools/anjuta-tools.plugin.in.h:1
-msgid "Tools"
-msgstr "Eines"
-
 #: ../plugins/tools/variable.c:84
 msgid "Project root URI"
 msgstr "URI arrel del projecte"
@@ -9227,8 +9375,7 @@ msgstr "Nom de fitxer seleccionat al connector del gestor de fitxers"
 #: ../plugins/tools/variable.c:91
 msgid "Selected file name without extension in the file manager plugin"
 msgstr ""
-"Nom de fitxer seleccionat sense l'extensió  al connector del gestor de "
-"fitxers"
+"Nom de fitxer sense l'extensió seleccionat al connector del gestor de fitxers"
 
 #: ../plugins/tools/variable.c:92
 msgid "Selected file's extension in the file manager plugin"
@@ -9249,7 +9396,7 @@ msgstr "Nom de fitxer complet seleccionat al connector del gestor de projectes"
 #: ../plugins/tools/variable.c:96
 msgid "Selected full file name without extension in the project manager plugin"
 msgstr ""
-"Nom de fitxer complet  seleccionat sense l'extensió al connector del gestor "
+"Nom de fitxer complet sense l'extensió seleccionat al connector del gestor "
 "de projectes"
 
 #: ../plugins/tools/variable.c:97
@@ -9259,7 +9406,7 @@ msgstr "Nom de fitxer seleccionat al connector del gestor de projectes"
 #: ../plugins/tools/variable.c:98
 msgid "Selected file name without extension in the project manager plugin"
 msgstr ""
-"Nom de fitxer seleccionat sense l'extensió  al connector del gestor de "
+"Nom de fitxer sense l'extensió seleccionat al connector del gestor de "
 "projectes"
 
 #: ../plugins/tools/variable.c:99
@@ -9280,7 +9427,7 @@ msgstr "Directori del fitxer editat actualment"
 
 #: ../plugins/tools/variable.c:103
 msgid "Currently selected text in editor"
-msgstr "Selecció de text actual en l'editor"
+msgstr "Selecció actual en l'editor"
 
 #: ../plugins/tools/variable.c:104
 msgid "Current word in editor"
@@ -9294,7 +9441,7 @@ msgstr "Línia actual en l'editor"
 msgid "Ask the user to get additional parameters"
 msgstr "Demana a l'usuari per obtindre paràmetres addicionals"
 
-#: ../plugins/tools/variable.c:493
+#: ../plugins/tools/variable.c:499
 msgid "Command line parameters"
 msgstr "Paràmetres de la línia d'ordes"
 
@@ -9319,7 +9466,7 @@ msgid "Replace buffer"
 msgstr "Reemplaça la memòria intermèdia"
 
 #: ../plugins/tools/tool.c:86
-msgid "Insert in buffer"
+msgid "Insert into buffer"
 msgstr "Insereix en la memòria intermèdia"
 
 #: ../plugins/tools/tool.c:87
@@ -9360,8 +9507,8 @@ msgid "Copyright (c) Naba Kumar"
 msgstr "Copyright (c) Naba Kumar"
 
 #: ../src/anjuta.c:424
-msgid "Loaded Session..."
-msgstr "S'ha carregat la sessió..."
+msgid "Loaded Sessionâ?¦"
+msgstr "S'ha carregat la sessió�"
 
 #: ../src/anjuta-actions.h:23
 msgid "_File"
@@ -9471,7 +9618,7 @@ msgstr "Informeu d'errors/_pedaços/peticions"
 msgid "Submit a bug report, patch or feature request for Anjuta"
 msgstr ""
 "Envieu un informe d'error, pedaç o demaneu característiques noves per a "
-"Anjuta"
+"l'Anjuta"
 
 #: ../src/anjuta-actions.h:87
 msgid "Ask a _Question"
@@ -9494,63 +9641,63 @@ msgid "About External _Plugins"
 msgstr "_Quant als connectors externs"
 
 #: ../src/anjuta-actions.h:96
-msgid "About third party Anjuta plugins"
+msgid "About third-party Anjuta plugins"
 msgstr "Quant als connectors externs de l'Anjuta"
 
 #: ../src/anjuta-app.c:489
 msgid "Edit"
 msgstr "Edita"
 
-#: ../src/anjuta-app.c:734
+#: ../src/anjuta-app.c:771
 msgid "Installed plugins"
 msgstr "Connectors instal·lats"
 
-#: ../src/anjuta-app.c:738
+#: ../src/anjuta-app.c:775
 msgid "Shortcuts"
 msgstr "Dreceres"
 
-#: ../src/anjuta-app.c:810
+#: ../src/anjuta-app.c:847
 #, c-format
 msgid "Value doesn't exist"
 msgstr "No existeix el valor"
 
-#: ../src/main.c:62
+#: ../src/main.c:74
 msgid "Specify the size and location of the main window"
 msgstr "Especifiqueu la mida i la ubicació de la finestra principal"
 
 #. This is the format you can specify the size andposition
 #. * of the window on command line
-#: ../src/main.c:65
+#: ../src/main.c:77
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "AMPLADAxALÃ?ADA+DESPLAÃ?AMENTX+DESPLAÃ?AMENTY"
 
-#: ../src/main.c:70
-msgid "Do not show the splashscreen"
+#: ../src/main.c:82
+msgid "Do not show the splash screen"
 msgstr "No mostres la pantalla d'inici"
 
-#: ../src/main.c:76
-msgid "Start a new instance and do not open the file in a existing"
+#: ../src/main.c:88
+msgid "Start a new instance and do not open the file in an existing instance"
 msgstr ""
 "Inicia una instància nova en comptes d'obrir el fitxer en una d'existent"
 
-#: ../src/main.c:82
+#: ../src/main.c:94
 msgid "Do not open last session on startup"
-msgstr "No s'obrirà l'última sessió al iniciar"
+msgstr "No s'obrirà l'última sessió en iniciar"
 
-#: ../src/main.c:88
+#: ../src/main.c:100
 msgid "Do not open last project and files on startup"
-msgstr "No s'obrirà l'últim projecte i fitxers al iniciar"
+msgstr "No s'obrirà l'últim projecte i fitxers en iniciar"
 
-#: ../src/main.c:94
-msgid "Shutdown anjuta properly releasing all resources (for debugging)"
+#: ../src/main.c:106
+msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr ""
-"Ix de l'Anjuta i allibera'n adequadament tots els recursos (per a depurar)"
+"Ix de l'Anjuta i allibera'n adequadament tots els recursos (per depurar)"
 
-#: ../src/main.c:156
+#: ../src/main.c:174
 msgid "- Integrated Development Environment"
 msgstr "- Entorn integrat de desenvolupament"
 
-#: ../src/main.c:232
+#: ../src/main.c:250
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -9572,19 +9719,19 @@ msgstr "Nom del desenvolupador:"
 
 #: ../src/preferences.ui.h:6
 msgid "Do not load last project and files on startup"
-msgstr "En iniciar, no carregues ni l'últim projecte ni els últims fitxers"
+msgstr "En iniciar, no carreguis ni l'últim projecte ni els últims fitxers"
 
 #: ../src/preferences.ui.h:7
 msgid "Do not load last session on startup"
-msgstr "En iniciar, no carregues l'última sessió"
+msgstr "En iniciar, no carreguis l'última sessió"
 
 #. Style of the buttons/tabs used to select docked windows in anjuta
 #: ../src/preferences.ui.h:9
 msgid "Dock switcher style:"
 msgstr "Estil del canviador acoblable:"
 
-#: ../src/preferences.ui.h:11
-msgid "Gnome toolbar setting"
+#: ../src/preferences.ui.h:10
+msgid "GNOME toolbar setting"
 msgstr "Preferències de la barra d'eines del GNOME"
 
 #: ../src/preferences.ui.h:12
@@ -9600,7 +9747,7 @@ msgid "Project Defaults"
 msgstr "Predeterminats del projecte"
 
 #: ../src/preferences.ui.h:15
-msgid "Select projects directory"
+msgid "Select project directory"
 msgstr "Seleccioneu el directori dels projectes"
 
 #: ../src/preferences.ui.h:16
@@ -9634,19 +9781,19 @@ msgstr "Etiquetes dels botons de la barra d'eines:"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
 msgid "Do not display warning if not using a Debug configuration"
-msgstr "No mostres l'avís si no està utilizant la configuració del depurador."
+msgstr ""
+"No mostres els avisos si no s'està utilitzant una configuració de depuració"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
-msgstr "Afig «(» després de la crida de completa automàticament de la funció"
+msgstr "Afig «(» després de la crida de compleció automàtica de la funció"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
 msgid "Add a space after function call autocompletion"
-msgstr ""
-"Afig un espai després de la crida de completa automàticament de la funció"
+msgstr "Afig un espai després de la crida de compleció automàtica de la funció"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
-msgid "Autocomplete"
+msgid "Auto-complete"
 msgstr "Completa automàticament"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
@@ -9654,103 +9801,96 @@ msgid "Autocompletion (C/C++/Java only)"
 msgstr "Compleció automàtica (només C/C++/Java)"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
-msgid "Autocompletion pop up choices"
-msgstr "Diàleg emergent amb alternatives per la compleció automàtica"
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Brace indentation size in spaces:"
 msgstr "Mida del sagnat de les claus en espais:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Calltips"
 msgstr "Etiquetes de les funcions"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
 msgid "Enable code completion"
 msgstr "Habilita la compleció de codi"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
 msgid "Enable smart brace completion"
 msgstr "Habilita la compleció intel·ligent de les claus/parèntesis"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable smart indentation"
 msgstr "Habilita el sagnat intel·ligent"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Indent:"
 msgstr "Sagnat:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 msgid "Indentation parameters"
 msgstr "Paràmetres de sagnat"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Line up parentheses"
 msgstr "Alinea els parèntesis"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
-msgid "Parenthese indentation"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+msgid "Parenthesis indentation"
 msgstr "Sagnat dels parèntesis"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "Mostra les etiquetes de les funcions"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Smart Indentation"
 msgstr "Sagnat intel·ligent"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "Mida del sagnat de la sentència en espais:"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1921
-msgid "_AutoComplete"
-msgstr "Completa _automàticament"
-
-#: ../plugins/language-support-cpp-java/plugin.c:1922
-msgid "AutoComplete the current word"
-msgstr "Completa automàticament la paraula actual"
-
-#: ../plugins/language-support-cpp-java/plugin.c:1928
-msgid "Auto Indent"
+#: ../plugins/language-support-cpp-java/plugin.c:1888
+msgid "Auto-Indent"
 msgstr "Sagnat automàtic"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1929
-msgid "Auto indent current line or selection based on indentation settings"
+#: ../plugins/language-support-cpp-java/plugin.c:1889
+msgid "Auto-indent current line or selection based on indentation settings"
 msgstr ""
 "Sagnat automàtic de la línia actual o la selecció basada en la configuració "
 "del sagnat"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1934
+#: ../plugins/language-support-cpp-java/plugin.c:1894
 msgid "Swap .h/.c"
 msgstr "Alterna capçalera/codi"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1935
-msgid "Swap c header and source files"
+#: ../plugins/language-support-cpp-java/plugin.c:1895
+msgid "Swap C header and source files"
 msgstr "Alterna entre el fitxer de capçalera de C i els fitxers de codi"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1978
+#: ../plugins/language-support-cpp-java/plugin.c:1936
 msgid "C++/Java Assistance"
 msgstr "Assistència per a C++/Java"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2071
-#: ../plugins/language-support-cpp-java/plugin.c:2080
+#: ../plugins/language-support-cpp-java/plugin.c:2048
+#: ../plugins/language-support-cpp-java/plugin.c:2061
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1374
+msgid "C/C++"
+msgstr "C/C++"
+
 #: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "Editor GtkSourceView"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:1
-msgid "Gdb"
-msgstr "Gdb"
+msgid "GNU Debugger Plugin"
+msgstr "Connector de depuració del GNU"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:2
-msgid "Gdb plugin."
-msgstr "Connector Gdb."
+msgid "Gdb"
+msgstr "Gdb"
 
 #: ../plugins/git/git.plugin.in.h:2
 msgid "Git version control"
@@ -9845,24 +9985,24 @@ msgid "CVS Plugin"
 msgstr "Connector CVS"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
-msgid "Import an existing autotools project to anjuta"
+msgid "Import an existing autotools project to Anjuta"
 msgstr "Importa un projecte existent d'autotools a l'Anjuta"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:2
-msgid "Project From Existing Sources"
-msgstr "Projecte des de fonts existents"
+msgid "Project Import Assistant"
+msgstr "Auxiliar per importar un projecte"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
-msgid "Project Import Assistant"
-msgstr "Auxiliar per a importar un projecte"
+msgid "Project from Existing Sources"
+msgstr "Projecte des de fonts existents"
 
 #: ../plugins/sourceview/sourceview.plugin.in.h:1
-msgid "GtkSourceview editor"
-msgstr "Editor GtkSourceview"
+msgid "GtkSourceView editor"
+msgstr "Editor GtkSourceView"
 
 #: ../plugins/sourceview/sourceview.plugin.in.h:2
-msgid "The default editor based on GtkSourceview"
-msgstr "L'editor predeterminat basat en el GtkSourceview"
+msgid "The default editor based on GtkSourceView"
+msgstr "L'editor predeterminat basat en el GtkSourceView"
 
 #: ../plugins/starter/anjuta-starter.plugin.in.h:2
 msgid "Welcome page with most common actions."
@@ -9870,13 +10010,13 @@ msgstr "Pàgina de benvinguda amb les accions més comunes."
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in.h:1
 msgid "C++ and Java support Plugin"
-msgstr "Connector per a admetre C++ i Java"
+msgstr "Connector per admetre el C++ i el Java"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in.h:2
-msgid "C++ and Java support plugin for code completion, auto indentation etc."
+msgid "C++ and Java support plugin for code completion, auto-indentation, etc."
 msgstr ""
-"Connector per a permetre la compleció de codi C++ i Java, el sagnat "
-"automàtic, etc."
+"Connector per permetre la compleció de codi C++ i Java, el sagnat automàtic, "
+"etc."
 
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:2
 msgid "Project Assistant"
@@ -9884,7 +10024,7 @@ msgstr "Auxiliar del projecte"
 
 #: ../plugins/search/anjuta-search.plugin.in.h:1
 msgid "Component for searching"
-msgstr "Component per a fer cerques"
+msgstr "Component per fer cerques"
 
 #: ../plugins/search/anjuta-search.plugin.in.h:2
 msgid "Searching"
@@ -9908,7 +10048,7 @@ msgstr "Connector del gestor de projectes per a l'Anjuta."
 
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:2
 msgid "Symbol Database Plugin for Anjuta."
-msgstr "Connector de la base de dades de símbols per a l'Anjuta."
+msgstr "Base de dades de símbols per a l'Anjuta."
 
 #: ../plugins/message-view/anjuta-message-manager.plugin.in.h:1
 msgid "Manages messages from external apps"
@@ -9920,7 +10060,7 @@ msgstr "Gestor de missatges"
 
 #: ../plugins/file-loader/anjuta-loader.plugin.in.h:2
 msgid "File loader to load different files"
-msgstr "Carregador de fitxers per a carregar diferents fitxers"
+msgstr "Carregador de fitxers per carregar diferents fitxers"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:1
 msgid "Debug Manager plugin."
@@ -9941,7 +10081,7 @@ msgstr "Gestor de llenguatges"
 #: ../plugins/language-manager/language-manager.plugin.in.h:2
 msgid "Plugin to keep track of multiple programming languages"
 msgstr ""
-"Connector per a mantindre el seguiment de diversos llenguatges de programació"
+"Connector per mantindre el seguiment de diversos llenguatges de programació"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile.plugin.in.h:1
 msgid "Makefile backend"
@@ -9959,357 +10099,299 @@ msgstr "Rerefons de les autotools"
 msgid "Autotools backend for project manager"
 msgstr "Rerefons de les autotools per al gestor de projectes"
 
-#, fuzzy
-#~| msgid "_Build"
-#~ msgid "Build"
-#~ msgstr "_Munta"
-
-#, fuzzy
-#~| msgid "Confirmation"
-#~ msgid "Configuration:"
-#~ msgstr "Confirmació"
-
-#, fuzzy
-#~| msgid "_Install"
-#~ msgid "Install"
-#~ msgstr "_Instal·la"
-
-#, fuzzy
-#~| msgid "Configure Project"
-#~ msgid "C_onfigure Projectâ?¦"
-#~ msgstr "Configura el projecte"
-
-#, fuzzy
-#~| msgid "CVS operations"
-#~ msgid "CVS Options"
-#~ msgstr "Operacions del CVS"
-
-#, fuzzy
-#~| msgid "Repository Head"
-#~ msgid "Repository:"
-#~ msgstr "Cap del dipòsit"
-
-#, fuzzy
-#~| msgid "Debugger"
-#~ msgid "Debugger:"
-#~ msgstr "Depurador"
-
-#, fuzzy
-#~| msgid "Debugger command"
-#~ msgid "Debugger Commandâ?¦"
-#~ msgstr "Ordre del depurador"
-
-#, fuzzy
-#~| msgid "ID"
-#~ msgid "PID"
-#~ msgstr "ID"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#, fuzzy
-#~| msgid "Inspect/Evaluate"
-#~ msgid "Ins_pect/Evaluateâ?¦"
-#~ msgstr "Inspecciona/avalua"
-
-#, fuzzy
-#~| msgid "Add Watch"
-#~ msgid "Add Watchâ?¦"
-#~ msgstr "Afegeix vigilància"
-
-#, fuzzy
-#~| msgid "_Rename"
-#~ msgid "Rename"
-#~ msgstr "Canvia el _nom"
-
-#, fuzzy
-#~| msgid "<b>Autosave</b>"
-#~ msgid "Autosave"
-#~ msgstr "<b>Desa automàticament</b>"
-
-#, fuzzy
-#~| msgid "Print"
-#~ msgid "_Printâ?¦"
-#~ msgstr "Imprimeix"
-
-#, fuzzy
-#~| msgid "_Undo: %s"
-#~ msgctxt "recent menu label"
-#~ msgid "_%d. %s"
-#~ msgstr "_Desfés: %s"
-
-#, fuzzy
-#~| msgid "_Open"
-#~ msgid "_Openâ?¦"
-#~ msgstr "_Obre"
-
-#, fuzzy
-#~| msgid "URL:"
-#~ msgid "URI:"
-#~ msgstr "URL:"
+#: ../plugins/js-debugger/plugin.c:122
+#, c-format
+msgid "Error: %s"
+msgstr "Error: %s"
 
-#, fuzzy
-#~| msgid "Advanced"
-#~ msgid "Advancedâ?¦"
-#~ msgstr "Avançat"
-
-#, fuzzy
-#~| msgid "_Commit"
-#~ msgid "_Commitâ?¦"
-#~ msgstr "Publica els _canvis"
-
-#, fuzzy
-#~| msgid "View log"
-#~ msgid "_View logâ?¦"
-#~ msgstr "Visualitza el registre"
-
-#, fuzzy
-#~| msgid "Push"
-#~ msgid "_Pushâ?¦"
-#~ msgstr "Empeny"
-
-#, fuzzy
-#~| msgid "Pull"
-#~ msgid "_Pullâ?¦"
-#~ msgstr "Estira"
-
-#, fuzzy
-#~| msgid "_Add"
-#~ msgid "_Addâ?¦"
-#~ msgstr "_Afegeix"
-
-#, fuzzy
-#~| msgid "_Remove"
-#~ msgid "_Removeâ?¦"
-#~ msgstr "_Suprimeix"
-
-#, fuzzy
-#~| msgid "Ignored"
-#~ msgid "_Ignoreâ?¦"
-#~ msgstr "Ignorat"
-
-#, fuzzy
-#~| msgid "Create patch series"
-#~ msgid "Create patch seriesâ?¦"
-#~ msgstr "Crea una sèrie de pedaços"
-
-#, fuzzy
-#~| msgid "Switch to another branch"
-#~ msgid "_Switch to another branchâ?¦"
-#~ msgstr "Commuta a una altra branca"
-
-#, fuzzy
-#~| msgid "Merge"
-#~ msgid "_Mergeâ?¦"
-#~ msgstr "Combina"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgid "_Deleteâ?¦"
-#~ msgstr "Suprimeix"
+#: ../plugins/js-debugger/plugin.c:142
+#: ../plugins/js-debugger/debugger-js.c:546
+msgid "Error: cant bind port"
+msgstr "Error: no es pot vincular el port"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:1
+msgid "Anjuta JS Debugger Plugin"
+msgstr "Connector de depuració del JS de l'Anjuta"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:2
+msgid "Javascript Debugger Plugin"
+msgstr "Connector de depuració del JavaScript"
+
+#: ../plugins/language-support-js/plugin.c:332
+#: ../plugins/language-support-js/plugin.c:341
+msgid "JavaScript"
+msgstr "JavaScript"
+
+#: ../plugins/language-support-js/plugin.c:397
+msgid "JS"
+msgstr "JS"
+
+#: ../plugins/language-support-js/js_support_plugin.plugin.in.h:1
+msgid "JS Support Plugin"
+msgstr "Connector per admetre el JS"
+
+#: ../plugins/language-support-js/js_support_plugin.plugin.in.h:2
+msgid "JavaScript Support Plugin"
+msgstr "Connector per admetre el JavaScript"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:1
+msgid "<b>JS Find dirs</b>"
+msgstr "<b>Directoris de cerca del JS</b>"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:2
+msgid "Add brace after function call autocompletion"
+msgstr "Afig una clau després de la crida de compleció automàtica de la funció"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:3
+msgid "Gir repository's directory:   "
+msgstr "Directori del dipòsit Gir:   "
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:4
+msgid "Gjs repository's directory:   "
+msgstr "Directori del dipòsit Gjs:   "
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
+msgid "Highlight missed semicolon"
+msgstr "Ressalta els punts i coma que falten"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:6
+msgid "Min character for completion "
+msgstr "Caràcters mínims per la compleció "
+
+#~ msgid "Online"
+#~ msgstr "En línia"
+
+# Ã?s un error de la cadena original
+#~ msgid "Edit&#x2026;"
+#~ msgstr "Editaâ?¦"
+
+#~ msgid "Autocompletion pop up choices"
+#~ msgstr "Diàleg emergent amb alternatives per la compleció automàtica"
+
+#~ msgid "private"
+#~ msgstr "privada"
+
+#~ msgid "protected"
+#~ msgstr "protegida"
+
+#~ msgid "public"
+#~ msgstr "pública"
 
-#, fuzzy
-#~| msgid "Delete tags"
-#~ msgid "_Delete tagâ?¦"
-#~ msgstr "Suprimeix les etiquetes"
-
-#, fuzzy
-#~| msgid "Unknown error in module %s"
-#~ msgid "Unknown editor language \"%s\""
-#~ msgstr "Error desconegut en el mòdul %s"
-
-#, fuzzy
-#~| msgid "Miscellaneous Data"
-#~ msgid "Miscellaneous"
-#~ msgstr "Dades diverses"
-
-#, fuzzy
-#~| msgid "<b>Macro text:</b>"
-#~ msgid "Macro text:"
-#~ msgstr "<b>Text de la macro:</b>"
-
-#, fuzzy
-#~| msgid "Macros"
-#~ msgid "Macros:"
-#~ msgstr "Macros"
-
-#, fuzzy
-#~| msgid "Macros"
-#~ msgid "Macrosâ?¦"
-#~ msgstr "Macros"
-
-#, fuzzy
-#~| msgid "Patching...\n"
-#~ msgid "Patchingâ?¦\n"
-#~ msgstr "S'està aplicant un pedaç...\n"
-
-#, fuzzy
-#~| msgid "Patching..."
-#~ msgid "Patchingâ?¦"
-#~ msgstr "S'està aplicant un pedaç..."
-
-#, fuzzy
-#~| msgid "Patch"
-#~ msgid "_Patchâ?¦"
-#~ msgstr "Aplica un pedaç"
-
-#, fuzzy
-#~| msgid "Project name:"
-#~ msgid "Project name"
-#~ msgstr "Nom del projecte:"
-
-#, fuzzy
-#~| msgid "Select file to add:"
-#~ msgid "_Select file to addâ?¦"
-#~ msgstr "Seleccioneu un fitxer a afegir:"
-
-#, fuzzy
-#~| msgid "Refresh symbol browser tree"
-#~ msgid "Refreshing symbol treeâ?¦"
-#~ msgstr "Actualitza l'arbre del navegador de símbols"
-
-#, fuzzy
-#~| msgid "Add _Group"
-#~ msgid "Add _Groupâ?¦"
-#~ msgstr "Afegeix un _grup"
-
-#, fuzzy
-#~| msgid "Add _Target"
-#~ msgid "Add _Targetâ?¦"
-#~ msgstr "Afegeix un _objectiu"
-
-#, fuzzy
-#~| msgid "Add _Source File"
-#~ msgid "Add _Source Fileâ?¦"
-#~ msgstr "Afegeix un fitxer de _codi"
-
-#, fuzzy
-#~| msgid "Add to Project"
-#~ msgid "_Add to Project"
-#~ msgstr "Afegeix al projecte"
-
-#, fuzzy
-#~| msgid "<b>Details</b>"
-#~ msgid "Details"
-#~ msgstr "<b>Detalls</b>"
-
-#, fuzzy
-#~| msgid "Widgets"
 #~ msgid "wxWidgets"
-#~ msgstr "Ginys"
+#~ msgstr "wxWidgets"
+
+#~ msgid "Gdb plugin."
+#~ msgstr "Connector Gdb."
+
+#~ msgid "Up to date"
+#~ msgstr "Actualitzat"
+
+#~ msgid "<b>Build</b>"
+#~ msgstr "<b>Munta</b>"
+
+#~ msgid "<b>Configuration:</b>"
+#~ msgstr "<b>Configuració:</b>"
+
+#~ msgid "<b>Install</b>"
+#~ msgstr "<b>Instal·la</b>"
+
+#~ msgid "Program '%s' does not exists"
+#~ msgstr "No existeix el programa «%s»"
+
+#~ msgid "C_onfigure Project..."
+#~ msgstr "C_onfigura el projecte..."
+
+#~ msgid "<b>CVS Options</b>"
+#~ msgstr "<b>Opcions del CVS</b>"
+
+#~ msgid "<b>Options:</b>"
+#~ msgstr "<b>Opcions:</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Opcions</b>"
+
+#~ msgid "<b>Repository: </b>"
+#~ msgstr "<b>Dipòsit: </b>"
+
+#~ msgid "<b>Debugger:</b>"
+#~ msgstr "<b>Depurador:</b>"
+
+#~ msgid "Debugger Command..."
+#~ msgstr "Ordre del depurador..."
+
+#~ msgid "Pid"
+#~ msgstr "Identificador de procés"
+
+#~ msgid "Id"
+#~ msgstr "Id"
+
+#~ msgid "Ins_pect/Evaluate..."
+#~ msgstr "Ins_pecciona/avalua..."
+
+#~ msgid "Add Watch..."
+#~ msgstr "Afegeix la vigilància..."
+
+#~ msgid "_Print..."
+#~ msgstr "_Imprimeix..."
+
+#~ msgid "recent menu label|_%d. %s"
+#~ msgstr "_%d. %s"
+
+#~ msgid "recent menu label|%d. %s"
+#~ msgstr "%d. %s"
+
+#~ msgid "_Open..."
+#~ msgstr "_Obre..."
+
+#~ msgid "Url:"
+#~ msgstr "URL:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Avançat..."
+
+#~ msgid "Source coudn't be removed"
+#~ msgstr "No s'ha pogut suprimir la font"
+
+#~ msgid "<b>Tags</b>"
+#~ msgstr "<b>Etiquetes</b>"
+
+#~ msgid "Add signed off by line"
+#~ msgstr "Afegeix l'assignació per línia"
+
+#~ msgid "_Commit..."
+#~ msgstr "Publica els _canvis..."
+
+#~ msgid "_View log..."
+#~ msgstr "_Visualitza el registre..."
 
-#~ msgid "Run in Terminal"
+#~ msgid "_Push..."
+#~ msgstr "_Empeny..."
+
+#~ msgid "_Pull..."
+#~ msgstr "_Estira..."
+
+#~ msgid "_Add..."
+#~ msgstr "_Afegeix..."
+
+#~ msgid "_Remove..."
+#~ msgstr "_Suprimeix..."
+
+#~ msgid "_Ignore..."
+#~ msgstr "_Ignora..."
+
+#~ msgid "Create patch series..."
+#~ msgstr "Crea una sèrie de pedaços..."
+
+#~ msgid "_Switch to another branch..."
+#~ msgstr "_Commuta a una altra branca..."
+
+#~ msgid "_Merge..."
+#~ msgstr "_Combina..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Suprimeix..."
+
+#~ msgid "_Delete tag..."
+#~ msgstr "_Suprimeix una etiqueta..."
+
+#~ msgid "Unknown language of the editor \"%s\""
+#~ msgstr "El llenguatge de l'editor «%s» no és conegut"
+
+#~ msgid "n/a"
+#~ msgstr "n/d"
+
+#~ msgid "Misc"
+#~ msgstr "Miscel·lània"
+
+#~ msgid "<b>Macros:</b>"
+#~ msgstr "<b>Macros:</b>"
+
+#~ msgid "Edit..."
+#~ msgstr "Edita..."
+
+#~ msgid "Macros..."
+#~ msgstr "Macros..."
+
+#~ msgid "_Patch..."
+#~ msgstr "_Pedaç..."
+
+#~ msgid "<b>Project name</b>"
+#~ msgstr "<b>Nom del projecte</b>"
+
+#~ msgid "_Select file to add..."
+#~ msgstr "_Seleccioneu un fitxer a afegir..."
+
+#~ msgid "Add _Group..."
+#~ msgstr "Afegeix un _grup..."
+
+#~ msgid "Add _Target..."
+#~ msgstr "Afegeix un _objectiu..."
+
+#~ msgid "Add _Source File..."
+#~ msgstr "Afegeix un fitxer de _codi..."
+
+#~ msgid "_Add To Project"
+#~ msgstr "_Afegeix al projecte"
+
+#~ msgid "Select project type"
+#~ msgstr "Seleccioneu el tipus de projecte"
+
+#~ msgid "Create a template gtk builder interface file"
+#~ msgstr "Crea un fitxer de plantilla d'interfície GTK Builder"
+
+#~ msgid "Run In Terminal"
 #~ msgstr "Executa en un terminal"
 
-#, fuzzy
-#~| msgid "Program Parameters"
-#~ msgid "Program Parametersâ?¦"
-#~ msgstr "Paràmetres del programa"
+#~ msgid "Program Parameters..."
+#~ msgstr "Paràmetres del programa..."
 
-#, fuzzy
-#~| msgid "Action"
-#~ msgid "Actions"
-#~ msgstr "Acció"
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Accions</b>"
 
-#, fuzzy
-#~| msgid "<b>File Filter</b>"
-#~ msgid "File Filter"
-#~ msgstr "<b>Filtre de fitxers</b>"
+#~ msgid "<b>Parameters</b>"
+#~ msgstr "<b>Paràmetres</b>"
 
-#~ msgid "Parameters"
-#~ msgstr "Paràmetres"
+#~ msgid "<b>Scope</b>"
+#~ msgstr "<b>Abast</b>"
 
-#, fuzzy
-#~| msgid "_Find..."
-#~ msgid "_Findâ?¦"
-#~ msgstr "Ce_rca..."
+#~ msgid "Searching..."
+#~ msgstr "S'està cercant..."
 
-#, fuzzy
-#~| msgid "Searching"
-#~ msgid "Searchingâ?¦"
-#~ msgstr "S'està cercant"
+#~ msgid "_Update..."
+#~ msgstr "Act_ualitza..."
 
-#, fuzzy
-#~| msgid ""
-#~| "The file '%s' on the disk is more recent than the current buffer.\n"
-#~| "Do you want to reload it?"
-#~ msgid ""
-#~ "The file \"%s\" on the disk is more recent than the current buffer.\n"
-#~ "Do you want to reload it?"
-#~ msgstr ""
-#~ "La còpia del fitxer «%s» al disc és més nova que la carregada a la memòria "
-#~ "intermèdia.\n"
-#~ "Voleu tornar-lo a carregar?"
+#~ msgid "Merge..."
+#~ msgstr "Combina..."
+
+#~ msgid "_View Log..."
+#~ msgstr "_Visualitza el registre..."
+
+#~ msgid "_Diff..."
+#~ msgstr "_Diferències..."
+
+#~ msgid "Copy..."
+#~ msgstr "Copia..."
+
+#~ msgid "Diff..."
+#~ msgstr "Diferències..."
+
+#~ msgid "_Find Symbol..."
+#~ msgstr "Ce_rca un símbol..."
 
-#, fuzzy
-#~| msgid "Retrieving status..."
-#~ msgid "Retrieving status��"
-#~ msgstr "S'està obtenint l'estat..."
-
-#, fuzzy
-#~| msgid "_Revert..."
-#~ msgid "_Revertâ?¦"
-#~ msgstr "_Desfés..."
-
-#, fuzzy
-#~| msgid "_Update"
-#~ msgid "_Updateâ?¦"
-#~ msgstr "Act_ualitza"
-
-#, fuzzy
-#~| msgid "Merge"
-#~ msgid "Mergeâ?¦"
-#~ msgstr "Combina"
-
-#, fuzzy
-#~| msgid "View Log"
-#~ msgid "_View Logâ?¦"
-#~ msgstr "Visualitza el registre"
-
-#, fuzzy
-#~| msgid "_Diff"
-#~ msgid "_Diffâ?¦"
-#~ msgstr "_Diferències"
-
-#, fuzzy
-#~| msgid "Copy"
-#~ msgid "Copyâ?¦"
-#~ msgstr "Copia"
-
-#, fuzzy
-#~| msgid "Diff"
-#~ msgid "Diffâ?¦"
-#~ msgstr "Diferència"
-
-#, fuzzy
-#~| msgid "Find Symbol"
-#~ msgid "_Find Symbolâ?¦"
-#~ msgstr "Cerca un símbol"
-
-#, fuzzy
-#~| msgid "Loading"
-#~ msgid "Loadingâ?¦"
-#~ msgstr "S'està carregant"
-
-#, fuzzy
-#~| msgid "<b>Available API tags</b>"
-#~ msgid "Available API tags"
-#~ msgstr "<b>Etiquetes de l'API disponibles</b>"
-
-#, fuzzy
-#~| msgid "terminal operations"
-#~ msgid "Terminal options"
-#~ msgstr "operacions del terminal"
-
-#, fuzzy
-#~| msgid "Variable"
-#~ msgid "_Variableâ?¦"
-#~ msgstr "Variable"
-
-#, fuzzy
-#~| msgid "GtkSourceView Editor"
-#~ msgid "GtkSourceView editor"
-#~ msgstr "Editor GtkSourceView"
+#~ msgid "<b>Global</b>"
+#~ msgstr "<b>Global</b>"
+
+#~ msgid "<b>Terminal options</b>"
+#~ msgstr "<b>Opcions del terminal</b>"
+
+#~ msgid "<b>Tools</b>"
+#~ msgstr "<b>Eines</b>"
+
+#~ msgid "_Variable..."
+#~ msgstr "_Variable..."
+
+#~ msgid "GtkSourceview editor"
+#~ msgstr "Editor GtkSourceview"
 
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
@@ -10389,9 +10471,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "<b>Changes:</b>"
 #~ msgstr "<b>Canvis:</b>"
 
-#~ msgid "<b>Filters</b>"
-#~ msgstr "<b>Filtres</b>"
-
 #~ msgid "<b>Log Message:</b>"
 #~ msgstr "<b>Missatge de registre:</b>"
 
@@ -10790,9 +10869,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Pressing tab inserts indentation"
 #~ msgstr "Premeu el tabulador per a inserir un sagnat"
 
-#~ msgid "Select highlight style to edit:"
-#~ msgstr "Seleccioneu l'estil de ressaltat que voleu editar:"
-
 #~ msgid "Selection background:"
 #~ msgstr "Fons de la selecció:"
 
@@ -11085,9 +11161,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Cachegrind"
 #~ msgstr "Cachegrind"
 
-#~ msgid "Error contains"
-#~ msgstr "L'error conté"
-
 #~ msgid "Function contains"
 #~ msgstr "La funció conté"
 
@@ -11623,12 +11696,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Could not set file permissions %s: %s."
 #~ msgstr "No es poden establir els permisos del fitxer %s: %s."
 
-#~ msgid "Refresh file manager tree"
-#~ msgstr "Actualitza l'arbre del gestor de fitxers"
-
-#~ msgid "No properties available for this group"
-#~ msgstr "No hi ha propietats disponibles per a aquest grup"
-
 #~ msgid "Could not obtain backup filename"
 #~ msgstr "No s'ha pogut obtenir el nom de fitxer de còpia de seguretat"
 
@@ -11676,9 +11743,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Unable to build user interface for tool list"
 #~ msgstr "No es pot muntar la interfície d'usuari per a la llista d'eines"
 
-#~ msgid "_Configure"
-#~ msgstr "_Configura"
-
 #~ msgid "Configure external tools"
 #~ msgstr "Configura les eines externes"
 
@@ -12597,9 +12661,6 @@ msgstr "Rerefons de les autotools per al gestor de projectes"
 #~ msgid "Toggle View"
 #~ msgstr "Commuta la visualització"
 
-#~ msgid "Anjuta Plugins"
-#~ msgstr "Connectors de l'Anjuta"
-
 #~ msgid "_Settings"
 #~ msgstr "_Paràmetres"
 
diff --git a/po/da.po b/po/da.po
index 47b6e6e..8438919 100644
--- a/po/da.po
+++ b/po/da.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: anjuta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-28 00:18+0100\n"
+"POT-Creation-Date: 2010-03-28 00:17+0100\n"
 "PO-Revision-Date: 2010-03-27 23:17+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen gmail com>\n"
 "Language-Team: <dansk dansk-gruppen dk>\n"
@@ -1430,8 +1430,8 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ignorér .cvsrc-fil (anbefalet)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2327
-#: ../plugins/symbol-db/plugin.c:2397
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2120
+#: ../plugins/symbol-db/plugin.c:2189
 msgid "Local"
 msgstr "Lokal"
 
@@ -2616,7 +2616,7 @@ msgid "Search Help:"
 msgstr "Søg i hjælp:"
 
 #: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:239
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:313
+#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:312
 msgid "_Go to"
 msgstr "_GÃ¥ til"
 
@@ -2656,8 +2656,8 @@ msgstr "Indhold"
 #: ../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:2331
-#: ../plugins/symbol-db/plugin.c:2447
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2124
+#: ../plugins/symbol-db/plugin.c:2206
 msgid "Search"
 msgstr "Søg"
 
@@ -2710,26 +2710,26 @@ msgstr "Omdøb"
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../plugins/document-manager/anjuta-docman.c:399
+#: ../plugins/document-manager/anjuta-docman.c:435
 msgid "Close file"
 msgstr "Luk fil"
 
-#: ../plugins/document-manager/anjuta-docman.c:447
+#: ../plugins/document-manager/anjuta-docman.c:483
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../plugins/document-manager/anjuta-docman.c:564
+#: ../plugins/document-manager/anjuta-docman.c:600
 #: ../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 "Ã?ben fil"
 
-#: ../plugins/document-manager/anjuta-docman.c:583
+#: ../plugins/document-manager/anjuta-docman.c:619
 #: ../plugins/message-view/message-view.c:94
 msgid "Save file as"
 msgstr "Gem fil som"
 
-#: ../plugins/document-manager/anjuta-docman.c:664
+#: ../plugins/document-manager/anjuta-docman.c:700
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -2738,11 +2738,11 @@ msgstr ""
 "Filen \"%s\" findes allerede.\n"
 "Vil du overskrive den med filen, du er ved at gemme?"
 
-#: ../plugins/document-manager/anjuta-docman.c:673
+#: ../plugins/document-manager/anjuta-docman.c:709
 msgid "_Replace"
 msgstr "_Erstat"
 
-#: ../plugins/document-manager/anjuta-docman.c:1390
+#: ../plugins/document-manager/anjuta-docman.c:1426
 msgid "[read-only]"
 msgstr "[skrivebeskyttet]"
 
@@ -3673,7 +3673,7 @@ msgid "Filter"
 msgstr "Filter"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2329 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2122 ../plugins/symbol-db/plugin.c:2201
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Global"
@@ -9015,65 +9015,65 @@ msgstr "Mangler: %s"
 msgid "Obstructed: %s"
 msgstr "Forhindret: %s"
 
-#: ../plugins/symbol-db/plugin.c:317
+#: ../plugins/symbol-db/plugin.c:316
 msgid "Tag De_claration"
 msgstr "Mærke_erklæring"
 
-#: ../plugins/symbol-db/plugin.c:319
+#: ../plugins/symbol-db/plugin.c:318
 msgid "Go to symbol declaration"
 msgstr "Gå til symbolerklæring"
 
 # Eller mærk implementation?
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:326
+#: ../plugins/symbol-db/plugin.c:325
 msgid "Tag _Implementation"
 msgstr "Mærke_implementation"
 
-#: ../plugins/symbol-db/plugin.c:328
+#: ../plugins/symbol-db/plugin.c:327
 msgid "Go to symbol definition"
 msgstr "GÃ¥ til symboldefinition"
 
-#: ../plugins/symbol-db/plugin.c:335
+#: ../plugins/symbol-db/plugin.c:334
 msgid "_Find Symbolâ?¦"
 msgstr "_Find symbolâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:336
+#: ../plugins/symbol-db/plugin.c:335
 msgid "Find Symbol"
 msgstr "Find symbol"
 
-#: ../plugins/symbol-db/plugin.c:1173
+#: ../plugins/symbol-db/plugin.c:1022
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%s: Genererer nedarvningsstrukturâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:1178
+#: ../plugins/symbol-db/plugin.c:1027
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%s: %d af %d filer scannet"
 
-#: ../plugins/symbol-db/plugin.c:1209
+#: ../plugins/symbol-db/plugin.c:1058
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "Genererer nedarvningsstrukturâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:1211
+#: ../plugins/symbol-db/plugin.c:1060
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "%d af %d filer scannet"
 
-#: ../plugins/symbol-db/plugin.c:1979
+#: ../plugins/symbol-db/plugin.c:1785
 msgid "Populating symbol databaseâ?¦"
 msgstr "Opbygger symboldatabaseâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2148 ../plugins/symbol-db/plugin.c:2232
 msgid "Symbols"
 msgstr "Symboler"
 
-#: ../plugins/symbol-db/plugin.c:2489
+#: ../plugins/symbol-db/plugin.c:2241
 msgid "SymbolDb popup actions"
 msgstr "Pop op-handlinger for symboldatabase"
 
-#: ../plugins/symbol-db/plugin.c:2497
+#: ../plugins/symbol-db/plugin.c:2249
 msgid "SymbolDb menu actions"
 msgstr "Menuhandlinger for symboldatabase"
 
@@ -9095,15 +9095,6 @@ msgstr "API-mærker"
 msgid "Resuming glb scan."
 msgstr "Fortsætter glb-scanning."
 
-#: ../plugins/symbol-db/symbol-db-view-locals.c:326
-#: ../plugins/symbol-db/symbol-db-view.c:1412
-msgid "Symbol"
-msgstr "Symbol"
-
-#: ../plugins/symbol-db/symbol-db-view.c:798
-msgid "Loadingâ?¦"
-msgstr "Henterâ?¦"
-
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
 msgid "Automatically scan project's packages"
 msgstr "Scan automatisk projektets pakker"
@@ -10166,6 +10157,12 @@ msgstr "Fremhæv manglende semikolon"
 msgid "Min character for completion "
 msgstr "Mindste antal tegn for fuldførelse"
 
+#~ msgid "Symbol"
+#~ msgstr "Symbol"
+
+#~ msgid "Loadingâ?¦"
+#~ msgstr "Henterâ?¦"
+
 #~ msgid "Edit&#x2026;"
 #~ msgstr "Redigér&#x2026;"
 
diff --git a/po/el.po b/po/el.po
index c551f57..d7fdc35 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-27 20:03+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta&component=core application\n"
+"POT-Creation-Date: 2010-03-22 22:11+0000\n"
 "PO-Revision-Date: 2010-03-27 18:29+0200\n"
 "Last-Translator: Bakaoukas Nikolaos <nikolaosx1 gmail com>\n"
 "Language-Team: Greek <team gnome gr>\n"
@@ -33,7 +33,8 @@ msgid "Develop software in an integrated development environment"
 msgstr "Î?νάÏ?Ï?Ï?ξη λογιÏ?μικοÏ? Ï?ε ένα ενÏ?Ï?μαÏ?Ï?μένο Ï?εÏ?ιβάλλον ανάÏ?Ï?Ï?ξηÏ?"
 
 #
-#: ../anjuta.desktop.in.in.h:3 ../src/about.c:204
+#: ../anjuta.desktop.in.in.h:3
+#: ../src/about.c:204
 msgid "Integrated Development Environment"
 msgstr "Î?νÏ?Ï?μαÏ?Ï?μένο Ï?εÏ?ιβάλλον Ï?Ï?ογÏ?αμμαÏ?ιÏ?μοÏ?"
 
@@ -45,9 +46,7 @@ msgstr "Î?δÏ?ναÏ?η η εÏ?Ï?εÏ?η αÏ?θÏ?Ï?μαÏ?οÏ? Ï?Ï?Ï?Ï?θεÏ?ηÏ? 
 #: ../libanjuta/anjuta-c-module.c:213
 #, c-format
 msgid "Unable to find plugin registration function %s in module %s"
-msgstr ""
-"Î?δÏ?ναÏ?η η εÏ?Ï?εÏ?η Ï?ηÏ? Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ? Ï?ηÏ? Ï?Ï?νάÏ?Ï?ηÏ?ηÏ? εγγÏ?αÏ?ήÏ? %s Ï?Ï?ο "
-"άÏ?θÏ?Ï?μα %s"
+msgstr "Î?δÏ?ναÏ?η η εÏ?Ï?εÏ?η Ï?ηÏ? Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ? Ï?ηÏ? Ï?Ï?νάÏ?Ï?ηÏ?ηÏ? εγγÏ?αÏ?ήÏ? %s Ï?Ï?ο άÏ?θÏ?Ï?μα %s"
 
 #: ../libanjuta/anjuta-c-module.c:219
 #, c-format
@@ -69,33 +68,35 @@ msgstr "Î?είÏ?ει ο Ï?Ï?Ï?οÏ? Ï?οÏ? καθοÏ?ίÏ?Ï?ηκε αÏ?Ï? Ï?ην 
 msgid "plugin %s fails to register type %s"
 msgstr "Î? Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία %s αÏ?οÏ?Ï?γÏ?άνει να δηλÏ?Ï?ει Ï?ον Ï?Ï?Ï?ο %s"
 
-#: ../libanjuta/anjuta-convert.c:74 ../libanjuta/anjuta-convert.c:111
+#: ../libanjuta/anjuta-convert.c:74
+#: ../libanjuta/anjuta-convert.c:111
 #, c-format
 msgid "The file you are trying to open contains an invalid byte sequence."
-msgstr ""
-"Το αÏ?Ï?είο Ï?οÏ? Ï?Ï?οÏ?Ï?αθείÏ?ε να ανοίξεÏ?ε Ï?εÏ?ιέÏ?ει μία μη έγκÏ?Ï?η ακολοÏ?θία byte."
+msgstr "Το αÏ?Ï?είο Ï?οÏ? Ï?Ï?οÏ?Ï?αθείÏ?ε να ανοίξεÏ?ε Ï?εÏ?ιέÏ?ει μία μη έγκÏ?Ï?η ακολοÏ?θία byte."
 
-#: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
+#: ../libanjuta/anjuta-convert.c:168
+#: ../libanjuta/anjuta-convert.c:207
 #, c-format
-msgid ""
-"Anjuta was not able to automatically determine the encoding of the file you "
-"want to open."
-msgstr ""
-"Το Anjuta δεν μÏ?Ï?Ï?εÏ?ε να αναγνÏ?Ï?ίÏ?ει αÏ?Ï?Ï?μαÏ?α Ï?ην κÏ?δικοÏ?οίηÏ?η Ï?οÏ? αÏ?Ï?είοÏ? "
-"Ï?οÏ? εÏ?ιθÏ?μείÏ?ε να ανοίξεÏ?ε."
+msgid "Anjuta was not able to automatically determine the encoding of the file you want to open."
+msgstr "Το Anjuta δεν μÏ?Ï?Ï?εÏ?ε να αναγνÏ?Ï?ίÏ?ει αÏ?Ï?Ï?μαÏ?α Ï?ην κÏ?δικοÏ?οίηÏ?η Ï?οÏ? αÏ?Ï?είοÏ? Ï?οÏ? εÏ?ιθÏ?μείÏ?ε να ανοίξεÏ?ε."
 
-#: ../libanjuta/anjuta-encodings.c:137 ../libanjuta/anjuta-encodings.c:182
-#: ../libanjuta/anjuta-encodings.c:184 ../libanjuta/anjuta-encodings.c:186
+#: ../libanjuta/anjuta-encodings.c:137
+#: ../libanjuta/anjuta-encodings.c:182
+#: ../libanjuta/anjuta-encodings.c:184
+#: ../libanjuta/anjuta-encodings.c:186
 #: ../libanjuta/anjuta-encodings.c:188
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../libanjuta/anjuta-encodings.c:151 ../libanjuta/anjuta-encodings.c:177
-#: ../libanjuta/anjuta-encodings.c:223 ../libanjuta/anjuta-encodings.c:266
+#: ../libanjuta/anjuta-encodings.c:151
+#: ../libanjuta/anjuta-encodings.c:177
+#: ../libanjuta/anjuta-encodings.c:223
+#: ../libanjuta/anjuta-encodings.c:266
 msgid "Western"
 msgstr "Î?Ï?Ï?ική"
 
-#: ../libanjuta/anjuta-encodings.c:153 ../libanjuta/anjuta-encodings.c:225
+#: ../libanjuta/anjuta-encodings.c:153
+#: ../libanjuta/anjuta-encodings.c:225
 #: ../libanjuta/anjuta-encodings.c:262
 msgid "Central European"
 msgstr "Î?ενÏ?Ï?ικήÏ? Î?Ï?Ï?Ï?Ï?ηÏ?"
@@ -105,23 +106,29 @@ msgid "South European"
 msgstr "Î?Ï?Ï?ιαÏ? Î?Ï?Ï?Ï?Ï?ηÏ?"
 
 #
-#: ../libanjuta/anjuta-encodings.c:157 ../libanjuta/anjuta-encodings.c:173
+#: ../libanjuta/anjuta-encodings.c:157
+#: ../libanjuta/anjuta-encodings.c:173
 #: ../libanjuta/anjuta-encodings.c:276
 msgid "Baltic"
 msgstr "Î?αλÏ?ική"
 
-#: ../libanjuta/anjuta-encodings.c:159 ../libanjuta/anjuta-encodings.c:227
-#: ../libanjuta/anjuta-encodings.c:240 ../libanjuta/anjuta-encodings.c:244
-#: ../libanjuta/anjuta-encodings.c:246 ../libanjuta/anjuta-encodings.c:264
+#: ../libanjuta/anjuta-encodings.c:159
+#: ../libanjuta/anjuta-encodings.c:227
+#: ../libanjuta/anjuta-encodings.c:240
+#: ../libanjuta/anjuta-encodings.c:244
+#: ../libanjuta/anjuta-encodings.c:246
+#: ../libanjuta/anjuta-encodings.c:264
 msgid "Cyrillic"
 msgstr "Î?Ï?Ï?ιλλική"
 
-#: ../libanjuta/anjuta-encodings.c:161 ../libanjuta/anjuta-encodings.c:233
+#: ../libanjuta/anjuta-encodings.c:161
+#: ../libanjuta/anjuta-encodings.c:233
 #: ../libanjuta/anjuta-encodings.c:274
 msgid "Arabic"
 msgstr "Î?Ï?αβικά"
 
-#: ../libanjuta/anjuta-encodings.c:163 ../libanjuta/anjuta-encodings.c:268
+#: ../libanjuta/anjuta-encodings.c:163
+#: ../libanjuta/anjuta-encodings.c:268
 msgid "Greek"
 msgstr "Î?λληνικά"
 
@@ -129,13 +136,15 @@ msgstr "Î?λληνικά"
 msgid "Hebrew Visual"
 msgstr "Î?Ï?Ï?ικά εβÏ?αÏ?κά"
 
-#: ../libanjuta/anjuta-encodings.c:167 ../libanjuta/anjuta-encodings.c:231
+#: ../libanjuta/anjuta-encodings.c:167
+#: ../libanjuta/anjuta-encodings.c:231
 #: ../libanjuta/anjuta-encodings.c:272
 msgid "Hebrew"
 msgstr "Î?βÏ?αÏ?κά"
 
 #
-#: ../libanjuta/anjuta-encodings.c:169 ../libanjuta/anjuta-encodings.c:229
+#: ../libanjuta/anjuta-encodings.c:169
+#: ../libanjuta/anjuta-encodings.c:229
 #: ../libanjuta/anjuta-encodings.c:270
 msgid "Turkish"
 msgstr "ΤοÏ?Ï?κικά"
@@ -156,7 +165,8 @@ msgstr "ΡοÏ?μανικά"
 msgid "Armenian"
 msgstr "Î?Ï?μενικά"
 
-#: ../libanjuta/anjuta-encodings.c:193 ../libanjuta/anjuta-encodings.c:195
+#: ../libanjuta/anjuta-encodings.c:193
+#: ../libanjuta/anjuta-encodings.c:195
 #: ../libanjuta/anjuta-encodings.c:209
 msgid "Chinese Traditional"
 msgstr "ΠαÏ?αδοÏ?ιακά κινέζικα"
@@ -165,19 +175,25 @@ msgstr "ΠαÏ?αδοÏ?ιακά κινέζικα"
 msgid "Cyrillic/Russian"
 msgstr "Î?Ï?Ï?ιλλικά/ΡÏ?Ï?ικα"
 
-#: ../libanjuta/anjuta-encodings.c:200 ../libanjuta/anjuta-encodings.c:202
-#: ../libanjuta/anjuta-encodings.c:204 ../libanjuta/anjuta-encodings.c:236
+#: ../libanjuta/anjuta-encodings.c:200
+#: ../libanjuta/anjuta-encodings.c:202
+#: ../libanjuta/anjuta-encodings.c:204
+#: ../libanjuta/anjuta-encodings.c:236
 #: ../libanjuta/anjuta-encodings.c:251
 msgid "Japanese"
 msgstr "Î?αÏ?Ï?νικά"
 
-#: ../libanjuta/anjuta-encodings.c:207 ../libanjuta/anjuta-encodings.c:238
-#: ../libanjuta/anjuta-encodings.c:242 ../libanjuta/anjuta-encodings.c:257
+#: ../libanjuta/anjuta-encodings.c:207
+#: ../libanjuta/anjuta-encodings.c:238
+#: ../libanjuta/anjuta-encodings.c:242
+#: ../libanjuta/anjuta-encodings.c:257
 msgid "Korean"
 msgstr "Î?οÏ?εάÏ?ικα"
 
-#: ../libanjuta/anjuta-encodings.c:212 ../libanjuta/anjuta-encodings.c:214
-#: ../libanjuta/anjuta-encodings.c:216 ../libanjuta/anjuta-encodings.c:220
+#: ../libanjuta/anjuta-encodings.c:212
+#: ../libanjuta/anjuta-encodings.c:214
+#: ../libanjuta/anjuta-encodings.c:216
+#: ../libanjuta/anjuta-encodings.c:220
 msgid "Chinese Simplified"
 msgstr "Î?Ï?λοÏ?οιημένα κινέζικα"
 
@@ -190,7 +206,8 @@ msgstr "Î?εÏ?Ï?γιανά"
 msgid "Cyrillic/Ukrainian"
 msgstr "Î?Ï?Ï?ιλλικά/Î?Ï?κÏ?ανικά"
 
-#: ../libanjuta/anjuta-encodings.c:253 ../libanjuta/anjuta-encodings.c:259
+#: ../libanjuta/anjuta-encodings.c:253
+#: ../libanjuta/anjuta-encodings.c:259
 #: ../libanjuta/anjuta-encodings.c:278
 msgid "Vietnamese"
 msgstr "Î?ιεÏ?ναμέζικα"
@@ -199,7 +216,8 @@ msgstr "Î?ιεÏ?ναμέζικα"
 msgid "Thai"
 msgstr "ΤαÏ?λανδέζικα"
 
-#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:193
+#: ../libanjuta/anjuta-encodings.c:441
+#: ../plugins/gbf-am/gbf-am-project.c:193
 #: ../plugins/gbf-am/gbf-am-project.c:3372
 #: ../plugins/gbf-am/gbf-am-properties.c:129
 #: ../plugins/gbf-am/gbf-am-properties.c:176
@@ -212,8 +230,10 @@ msgid "Unknown"
 msgstr "Î?γνÏ?Ï?Ï?ο"
 
 #
-#: ../libanjuta/anjuta-launcher.c:1154 ../libanjuta/resources.c:267
-#: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
+#: ../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 "Î?εν μÏ?οÏ?Ï? να εκÏ?ελέÏ?Ï? Ï?ην ενÏ?ολή: \"%s\""
@@ -223,7 +243,8 @@ msgstr "Î?εν μÏ?οÏ?Ï? να εκÏ?ελέÏ?Ï? Ï?ην ενÏ?ολή: \"%s\""
 msgid "execvp failed"
 msgstr "Το execvp αÏ?έÏ?Ï?Ï?ε"
 
-#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2312
+#: ../libanjuta/anjuta-plugin.c:326
+#: ../libanjuta/anjuta-plugin-manager.c:2312
 msgid "Anjuta Shell"
 msgstr "Î?έλÏ?Ï?οÏ? Ï?οÏ? Anjuta"
 
@@ -240,13 +261,11 @@ msgstr "Î? Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία '%s' δεν εÏ?ιθÏ?μεί ν
 #, c-format
 msgid ""
 "Could not load %s\n"
-"This usually means that your installation is corrupted. The error message "
-"leading to this was:\n"
+"This usually means that your installation is corrupted. The error message leading to this was:\n"
 "%s"
 msgstr ""
 "Î?εν ήÏ?αν δÏ?ναÏ?ή η Ï?Ï?Ï?Ï?Ï?Ï?η Ï?οÏ? %s\n"
-"Î?Ï?Ï?Ï? Ï?Ï?νήθÏ?Ï? Ï?ημαίνει Ï?Ï?ι η εγκαÏ?άÏ?Ï?αÏ?ή Ï?αÏ? είναι καÏ?εÏ?Ï?Ï?αμμένη. Το μήνÏ?μα "
-"Ï?Ï?άλμαÏ?οÏ? Ï?οÏ? οδηγεί Ï?ε αÏ?Ï?Ï? ήÏ?αν Ï?ο εξήÏ?:\n"
+"Î?Ï?Ï?Ï? Ï?Ï?νήθÏ?Ï? Ï?ημαίνει Ï?Ï?ι η εγκαÏ?άÏ?Ï?αÏ?ή Ï?αÏ? είναι καÏ?εÏ?Ï?Ï?αμμένη. Το μήνÏ?μα Ï?Ï?άλμαÏ?οÏ? Ï?οÏ? οδηγεί Ï?ε αÏ?Ï?Ï? ήÏ?αν Ï?ο εξήÏ?:\n"
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
@@ -262,7 +281,8 @@ msgstr "Î?ιαθέÏ?ιμεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ?"
 
 #  3
 #  4
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:773
+#: ../libanjuta/anjuta-plugin-manager.c:1036
+#: ../src/anjuta-app.c:773
 msgid "Preferred plugins"
 msgstr "ΠÏ?οÏ?ιμÏ?μενεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ?"
 
@@ -271,23 +291,16 @@ msgid "Only show user activatable plugins"
 msgstr "ΠÏ?οβολή μÏ?νο Ï?Ï?ν ενεÏ?γοÏ?οιήÏ?ιμÏ?ν αÏ?Ï? Ï?ο Ï?Ï?ήÏ?Ï?η Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1197
-msgid ""
-"These are the plugins selected by you when Anjuta prompted to choose one of "
-"many suitable plugins. Removing the preferred plugin will let Anjuta prompt "
-"you again to choose different plugin."
-msgstr ""
-"Î?Ï?Ï?έÏ? είναι οι Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? Ï?οÏ? εÏ?ιλέÏ?Ï?ηκαν αÏ?Ï? εÏ?άÏ? Ï?Ï?αν ζηÏ?ήθηκε "
-"αÏ?Ï? Ï?ο Anjuta να διαλέξει μία αÏ?Ï? Ï?ιÏ? Ï?ολλέÏ? καÏ?άλληλεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? "
-"λειÏ?οÏ?Ï?γίεÏ?. Î?ν διαγÏ?άÏ?εÏ?ε Ï?η Ï?Ï?οÏ?ιμÏ?μενη Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία, αÏ?Ï?Ï? θα "
-"αναγκάÏ?ει Ï?ο Anjuta να Ï?αÏ? ζηÏ?ήÏ?ει ξανά να διαλέξεÏ?ε διαÏ?οÏ?εÏ?ική Ï?Ï?Ï?Ï?θεÏ?η "
-"λειÏ?οÏ?Ï?γία."
+msgid "These are the plugins selected by you when Anjuta prompted to choose one of many suitable plugins. Removing the preferred plugin will let Anjuta prompt you again to choose different plugin."
+msgstr "Î?Ï?Ï?έÏ? είναι οι Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? Ï?οÏ? εÏ?ιλέÏ?Ï?ηκαν αÏ?Ï? εÏ?άÏ? Ï?Ï?αν ζηÏ?ήθηκε αÏ?Ï? Ï?ο Anjuta να διαλέξει μία αÏ?Ï? Ï?ιÏ? Ï?ολλέÏ? καÏ?άλληλεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ?. Î?ν διαγÏ?άÏ?εÏ?ε Ï?η Ï?Ï?οÏ?ιμÏ?μενη Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία, αÏ?Ï?Ï? θα αναγκάÏ?ει Ï?ο Anjuta να Ï?αÏ? ζηÏ?ήÏ?ει ξανά να διαλέξεÏ?ε διαÏ?οÏ?εÏ?ική Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία."
 
 #: ../libanjuta/anjuta-plugin-manager.c:1223
 msgid "Forget selected plugin"
 msgstr "Î?α ξεÏ?αÏ?Ï?εί η εÏ?ιλεγμένη Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1357
-#: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
+#: ../libanjuta/anjuta-plugin-manager.c:1508
+#: ../libanjuta/anjuta-profile.c:507
 #: ../plugins/debug-manager/queue.c:537
 msgid "Select a plugin"
 msgstr "Î?Ï?ιλογή μιαÏ? Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ?"
@@ -301,9 +314,7 @@ msgstr "ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε μια Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?
 #: ../libanjuta/anjuta-plugin-manager.c:1372
 #, c-format
 msgid "No plugin is able to load other plugins in %s"
-msgstr ""
-"Î?αμία Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία δεν μÏ?οÏ?εί να Ï?οÏ?Ï?Ï?Ï?ει άλλεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? "
-"Ï?Ï?ο %s"
+msgstr "Î?αμία Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία δεν μÏ?οÏ?εί να Ï?οÏ?Ï?Ï?Ï?ει άλλεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? Ï?Ï?ο %s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1962
 msgid "Remember this selection"
@@ -324,9 +335,7 @@ msgstr "Î?ιαθέÏ?ιμεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:2300
 msgid "Currently available plugins found in plugin paths"
-msgstr ""
-"Î?ι Ï?Ï?έÏ?οÏ?Ï?εÏ? διαθέÏ?ιμεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? Ï?οÏ? βÏ?έθηκαν Ï?Ï?α μονοÏ?άÏ?ια Ï?Ï?ν "
-"Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν"
+msgstr "Î?ι Ï?Ï?έÏ?οÏ?Ï?εÏ? διαθέÏ?ιμεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? Ï?οÏ? βÏ?έθηκαν Ï?Ï?α μονοÏ?άÏ?ια Ï?Ï?ν Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν"
 
 #: ../libanjuta/anjuta-plugin-manager.c:2306
 msgid "Activated plugins"
@@ -346,9 +355,7 @@ msgstr "Î?αÏ?άÏ?Ï?αÏ?η Ï?οÏ? Anjuta"
 
 #: ../libanjuta/anjuta-plugin-manager.c:2322
 msgid "Anjuta status to use in loading and unloading of plugins"
-msgstr ""
-"Î? καÏ?άÏ?Ï?αÏ?η Ï?οÏ? Anjuta Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι Ï?Ï?ην Ï?Ï?Ï?Ï?Ï?Ï?η και Ï?Ï?ην εκÏ?Ï?Ï?Ï?Ï?Ï?η "
-"Ï?Ï?ν Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν"
+msgstr "Î? καÏ?άÏ?Ï?αÏ?η Ï?οÏ? Anjuta Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι Ï?Ï?ην Ï?Ï?Ï?Ï?Ï?Ï?η και Ï?Ï?ην εκÏ?Ï?Ï?Ï?Ï?Ï?η Ï?Ï?ν Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν"
 
 #. DEBUG_PRINT ("Icon: %s", icon_path);
 #. Avoid space in translated string
@@ -362,9 +369,7 @@ msgstr "Î?ιαÏ?ειÏ?ιÏ?Ï?ήÏ? Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν"
 
 #: ../libanjuta/anjuta-profile.c:255
 msgid "The plugin manager to use for resolving plugins"
-msgstr ""
-"Î? διαÏ?ειÏ?ιÏ?Ï?ήÏ? Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι για εÏ?ίλÏ?Ï?η "
-"Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν"
+msgstr "Î? διαÏ?ειÏ?ιÏ?Ï?ήÏ? Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι για εÏ?ίλÏ?Ï?η Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν"
 
 #: ../libanjuta/anjuta-profile.c:263
 msgid "Profile Name"
@@ -396,12 +401,8 @@ msgstr "ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε μια Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?
 
 #: ../libanjuta/anjuta-profile.c:672
 #, c-format
-msgid ""
-"Failed to read '%s': XML parse error. Invalid or corrupted Anjuta plugins "
-"profile."
-msgstr ""
-"Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?ην ανάγνÏ?Ï?η Ï?οÏ? '%s': Ï?Ï?άλμα Ï?Ï?Ï?Ï?Ï?Ï?ηÏ? Ï?οÏ? XML. Î?η έγκÏ?Ï?ο ή "
-"καÏ?εÏ?Ï?Ï?αμμένο Ï?Ï?οÏ?ίλ Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν Ï?οÏ? Anjuta."
+msgid "Failed to read '%s': XML parse error. Invalid or corrupted Anjuta plugins profile."
+msgstr "Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?ην ανάγνÏ?Ï?η Ï?οÏ? '%s': Ï?Ï?άλμα Ï?Ï?Ï?Ï?Ï?Ï?ηÏ? Ï?οÏ? XML. Î?η έγκÏ?Ï?ο ή καÏ?εÏ?Ï?Ï?αμμένο Ï?Ï?οÏ?ίλ Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν Ï?οÏ? Anjuta."
 
 #. <Pluginname>: Install it from <some location on the web>
 #: ../libanjuta/anjuta-profile.c:699
@@ -415,8 +416,7 @@ msgid ""
 "Failed to read '%s': Following mandatory plugins are missing:\n"
 "%s"
 msgstr ""
-"Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?ην ανάγνÏ?Ï?η Ï?οÏ? '%s': Î?ι ακÏ?λοÏ?θεÏ? αÏ?αÏ?αίÏ?ηÏ?εÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? "
-"λειÏ?οÏ?Ï?γίεÏ? λείÏ?οÏ?ν:\n"
+"Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?ην ανάγνÏ?Ï?η Ï?οÏ? '%s': Î?ι ακÏ?λοÏ?θεÏ? αÏ?αÏ?αίÏ?ηÏ?εÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? λείÏ?οÏ?ν:\n"
 "%s"
 
 #: ../libanjuta/anjuta-preferences.c:1534
@@ -429,12 +429,14 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:455
+#: ../libanjuta/anjuta-preferences.c:1538
+#: ../plugins/git/plugin.c:455
 msgid "_Reset"
 msgstr "_Î?Ï?αναÏ?οÏ?ά"
 
 #: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:229 ../plugins/gtodo/mcategory.c:36
+#: ../plugins/gtodo/interface.c:229
+#: ../plugins/gtodo/mcategory.c:36
 msgid "Category"
 msgstr "Î?αÏ?ηγοÏ?ία"
 
@@ -442,7 +444,8 @@ msgstr "Î?αÏ?ηγοÏ?ία"
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:760
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../src/anjuta-app.c:760
 #: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "Î?ενικά"
@@ -477,16 +480,10 @@ msgstr "_Î?Ï?Ï?Ï?Ï?ιÏ?η αλλαγÏ?ν"
 
 #: ../libanjuta/anjuta-save-prompt.c:297
 #, c-format
-msgid ""
-"<b>There is %d item with unsaved changes. Save changes before closing?</b>"
-msgid_plural ""
-"<b>There are %d items with unsaved changes. Save changes before closing?</b>"
-msgstr[0] ""
-"<b>Î?ι αλλαγέÏ? Ï?οÏ? ανÏ?ικειμένοÏ? %d δεν αÏ?οθηκεÏ?Ï?ηκαν. Î?έλεÏ?ε να Ï?ιÏ? "
-"αÏ?οθηκεÏ?Ï?εÏ?ε Ï?Ï?ιν Ï?ον Ï?εÏ?μαÏ?ιÏ?μÏ?;</b>"
-msgstr[1] ""
-"<b>Î?ι αλλαγέÏ? Ï?Ï?ν ανÏ?ικειμένÏ?ν %d δεν αÏ?οθηκεÏ?Ï?ηκαν. Î?έλεÏ?ε να Ï?ιÏ? "
-"αÏ?οθηκεÏ?Ï?εÏ?ε Ï?Ï?ιν Ï?ον Ï?εÏ?μαÏ?ιÏ?μÏ?;</b>"
+msgid "<b>There is %d item with unsaved changes. Save changes before closing?</b>"
+msgid_plural "<b>There are %d items with unsaved changes. Save changes before closing?</b>"
+msgstr[0] "<b>Î?ι αλλαγέÏ? Ï?οÏ? ανÏ?ικειμένοÏ? %d δεν αÏ?οθηκεÏ?Ï?ηκαν. Î?έλεÏ?ε να Ï?ιÏ? αÏ?οθηκεÏ?Ï?εÏ?ε Ï?Ï?ιν Ï?ον Ï?εÏ?μαÏ?ιÏ?μÏ?;</b>"
+msgstr[1] "<b>Î?ι αλλαγέÏ? Ï?Ï?ν ανÏ?ικειμένÏ?ν %d δεν αÏ?οθηκεÏ?Ï?ηκαν. Î?έλεÏ?ε να Ï?ιÏ? αÏ?οθηκεÏ?Ï?εÏ?ε Ï?Ï?ιν Ï?ον Ï?εÏ?μαÏ?ιÏ?μÏ?;</b>"
 
 #: ../libanjuta/anjuta-save-prompt.c:304
 msgid "There is an item with unsaved changes. Save changes before closing?"
@@ -518,15 +515,8 @@ msgid "System:"
 msgstr "ΣÏ?Ï?Ï?ημα:"
 
 #: ../libanjuta/anjuta-utils.c:505
-msgid ""
-"You do not seem to have PackageKit installed. PackageKit is required for "
-"installing missing packages. Please install \"packagekit-gnome\" package "
-"from your distribution, or install the missing packages manually."
-msgstr ""
-"ΦαίνεÏ?αι Ï?Ï?ι δεν έÏ?εÏ?ε Ï?ο PackageKit εγκαÏ?εÏ?Ï?ημένο. Το PackageKit αÏ?αιÏ?είÏ?αι "
-"για Ï?ην εγκαÏ?άÏ?Ï?αÏ?η Ï?ακέÏ?Ï?ν Ï?οÏ? λείÏ?οÏ?ν. ΠαÏ?ακαλοÏ?με εγκαÏ?αÏ?Ï?ήÏ?Ï?ε Ï?ο "
-"«packagekit-gnome» αÏ?Ï? Ï?η διανομή Ï?αÏ?, ή εγκαÏ?αÏ?Ï?ήÏ?Ï?ε Ï?ειÏ?οκίνηÏ?α Ï?α Ï?ακέÏ?α "
-"Ï?οÏ? λείÏ?οÏ?ν."
+msgid "You do not seem to have PackageKit installed. PackageKit is required for installing missing packages. Please install \"packagekit-gnome\" package from your distribution, or install the missing packages manually."
+msgstr "ΦαίνεÏ?αι Ï?Ï?ι δεν έÏ?εÏ?ε Ï?ο PackageKit εγκαÏ?εÏ?Ï?ημένο. Το PackageKit αÏ?αιÏ?είÏ?αι για Ï?ην εγκαÏ?άÏ?Ï?αÏ?η Ï?ακέÏ?Ï?ν Ï?οÏ? λείÏ?οÏ?ν. ΠαÏ?ακαλοÏ?με εγκαÏ?αÏ?Ï?ήÏ?Ï?ε Ï?ο «packagekit-gnome» αÏ?Ï? Ï?η διανομή Ï?αÏ?, ή εγκαÏ?αÏ?Ï?ήÏ?Ï?ε Ï?ειÏ?οκίνηÏ?α Ï?α Ï?ακέÏ?α Ï?οÏ? λείÏ?οÏ?ν."
 
 #: ../libanjuta/anjuta-utils.c:515
 #, c-format
@@ -554,24 +544,20 @@ msgstr ""
 #. Try xterm
 #: ../libanjuta/anjuta-utils.c:1086
 msgid "Cannot find a terminal; using xterm, even if it may not work"
-msgstr ""
-"Î?εν ενÏ?οÏ?ίÏ?Ï?ηκε Ï?εÏ?μαÏ?ικÏ?. ΧÏ?ήÏ?η Ï?οÏ? xterm, ακÏ?μα κι αν μÏ?οÏ?εί να μη δοÏ?λέÏ?ει"
+msgstr "Î?εν ενÏ?οÏ?ίÏ?Ï?ηκε Ï?εÏ?μαÏ?ικÏ?. ΧÏ?ήÏ?η Ï?οÏ? xterm, ακÏ?μα κι αν μÏ?οÏ?εί να μη δοÏ?λέÏ?ει"
 
 #
-#: ../libanjuta/anjuta-utils.c:1122 ../libanjuta/anjuta-utils.c:1126
-#: ../libanjuta/anjuta-utils.c:1154 ../libanjuta/anjuta-utils.c:1158
+#: ../libanjuta/anjuta-utils.c:1122
+#: ../libanjuta/anjuta-utils.c:1126
+#: ../libanjuta/anjuta-utils.c:1154
+#: ../libanjuta/anjuta-utils.c:1158
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "Î?δÏ?ναμία εκÏ?έλεÏ?ηÏ? ενÏ?ολήÏ?: \"%s\" (Ï?Ï?ήÏ?η κελÏ?Ï?οÏ?Ï? %s)\n"
 
 #: ../libanjuta/anjuta-utils.c:1790
-msgid ""
-"Unable to display help. Please make sure the Anjuta documentation package is "
-"installed. It can be downloaded from http://anjuta.org.";
-msgstr ""
-"Î?ίναι αδÏ?ναÏ?η η Ï?Ï?οβολή βοήθειαÏ?. ΠαÏ?ακαλÏ? Ï?ιγοÏ?Ï?εÏ?Ï?είÏ?ε Ï?Ï?ι Ï?ο Ï?ακέÏ?ο "
-"Ï?εκμηÏ?ίÏ?Ï?ηÏ? Ï?οÏ? Anjuta έÏ?ει εγκαÏ?αÏ?Ï?αθεί. Î?Ï?οÏ?εί να γίνει λήÏ?η αÏ?Ï? Ï?ο http://";
-"anjuta.org."
+msgid "Unable to display help. Please make sure the Anjuta documentation package is installed. It can be downloaded from http://anjuta.org.";
+msgstr "Î?ίναι αδÏ?ναÏ?η η Ï?Ï?οβολή βοήθειαÏ?. ΠαÏ?ακαλÏ? Ï?ιγοÏ?Ï?εÏ?Ï?είÏ?ε Ï?Ï?ι Ï?ο Ï?ακέÏ?ο Ï?εκμηÏ?ίÏ?Ï?ηÏ? Ï?οÏ? Anjuta έÏ?ει εγκαÏ?αÏ?Ï?αθεί. Î?Ï?οÏ?εί να γίνει λήÏ?η αÏ?Ï? Ï?ο http://anjuta.org.";
 
 #: ../libanjuta/anjuta-utils.c:2229
 #, c-format
@@ -624,7 +610,8 @@ msgid "Ignored"
 msgstr "Î?γνοημένο"
 
 #
-#: ../libanjuta/cell-renderer-captioned-image.c:218 ../src/preferences.ui.h:18
+#: ../libanjuta/cell-renderer-captioned-image.c:218
+#: ../src/preferences.ui.h:18
 msgid "Text"
 msgstr "Î?είμενο"
 
@@ -640,13 +627,15 @@ msgstr "Î?νÏ?ικείμενο Pixbuf"
 msgid "The pixbuf to render."
 msgstr "Το pixbuf για αÏ?Ï?δοÏ?η."
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3029
+#: ../libanjuta/resources.c:63
+#: ../plugins/glade/plugin.c:3029
 #: ../plugins/glade/plugin.c:3064
 #, c-format
 msgid "Widget not found: %s"
 msgstr "Το Widget δε βÏ?έθηκε: %s"
 
-#: ../libanjuta/resources.c:79 ../libanjuta/resources.c:101
+#: ../libanjuta/resources.c:79
+#: ../libanjuta/resources.c:101
 #, c-format
 msgid "Could not find application pixmap file: %s"
 msgstr "Î?ε βÏ?έθηκε αÏ?Ï?είο pixmap εÏ?αÏ?μογήÏ?: %s"
@@ -727,7 +716,8 @@ msgstr "Î?εÏ?άÏ?Ï?αÏ?η μηνÏ?μάÏ?Ï?ν"
 #: ../plugins/build-basic-autotools/configuration-list.c:68
 #: ../plugins/class-gen/window.c:525
 #: ../plugins/search/search_preferences.c:523
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
+#: ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "ΠÏ?οεÏ?ιλεγμένο"
 
@@ -884,19 +874,13 @@ msgstr "Î?αÏ?αÏ?κεÏ?ή %d: %s"
 
 #. Need to run make clean before
 #: ../plugins/build-basic-autotools/plugin.c:1518
-msgid ""
-"Before using this new configuration, the default one needs to be removed. Do "
-"you want to do that ?"
-msgstr ""
-"ΠÏ?οÏ?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιηθεί η νέα Ï?Ï?θμιÏ?η, Ï?Ï?έÏ?ει να αÏ?ομακÏ?Ï?νθεί η Ï?Ï?οεÏ?ιλεγμένη. "
-"Î?έλεÏ?ε να Ï?ο κάνεÏ?ε αÏ?Ï?Ï?;"
+msgid "Before using this new configuration, the default one needs to be removed. Do you want to do that ?"
+msgstr "ΠÏ?οÏ?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιηθεί η νέα Ï?Ï?θμιÏ?η, Ï?Ï?έÏ?ει να αÏ?ομακÏ?Ï?νθεί η Ï?Ï?οεÏ?ιλεγμένη. Î?έλεÏ?ε να Ï?ο κάνεÏ?ε αÏ?Ï?Ï?;"
 
 #: ../plugins/build-basic-autotools/plugin.c:1822
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
-msgstr ""
-"Î?εν μÏ?οÏ?εί να γίνει η μεÏ?αγλÏ?Ï?Ï?ιÏ?η Ï?οÏ? \"%s\": Î?εν καθοÏ?ίÏ?Ï?ηκε κάÏ?οιοÏ? "
-"κανÏ?ναÏ? μεÏ?αγλÏ?Ï?Ï?ιÏ?ηÏ? για αÏ?Ï?Ï?ν Ï?ον Ï?Ï?Ï?ο αÏ?Ï?είÏ?ν."
+msgstr "Î?εν μÏ?οÏ?εί να γίνει η μεÏ?αγλÏ?Ï?Ï?ιÏ?η Ï?οÏ? \"%s\": Î?εν καθοÏ?ίÏ?Ï?ηκε κάÏ?οιοÏ? κανÏ?ναÏ? μεÏ?αγλÏ?Ï?Ï?ιÏ?ηÏ? για αÏ?Ï?Ï?ν Ï?ον Ï?Ï?Ï?ο αÏ?Ï?είÏ?ν."
 
 #: ../plugins/build-basic-autotools/plugin.c:1957
 #, c-format
@@ -1002,11 +986,8 @@ msgid "Remove Configuration"
 msgstr "Î?Ï?αίÏ?εÏ?η Ï?Ï?θμίÏ?εÏ?ν"
 
 #: ../plugins/build-basic-autotools/plugin.c:2503
-msgid ""
-"Clean project (distclean) and remove configuration directory if possible"
-msgstr ""
-"Î?αθαÏ?ιÏ?μÏ?Ï? έÏ?γοÏ? (distclean) και, αν είναι δÏ?ναÏ?Ï?, αÏ?αίÏ?εÏ?η Ï?οÏ? καÏ?αλÏ?γοÏ? "
-"Ï?Ï?θμίÏ?εÏ?ν"
+msgid "Clean project (distclean) and remove configuration directory if possible"
+msgstr "Î?αθαÏ?ιÏ?μÏ?Ï? έÏ?γοÏ? (distclean) και, αν είναι δÏ?ναÏ?Ï?, αÏ?αίÏ?εÏ?η Ï?οÏ? καÏ?αλÏ?γοÏ? Ï?Ï?θμίÏ?εÏ?ν"
 
 #: ../plugins/build-basic-autotools/plugin.c:2516
 #: ../plugins/build-basic-autotools/plugin.c:2544
@@ -1244,10 +1225,10 @@ msgstr "Το Ï?Ï?Ï?Ï?Ï?Ï?ο autogen Ï?Ï?ηÏ?ιμοÏ?οιήθηκε Ï?Ï?ο αÏ?Ï?
 
 #: ../plugins/class-gen/generator.c:302
 msgid "Autogen template used for the implementation file"
-msgstr ""
-"Το Ï?Ï?Ï?Ï?Ï?Ï?ο αÏ?Ï?Ï?μαÏ?ηÏ? δημιοÏ?Ï?γίαÏ? Ï?Ï?ηÏ?ιμοÏ?οιήθηκε για Ï?ο αÏ?Ï?είο Ï?λοÏ?οίηÏ?ηÏ?"
+msgstr "Το Ï?Ï?Ï?Ï?Ï?Ï?ο αÏ?Ï?Ï?μαÏ?ηÏ? δημιοÏ?Ï?γίαÏ? Ï?Ï?ηÏ?ιμοÏ?οιήθηκε για Ï?ο αÏ?Ï?είο Ï?λοÏ?οίηÏ?ηÏ?"
 
-#: ../plugins/class-gen/generator.c:310 ../plugins/class-gen/generator.c:318
+#: ../plugins/class-gen/generator.c:310
+#: ../plugins/class-gen/generator.c:318
 msgid "File to which the processed template will be written"
 msgstr "Î?Ï?Ï?είο Ï?Ï?ο οÏ?οίο Ï?ο εÏ?εξεÏ?γαÏ?μένο Ï?Ï?Ï?Ï?Ï?Ï?ο θα εγγÏ?αÏ?εί"
 
@@ -1256,16 +1237,13 @@ msgstr "Î?Ï?Ï?είο Ï?Ï?ο οÏ?οίο Ï?ο εÏ?εξεÏ?γαÏ?μένο Ï?Ï?Ï?Ï?
 msgid "Failed to write autogen definition file"
 msgstr "Î?δÏ?ναμία εγγÏ?αÏ?ήÏ? Ï?οÏ? αÏ?Ï?είοÏ? οÏ?ιÏ?μÏ?ν autogen"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1127
-msgid ""
-"Could not find autogen version 5; please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net.";
-msgstr ""
-"Î?εν ήÏ?αν δÏ?ναÏ?ή η εÏ?Ï?εÏ?η Ï?ηÏ? έκδοÏ?ηÏ? 5 Ï?οÏ? autogen, Ï?αÏ?ακαλÏ? να "
-"εγκαÏ?αÏ?Ï?ήÏ?εÏ?ε Ï?ο Ï?ακέÏ?ο autogen. Î?Ï?οÏ?είÏ?ε να Ï?ο βÏ?είÏ?ε Ï?Ï?ην Ï?ελίδα http://";
-"autogen.sourceforge.net"
+#: ../plugins/class-gen/plugin.c:98
+#: ../plugins/project-wizard/druid.c:1127
+msgid "Could not find autogen version 5; please install the autogen package. You can get it from http://autogen.sourceforge.net.";
+msgstr "Î?εν ήÏ?αν δÏ?ναÏ?ή η εÏ?Ï?εÏ?η Ï?ηÏ? έκδοÏ?ηÏ? 5 Ï?οÏ? autogen, Ï?αÏ?ακαλÏ? να εγκαÏ?αÏ?Ï?ήÏ?εÏ?ε Ï?ο Ï?ακέÏ?ο autogen. Î?Ï?οÏ?είÏ?ε να Ï?ο βÏ?είÏ?ε Ï?Ï?ην Ï?ελίδα http://autogen.sourceforge.net";
 
-#: ../plugins/class-gen/plugin.c:242 ../plugins/class-gen/plugin.c:410
+#: ../plugins/class-gen/plugin.c:242
+#: ../plugins/class-gen/plugin.c:410
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "Î?εν είναι δÏ?ναÏ?ή η εκÏ?έλεÏ?η Ï?οÏ? autogen: %s"
@@ -1275,7 +1253,8 @@ msgid "Guess from type"
 msgstr "Î?α Ï?Ï?ολογιÏ?Ï?εί αÏ?Ï? Ï?ον Ï?Ï?Ï?ο"
 
 #
-#: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+#: ../plugins/class-gen/window.c:499
+#: ../plugins/class-gen/window.c:510
 #: ../plugins/search/anjuta-search.ui.h:29
 msgid "Scope"
 msgstr "Î?μβέλεια"
@@ -1284,21 +1263,25 @@ msgstr "Î?μβέλεια"
 msgid "Implementation"
 msgstr "ΥλοÏ?οίηÏ?η"
 
-#: ../plugins/class-gen/window.c:501 ../plugins/class-gen/window.c:511
+#: ../plugins/class-gen/window.c:501
+#: ../plugins/class-gen/window.c:511
 #: ../plugins/class-gen/window.c:533
 #: ../plugins/debug-manager/breakpoints.c:1914
 #: ../plugins/debug-manager/debug_tree.c:126
 msgid "Type"
 msgstr "ΤÏ?Ï?οÏ?"
 
-#: ../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/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:754
 #: ../plugins/search/search_preferences.c:534
 msgid "Name"
 msgstr "Î?νομα"
 
-#: ../plugins/class-gen/window.c:503 ../plugins/class-gen/window.c:513
+#: ../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"
@@ -1322,7 +1305,8 @@ msgstr "ParamSpec"
 
 #
 #. Somehow redundant with marshaller, but required for default handler
-#: ../plugins/class-gen/window.c:526 ../plugins/class-gen/window.c:536
+#: ../plugins/class-gen/window.c:526
+#: ../plugins/class-gen/window.c:536
 msgid "Flags"
 msgstr "ΣημαίεÏ?"
 
@@ -1338,15 +1322,11 @@ msgstr "ΠεÏ?ιγÏ?αÏ?ή XML Ï?ηÏ? διεÏ?αÏ?ήÏ? Ï?οÏ? Ï?Ï?ήÏ?Ï?η"
 msgid ""
 "<b>Please note: </b>\n"
 "\n"
-"Pressing OK will delete the file from disk and from CVS. Of course, the file "
-"won't be removed from CVS before you use CVS Commit. <b>You have been warned!"
-"</b>"
+"Pressing OK will delete the file from disk and from CVS. Of course, the file won't be removed from CVS before you use CVS Commit. <b>You have been warned!</b>"
 msgstr ""
 "<b>ΠαÏ?ακαλÏ? Ï?ημειÏ?Ï?Ï?ε: </b>\n"
 "\n"
-"Î?ν Ï?ιέÏ?εÏ?ε Ï?ο Î?νÏ?άξει, Ï?Ï?Ï?ε θα διαγÏ?αÏ?εί Ï?ο αÏ?Ï?είο αÏ?Ï? Ï?ο δίÏ?κο και αÏ?Ï? Ï?ο "
-"CVS. ΦÏ?Ï?ικά Ï?ο αÏ?Ï?είο δεν θα διαγÏ?αÏ?εί αÏ?Ï? Ï?ο CVS Ï?Ï?ιν εκÏ?ελέÏ?εÏ?ε Ï?ο CVS "
-"Commit. <b>Î?Ï?εÏ?ε λάβει Ï?Ï?οειδοÏ?οίηÏ?η!</b>"
+"Î?ν Ï?ιέÏ?εÏ?ε Ï?ο Î?νÏ?άξει, Ï?Ï?Ï?ε θα διαγÏ?αÏ?εί Ï?ο αÏ?Ï?είο αÏ?Ï? Ï?ο δίÏ?κο και αÏ?Ï? Ï?ο CVS. ΦÏ?Ï?ικά Ï?ο αÏ?Ï?είο δεν θα διαγÏ?αÏ?εί αÏ?Ï? Ï?ο CVS Ï?Ï?ιν εκÏ?ελέÏ?εÏ?ε Ï?ο CVS Commit. <b>Î?Ï?εÏ?ε λάβει Ï?Ï?οειδοÏ?οίηÏ?η!</b>"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
 msgid "Be verbose"
@@ -1472,7 +1452,8 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "Î?γνÏ?ηÏ?η αÏ?Ï?είοÏ? .cvsrc (Ï?Ï?οÏ?εινÏ?μενο)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2327
+#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/symbol-db/plugin.c:2327
 #: ../plugins/symbol-db/plugin.c:2397
 msgid "Local"
 msgstr "ΤοÏ?ικά"
@@ -1493,7 +1474,8 @@ msgstr "Î?νομα αÏ?θÏ?Ï?μαÏ?οÏ?:"
 #
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/glade/plugin.c:3085
+#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/glade/plugin.c:3085
 #: ../plugins/search/anjuta-search.ui.h:25
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
@@ -1590,8 +1572,7 @@ msgstr "ΠαÏ?ακαλÏ? Ï?Ï?μÏ?ληÏ?Ï?Ï?Ï?ε Ï?ο Ï?εδίο: %s"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:78
 msgid "CVS command is running! Please wait until it is finished!"
-msgstr ""
-"Î? ενÏ?ολή Ï?οÏ? CVS είναι Ï?ε εκÏ?έλεÏ?η, Ï?αÏ?ακαλÏ? Ï?εÏ?ιμένεÏ?ε μέÏ?Ï?ι να ολοκληÏ?Ï?θεί!"
+msgstr "Î? ενÏ?ολή Ï?οÏ? CVS είναι Ï?ε εκÏ?έλεÏ?η, Ï?αÏ?ακαλÏ? Ï?εÏ?ιμένεÏ?ε μέÏ?Ï?ι να ολοκληÏ?Ï?θεί!"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:152
 msgid "Unable to delete file"
@@ -1640,18 +1621,19 @@ msgstr[1] "Î?Ï?ιÏ?Ï?Ï?ήÏ? ενÏ?ολή CVS! ΧÏ?Ï?νοÏ? διάÏ?κειαÏ?: %
 
 #: ../plugins/cvs-plugin/cvs-execute.c:221
 msgid "CVS command is running â?? please wait until it finishes!"
-msgstr ""
-"Î? ενÏ?ολή Ï?οÏ? CVS είναι Ï?ε εκÏ?έλεÏ?η, Ï?αÏ?ακαλÏ? Ï?εÏ?ιμένεÏ?ε μέÏ?Ï?ι να ολοκληÏ?Ï?θεί!"
+msgstr "Î? ενÏ?ολή Ï?οÏ? CVS είναι Ï?ε εκÏ?έλεÏ?η, Ï?αÏ?ακαλÏ? Ï?εÏ?ιμένεÏ?ε μέÏ?Ï?ι να ολοκληÏ?Ï?θεί!"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
-#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:467
+#: ../plugins/cvs-plugin/cvs-execute.c:233
+#: ../plugins/cvs-plugin/plugin.c:467
 #: ../plugins/cvs-plugin/plugin.c:474
 msgid "CVS"
 msgstr "CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:44 ../plugins/cvs-plugin/plugin.c:119
+#: ../plugins/cvs-plugin/plugin.c:44
+#: ../plugins/cvs-plugin/plugin.c:119
 msgid "_CVS"
 msgstr "_CVS"
 
@@ -1684,63 +1666,73 @@ msgstr "Î?ιαγÏ?αÏ?ή ενÏ?Ï? αÏ?Ï?είοÏ?/καÏ?αλÏ?γοÏ? αÏ?Ï? Ï?ο
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:68 ../plugins/cvs-plugin/plugin.c:127
+#: ../plugins/cvs-plugin/plugin.c:68
+#: ../plugins/cvs-plugin/plugin.c:127
 msgid "_Commit"
 msgstr "_Î?νÏ?Ï?μάÏ?Ï?Ï?η (Commit)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:70 ../plugins/cvs-plugin/plugin.c:129
+#: ../plugins/cvs-plugin/plugin.c:70
+#: ../plugins/cvs-plugin/plugin.c:129
 msgid "Commit your changes to the CVS tree"
 msgstr "Î?νÏ?Ï?μάÏ?Ï?Ï?η αλλαγÏ?ν Ï?Ï?ο δένÏ?Ï?ο Ï?οÏ? CVS"
 
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:76 ../plugins/cvs-plugin/plugin.c:135
+#: ../plugins/cvs-plugin/plugin.c:76
+#: ../plugins/cvs-plugin/plugin.c:135
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "Î?νη_μέÏ?Ï?Ï?η"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
+#: ../plugins/cvs-plugin/plugin.c:78
+#: ../plugins/cvs-plugin/plugin.c:137
 msgid "Syncronize your local copy with the CVS tree"
 msgstr "ΣÏ?γÏ?Ï?ονιÏ?μÏ?Ï? Ï?οÏ? Ï?οÏ?ικοÏ? ανÏ?ιγÏ?άÏ?οÏ? Ï?αÏ? με Ï?ο δένÏ?Ï?ο Ï?οÏ? CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:84 ../plugins/cvs-plugin/plugin.c:143
+#: ../plugins/cvs-plugin/plugin.c:84
+#: ../plugins/cvs-plugin/plugin.c:143
 msgid "_Diff"
 msgstr "_Î?ιαÏ?οÏ?έÏ? (diff)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:86 ../plugins/cvs-plugin/plugin.c:145
+#: ../plugins/cvs-plugin/plugin.c:86
+#: ../plugins/cvs-plugin/plugin.c:145
 msgid "Show differences between your local copy and the tree"
 msgstr "ΠÏ?οβολή διαÏ?οÏ?Ï?ν μεÏ?αξÏ? Ï?οÏ? Ï?οÏ?ικοÏ? Ï?αÏ? ανÏ?ιγÏ?άÏ?οÏ? και Ï?οÏ? δένÏ?Ï?οÏ?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:92 ../plugins/cvs-plugin/plugin.c:151
+#: ../plugins/cvs-plugin/plugin.c:92
+#: ../plugins/cvs-plugin/plugin.c:151
 msgid "_Show Status"
 msgstr "_Î?μÏ?άνιÏ?η καÏ?άÏ?Ï?αÏ?ηÏ?"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:94 ../plugins/cvs-plugin/plugin.c:153
+#: ../plugins/cvs-plugin/plugin.c:94
+#: ../plugins/cvs-plugin/plugin.c:153
 msgid "Show the status of a file/directory"
 msgstr "ΠÏ?οβολή καÏ?άÏ?Ï?αÏ?ηÏ? αÏ?Ï?είοÏ?/καÏ?αλÏ?γοÏ?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:100 ../plugins/cvs-plugin/plugin.c:159
+#: ../plugins/cvs-plugin/plugin.c:100
+#: ../plugins/cvs-plugin/plugin.c:159
 msgid "_Show Log"
 msgstr "_Î?μÏ?άνιÏ?η καÏ?αγÏ?αÏ?Ï?ν"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:102 ../plugins/cvs-plugin/plugin.c:161
+#: ../plugins/cvs-plugin/plugin.c:102
+#: ../plugins/cvs-plugin/plugin.c:161
 msgid "Show the log of a file/directory"
 msgstr "Î?μÏ?άνιÏ?ηÏ? Ï?Ï?ν καÏ?αγÏ?αÏ?Ï?ν ενÏ?Ï? αÏ?Ï?είοÏ?/καÏ?αλÏ?γοÏ?"
 
@@ -1766,19 +1758,13 @@ msgstr "Î?ναδÏ?Ï?μενεÏ? λειÏ?οÏ?Ï?γίεÏ? CVS"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
-"program not using the Debug configuration?</span>\n"
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a program not using the Debug configuration?</span>\n"
 "\n"
-"When optimizations are enabled, the debugger cannot always identify the "
-"source code corresponding to the instructions, so some commands can perform "
-"in a strange way, especially steps."
+"When optimizations are enabled, the debugger cannot always identify the source code corresponding to the instructions, so some commands can perform in a strange way, especially steps."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Î?έλεÏ?ε Ï?ίγοÏ?Ï?α να αÏ?οÏ?Ï?αλμαÏ?Ï?Ï?εÏ?ε ένα "
-"Ï?Ï?Ï?γÏ?αμμα Ï?Ï?Ï?ίÏ? Ï?Ï?ήÏ?η Ï?ηÏ? Ï?Ï?θμιÏ?ηÏ? Î?Ï?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?;</span>\n"
+"<span weight=\"bold\" size=\"larger\">Î?έλεÏ?ε Ï?ίγοÏ?Ï?α να αÏ?οÏ?Ï?αλμαÏ?Ï?Ï?εÏ?ε ένα Ï?Ï?Ï?γÏ?αμμα Ï?Ï?Ï?ίÏ? Ï?Ï?ήÏ?η Ï?ηÏ? Ï?Ï?θμιÏ?ηÏ? Î?Ï?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?;</span>\n"
 "\n"
-"Î?Ï?αν είναι ενεÏ?γοÏ?οιημένεÏ? οι βελÏ?ιÏ?Ï?οÏ?οιήÏ?ειÏ?, ο αÏ?οÏ?Ï?αλμαÏ?Ï?Ï?ήÏ? δεν μÏ?οÏ?εί "
-"Ï?άνÏ?α να αναγνÏ?Ï?ίÏ?ει Ï?ον Ï?ηγαίο κÏ?δικα Ï?οÏ? ανÏ?ιÏ?Ï?οιÏ?εί Ï?Ï?ιÏ? ενÏ?ολέÏ?, οÏ?Ï?Ï?ε "
-"μεÏ?ικέÏ? ενÏ?ολέÏ? μÏ?οÏ?εί να Ï?Ï?μÏ?εÏ?ιÏ?έÏ?ονÏ?αι Ï?εÏ?ίεÏ?γα, ειδικά Ï?α βήμαÏ?α."
+"Î?Ï?αν είναι ενεÏ?γοÏ?οιημένεÏ? οι βελÏ?ιÏ?Ï?οÏ?οιήÏ?ειÏ?, ο αÏ?οÏ?Ï?αλμαÏ?Ï?Ï?ήÏ? δεν μÏ?οÏ?εί Ï?άνÏ?α να αναγνÏ?Ï?ίÏ?ει Ï?ον Ï?ηγαίο κÏ?δικα Ï?οÏ? ανÏ?ιÏ?Ï?οιÏ?εί Ï?Ï?ιÏ? ενÏ?ολέÏ?, οÏ?Ï?Ï?ε μεÏ?ικέÏ? ενÏ?ολέÏ? μÏ?οÏ?εί να Ï?Ï?μÏ?εÏ?ιÏ?έÏ?ονÏ?αι Ï?εÏ?ίεÏ?γα, ειδικά Ï?α βήμαÏ?α."
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
@@ -2160,7 +2146,8 @@ msgstr "_Î?εÏ?άβαÏ?η Ï?ε διεÏ?θÏ?νÏ?η"
 
 #
 #: ../plugins/debug-manager/debug_tree.c:126
-#: ../plugins/gbf-am/gbf-am-properties.c:974 ../plugins/tools/editor.c:468
+#: ../plugins/gbf-am/gbf-am-properties.c:974
+#: ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "Î?εÏ?αβληÏ?ή"
 
@@ -2168,7 +2155,8 @@ msgstr "Î?εÏ?αβληÏ?ή"
 #: ../plugins/debug-manager/debug_tree.c:126
 #: ../plugins/debug-manager/registers.c:469
 #: ../plugins/gbf-am/gbf-am-properties.c:984
-#: ../plugins/run-program/parameters.c:763 ../plugins/tools/editor.c:474
+#: ../plugins/run-program/parameters.c:763
+#: ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "Τιμή"
 
@@ -2177,7 +2165,8 @@ msgid "Disassembly"
 msgstr "Î?εÏ?αγλÏ?Ï?Ï?ιÏ?η αÏ?Ï? κÏ?δικα μηÏ?ανήÏ?"
 
 #
-#: ../plugins/debug-manager/info.c:52 ../plugins/debug-manager/info.c:101
+#: ../plugins/debug-manager/info.c:52
+#: ../plugins/debug-manager/info.c:101
 #: ../plugins/project-wizard/druid.c:138
 msgid "Information"
 msgstr "ΠληÏ?οÏ?οÏ?ίεÏ?"
@@ -2196,9 +2185,12 @@ msgid "Debugger Log"
 msgstr "Î?αÏ?αγÏ?αÏ?έÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?"
 
 #
-#: ../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/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 "Î?Ï?αÏ?μογή αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?"
@@ -2259,8 +2251,7 @@ msgstr "Î?ιαδικαÏ?ία _αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?..."
 
 #: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
-msgstr ""
-"Î?κκίνηÏ?η εÏ?αÏ?μογήÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? και Ï?Ï?νδεÏ?ή Ï?ηÏ? Ï?ε εκÏ?ελοÏ?μενο Ï?Ï?Ï?γÏ?αμμα"
+msgstr "Î?κκίνηÏ?η εÏ?αÏ?μογήÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? και Ï?Ï?νδεÏ?ή Ï?ηÏ? Ï?ε εκÏ?ελοÏ?μενο Ï?Ï?Ï?γÏ?αμμα"
 
 #: ../plugins/debug-manager/plugin.c:861
 msgid "Debug _Remote Targetâ?¦"
@@ -2291,13 +2282,15 @@ msgstr "ΠÏ?οÏ?θήκη Ï?Ï?Ï?Ï?θεÏ?Ï?ν μονοÏ?αÏ?ιÏ?ν Ï?ηγαίοÏ?
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:889 ../plugins/debug-manager/plugin.c:997
+#: ../plugins/debug-manager/plugin.c:889
+#: ../plugins/debug-manager/plugin.c:997
 msgid "Debugger Commandâ?¦"
 msgstr "Î?νÏ?ολή εÏ?αÏ?μογήÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:891 ../plugins/debug-manager/plugin.c:999
+#: ../plugins/debug-manager/plugin.c:891
+#: ../plugins/debug-manager/plugin.c:999
 msgid "Custom debugger command"
 msgstr "ΠÏ?οÏ?αÏ?μοÏ?μένη ενÏ?ολή βοηθοÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?"
 
@@ -2313,9 +2306,7 @@ msgstr "Î?Ï?Ï?εία Ï?ληÏ?οÏ?οÏ?ιÏ?ν _Ï?Ï?Ï?Ï?οÏ?"
 
 #: ../plugins/debug-manager/plugin.c:907
 msgid "Display information on the files the debugger is active with"
-msgstr ""
-"Î?μÏ?άνιÏ?η Ï?ληÏ?οÏ?οÏ?ιÏ?ν για Ï?α αÏ?Ï?εία με Ï?α οÏ?οία η εÏ?αÏ?μογή αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? "
-"είναι ενεÏ?γή"
+msgstr "Î?μÏ?άνιÏ?η Ï?ληÏ?οÏ?οÏ?ιÏ?ν για Ï?α αÏ?Ï?εία με Ï?α οÏ?οία η εÏ?αÏ?μογή αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? είναι ενεÏ?γή"
 
 #: ../plugins/debug-manager/plugin.c:913
 msgid "Info _Program"
@@ -2331,9 +2322,7 @@ msgstr "ΠληÏ?οÏ?οÏ?ίεÏ? Ï?Ï?εÏ?ικά με Ï?η δομή Ï?Ï?ήÏ?Ï?η Ï?
 
 #: ../plugins/debug-manager/plugin.c:923
 msgid "Display the contents of kernel 'struct user' for current child"
-msgstr ""
-"Î?μÏ?άνιÏ?η Ï?Ï?ν Ï?εÏ?ιεÏ?ομένÏ?ν Ï?οÏ? 'struct user' Ï?οÏ? Ï?Ï?Ï?ήνα για Ï?ην Ï?Ï?έÏ?οÏ?Ï?α "
-"θÏ?γαÏ?Ï?ική διεÏ?γαÏ?ία"
+msgstr "Î?μÏ?άνιÏ?η Ï?Ï?ν Ï?εÏ?ιεÏ?ομένÏ?ν Ï?οÏ? 'struct user' Ï?οÏ? Ï?Ï?Ï?ήνα για Ï?ην Ï?Ï?έÏ?οÏ?Ï?α θÏ?γαÏ?Ï?ική διεÏ?γαÏ?ία"
 
 #: ../plugins/debug-manager/plugin.c:937
 #: ../plugins/debug-manager/plugin.c:1037
@@ -2444,9 +2433,7 @@ msgstr "Î?ειÏ?οÏ?Ï?γίεÏ? εÏ?αÏ?μογήÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?"
 #: ../plugins/debug-manager/queue.c:524
 #, c-format
 msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
-msgstr ""
-"Î?δÏ?ναÏ?η η εÏ?Ï?εÏ?η Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? Ï?οÏ? να Ï?Ï?οÏ?Ï?ηÏ?ίζει ένα "
-"Ï?Ï?Ï?Ï?ο με Ï?Ï?Ï?ο MIME %s"
+msgstr "Î?δÏ?ναÏ?η η εÏ?Ï?εÏ?η Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? Ï?οÏ? να Ï?Ï?οÏ?Ï?ηÏ?ίζει ένα Ï?Ï?Ï?Ï?ο με Ï?Ï?Ï?ο MIME %s"
 
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
@@ -2467,12 +2454,14 @@ msgid "Shared Object"
 msgstr "Î?οινÏ?Ï?Ï?ηÏ?Ï?ο ανÏ?ικείμενο"
 
 #
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/debug-manager/sharedlib.c:173
+#: ../plugins/git/anjuta-git.ui.h:49
 msgid "From"
 msgstr "Î?Ï?Ï?"
 
 #
-#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:114
+#: ../plugins/debug-manager/sharedlib.c:180
+#: ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "ΠÏ?οÏ?"
 
@@ -2564,7 +2553,8 @@ msgstr "ΠλαίÏ?ιο"
 #
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:631
-#: ../plugins/debug-manager/threads.c:451 ../plugins/tools/tool.c:100
+#: ../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"
@@ -2622,23 +2612,20 @@ msgstr "Î?εν είναι δÏ?ναÏ?Ï? Ï?ο άνοιγμα Ï?οÏ? αÏ?Ï?είοÏ?
 #: ../plugins/debug-manager/start.c:968
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
-msgstr ""
-"Î?εν είναι δÏ?ναÏ?Ï? Ï?ο άνοιγμα Ï?οÏ? %s. Î?δÏ?ναÏ?η η εκκίνηÏ?η Ï?ηÏ? εÏ?αÏ?μογήÏ? "
-"αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?."
+msgstr "Î?εν είναι δÏ?ναÏ?Ï? Ï?ο άνοιγμα Ï?οÏ? %s. Î?δÏ?ναÏ?η η εκκίνηÏ?η Ï?ηÏ? εÏ?αÏ?μογήÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?."
 
 #: ../plugins/debug-manager/start.c:978
 #, c-format
 msgid "Unable to detect MIME type of %s. Debugger cannot start."
-msgstr ""
-"Î?εν είναι δÏ?ναÏ?ή η αναγνÏ?Ï?ιÏ?η Ï?οÏ? Ï?Ï?Ï?οÏ? MIME Ï?οÏ? %s. Î?δÏ?ναÏ?η η εκκίνηÏ?η Ï?ηÏ? "
-"εÏ?αÏ?μογήÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?."
+msgstr "Î?εν είναι δÏ?ναÏ?ή η αναγνÏ?Ï?ιÏ?η Ï?οÏ? Ï?Ï?Ï?οÏ? MIME Ï?οÏ? %s. Î?δÏ?ναÏ?η η εκκίνηÏ?η Ï?ηÏ? εÏ?αÏ?μογήÏ? αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?."
 
 #
 #: ../plugins/debug-manager/start.c:1339
 msgid "Path"
 msgstr "Î?ονοÏ?άÏ?ι"
 
-#: ../plugins/debug-manager/start.c:1388 ../plugins/gdb/debugger.c:1738
+#: ../plugins/debug-manager/start.c:1388
+#: ../plugins/gdb/debugger.c:1738
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2709,7 +2696,8 @@ msgstr "Î?Ï?αίÏ?εÏ?η Ï?λÏ?ν"
 msgid "Automatic update"
 msgstr "Î?Ï?Ï?Ï?μαÏ?η ενημέÏ?Ï?Ï?η"
 
-#: ../plugins/debug-manager/watch.c:457 ../plugins/debug-manager/watch.c:463
+#: ../plugins/debug-manager/watch.c:457
+#: ../plugins/debug-manager/watch.c:463
 msgid "Watch operations"
 msgstr "Î?ειÏ?οÏ?Ï?γίεÏ? ελεγκÏ?ή"
 
@@ -2722,8 +2710,10 @@ msgstr "Î?λεγκÏ?έÏ? (watch)"
 msgid "Search Help:"
 msgstr "Î?Ï?Ï?εÏ?η βοήθειαÏ?:"
 
-#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:239
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:313
+#: ../plugins/devhelp/plugin.c:222
+#: ../plugins/document-manager/plugin.c:239
+#: ../plugins/message-view/plugin.c:76
+#: ../plugins/symbol-db/plugin.c:313
 msgid "_Go to"
 msgstr "_Î?εÏ?άβαÏ?η Ï?ε"
 
@@ -2746,8 +2736,7 @@ msgstr "ΣÏ?εÏ?ική _βοήθεια"
 
 #: ../plugins/devhelp/plugin.c:245
 msgid "Search help for the current word in the editor"
-msgstr ""
-"Î?ναζήÏ?ηÏ?η βοήθειαÏ? για Ï?Ï?έÏ?οÏ?Ï?α λέξη αÏ?Ï? Ï?η θέÏ?η Ï?οÏ? εÏ?εξεÏ?γαÏ?Ï?ή κειμένοÏ?"
+msgstr "Î?ναζήÏ?ηÏ?η βοήθειαÏ? για Ï?Ï?έÏ?οÏ?Ï?α λέξη αÏ?Ï? Ï?η θέÏ?η Ï?οÏ? εÏ?εξεÏ?γαÏ?Ï?ή κειμένοÏ?"
 
 #: ../plugins/devhelp/plugin.c:251
 msgid "_Search Help"
@@ -2765,22 +2754,26 @@ msgstr "Î?ειÏ?οÏ?Ï?γίεÏ? βοήθειαÏ?"
 msgid "Contents"
 msgstr "ΠεÏ?ιεÏ?Ï?μενα"
 
-#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
+#: ../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:2331
+#: ../plugins/search/search-replace.c:2065
+#: ../plugins/symbol-db/plugin.c:2331
 #: ../plugins/symbol-db/plugin.c:2447
 msgid "Search"
 msgstr "Î?ναζήÏ?ηÏ?η"
 
 #
-#: ../plugins/devhelp/plugin.c:375 ../plugins/devhelp/plugin.c:495
+#: ../plugins/devhelp/plugin.c:375
+#: ../plugins/devhelp/plugin.c:495
 #: ../src/anjuta-app.c:502
 msgid "Help"
 msgstr "Î?οήθεια"
 
-#: ../plugins/devhelp/plugin.c:405 ../plugins/devhelp/plugin.c:500
+#: ../plugins/devhelp/plugin.c:405
+#: ../plugins/devhelp/plugin.c:500
 msgid "Help display"
 msgstr "Î?μÏ?άνιÏ?η βοήθειαÏ?"
 
@@ -2822,7 +2815,8 @@ msgstr "Î?εÏ?ονομαÏ?ία"
 
 #
 #: ../plugins/document-manager/anjuta-bookmarks.c:340
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+#: ../plugins/gtodo/callback.c:20
+#: ../plugins/gtodo/callback.c:101
 msgid "Remove"
 msgstr "Î?Ï?αίÏ?εÏ?η"
 
@@ -2836,8 +2830,10 @@ msgid "Path:"
 msgstr "Î?ιαδÏ?ομή:"
 
 #: ../plugins/document-manager/anjuta-docman.c:564
-#: ../plugins/file-loader/plugin.c:591 ../plugins/file-loader/plugin.c:894
-#: ../plugins/file-loader/plugin.c:904 ../plugins/file-loader/plugin.c:917
+#: ../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 "Î?νοιγμα αÏ?Ï?είοÏ?"
 
@@ -3055,9 +3051,7 @@ msgstr "Î?εÏ?αÏ?Ï?οÏ?ή Ï?αÏ?ακÏ?ήÏ?Ï?ν EOL Ï?ε Ï?λειοÏ?ηÏ?ία EO
 
 #: ../plugins/document-manager/plugin.c:202
 msgid "Convert End Of Line characters to the most common EOL found in the file"
-msgstr ""
-"Î?εÏ?αÏ?Ï?οÏ?ή Ï?αÏ?ακÏ?ήÏ?Ï?ν Ï?έλοÏ?Ï? γÏ?αμμήÏ? Ï?Ï?ο Ï?ιο Ï?Ï?νηθιÏ?μένο EOL Ï?οÏ? βÏ?έθηκε Ï?Ï?ο "
-"αÏ?Ï?είο"
+msgstr "Î?εÏ?αÏ?Ï?οÏ?ή Ï?αÏ?ακÏ?ήÏ?Ï?ν Ï?έλοÏ?Ï? γÏ?αμμήÏ? Ï?Ï?ο Ï?ιο Ï?Ï?νηθιÏ?μένο EOL Ï?οÏ? βÏ?έθηκε Ï?Ï?ο αÏ?Ï?είο"
 
 #
 #: ../plugins/document-manager/plugin.c:207
@@ -3173,7 +3167,8 @@ msgstr "Î?Ï?Ï?μενο ιÏ?_Ï?οÏ?ικÏ?"
 msgid "Go to next history"
 msgstr "Î?εÏ?άβαÏ?η Ï?Ï?ο εÏ?Ï?μενο ιÏ?Ï?οÏ?ικÏ?"
 
-#: ../plugins/document-manager/plugin.c:261 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:261
+#: ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "_Î?ναζήÏ?ηÏ?η"
 
@@ -3194,7 +3189,8 @@ msgid "Repeat quick search"
 msgstr "Î?Ï?ανάληÏ?η Ï?ηÏ? γÏ?ήγοÏ?ηÏ? αναζήÏ?ηÏ?ηÏ?"
 
 #
-#: ../plugins/document-manager/plugin.c:271 ../plugins/gtodo/interface.c:168
+#: ../plugins/document-manager/plugin.c:271
+#: ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
 #: ../plugins/language-support-cpp-java/plugin.c:1882
 msgid "_Edit"
@@ -3230,7 +3226,8 @@ msgid "U_ndo"
 msgstr "_Î?ναίÏ?εÏ?η"
 
 #
-#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4076
+#: ../plugins/document-manager/plugin.c:286
+#: ../plugins/glade/plugin.c:4076
 msgid "Undo the last action"
 msgstr "Î?ναίÏ?εÏ?η Ï?ηÏ? Ï?ελεÏ?Ï?αίαÏ? ενέÏ?γειαÏ?"
 
@@ -3251,13 +3248,13 @@ msgstr "Î?Ï?οκο_Ï?ή"
 
 #: ../plugins/document-manager/plugin.c:292
 msgid "Cut the selected text from the editor to the clipboard"
-msgstr ""
-"Î?Ï?οκοÏ?ή Ï?οÏ? εÏ?ιλεγμένοÏ? κειμένοÏ? και μεÏ?ακίνηÏ?ή Ï?οÏ? Ï?Ï?ο Ï?Ï?Ï?Ï?ειÏ?ο (clipboard)"
+msgstr "Î?Ï?οκοÏ?ή Ï?οÏ? εÏ?ιλεγμένοÏ? κειμένοÏ? και μεÏ?ακίνηÏ?ή Ï?οÏ? Ï?Ï?ο Ï?Ï?Ï?Ï?ειÏ?ο (clipboard)"
 
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:609
+#: ../plugins/document-manager/plugin.c:294
+#: ../plugins/terminal/terminal.c:609
 msgid "_Copy"
 msgstr "Î?νÏ?ιγÏ?α_Ï?ή"
 
@@ -3266,7 +3263,8 @@ msgid "Copy the selected text to the clipboard"
 msgstr "Î?νÏ?ιγÏ?αÏ?ή Ï?οÏ? εÏ?ιλεγμένοÏ? αÏ?Ï?είοÏ? Ï?Ï?ο Ï?Ï?Ï?Ï?ειÏ?ο (clipboard)"
 
 #
-#: ../plugins/document-manager/plugin.c:297 ../plugins/terminal/terminal.c:617
+#: ../plugins/document-manager/plugin.c:297
+#: ../plugins/terminal/terminal.c:617
 msgid "_Paste"
 msgstr "Î?Ï?ικÏ?λληÏ?η"
 
@@ -3559,17 +3557,12 @@ msgstr "Î? αÏ?Ï?Ï?μαÏ?η αÏ?οθήκεÏ?Ï?η ολοκληÏ?Ï?θηκε"
 #: ../plugins/document-manager/search-box.c:383
 #, c-format
 msgid "Search for \"%s\" reached the end and was continued at the top."
-msgstr ""
-"Î? αναζήÏ?ηÏ?η για Ï?ο \"%s\" έÏ?Ï?αÏ?ε Ï?Ï?ο Ï?έλοÏ? Ï?ηÏ? και Ï?Ï?νεÏ?ίÏ?Ï?ηκε Ï?Ï?ην κοÏ?Ï?Ï?ή."
+msgstr "Î? αναζήÏ?ηÏ?η για Ï?ο \"%s\" έÏ?Ï?αÏ?ε Ï?Ï?ο Ï?έλοÏ? Ï?ηÏ? και Ï?Ï?νεÏ?ίÏ?Ï?ηκε Ï?Ï?ην κοÏ?Ï?Ï?ή."
 
 #: ../plugins/document-manager/search-box.c:389
 #, c-format
-msgid ""
-"Search for \"%s\" reached the end and was continued at the top but no new "
-"match was found."
-msgstr ""
-"Î? αναζήÏ?ηÏ?η για Ï?ο \"%s\" έÏ?Ï?αÏ?ε Ï?Ï?ο Ï?έλοÏ? Ï?ηÏ? και Ï?Ï?νεÏ?ίÏ?Ï?ηκε Ï?Ï?ην κοÏ?Ï?Ï?ή "
-"αλλά δε βÏ?έθηκε Ï?αίÏ?ιαÏ?μα."
+msgid "Search for \"%s\" reached the end and was continued at the top but no new match was found."
+msgstr "Î? αναζήÏ?ηÏ?η για Ï?ο \"%s\" έÏ?Ï?αÏ?ε Ï?Ï?ο Ï?έλοÏ? Ï?ηÏ? και Ï?Ï?νεÏ?ίÏ?Ï?ηκε Ï?Ï?ην κοÏ?Ï?Ï?ή αλλά δε βÏ?έθηκε Ï?αίÏ?ιαÏ?μα."
 
 #: ../plugins/document-manager/search-box.c:446
 #: ../plugins/search/anjuta-search.ui.h:18
@@ -3600,8 +3593,7 @@ msgstr "Î?ε βÏ?έθηκε Ï?Ï?Ï?Ï?Ï?αÏ?α Ï?Ï?ηÏ?ιμοÏ?οιημένοÏ? Ï?
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:758
 #, c-format
 msgid "This function is not implemented for widgets of class '%s'"
-msgstr ""
-"Î?Ï?Ï?ή η λειÏ?οÏ?Ï?γία δεν Ï?Ï?οÏ?Ï?ηÏ?ίζεÏ?αι για γÏ?αÏ?ικά Ï?Ï?Ï?Ï?αÏ?ικά Ï?ηÏ? κλάÏ?ηÏ? '%s'"
+msgstr "Î?Ï?Ï?ή η λειÏ?οÏ?Ï?γία δεν Ï?Ï?οÏ?Ï?ηÏ?ίζεÏ?αι για γÏ?αÏ?ικά Ï?Ï?Ï?Ï?αÏ?ικά Ï?ηÏ? κλάÏ?ηÏ? '%s'"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:937
 #: ../plugins/starter/starter.c:111
@@ -3649,8 +3641,7 @@ msgstr ""
 msgid ""
 "<b>Cannot open \"%s\"</b>.\n"
 "\n"
-"There is no plugin, default action, or application configured to handle this "
-"file type.\n"
+"There is no plugin, default action, or application configured to handle this file type.\n"
 "\n"
 "MIME type: %s\n"
 "\n"
@@ -3658,13 +3649,11 @@ msgid ""
 msgstr ""
 "<b>Î?δÏ?ναÏ?ο Ï?ο άνοιγμα Ï?οÏ? \"%s\"</b>.\n"
 "\n"
-"Î?εν Ï?Ï?άÏ?Ï?ει Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία, Ï?Ï?οεÏ?ιλεγμένη ενέÏ?γεια ή εÏ?αÏ?μογή "
-"Ï?Ï?θμιÏ?μένη για Ï?ο Ï?ειÏ?ιÏ?μÏ? αÏ?Ï?οÏ? Ï?οÏ? Ï?Ï?Ï?οÏ? αÏ?Ï?είοÏ?.\n"
+"Î?εν Ï?Ï?άÏ?Ï?ει Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία, Ï?Ï?οεÏ?ιλεγμένη ενέÏ?γεια ή εÏ?αÏ?μογή Ï?Ï?θμιÏ?μένη για Ï?ο Ï?ειÏ?ιÏ?μÏ? αÏ?Ï?οÏ? Ï?οÏ? Ï?Ï?Ï?οÏ? αÏ?Ï?είοÏ?.\n"
 "\n"
 "ΤÏ?Ï?οÏ? MIME: %s.\n"
 "\n"
-"Î?Ï?οÏ?είÏ?ε να Ï?Ï?οÏ?Ï?αθήÏ?εÏ?ε να Ï?ο ανοίξεÏ?ε με Ï?ιÏ? εÏ?Ï?μενεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? "
-"λειÏ?οÏ?Ï?γίεÏ? ή εÏ?αÏ?μογέÏ?."
+"Î?Ï?οÏ?είÏ?ε να Ï?Ï?οÏ?Ï?αθήÏ?εÏ?ε να Ï?ο ανοίξεÏ?ε με Ï?ιÏ? εÏ?Ï?μενεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? ή εÏ?αÏ?μογέÏ?."
 
 #
 #: ../plugins/file-loader/plugin.c:280
@@ -3677,7 +3666,8 @@ msgstr "Î?νοιγμα με:"
 msgid "Document Manager"
 msgstr "Î?ιαÏ?ειÏ?ιÏ?Ï?ήÏ? αÏ?Ï?είοÏ?"
 
-#: ../plugins/file-loader/plugin.c:497 ../plugins/patch/patch-plugin.c:122
+#: ../plugins/file-loader/plugin.c:497
+#: ../plugins/patch/patch-plugin.c:122
 #: ../plugins/run-program/parameters.c:308
 msgid "All files"
 msgstr "Î?λα Ï?α αÏ?Ï?εία"
@@ -3755,21 +3745,25 @@ msgid "_Openâ?¦"
 msgstr "Î?_νοιγμα..."
 
 #
-#: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
+#: ../plugins/file-loader/plugin.c:903
+#: ../plugins/file-loader/plugin.c:916
 msgid "_Open"
 msgstr "Î?_νοιγμα"
 
 #
-#: ../plugins/file-loader/plugin.c:910 ../plugins/file-loader/plugin.c:923
+#: ../plugins/file-loader/plugin.c:910
+#: ../plugins/file-loader/plugin.c:923
 msgid "Open _With"
 msgstr "Î?νοιγμα _με"
 
 #
-#: ../plugins/file-loader/plugin.c:911 ../plugins/file-loader/plugin.c:924
+#: ../plugins/file-loader/plugin.c:911
+#: ../plugins/file-loader/plugin.c:924
 msgid "Open with"
 msgstr "Î?νοιγμα με"
 
-#: ../plugins/file-loader/plugin.c:1243 ../plugins/file-loader/plugin.c:1249
+#: ../plugins/file-loader/plugin.c:1243
+#: ../plugins/file-loader/plugin.c:1249
 #: ../plugins/file-loader/anjuta-loader.plugin.in.h:1
 msgid "File Loader"
 msgstr "Î?Ï?αÏ?μογή Ï?Ï?Ï?Ï?Ï?Ï?ηÏ? αÏ?Ï?είÏ?ν"
@@ -3783,7 +3777,8 @@ msgstr "Î?έο"
 msgid "New file, project and project components."
 msgstr "Î?έο αÏ?Ï?είο, έÏ?γο και Ï?εÏ?ιεÏ?Ï?μενα έÏ?γοÏ?."
 
-#: ../plugins/file-loader/plugin.c:1261 ../plugins/file-loader/plugin.c:1301
+#: ../plugins/file-loader/plugin.c:1261
+#: ../plugins/file-loader/plugin.c:1301
 msgid "Open"
 msgstr "Î?νοιγμα"
 
@@ -3791,7 +3786,8 @@ msgstr "Î?νοιγμα"
 msgid "Open _Recent"
 msgstr "Î?νοιγμα_Ï?Ï?Ï?Ï?Ï?αÏ?οÏ?"
 
-#: ../plugins/file-loader/plugin.c:1266 ../plugins/file-loader/plugin.c:1303
+#: ../plugins/file-loader/plugin.c:1266
+#: ../plugins/file-loader/plugin.c:1303
 msgid "Open recent file"
 msgstr "Î?νοιγμα Ï?Ï?Ï?Ï?Ï?αÏ?οÏ? αÏ?Ï?είοÏ?"
 
@@ -3803,7 +3799,8 @@ msgstr "Î?νοιγμα Ï?Ï?Ï?Ï?Ï?αÏ?Ï?ν αÏ?Ï?είÏ?ν"
 msgid "Open a file"
 msgstr "Î?νοιγμα αÏ?Ï?είοÏ?"
 
-#: ../plugins/file-loader/plugin.c:1416 ../plugins/file-loader/plugin.c:1418
+#: ../plugins/file-loader/plugin.c:1416
+#: ../plugins/file-loader/plugin.c:1418
 #, c-format
 msgid "File not found"
 msgstr "Το αÏ?Ï?είο δε βÏ?έθηκε"
@@ -3812,10 +3809,10 @@ msgstr "Το αÏ?Ï?είο δε βÏ?έθηκε"
 #: ../plugins/file-loader/plugin.c:1437
 #, c-format
 msgid "Please select a plugin to open <b>%s</b>."
-msgstr ""
-"ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε μια Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία για να ανοίξεÏ?ε Ï?ο <b>%s</b>."
+msgstr "ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε μια Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία για να ανοίξεÏ?ε Ï?ο <b>%s</b>."
 
-#: ../plugins/file-loader/plugin.c:1441 ../plugins/project-import/plugin.c:205
+#: ../plugins/file-loader/plugin.c:1441
+#: ../plugins/project-import/plugin.c:205
 msgid "Open With"
 msgstr "Î?νοιγμα με"
 
@@ -3845,7 +3842,8 @@ msgid "Filter"
 msgstr "ΦίλÏ?Ï?ο"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2329 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2329
+#: ../plugins/symbol-db/plugin.c:2423
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Î?αθολικά"
@@ -3889,7 +3887,8 @@ msgstr "Î?ναδÏ?Ï?μενεÏ? ενέÏ?γειεÏ? διαÏ?ειÏ?ιÏ?Ï?ή αÏ?Ï?
 msgid "Files"
 msgstr "Î?Ï?Ï?εία"
 
-#: ../plugins/file-manager/plugin.c:460 ../plugins/file-manager/plugin.c:469
+#: ../plugins/file-manager/plugin.c:460
+#: ../plugins/file-manager/plugin.c:469
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "Î?ιαÏ?ειÏ?ιÏ?Ï?ήÏ? αÏ?Ï?είÏ?ν"
@@ -3924,7 +3923,8 @@ msgid "File Information"
 msgstr "ΠληÏ?οÏ?οÏ?ίεÏ? αÏ?Ï?είοÏ?"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
-#: ../plugins/git/anjuta-git.ui.h:64 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/macro/anjuta-macro.ui.h:6
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "Î?νομα:"
@@ -3990,7 +3990,8 @@ msgstr "BSD Public License"
 msgid "Unable to build user interface for New File"
 msgstr "Î?ίναι αδÏ?ναÏ?η η καÏ?αÏ?κεÏ?ή διεÏ?ιÏ?άνειαÏ? Ï?Ï?ήÏ?Ï?η για Î?έο Î?Ï?Ï?είο"
 
-#: ../plugins/gbf-am/gbf-am-config.c:98 ../plugins/gbf-am/gbf-am-config.c:132
+#: ../plugins/gbf-am/gbf-am-config.c:98
+#: ../plugins/gbf-am/gbf-am-config.c:132
 msgid "Invalid GbfAmConfigValue type"
 msgstr "Î?η έγκÏ?Ï?οÏ? Ï?Ï?Ï?οÏ? GbfAmConfigValue"
 
@@ -4169,8 +4170,7 @@ msgstr "Î?δÏ?ναμία ενημέÏ?Ï?Ï?ηÏ? έÏ?γοÏ?"
 #: ../plugins/gbf-am/gbf-am-project.c:2743
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2692
 msgid "Invalid or remote path (only local paths supported)"
-msgstr ""
-"Î?η έγκÏ?Ï?η ή αÏ?ομακÏ?Ï?Ï?μένη μονοÏ?άÏ?ι (Ï?Ï?οÏ?Ï?ηÏ?ίζονÏ?αι μÏ?νο Ï?οÏ?ικέÏ? διαδÏ?ομέÏ?)"
+msgstr "Î?η έγκÏ?Ï?η ή αÏ?ομακÏ?Ï?Ï?μένη μονοÏ?άÏ?ι (Ï?Ï?οÏ?Ï?ηÏ?ίζονÏ?αι μÏ?νο Ï?οÏ?ικέÏ? διαδÏ?ομέÏ?)"
 
 #: ../plugins/gbf-am/gbf-am-project.c:2751
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2713
@@ -4191,9 +4191,7 @@ msgstr "ΠαÏ?ακαλÏ? Ï?Ï?οÏ?διοÏ?ίÏ?Ï?ε Ï?ο Ï?νομα Ï?ηÏ? ομά
 
 #: ../plugins/gbf-am/gbf-am-project.c:2973
 msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr ""
-"Το Ï?νομα Ï?ηÏ? ομάδαÏ? μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει μÏ?νο αλÏ?αÏ?ιθμηÏ?ικοÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ?, "
-"καθÏ?Ï? και Ï?α'_', '-' και '.'"
+msgstr "Το Ï?νομα Ï?ηÏ? ομάδαÏ? μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει μÏ?νο αλÏ?αÏ?ιθμηÏ?ικοÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ?, καθÏ?Ï? και Ï?α'_', '-' και '.'"
 
 #: ../plugins/gbf-am/gbf-am-project.c:2982
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2925
@@ -4222,19 +4220,15 @@ msgstr "ΠαÏ?ακαλÏ? Ï?Ï?οÏ?διοÏ?ίÏ?Ï?ε Ï?ο Ï?νομα Ï?οÏ? Ï?Ï?Ï?
 
 #: ../plugins/gbf-am/gbf-am-project.c:3227
 msgid "Target name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr ""
-"Το Ï?νομα Ï?οÏ? Ï?Ï?Ï?Ï?οÏ? μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει μÏ?νο αλÏ?αÏ?ιθμηÏ?ικοÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ?, "
-"καθÏ?Ï? και Ï?α'_', '-' και '.'"
+msgstr "Το Ï?νομα Ï?οÏ? Ï?Ï?Ï?Ï?οÏ? μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει μÏ?νο αλÏ?αÏ?ιθμηÏ?ικοÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ?, καθÏ?Ï? και Ï?α'_', '-' και '.'"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3236
 msgid "Shared library target name must be of the form 'libxxx.la'"
-msgstr ""
-"Το Ï?νομα Ï?ηÏ? κοινÏ?Ï?Ï?ηÏ?Ï?ηÏ? βιβλιοθήκηÏ? Ï?Ï?έÏ?ει να είναι Ï?ηÏ? μοÏ?Ï?ήÏ? 'libxxx.la'"
+msgstr "Το Ï?νομα Ï?ηÏ? κοινÏ?Ï?Ï?ηÏ?Ï?ηÏ? βιβλιοθήκηÏ? Ï?Ï?έÏ?ει να είναι Ï?ηÏ? μοÏ?Ï?ήÏ? 'libxxx.la'"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3245
 msgid "Static library target name must be of the form 'libxxx.a'"
-msgstr ""
-"Το Ï?νομα Ï?ηÏ? Ï?Ï?αÏ?ικήÏ? βιβλιοθήκηÏ? Ï?Ï?έÏ?ει να είναι Ï?ηÏ? μοÏ?Ï?ήÏ? 'libxxx.a'"
+msgstr "Το Ï?νομα Ï?ηÏ? Ï?Ï?αÏ?ικήÏ? βιβλιοθήκηÏ? Ï?Ï?έÏ?ει να είναι Ï?ηÏ? μοÏ?Ï?ήÏ? 'libxxx.a'"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3257
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3159
@@ -4261,11 +4255,8 @@ msgid "Source doesn't exist"
 msgstr "Î?Ï?οÏ?Ï?ιάζει ο Ï?ηγαίοÏ? κÏ?δικαÏ?"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3532
-msgid ""
-"Source file name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr ""
-"Το Ï?νομα αÏ?Ï?είÏ?ν Ï?ηγαίοÏ? κÏ?δικα μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει μÏ?νο αλÏ?αÏ?ιθμηÏ?ικοÏ?Ï? "
-"Ï?αÏ?ακÏ?ήÏ?εÏ?, καθÏ?Ï? και Ï?α '_', '-' και '.'"
+msgid "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
+msgstr "Το Ï?νομα αÏ?Ï?είÏ?ν Ï?ηγαίοÏ? κÏ?δικα μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει μÏ?νο αλÏ?αÏ?ιθμηÏ?ικοÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ?, καθÏ?Ï? και Ï?α '_', '-' και '.'"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3612
 msgid "Source file is already in given target"
@@ -4277,8 +4268,7 @@ msgstr "Î?ενική αÏ?οÏ?Ï?Ï?ία καÏ?ά Ï?ην Ï?Ï?οÏ?θήκη Ï?οÏ? α
 
 #: ../plugins/gbf-am/gbf-am-project.c:3664
 msgid "Newly added source file could not be identified"
-msgstr ""
-"Î?εν ήÏ?αν δÏ?ναÏ?ή η αναγνÏ?Ï?ιÏ?η Ï?οÏ? νεοÏ?Ï?οÏ?Ï?εθένÏ?οÏ? αÏ?Ï?είοÏ? Ï?ηγαίοÏ? κÏ?δικα"
+msgstr "Î?εν ήÏ?αν δÏ?ναÏ?ή η αναγνÏ?Ï?ιÏ?η Ï?οÏ? νεοÏ?Ï?οÏ?Ï?εθένÏ?οÏ? αÏ?Ï?είοÏ? Ï?ηγαίοÏ? κÏ?δικα"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3695
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3520
@@ -4309,12 +4299,8 @@ msgstr "Î?κδοÏ?η"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:530
 #, c-format
-msgid ""
-"Are you sure you want to remove module \"%s\" and all its associated "
-"packages?"
-msgstr ""
-"Î?ίÏ?Ï?ε βέβαιοι Ï?Ï?ι εÏ?ιθÏ?μείÏ?ε να διαγÏ?άÏ?εÏ?ε Ï?ο άÏ?θÏ?Ï?μα \"%s\" και Ï?λα Ï?α "
-"Ï?Ï?εÏ?ιζÏ?μενα με αÏ?Ï?Ï? Ï?ακέÏ?α;"
+msgid "Are you sure you want to remove module \"%s\" and all its associated packages?"
+msgstr "Î?ίÏ?Ï?ε βέβαιοι Ï?Ï?ι εÏ?ιθÏ?μείÏ?ε να διαγÏ?άÏ?εÏ?ε Ï?ο άÏ?θÏ?Ï?μα \"%s\" και Ï?λα Ï?α Ï?Ï?εÏ?ιζÏ?μενα με αÏ?Ï?Ï? Ï?ακέÏ?α;"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:532
 #, c-format
@@ -4531,9 +4517,7 @@ msgstr "Î?εν καθοÏ?ίÏ?Ï?ηκαν εκÏ?ελέÏ?ιμα.\n"
 
 #: ../plugins/gdb/debugger.c:991
 msgid "Open an executable or attach to a process to start debugging.\n"
-msgstr ""
-"Î?νοιγμα ενÏ?Ï? εκÏ?ελέÏ?ιμοÏ? ή εÏ?ιÏ?Ï?ναÏ?η Ï?ε μια διεÏ?γαÏ?ία για να ξεκινήÏ?ει η "
-"αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?η.\n"
+msgstr "Î?νοιγμα ενÏ?Ï? εκÏ?ελέÏ?ιμοÏ? ή εÏ?ιÏ?Ï?ναÏ?η Ï?ε μια διεÏ?γαÏ?ία για να ξεκινήÏ?ει η αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?η.\n"
 
 #: ../plugins/gdb/debugger.c:1000
 msgid "There was an error whilst launching the debugger.\n"
@@ -4642,11 +4626,8 @@ msgstr "ΣÏ?άλμα καÏ?ά Ï?η Ï?ημαÏ?οδÏ?Ï?ηÏ?η Ï?ηÏ? διεÏ?γα
 
 #: ../plugins/gdb/plugin.c:112
 #, c-format
-msgid ""
-"Failed to create FIFO file named %s. The program will run without a terminal."
-msgstr ""
-"Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?η δημιοÏ?Ï?γία αÏ?Ï?είοÏ? FIFO με Ï?νομα %s. Το Ï?Ï?Ï?γÏ?αμμα θα "
-"εκÏ?ελεÏ?Ï?εί Ï?Ï?Ï?ίÏ? Ï?εÏ?μαÏ?ικÏ?."
+msgid "Failed to create FIFO file named %s. The program will run without a terminal."
+msgstr "Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?η δημιοÏ?Ï?γία αÏ?Ï?είοÏ? FIFO με Ï?νομα %s. Το Ï?Ï?Ï?γÏ?αμμα θα εκÏ?ελεÏ?Ï?εί Ï?Ï?Ï?ίÏ? Ï?εÏ?μαÏ?ικÏ?."
 
 #: ../plugins/gdb/plugin.c:198
 msgid "Cannot start terminal for debugging."
@@ -4684,7 +4665,8 @@ msgstr "Î?Ï?αÏ?μογή stash"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
+#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "Î?Ï?αÏ?μογή αÏ?Ï?είÏ?ν mailbox"
 
@@ -4790,7 +4772,8 @@ msgstr "Î?ημιοÏ?Ï?γία εÏ?ικέÏ?αÏ?"
 msgid "Create patch series"
 msgstr "Î?ημιοÏ?Ï?γία Ï?ειÏ?άÏ? patch"
 
-#: ../plugins/git/anjuta-git.ui.h:37 ../plugins/git/git-log-dialog.c:189
+#: ../plugins/git/anjuta-git.ui.h:37
+#: ../plugins/git/git-log-dialog.c:189
 #: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "Î?μεÏ?ομηνία"
@@ -5019,8 +5002,7 @@ msgstr "Î?μÏ?άνιÏ?η Ï?Ï?ν αναθεÏ?Ï?ήÏ?εÏ?ν κÏ?δικα Ï?Ï?ο μ
 
 #: ../plugins/git/anjuta-git.ui.h:98
 msgid "Show the contents of the selected stash in an editor"
-msgstr ""
-"Î?μÏ?άνιÏ?η Ï?Ï?ν Ï?εÏ?ιεÏ?ομένÏ?ν Ï?οÏ? εÏ?ιλεγμένοÏ? stash Ï?ε έναν εÏ?εξεÏ?γαÏ?Ï?ή κειμένοÏ?"
+msgstr "Î?μÏ?άνιÏ?η Ï?Ï?ν Ï?εÏ?ιεÏ?ομένÏ?ν Ï?οÏ? εÏ?ιλεγμένοÏ? stash Ï?ε έναν εÏ?εξεÏ?γαÏ?Ï?ή κειμένοÏ?"
 
 #: ../plugins/git/anjuta-git.ui.h:99
 msgid "Sign this tag"
@@ -5034,7 +5016,8 @@ msgstr "Î?αλακÏ?"
 msgid "Squash"
 msgstr "Squash (καÏ?αÏ?Ï?Ï?οÏ?ή)"
 
-#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
+#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/plugin.c:811
 msgid "Stash"
 msgstr "Stash"
 
@@ -5072,7 +5055,8 @@ msgstr "Î?Ï?ικέÏ?α/ενÏ?Ï?μάÏ?Ï?Ï?η"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/plugin.c:391
 msgid "Tags"
 msgstr "Î?Ï?ικέÏ?εÏ?"
 
@@ -5082,9 +5066,7 @@ msgstr "Î?Ï?ικέÏ?εÏ? Ï?Ï?οÏ? διαγÏ?αÏ?ή:"
 
 #: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
-msgstr ""
-"Î?Ï?Ï?ή η ενÏ?Ï?μάÏ?Ï?Ï?η (commit) Ï?εÏ?ιλαμβάνει μία αÏ?οÏ?Ï?Ï?ημένη Ï?Ï?γÏ?Ï?νεÏ?Ï?η "
-"(Ï?Ï?ηÏ?ιμοÏ?οιήÏ?Ï?ε -i)"
+msgstr "Î?Ï?Ï?ή η ενÏ?Ï?μάÏ?Ï?Ï?η (commit) Ï?εÏ?ιλαμβάνει μία αÏ?οÏ?Ï?Ï?ημένη Ï?Ï?γÏ?Ï?νεÏ?Ï?η (Ï?Ï?ηÏ?ιμοÏ?οιήÏ?Ï?ε -i)"
 
 #: ../plugins/git/anjuta-git.ui.h:115
 msgid "To:"
@@ -5136,7 +5118,8 @@ msgstr "Ï?ελίδα 3"
 msgid "Git: File staged for add."
 msgstr "Git: Το αÏ?Ï?είο Ï?Ï?οοÏ?ίζεÏ?αι (stage) για Ï?Ï?οÏ?θήκη."
 
-#: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:63
+#: ../plugins/git/git-add-dialog.c:62
+#: ../plugins/git/git-remove-dialog.c:63
 msgid "Please select a file."
 msgstr "ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε αÏ?Ï?είο."
 
@@ -5168,7 +5151,8 @@ msgstr "ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε ένα αÏ?Ï?είο mailbox."
 #: ../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/git/git-reset-dialog.c:57
+#: ../plugins/git/git-revert-dialog.c:46
 #: ../plugins/subversion/subversion-copy-dialog.c:207
 #: ../plugins/subversion/subversion-switch-dialog.c:122
 msgid "Please enter a revision."
@@ -5192,8 +5176,7 @@ msgstr "ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε Ï?ο Ï?νομα Ï?οÏ? Ï?Ï?γγÏ?αÏ?
 
 #: ../plugins/git/git-commit-dialog.c:115
 msgid "Please enter the commit author's e-mail address."
-msgstr ""
-"ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε Ï?ην ηλεκÏ?Ï?ονική διεÏ?θÏ?νÏ?η Ï?οÏ? Ï?Ï?γγÏ?αÏ?έα Ï?ηÏ? ενÏ?Ï?μάÏ?Ï?Ï?ηÏ?."
+msgstr "ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε Ï?ην ηλεκÏ?Ï?ονική διεÏ?θÏ?νÏ?η Ï?οÏ? Ï?Ï?γγÏ?αÏ?έα Ï?ηÏ? ενÏ?Ï?μάÏ?Ï?Ï?ηÏ?."
 
 #: ../plugins/git/git-create-branch-dialog.c:41
 #, c-format
@@ -5270,7 +5253,8 @@ msgstr "<b>Î?Ï?ικέÏ?α:</b> %s"
 msgid "<b>Remote:</b> %s"
 msgstr "<b>Î?Ï?ομακÏ?Ï?Ï?μένο:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:674
+#: ../plugins/git/git-log-dialog.c:849
+#: ../plugins/git/plugin.c:674
 #: ../plugins/git/plugin.c:867
 msgid "Branch"
 msgstr "Î?λάδοÏ?"
@@ -5291,8 +5275,7 @@ msgstr "ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε ένα αÏ?ομακÏ?Ï?Ï?μένο αÏ?
 
 #: ../plugins/git/git-pull-dialog.c:142
 msgid "Please enter the URL of the repository to pull from."
-msgstr ""
-"ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε Ï?ο URL Ï?οÏ? αÏ?οθεÏ?ηÏ?ίοÏ? αÏ?Ï? Ï?ο οÏ?οίο θα γίνει η άνÏ?ληÏ?η."
+msgstr "ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε Ï?ο URL Ï?οÏ? αÏ?οθεÏ?ηÏ?ίοÏ? αÏ?Ï? Ï?ο οÏ?οίο θα γίνει η άνÏ?ληÏ?η."
 
 #: ../plugins/git/git-push-dialog.c:36
 msgid "Git: Push complete."
@@ -5306,8 +5289,7 @@ msgstr "Î?Ï?ομακÏ?Ï?Ï?μένο Ï?Ï?ο οÏ?οίο θα γίνει push."
 
 #: ../plugins/git/git-push-dialog.c:162
 msgid "Please enter the URL of the repository to push to."
-msgstr ""
-"ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε Ï?ο URL Ï?οÏ? αÏ?οθεÏ?ηÏ?ίοÏ? αÏ?Ï? Ï?ο οÏ?οίο θα γίνει Ï?ο push."
+msgstr "ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε Ï?ο URL Ï?οÏ? αÏ?οθεÏ?ηÏ?ίοÏ? αÏ?Ï? Ï?ο οÏ?οίο θα γίνει Ï?ο push."
 
 #: ../plugins/git/git-push-dialog.c:197
 msgid "Git: Pushingâ?¦"
@@ -5337,7 +5319,8 @@ msgstr "Git: Î?λα Ï?α stash καθαÏ?ίÏ?Ï?ηκαν."
 msgid "Git: Branch checkout complete."
 msgstr "Git: Î?λοκληÏ?Ï?θηκε Ï?ο checkout Ï?οÏ? κλάδοÏ?."
 
-#: ../plugins/git/git-ui-utils.c:89 ../plugins/git/git-ui-utils.c:94
+#: ../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"
@@ -5373,7 +5356,8 @@ msgstr "Git: Î?γινε unstage Ï?Ï?ν αÏ?Ï?είÏ?ν."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
+#: ../plugins/git/plugin.c:68
+#: ../plugins/git/plugin.c:575
 msgid "_Git"
 msgstr "_Git"
 
@@ -5386,7 +5370,8 @@ msgstr "_Î?λλαγέÏ?"
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
+#: ../plugins/git/plugin.c:87
+#: ../plugins/subversion/plugin.c:76
 msgid "_Commitâ?¦"
 msgstr "_Î?νÏ?Ï?μάÏ?Ï?Ï?η (Commit)..."
 
@@ -5440,7 +5425,8 @@ msgstr "Î?Ï?αÏ?μογή Ï?Ï?ν αλλαγÏ?ν αÏ?Ï? Ï?ο stash Ï?Ï?ο Ï?Ï?έÏ?
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
+#: ../plugins/git/plugin.c:127
+#: ../plugins/git/plugin.c:583
 msgid "_View logâ?¦"
 msgstr "ΠÏ?ο_βολή καÏ?αγÏ?αÏ?ήÏ?..."
 
@@ -5502,8 +5488,10 @@ msgstr "_Î?Ï?Ï?εία"
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:175 ../plugins/git/plugin.c:375
-#: ../plugins/git/plugin.c:591 ../plugins/subversion/plugin.c:60
+#: ../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 "_ΠÏ?οÏ?θήκη..."
@@ -5517,8 +5505,10 @@ msgstr "ΠÏ?οÏ?θήκη αÏ?Ï?είÏ?ν Ï?Ï?ο Ï?Ï?Ï?ο αÏ?οθήκεÏ?Ï?ηÏ?"
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
-#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+#: ../plugins/git/plugin.c:183
+#: ../plugins/git/plugin.c:599
+#: ../plugins/subversion/plugin.c:68
+#: ../plugins/subversion/plugin.c:183
 msgid "_Removeâ?¦"
 msgstr "_Î?Ï?αίÏ?εÏ?η..."
 
@@ -5579,7 +5569,8 @@ msgstr "Î?αθοÏ?ιÏ?μÏ?Ï? Ï?Ï?ν Ï?Ï?γκÏ?οÏ?Ï?μενÏ?ν αÏ?Ï?είÏ?ν Ï?
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
+#: ../plugins/git/plugin.c:223
+#: ../plugins/patch/patch-plugin.c:117
 msgid "Patches"
 msgstr "Patch"
 
@@ -5634,18 +5625,16 @@ msgstr "ΠαÏ?άβλεÏ?η Ï?οÏ? Ï?Ï?έÏ?ονÏ?οÏ? patch Ï?Ï?η Ï?ειÏ?ά κ
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
+#: ../plugins/git/plugin.c:271
+#: ../plugins/git/plugin.c:351
 msgid "_Abort"
 msgstr "Î?γκαÏ?άλει_Ï?η"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:273
-msgid ""
-"Stop applying the series and return the repository to its original state"
-msgstr ""
-"Î?ιακοÏ?ή εÏ?αÏ?μογήÏ? Ï?ηÏ? Ï?ειÏ?άÏ? και εÏ?αναÏ?οÏ?ά Ï?οÏ? αÏ?οθεÏ?ηÏ?ίοÏ? Ï?Ï?ην αÏ?Ï?ική Ï?οÏ? "
-"καÏ?άÏ?Ï?αÏ?η"
+msgid "Stop applying the series and return the repository to its original state"
+msgstr "Î?ιακοÏ?ή εÏ?αÏ?μογήÏ? Ï?ηÏ? Ï?ειÏ?άÏ? και εÏ?αναÏ?οÏ?ά Ï?οÏ? αÏ?οθεÏ?ηÏ?ίοÏ? Ï?Ï?ην αÏ?Ï?ική Ï?οÏ? καÏ?άÏ?Ï?αÏ?η"
 
 #. Action name
 #. Stock icon, if any
@@ -5655,7 +5644,8 @@ msgstr "_Î?λάδοι"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
+#: ../plugins/git/plugin.c:287
+#: ../plugins/git/plugin.c:507
 msgid "_Create branchâ?¦"
 msgstr "_Î?ημιοÏ?Ï?γία κλάδοÏ?..."
 
@@ -5715,7 +5705,8 @@ msgstr "ΣÏ?γÏ?Ï?νεÏ?Ï?η Ï?Ï?ν αλλαγÏ?ν Ï?αÏ? με έναν αÏ?ομ
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
+#: ../plugins/git/plugin.c:327
+#: ../plugins/git/plugin.c:447
 msgid "_Startâ?¦"
 msgstr "E_κκίνηÏ?η..."
 
@@ -5754,23 +5745,20 @@ msgstr "ΠÏ?οÏ?Ï?έÏ?αÏ?η Ï?ηÏ? Ï?Ï?έÏ?οÏ?Ï?αÏ? Ï?Ï?γκÏ?οÏ?Ï?μενη
 #. short-cut
 #: ../plugins/git/plugin.c:353
 msgid "Abort the rebase and put the repository in its original state"
-msgstr ""
-"Î?κÏ?Ï?Ï?Ï?η Ï?ηÏ? δημιοÏ?Ï?γίαÏ? νέαÏ? βάÏ?ηÏ? και εÏ?ιÏ?Ï?Ï?οÏ?ή Ï?οÏ? αÏ?οθεÏ?ηÏ?ίοÏ? Ï?Ï?ην αÏ?Ï?ική "
-"Ï?οÏ? καÏ?άÏ?Ï?αÏ?η"
+msgstr "Î?κÏ?Ï?Ï?Ï?η Ï?ηÏ? δημιοÏ?Ï?γίαÏ? νέαÏ? βάÏ?ηÏ? και εÏ?ιÏ?Ï?Ï?οÏ?ή Ï?οÏ? αÏ?οθεÏ?ηÏ?ίοÏ? Ï?Ï?ην αÏ?Ï?ική Ï?οÏ? καÏ?άÏ?Ï?αÏ?η"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
+#: ../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 ""
-"Î?Ï?ιλεκÏ?ική Ï?Ï?γÏ?Ï?νεÏ?Ï?η ξεÏ?Ï?Ï?ιÏ?Ï?Ï?ν αλλαγÏ?ν αÏ?Ï? άλλοÏ?Ï? κλάδοÏ?Ï? Ï?Ï?ον Ï?Ï?έÏ?ονÏ?α"
+msgid "Selectively merge individual changes from other branches into the current one"
+msgstr "Î?Ï?ιλεκÏ?ική Ï?Ï?γÏ?Ï?νεÏ?Ï?η ξεÏ?Ï?Ï?ιÏ?Ï?Ï?ν αλλαγÏ?ν αÏ?Ï? άλλοÏ?Ï? κλάδοÏ?Ï? Ï?Ï?ον Ï?Ï?έÏ?ονÏ?α"
 
 #. Action name
 #. Stock icon, if any
@@ -5799,7 +5787,8 @@ msgstr "Î?ιαγÏ?αÏ?ή αÏ?ομακÏ?Ï?Ï?μένοÏ? κλάδοÏ?"
 #  6
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
+#: ../plugins/git/plugin.c:399
+#: ../plugins/git/plugin.c:515
 msgid "_Create tagâ?¦"
 msgstr "_Î?ημιοÏ?Ï?γία εÏ?ικέÏ?αÏ?..."
 
@@ -5829,7 +5818,8 @@ msgstr "_Î?Ï?αναÏ?οÏ?ά"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
+#: ../plugins/git/plugin.c:423
+#: ../plugins/git/plugin.c:523
 msgid "_Reset treeâ?¦"
 msgstr "_Î?Ï?αναÏ?οÏ?ά δένÏ?Ï?οÏ?..."
 
@@ -5841,7 +5831,8 @@ msgstr "Î?Ï?αναÏ?οÏ?ά κεÏ?αλήÏ? αÏ?οθεÏ?ηÏ?ίοÏ? Ï?ε οÏ?οια
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
+#: ../plugins/git/plugin.c:431
+#: ../plugins/git/plugin.c:531
 msgid "_Revert commitâ?¦"
 msgstr "_Î?Ï?αναÏ?οÏ?ά ενÏ?Ï?μάÏ?Ï?Ï?ηÏ?..."
 
@@ -5867,8 +5858,7 @@ msgstr "Î?κκίνηÏ?η μιαÏ? λειÏ?οÏ?Ï?γίαÏ? διÏ?οÏ?Ï?μηÏ?ηÏ?"
 #. short-cut
 #: ../plugins/git/plugin.c:457
 msgid "Stop the bisect and bring the tree back to normal"
-msgstr ""
-"Î?ιακοÏ?ή Ï?ηÏ? διÏ?οÏ?Ï?μηÏ?ηÏ? και εÏ?αναÏ?οÏ?ά Ï?οÏ? δένδÏ?οÏ? Ï?Ï?ην κανονική Ï?οÏ? καÏ?άÏ?Ï?αÏ?η"
+msgstr "Î?ιακοÏ?ή Ï?ηÏ? διÏ?οÏ?Ï?μηÏ?ηÏ? και εÏ?αναÏ?οÏ?ά Ï?οÏ? δένδÏ?οÏ? Ï?Ï?ην κανονική Ï?οÏ? καÏ?άÏ?Ï?αÏ?η"
 
 #. Action name
 #. Stock icon, if any
@@ -6051,13 +6041,15 @@ msgid "Automatically add resources"
 msgstr "Î?Ï?Ï?Ï?μαÏ?η Ï?Ï?οÏ?θήκη Ï?ηγÏ?ν"
 
 #
-#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:762
+#: ../plugins/glade/anjuta-glade.glade.h:7
+#: ../plugins/glade/plugin.c:762
 #: ../plugins/glade/plugin.c:3082
 msgid "Designer"
 msgstr "ΣÏ?εδιαÏ?Ï?ήÏ?"
 
 #
-#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3084
+#: ../plugins/glade/anjuta-glade.glade.h:8
+#: ../plugins/glade/plugin.c:3084
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "Î?Ï?εξεÏ?γαÏ?Ï?ήÏ? κειμένοÏ?"
@@ -6110,22 +6102,17 @@ msgstr "Î?η έγκÏ?Ï?η Ï?ιμή ιδιÏ?Ï?ηÏ?αÏ? %s"
 #: ../plugins/glade/designer-associations-item.c:496
 #, c-format
 msgid "Association item filename has no path"
-msgstr ""
-"Το Ï?νομα αÏ?Ï?είοÏ? Ï?οÏ? Ï?Ï?Ï?Ï?εÏ?ιÏ?μένοÏ? ανÏ?ικειμένοÏ? δεν Ï?εÏ?ιλαμβάνει διαδÏ?ομή"
+msgstr "Το Ï?νομα αÏ?Ï?είοÏ? Ï?οÏ? Ï?Ï?Ï?Ï?εÏ?ιÏ?μένοÏ? ανÏ?ικειμένοÏ? δεν Ï?εÏ?ιλαμβάνει διαδÏ?ομή"
 
 #: ../plugins/glade/plugin.c:856
 #, c-format
 msgid "No associations initialized: nothing to save"
-msgstr ""
-"Î?εν έÏ?ει αÏ?Ï?ικοÏ?οιηθεί κανέναÏ? Ï?Ï?Ï?Ï?εÏ?ιÏ?μÏ?Ï?: δεν Ï?Ï?άÏ?Ï?ει κάÏ?ι για να "
-"αÏ?οθηκεÏ?Ï?εί"
+msgstr "Î?εν έÏ?ει αÏ?Ï?ικοÏ?οιηθεί κανέναÏ? Ï?Ï?Ï?Ï?εÏ?ιÏ?μÏ?Ï?: δεν Ï?Ï?άÏ?Ï?ει κάÏ?ι για να αÏ?οθηκεÏ?Ï?εί"
 
 #: ../plugins/glade/plugin.c:863
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
-msgstr ""
-"Î?εν ήÏ?αν δÏ?ναÏ?ή η αÏ?οθήκεÏ?Ï?η Ï?Ï?ν Ï?Ï?Ï?Ï?εÏ?ιÏ?μÏ?ν γιαÏ?ί δεν έÏ?ει οÏ?ιÏ?Ï?εί η Ï?ίζα "
-"Ï?οÏ? έÏ?γοÏ?"
+msgstr "Î?εν ήÏ?αν δÏ?ναÏ?ή η αÏ?οθήκεÏ?Ï?η Ï?Ï?ν Ï?Ï?Ï?Ï?εÏ?ιÏ?μÏ?ν γιαÏ?ί δεν έÏ?ει οÏ?ιÏ?Ï?εί η Ï?ίζα Ï?οÏ? έÏ?γοÏ?"
 
 #: ../plugins/glade/plugin.c:885
 #, c-format
@@ -6179,29 +6166,26 @@ msgid "Unknown editor language \"%s\""
 msgstr "Î?γνÏ?Ï?Ï?ο γλÏ?Ï?Ï?α εÏ?εξεÏ?γαÏ?Ï?ή %s"
 
 #
-#: ../plugins/glade/plugin.c:2035 ../plugins/glade/plugin.c:2112
+#: ../plugins/glade/plugin.c:2035
+#: ../plugins/glade/plugin.c:2112
 #: ../plugins/glade/plugin.c:2237
 #, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "ΣÏ?άλμα καÏ?ά Ï?ην Ï?Ï?οÏ?θήκη νέοÏ? Ï?Ï?ελέÏ?οÏ?Ï? (stub) Ï?ειÏ?ιÏ?Ï?ή: %s"
 
-#: ../plugins/glade/plugin.c:2042 ../plugins/glade/plugin.c:2126
+#: ../plugins/glade/plugin.c:2042
+#: ../plugins/glade/plugin.c:2126
 msgid "Couldn't find signal information"
 msgstr "Î?ε βÏ?έθηκαν οι Ï?ληÏ?οÏ?οÏ?ίεÏ? Ï?ήμαÏ?οÏ?"
 
 #: ../plugins/glade/plugin.c:2069
 msgid "Error while adding a new handler stub: No current editor"
-msgstr ""
-"ΣÏ?άλμα καÏ?ά Ï?ην Ï?Ï?οÏ?θήκη νέοÏ? Ï?Ï?ελέÏ?οÏ?Ï? (stub) Ï?ειÏ?ιÏ?Ï?ή: Î?εν Ï?Ï?άÏ?Ï?ει Ï?Ï?έÏ?Ï?ν "
-"εÏ?εξεÏ?γαÏ?Ï?ήÏ?"
+msgstr "ΣÏ?άλμα καÏ?ά Ï?ην Ï?Ï?οÏ?θήκη νέοÏ? Ï?Ï?ελέÏ?οÏ?Ï? (stub) Ï?ειÏ?ιÏ?Ï?ή: Î?εν Ï?Ï?άÏ?Ï?ει Ï?Ï?έÏ?Ï?ν εÏ?εξεÏ?γαÏ?Ï?ήÏ?"
 
 #: ../plugins/glade/plugin.c:2242
 #, c-format
-msgid ""
-"To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
-msgstr ""
-"Î?ια να αÏ?οÏ?Ï?γεÏ?ε Ï?ην εμÏ?άνιÏ?η αÏ?Ï?οÏ? Ï?οÏ? μηνÏ?μαÏ?οÏ? αÏ?ενεÏ?γοÏ?οιήÏ?Ï?ε Ï?η Ï?ημαία "
-"\"%s\" αÏ?Ï? Ï?ιÏ? ΠÏ?οÏ?ιμήÏ?ειÏ?->ΣÏ?εδιαÏ?Ï?ήÏ? διεÏ?αÏ?ήÏ? Glade"
+msgid "To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
+msgstr "Î?ια να αÏ?οÏ?Ï?γεÏ?ε Ï?ην εμÏ?άνιÏ?η αÏ?Ï?οÏ? Ï?οÏ? μηνÏ?μαÏ?οÏ? αÏ?ενεÏ?γοÏ?οιήÏ?Ï?ε Ï?η Ï?ημαία \"%s\" αÏ?Ï? Ï?ιÏ? ΠÏ?οÏ?ιμήÏ?ειÏ?->ΣÏ?εδιαÏ?Ï?ήÏ? διεÏ?αÏ?ήÏ? Glade"
 
 #: ../plugins/glade/plugin.c:2312
 msgid "Couldn't find an associated document"
@@ -6227,9 +6211,7 @@ msgstr "Î?δÏ?ναÏ?η η εÏ?Ï?εÏ?η Ï?Ï?οεÏ?ιλεγμένοÏ? ονÏ?μαÏ?
 #: ../plugins/glade/plugin.c:3883
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
-msgstr ""
-"Το έÏ?γο %s δεν Ï?εÏ?ιλαμβάνει γÏ?αÏ?ικά Ï?Ï?Ï?Ï?αÏ?ικά Ï?Ï?Ï? καÏ?άÏ?γηÏ?η οÏ?Ï?ε εμÏ?ανίζει "
-"ανανÏ?ιÏ?Ï?οιÏ?ίεÏ? μεÏ?αξÏ? εκδÏ?Ï?εÏ?ν."
+msgstr "Το έÏ?γο %s δεν Ï?εÏ?ιλαμβάνει γÏ?αÏ?ικά Ï?Ï?Ï?Ï?αÏ?ικά Ï?Ï?Ï? καÏ?άÏ?γηÏ?η οÏ?Ï?ε εμÏ?ανίζει ανανÏ?ιÏ?Ï?οιÏ?ίεÏ? μεÏ?αξÏ? εκδÏ?Ï?εÏ?ν."
 
 #: ../plugins/glade/plugin.c:3900
 msgid "There is no Glade project"
@@ -6242,15 +6224,18 @@ msgstr "Î?εν Ï?Ï?άÏ?Ï?ει έÏ?γο glade"
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:3994 ../plugins/glade/plugin.c:3996
+#: ../plugins/glade/plugin.c:3994
+#: ../plugins/glade/plugin.c:3996
 msgid "Switch between designer/code"
 msgstr "Î?ναλλαγή μεÏ?αξÏ? Ï?Ï?εδιαÏ?Ï?ή/κÏ?δικα"
 
-#: ../plugins/glade/plugin.c:4002 ../plugins/glade/plugin.c:4004
+#: ../plugins/glade/plugin.c:4002
+#: ../plugins/glade/plugin.c:4004
 msgid "Insert handler stub"
 msgstr "Î?ιÏ?αγÏ?γή Ï?Ï?ελέÏ?οÏ?Ï? (stub) Ï?ειÏ?ιÏ?Ï?ή"
 
-#: ../plugins/glade/plugin.c:4010 ../plugins/glade/plugin.c:4012
+#: ../plugins/glade/plugin.c:4010
+#: ../plugins/glade/plugin.c:4012
 msgid "Insert handler stub, autoposition"
 msgstr "Î?ιÏ?αγÏ?γή Ï?Ï?ελέÏ?οÏ?Ï? (stub) Ï?ειÏ?ιÏ?Ï?ή, αÏ?Ï?Ï?μαÏ?η Ï?οÏ?οθέÏ?ηÏ?η"
 
@@ -6262,7 +6247,8 @@ msgstr "ΣÏ?Ï?Ï?εÏ?ιÏ?μÏ?Ï? Ï?οÏ? Ï?ελεÏ?Ï?αίοÏ? Ï?Ï?εδιαÏ?Ï?ή κ
 msgid "Associate last designer and editor"
 msgstr "ΣÏ?Ï?Ï?εÏ?ιÏ?μÏ?Ï? Ï?οÏ? Ï?ελεÏ?Ï?αίοÏ? Ï?Ï?εδιαÏ?Ï?ή και εÏ?εξεÏ?γαÏ?Ï?ή"
 
-#: ../plugins/glade/plugin.c:4026 ../plugins/glade/plugin.c:4028
+#: ../plugins/glade/plugin.c:4026
+#: ../plugins/glade/plugin.c:4028
 msgid "Associations dialogâ?¦"
 msgstr "Î?ιάλογοÏ? Ï?Ï?Ï?Ï?εÏ?ιÏ?μÏ?ν..."
 
@@ -6273,11 +6259,10 @@ msgstr "Î?κδÏ?Ï?ειÏ?..."
 
 #: ../plugins/glade/plugin.c:4036
 msgid "Switch between library versions and check deprecations"
-msgstr ""
-"Î?ναλλαγή μεÏ?αξÏ? Ï?Ï?ν διαÏ?οÏ?εÏ?ικÏ?ν εκδÏ?Ï?εÏ?ν Ï?Ï?ν βιβλιοθηκÏ?ν και έλεγÏ?οÏ? για "
-"Ï?ην Ï?Ï?αÏ?ξη Ï?Ï?οιÏ?είÏ?ν Ï?Ï?Ï? καÏ?άÏ?γηÏ?η"
+msgstr "Î?ναλλαγή μεÏ?αξÏ? Ï?Ï?ν διαÏ?οÏ?εÏ?ικÏ?ν εκδÏ?Ï?εÏ?ν Ï?Ï?ν βιβλιοθηκÏ?ν και έλεγÏ?οÏ? για Ï?ην Ï?Ï?αÏ?ξη Ï?Ï?οιÏ?είÏ?ν Ï?Ï?Ï? καÏ?άÏ?γηÏ?η"
 
-#: ../plugins/glade/plugin.c:4042 ../plugins/glade/plugin.c:4044
+#: ../plugins/glade/plugin.c:4042
+#: ../plugins/glade/plugin.c:4044
 msgid "Set as default resource target"
 msgstr "Î?Ï?ιÏ?μÏ?Ï? Ï?Ï? Ï?Ï?οεÏ?ιλεγμένηÏ? Ï?ηγήÏ?"
 
@@ -6358,7 +6343,8 @@ msgstr "Î?εν ήÏ?αν δÏ?ναÏ?Ï?ν να ανοίξει Ï?ο %s"
 msgid "Could not create a new glade project."
 msgstr "Î?εν ήÏ?αν δÏ?ναÏ?ή η δημιοÏ?Ï?γία νέοÏ? έÏ?γοÏ? glade."
 
-#: ../plugins/glade/plugin.c:5025 ../plugins/glade/plugin.c:5050
+#: ../plugins/glade/plugin.c:5025
+#: ../plugins/glade/plugin.c:5050
 msgid "Glade GUI Designer"
 msgstr "ΣÏ?εδιαÏ?Ï?ήÏ? διεÏ?αÏ?ήÏ? glade"
 
@@ -6375,9 +6361,7 @@ msgstr "Î?η έγκÏ?Ï?ο Ï?νομα αÏ?Ï?είοÏ? Ï?οÏ? Glade"
 
 #: ../plugins/gtodo/add_edit_item.c:99
 msgid "You need to select a to do item before you can edit it"
-msgstr ""
-"ΧÏ?ειάζεÏ?αι να εÏ?ιλέξεÏ?ε ένα ανÏ?ικείμενο εκÏ?έλεÏ?ηÏ? Ï?Ï?ιν να μÏ?οÏ?είÏ?ε να Ï?ο "
-"εÏ?εξεÏ?γαÏ?Ï?είÏ?ε"
+msgstr "ΧÏ?ειάζεÏ?αι να εÏ?ιλέξεÏ?ε ένα ανÏ?ικείμενο εκÏ?έλεÏ?ηÏ? Ï?Ï?ιν να μÏ?οÏ?είÏ?ε να Ï?ο εÏ?εξεÏ?γαÏ?Ï?είÏ?ε"
 
 #: ../plugins/gtodo/add_edit_item.c:118
 msgid "Add Item"
@@ -6389,22 +6373,27 @@ msgid "Edit Item"
 msgstr "Î?Ï?εξεÏ?γαÏ?ία ανÏ?ικειμένοÏ?"
 
 #
-#: ../plugins/gtodo/add_edit_item.c:152 ../plugins/gtodo/add_edit_item.c:153
+#: ../plugins/gtodo/add_edit_item.c:152
+#: ../plugins/gtodo/add_edit_item.c:153
 #: ../plugins/gtodo/list_tooltip.c:42
 msgid "Summary:"
 msgstr "ΠεÏ?ίληÏ?η:"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
+#: ../plugins/gtodo/add_edit_item.c:172
+#: ../plugins/macro/anjuta-macro.ui.h:1
 msgid "Category:"
 msgstr "Î?αÏ?ηγοÏ?ία:"
 
-#: ../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
+#: ../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 "Î?Ï?εξεÏ?γαÏ?ία καÏ?ηγοÏ?ιÏ?ν"
 
-#: ../plugins/gtodo/add_edit_item.c:205 ../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 "Î?μεÏ?ομηνία λήξηÏ?:"
@@ -6415,13 +6404,16 @@ msgstr "ΠÏ?οειδοÏ?οίηÏ?η καÏ?ά Ï?η λήξη"
 
 #
 #. label
-#: ../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
+#: ../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 "ΠÏ?οÏ?εÏ?αιÏ?Ï?ηÏ?α:"
 
 #
-#: ../plugins/gtodo/add_edit_item.c:258 ../plugins/gtodo/add_edit_item.c:259
+#: ../plugins/gtodo/add_edit_item.c:258
+#: ../plugins/gtodo/add_edit_item.c:259
 #: ../plugins/gtodo/list_tooltip.c:81
 msgid "Comment:"
 msgstr "ΣÏ?Ï?λιο:"
@@ -6430,19 +6422,23 @@ msgstr "ΣÏ?Ï?λιο:"
 msgid "Completed"
 msgstr "Î?λοκληÏ?Ï?θηκε"
 
-#: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:335
+#: ../plugins/gtodo/add_edit_item.c:289
+#: ../plugins/gtodo/add_edit_item.c:335
 #: ../plugins/gtodo/add_edit_item.c:448
 msgid "started:"
 msgstr "Î?εκίνηÏ?ε:"
 
-#: ../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
+#: ../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 "Î?/Î¥"
 
 #
-#: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
+#: ../plugins/gtodo/add_edit_item.c:296
+#: ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
 msgid "stopped:"
 msgstr "διακÏ?Ï?ηκε:"
@@ -6458,18 +6454,12 @@ msgstr "Î?έλεÏ?ε Ï?Ï?αγμαÏ?ικά να διαγÏ?άÏ?εÏ?ε Ï?ο εÏ?ι
 #: ../plugins/gtodo/callback.c:98
 #, c-format
 msgid "Are you sure you want to remove all the completed to-do items?"
-msgstr ""
-"Î?ίÏ?Ï?ε Ï?ίγοÏ?Ï?οι Ï?Ï?ι θέλεÏ?ε να διαγÏ?άÏ?εÏ?ε Ï?λα Ï?α ολοκληÏ?Ï?μένα ανÏ?ικείμενα to-"
-"do;"
+msgstr "Î?ίÏ?Ï?ε Ï?ίγοÏ?Ï?οι Ï?Ï?ι θέλεÏ?ε να διαγÏ?άÏ?εÏ?ε Ï?λα Ï?α ολοκληÏ?Ï?μένα ανÏ?ικείμενα to-do;"
 
 #: ../plugins/gtodo/callback.c:99
 #, c-format
-msgid ""
-"Are you sure you want to remove all the completed to-do items in the "
-"category \"%s\"?"
-msgstr ""
-"Î?έλεÏ?ε Ï?ίγοÏ?Ï?α να αÏ?αιÏ?έÏ?εÏ?ε Ï?λα Ï?α ολοκληÏ?Ï?μένα ανÏ?ικείμενα to-do Ï?Ï?ην "
-"καÏ?ηγοÏ?ία '%s';"
+msgid "Are you sure you want to remove all the completed to-do items in the category \"%s\"?"
+msgstr "Î?έλεÏ?ε Ï?ίγοÏ?Ï?α να αÏ?αιÏ?έÏ?εÏ?ε Ï?λα Ï?α ολοκληÏ?Ï?μένα ανÏ?ικείμενα to-do Ï?Ï?ην καÏ?ηγοÏ?ία '%s';"
 
 #: ../plugins/gtodo/export.c:47
 msgid "Export task list"
@@ -6505,7 +6495,8 @@ msgid "Custom (CSS) style sheet"
 msgstr "ΠÏ?οεÏ?ιλεγμένο (CSS) Ï?Ï?λλο Ï?Ï?ιλ "
 
 #
-#: ../plugins/gtodo/interface.c:34 ../src/anjuta-actions.h:38
+#: ../plugins/gtodo/interface.c:34
+#: ../src/anjuta-actions.h:38
 msgid "_View"
 msgstr "_ΠÏ?οβολή"
 
@@ -6541,7 +6532,8 @@ msgstr "Î?εν έÏ?εÏ?ε άδεια για Ï?ην ανάγνÏ?Ï?η Ï?οÏ? αÏ?
 msgid "Failed to read file"
 msgstr "Î?εν ήÏ?αν δÏ?ναÏ?ή η ανάγνÏ?Ï?η Ï?οÏ? αÏ?Ï?είοÏ?."
 
-#: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
+#: ../plugins/gtodo/libgtodo.c:626
+#: ../plugins/gtodo/libgtodo.c:637
 #, c-format
 msgid "Failed to parse XML structure"
 msgstr "Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?ην ανάλÏ?Ï?η δομήÏ? XML"
@@ -6574,24 +6566,26 @@ msgid "No filename supplied."
 msgstr "Î?ε δÏ?θηκε Ï?νομα αÏ?Ï?είοÏ?."
 
 #. create a priority string
-#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:130
+#: ../plugins/gtodo/list_tooltip.c:65
+#: ../plugins/gtodo/todo_db.c:130
 msgid "Low"
 msgstr "ΧαμηλÏ?"
 
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:131
+#: ../plugins/gtodo/list_tooltip.c:71
+#: ../plugins/gtodo/todo_db.c:131
 msgid "Medium"
 msgstr "Î?εÏ?αίο"
 
 #
-#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:132
+#: ../plugins/gtodo/list_tooltip.c:77
+#: ../plugins/gtodo/todo_db.c:132
 msgid "High"
 msgstr "Î¥Ï?ηλÏ?"
 
 #: ../plugins/gtodo/mcategory.c:145
 #, c-format
 msgid "When you delete the category \"%s\", all containing items are lost"
-msgstr ""
-"Î?Ï?αν αÏ?αιÏ?είÏ?ε Ï?ην καÏ?ηγοÏ?ία \"%s\", Ï?λα Ï?α ανÏ?ικείμενα Ï?οÏ? Ï?εÏ?ιέÏ?ει Ï?άνονÏ?αι"
+msgstr "Î?Ï?αν αÏ?αιÏ?είÏ?ε Ï?ην καÏ?ηγοÏ?ία \"%s\", Ï?λα Ï?α ανÏ?ικείμενα Ï?οÏ? Ï?εÏ?ιέÏ?ει Ï?άνονÏ?αι"
 
 #: ../plugins/gtodo/mcategory.c:146
 msgid "Delete"
@@ -6658,7 +6652,8 @@ msgstr "ΠÏ?οβολή διαÏ?ειÏ?ιÏ?Ï?ή εÏ?γαÏ?ιÏ?ν"
 msgid "Tasks"
 msgstr "Î?Ï?γαÏ?ίεÏ?"
 
-#: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
+#: ../plugins/gtodo/plugin.c:342
+#: ../plugins/gtodo/plugin.c:351
 msgid "To-do Manager"
 msgstr "Î?ιαÏ?ειÏ?ιÏ?Ï?ήÏ? εκκÏ?εμοÏ?ήÏ?Ï?ν"
 
@@ -6687,11 +6682,13 @@ msgstr "Ï?Ï?οβολή Ï?Ï?ήληÏ? Ï?Ï?οÏ?εÏ?αιÏ?Ï?ηÏ?αÏ?"
 msgid "Tooltips in list"
 msgstr "ΣÏ?μβοÏ?λέÏ? Ï?ε λίÏ?Ï?α"
 
-#: ../plugins/gtodo/preferences.c:117 ../plugins/gtodo/preferences.c:119
+#: ../plugins/gtodo/preferences.c:117
+#: ../plugins/gtodo/preferences.c:119
 msgid "Show in main window"
 msgstr "Î?μÏ?άνιÏ?η Ï?Ï?ο κÏ?Ï?ιο Ï?αÏ?άθÏ?Ï?ο"
 
-#: ../plugins/gtodo/preferences.c:130 ../plugins/gtodo/preferences.c:132
+#: ../plugins/gtodo/preferences.c:130
+#: ../plugins/gtodo/preferences.c:132
 msgid "Highlight"
 msgstr "Î?Ï?ιÏ?ήμανÏ?η"
 
@@ -6731,11 +6728,13 @@ msgstr "Î?κκαθάÏ?ιÏ?η ανÏ?ικειμένÏ?ν μεÏ?ά αÏ?Ï?"
 msgid "days."
 msgstr "ημέÏ?εÏ?."
 
-#: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
+#: ../plugins/gtodo/preferences.c:195
+#: ../plugins/gtodo/preferences.c:197
 msgid "Auto-Purge"
 msgstr "Î?Ï?Ï?Ï?μαÏ?η εκκαθάÏ?ιÏ?η"
 
-#: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
+#: ../plugins/gtodo/preferences.c:209
+#: ../plugins/gtodo/preferences.c:211
 msgid "Notification"
 msgstr "Î?ιδοÏ?οίηÏ?η"
 
@@ -6743,12 +6742,8 @@ msgstr "Î?ιδοÏ?οίηÏ?η"
 #, c-format
 msgid "Allow to-do items to notify me when they are due in %i minute"
 msgid_plural "Allow to-do items to notify me when they are due in %i minutes"
-msgstr[0] ""
-"Î?α εÏ?ιÏ?Ï?έÏ?εÏ?αι Ï?Ï?α ανÏ?ικείμενα Ï?Ï?οÏ? Ï?λοÏ?οίηÏ?η να με ειδοÏ?οιοÏ?ν Ï?Ï?αν λήγοÏ?ν "
-"Ï?Ï?ο %i λεÏ?Ï?Ï?"
-msgstr[1] ""
-"Î?α εÏ?ιÏ?Ï?έÏ?εÏ?αι Ï?Ï?α ανÏ?ικείμενα Ï?Ï?οÏ? Ï?λοÏ?οίηÏ?η να με ειδοÏ?οιοÏ?ν Ï?Ï?αν λήγοÏ?ν "
-"Ï?Ï?α %i λεÏ?Ï?ά"
+msgstr[0] "Î?α εÏ?ιÏ?Ï?έÏ?εÏ?αι Ï?Ï?α ανÏ?ικείμενα Ï?Ï?οÏ? Ï?λοÏ?οίηÏ?η να με ειδοÏ?οιοÏ?ν Ï?Ï?αν λήγοÏ?ν Ï?Ï?ο %i λεÏ?Ï?Ï?"
+msgstr[1] "Î?α εÏ?ιÏ?Ï?έÏ?εÏ?αι Ï?Ï?α ανÏ?ικείμενα Ï?Ï?οÏ? Ï?λοÏ?οίηÏ?η να με ειδοÏ?οιοÏ?ν Ï?Ï?αν λήγοÏ?ν Ï?Ï?α %i λεÏ?Ï?ά"
 
 #: ../plugins/gtodo/tasklists.c:10
 msgid "Open a Task List"
@@ -6764,6 +6759,7 @@ msgstr "Î?εν Ï?Ï?άÏ?Ï?ει ημεÏ?ομηνία"
 
 #
 #: ../plugins/macro/anjuta-macro.ui.h:2
+#| msgid "Edit"
 msgid "Editâ?¦"
 msgstr "Î?Ï?εξεÏ?γαÏ?ία..."
 
@@ -6970,8 +6966,10 @@ msgid "Icon"
 msgstr "Î?ικονίδιο"
 
 #: ../plugins/message-view/message-view.c:584
-#: ../plugins/message-view/plugin.c:324 ../plugins/message-view/plugin.c:333
-#: ../plugins/message-view/plugin.c:453 ../plugins/message-view/plugin.c:465
+#: ../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 "Î?ηνÏ?μαÏ?α"
 
@@ -7060,14 +7058,14 @@ msgid "Patch file"
 msgstr "Î?Ï?Ï?είο εÏ?ιÏ?Ï?άμμαÏ?οÏ?"
 
 #
-#: ../plugins/patch/patch-plugin.c:166 ../plugins/patch/patch-plugin.ui.h:3
+#: ../plugins/patch/patch-plugin.c:166
+#: ../plugins/patch/patch-plugin.ui.h:3
 msgid "Patch"
 msgstr "Î?Ï?ίÏ?Ï?αμμα"
 
 #: ../plugins/patch/patch-plugin.c:186
 msgid "Please select the directory where the patch should be applied"
-msgstr ""
-"ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε Ï?ον καÏ?άλογο Ï?Ï?ον οÏ?οίο Ï?Ï?έÏ?ει να εÏ?αÏ?μοÏ?Ï?εί Ï?ο εÏ?ίÏ?Ï?αμμα"
+msgstr "ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε Ï?ον καÏ?άλογο Ï?Ï?ον οÏ?οίο Ï?Ï?έÏ?ει να εÏ?αÏ?μοÏ?Ï?εί Ï?ο εÏ?ίÏ?Ï?αμμα"
 
 #: ../plugins/patch/patch-plugin.c:197
 #, c-format
@@ -7084,9 +7082,7 @@ msgstr "Î?ημιοÏ?Ï?γία patch..."
 
 #: ../plugins/patch/patch-plugin.c:224
 msgid "There are unfinished jobs: please wait until they are finished."
-msgstr ""
-"Î?Ï?ιÏ?μένεÏ? εÏ?γαÏ?ίεÏ? δεν έÏ?οÏ?ν ολοκληÏ?Ï?θεί: Ï?αÏ?ακαλÏ? Ï?εÏ?ιμένεÏ?ε Ï?Ï?Ï?οÏ? να "
-"ολοκληÏ?Ï?θοÏ?ν."
+msgstr "Î?Ï?ιÏ?μένεÏ? εÏ?γαÏ?ίεÏ? δεν έÏ?οÏ?ν ολοκληÏ?Ï?θεί: Ï?αÏ?ακαλÏ? Ï?εÏ?ιμένεÏ?ε Ï?Ï?Ï?οÏ? να ολοκληÏ?Ï?θοÏ?ν."
 
 #: ../plugins/patch/patch-plugin.c:266
 msgid ""
@@ -7122,7 +7118,8 @@ msgstr "Î?Ï?ίÏ?εδο patch:"
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/patch/plugin.c:53 ../plugins/tools/plugin.c:130
+#: ../plugins/patch/plugin.c:53
+#: ../plugins/tools/plugin.c:130
 msgid "_Tools"
 msgstr "_Î?Ï?γαλεία"
 
@@ -7139,13 +7136,8 @@ msgid "Patch files/directories"
 msgstr "Î?Ï?ίÏ?Ï?αμμα Ï?ε αÏ?Ï?εία/καÏ?αλÏ?γοÏ?Ï?"
 
 #: ../plugins/project-import/plugin.c:68
-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 ""
-"Î?Ï?έÏ?Ï?Ï?ε η δημιοÏ?Ï?γία αÏ?Ï?είοÏ? Ï?οÏ? έÏ?γοÏ?. Î?εν είναι δÏ?ναÏ?ή η εÏ?Ï?εÏ?η καÏ?άλληλοÏ? "
-"Ï?Ï?οÏ?Ï?Ï?οÏ? για Ï?Ï?ήÏ?η Ï?οÏ? για Ï?ο έÏ?γο. ΠαÏ?ακαλÏ? βεβαιÏ?θείÏ?ε Ï?Ï?ι η έκδοÏ?ή Ï?οÏ? "
-"anjuta είναι ενημεÏ?Ï?μένη."
+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 "Î?Ï?έÏ?Ï?Ï?ε η δημιοÏ?Ï?γία αÏ?Ï?είοÏ? Ï?οÏ? έÏ?γοÏ?. Î?εν είναι δÏ?ναÏ?ή η εÏ?Ï?εÏ?η καÏ?άλληλοÏ? Ï?Ï?οÏ?Ï?Ï?οÏ? για Ï?Ï?ήÏ?η Ï?οÏ? για Ï?ο έÏ?γο. ΠαÏ?ακαλÏ? βεβαιÏ?θείÏ?ε Ï?Ï?ι η έκδοÏ?ή Ï?οÏ? anjuta είναι ενημεÏ?Ï?μένη."
 
 #: ../plugins/project-import/plugin.c:88
 #, c-format
@@ -7156,12 +7148,8 @@ msgstr ""
 
 #: ../plugins/project-import/plugin.c:136
 #, c-format
-msgid ""
-"A file named \"%s\" cannot be written: %s. Check if you have write access to "
-"the project directory."
-msgstr ""
-"Î?εν είναι δÏ?ναÏ?ή η εγγÏ?αÏ?ή αÏ?Ï?είοÏ? με Ï?νομα \"%s\" Ï?Ï?ο: %s.  Î?λέγξÏ?ε αν "
-"έÏ?εÏ?ε Ï?Ï?Ï?Ï?βαÏ?η  εγγÏ?αÏ?ήÏ? Ï?Ï?ον καÏ?άλογο Ï?οÏ? έÏ?γοÏ?."
+msgid "A file named \"%s\" cannot be written: %s. Check if you have write access to the project directory."
+msgstr "Î?εν είναι δÏ?ναÏ?ή η εγγÏ?αÏ?ή αÏ?Ï?είοÏ? με Ï?νομα \"%s\" Ï?Ï?ο: %s.  Î?λέγξÏ?ε αν έÏ?εÏ?ε Ï?Ï?Ï?Ï?βαÏ?η  εγγÏ?αÏ?ήÏ? Ï?Ï?ον καÏ?άλογο Ï?οÏ? έÏ?γοÏ?."
 
 #: ../plugins/project-import/plugin.c:200
 #, c-format
@@ -7170,22 +7158,14 @@ msgstr "ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε ένα backend για Ï?ο έÏ?γο γ
 
 #: ../plugins/project-import/plugin.c:220
 #, c-format
-msgid ""
-"Could not find a valid project backend for the given directory (%s). Please "
-"select a different directory, or try upgrading to a newer version of Anjuta."
-msgstr ""
-"Î?εν ήÏ?αν δÏ?ναÏ?ή η εÏ?Ï?εÏ?η έγκÏ?Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? Ï?Ï?οÏ?Ï?ήÏ?ιξηÏ? έÏ?γοÏ? για Ï?ο δοθένÏ?α "
-"καÏ?άλογο (%s). ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε διαÏ?οÏ?εÏ?ικÏ? καÏ?άλογο ή Ï?Ï?οÏ?Ï?αθήÏ?Ï?ε να "
-"αναβαθμίÏ?εÏ?ε Ï?ην έκδοÏ?η Ï?οÏ? Anjuta."
+msgid "Could not find a valid project backend for the given directory (%s). Please select a different directory, or try upgrading to a newer version of Anjuta."
+msgstr "Î?εν ήÏ?αν δÏ?ναÏ?ή η εÏ?Ï?εÏ?η έγκÏ?Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? Ï?Ï?οÏ?Ï?ήÏ?ιξηÏ? έÏ?γοÏ? για Ï?ο δοθένÏ?α καÏ?άλογο (%s). ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε διαÏ?οÏ?εÏ?ικÏ? καÏ?άλογο ή Ï?Ï?οÏ?Ï?αθήÏ?Ï?ε να αναβαθμίÏ?εÏ?ε Ï?ην έκδοÏ?η Ï?οÏ? Anjuta."
 
 #: ../plugins/project-import/plugin.c:290
 #: ../plugins/project-import/plugin.c:346
 #, c-format
-msgid ""
-"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
-msgstr ""
-"Î?εν μÏ?Ï?Ï?εÏ?ε να γίνει checkout Ï?οÏ? δοθένÏ?οÏ? URI \"%s\". Το Ï?Ï?άλμα Ï?οÏ? "
-"εÏ?ιÏ?Ï?Ï?άÏ?ηκε ήÏ?αν: \"%s\""
+msgid "Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
+msgstr "Î?εν μÏ?Ï?Ï?εÏ?ε να γίνει checkout Ï?οÏ? δοθένÏ?οÏ? URI \"%s\". Το Ï?Ï?άλμα Ï?οÏ? εÏ?ιÏ?Ï?Ï?άÏ?ηκε ήÏ?αν: \"%s\""
 
 #
 #: ../plugins/project-import/project-import.ui.h:1
@@ -7373,8 +7353,7 @@ msgid ""
 "Are you sure you want to remove the following source file from the project?\n"
 "\n"
 msgstr ""
-"Î?έλεÏ?ε Ï?ίγοÏ?Ï?α Ï?ην αÏ?αίÏ?εÏ?η Ï?οÏ? ακÏ?λοÏ?θοÏ? αÏ?Ï?είοÏ? Ï?ηγαίοÏ? κÏ?δικα αÏ?Ï? Ï?ο "
-"έÏ?γο;\n"
+"Î?έλεÏ?ε Ï?ίγοÏ?Ï?α Ï?ην αÏ?αίÏ?εÏ?η Ï?οÏ? ακÏ?λοÏ?θοÏ? αÏ?Ï?είοÏ? Ï?ηγαίοÏ? κÏ?δικα αÏ?Ï? Ï?ο έÏ?γο;\n"
 "\n"
 
 #: ../plugins/project-manager/plugin.c:705
@@ -7527,12 +7506,8 @@ msgstr "Î?ημιοÏ?Ï?γήθηκε η Ï?Ï?οβολή Ï?οÏ? έÏ?γοÏ?..."
 
 #: ../plugins/project-manager/plugin.c:1408
 #, c-format
-msgid ""
-"Failed to parse project (the project is opened, but there will be no project "
-"view) %s: %s\n"
-msgstr ""
-"Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?η Ï?Ï?Ï?Ï?Ï?Ï?η Ï?οÏ? έÏ?γοÏ? (Ï?ο έÏ?γο είναι ανοικÏ?Ï?, αλλά δεν θα "
-"γίνεÏ?αι Ï?Ï?οβολή Ï?οÏ?) %s: %s\n"
+msgid "Failed to parse project (the project is opened, but there will be no project view) %s: %s\n"
+msgstr "Î?Ï?οÏ?Ï?Ï?ία καÏ?ά Ï?η Ï?Ï?Ï?Ï?Ï?Ï?η Ï?οÏ? έÏ?γοÏ? (Ï?ο έÏ?γο είναι ανοικÏ?Ï?, αλλά δεν θα γίνεÏ?αι Ï?Ï?οβολή Ï?οÏ?) %s: %s\n"
 
 #: ../plugins/project-manager/plugin.c:1601
 #, c-format
@@ -7566,7 +7541,8 @@ msgstr "Î?εÏ?Ï?ομέÏ?ειεÏ?"
 msgid "Error"
 msgstr "ΣÏ?άλμα"
 
-#: ../plugins/project-wizard/druid.c:142 ../plugins/project-wizard/druid.c:146
+#: ../plugins/project-wizard/druid.c:142
+#: ../plugins/project-wizard/druid.c:146
 msgid "Warning"
 msgstr "ΠÏ?οειδοÏ?οίηÏ?η"
 
@@ -7605,23 +7581,13 @@ msgstr ""
 
 #: ../plugins/project-wizard/druid.c:609
 #, c-format
-msgid ""
-"Field \"%s\" must start with a letter, a digit or an underscore and contain "
-"only letters, digits, underscore, minus and dot. Please fix it."
-msgstr ""
-"Το Ï?εδίο \"%s\" Ï?Ï?έÏ?ει να ξεκινά με γÏ?άμμα, αÏ?ιθμÏ? ή \"_\" και να Ï?εÏ?ιέÏ?ει "
-"μÏ?νο γÏ?άμμαÏ?α, αÏ?ιθμοÏ?Ï?, \"_\", \"-\" και \".\". ΠαÏ?ακαλÏ? διοÏ?θÏ?Ï?Ï?ε Ï?ο."
+msgid "Field \"%s\" must start with a letter, a digit or an underscore and contain only letters, digits, underscore, minus and dot. Please fix it."
+msgstr "Το Ï?εδίο \"%s\" Ï?Ï?έÏ?ει να ξεκινά με γÏ?άμμα, αÏ?ιθμÏ? ή \"_\" και να Ï?εÏ?ιέÏ?ει μÏ?νο γÏ?άμμαÏ?α, αÏ?ιθμοÏ?Ï?, \"_\", \"-\" και \".\". ΠαÏ?ακαλÏ? διοÏ?θÏ?Ï?Ï?ε Ï?ο."
 
 #: ../plugins/project-wizard/druid.c:614
 #, c-format
-msgid ""
-"Field \"%s\" must start with a letter, a digit, an underscore or a directory "
-"separator and contain only letters, digits, underscore, directory separator, "
-"minus and dot. Please fix it."
-msgstr ""
-"Το Ï?εδίο \"%s\" Ï?Ï?έÏ?ει να ξεκινά με γÏ?άμμα, αÏ?ιθμÏ?, \"/\" ή \"_\" και να "
-"Ï?εÏ?ιέÏ?ει μÏ?νο γÏ?άμμαÏ?α, αÏ?ιθμοÏ?Ï?, \"_\", \"-\", \"/\" και \".\". ΠαÏ?ακαλÏ? "
-"διοÏ?θÏ?Ï?Ï?ε Ï?ο."
+msgid "Field \"%s\" must start with a letter, a digit, an underscore or a directory separator and contain only letters, digits, underscore, directory separator, minus and dot. Please fix it."
+msgstr "Το Ï?εδίο \"%s\" Ï?Ï?έÏ?ει να ξεκινά με γÏ?άμμα, αÏ?ιθμÏ?, \"/\" ή \"_\" και να Ï?εÏ?ιέÏ?ει μÏ?νο γÏ?άμμαÏ?α, αÏ?ιθμοÏ?Ï?, \"_\", \"-\", \"/\" και \".\". ΠαÏ?ακαλÏ? διοÏ?θÏ?Ï?Ï?ε Ï?ο."
 
 #: ../plugins/project-wizard/druid.c:619
 #, c-format
@@ -7630,12 +7596,8 @@ msgstr "Î?γνÏ?Ï?Ï?ο Ï?Ï?άλμα."
 
 #: ../plugins/project-wizard/druid.c:646
 #, c-format
-msgid ""
-"Directory \"%s\" is not empty. Project creation could fail if some files "
-"cannot be written. Do you want to continue?"
-msgstr ""
-"Î? καÏ?άλογοÏ?  \"%s\" δεν είναι κενÏ?Ï?. Î? δημιοÏ?Ï?γία έÏ?γÏ?ν ίÏ?Ï?Ï? αÏ?οÏ?Ï?Ï?ει αν "
-"κάÏ?οια αÏ?Ï?εία δεν μÏ?οÏ?οÏ?ν να εγγÏ?αÏ?οÏ?ν. Î?έλεÏ?ε να Ï?Ï?νεÏ?ίÏ?εÏ?ε;"
+msgid "Directory \"%s\" is not empty. Project creation could fail if some files cannot be written. Do you want to continue?"
+msgstr "Î? καÏ?άλογοÏ?  \"%s\" δεν είναι κενÏ?Ï?. Î? δημιοÏ?Ï?γία έÏ?γÏ?ν ίÏ?Ï?Ï? αÏ?οÏ?Ï?Ï?ει αν κάÏ?οια αÏ?Ï?εία δεν μÏ?οÏ?οÏ?ν να εγγÏ?αÏ?οÏ?ν. Î?έλεÏ?ε να Ï?Ï?νεÏ?ίÏ?εÏ?ε;"
 
 #: ../plugins/project-wizard/druid.c:648
 #, c-format
@@ -7669,34 +7631,16 @@ msgstr ""
 "Î?είÏ?ει Ï?ο Ï?ακέÏ?ο: %s"
 
 #: ../plugins/project-wizard/druid.c:871
-msgid ""
-"Some important programs or development packages required to build this "
-"project are missing. Please make sure they are installed properly before "
-"generating the project.\n"
-msgstr ""
-"Î?είÏ?οÏ?ν οÏ?ιÏ?μένα Ï?ημανÏ?ικά Ï?Ï?ογÏ?άμμαÏ?α ή Ï?ακέÏ?α Ï?Ï?ογÏ?αμμαÏ?ιÏ?μοÏ? Ï?οÏ? "
-"αÏ?αιÏ?οÏ?νÏ?αι για Ï?ην καÏ?αÏ?κεÏ?ή αÏ?Ï?οÏ? Ï?οÏ? έÏ?γοÏ?. ΠαÏ?ακαλÏ?, ελέγξÏ?ε Ï?Ï?ι έÏ?οÏ?ν "
-"εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?Ï?ά Ï?Ï?ιν Ï?αÏ?άγεÏ?ε Ï?ο έÏ?γο.\n"
+msgid "Some important programs or development packages required to build this project are missing. Please make sure they are installed properly before generating the project.\n"
+msgstr "Î?είÏ?οÏ?ν οÏ?ιÏ?μένα Ï?ημανÏ?ικά Ï?Ï?ογÏ?άμμαÏ?α ή Ï?ακέÏ?α Ï?Ï?ογÏ?αμμαÏ?ιÏ?μοÏ? Ï?οÏ? αÏ?αιÏ?οÏ?νÏ?αι για Ï?ην καÏ?αÏ?κεÏ?ή αÏ?Ï?οÏ? Ï?οÏ? έÏ?γοÏ?. ΠαÏ?ακαλÏ?, ελέγξÏ?ε Ï?Ï?ι έÏ?οÏ?ν εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?Ï?ά Ï?Ï?ιν Ï?αÏ?άγεÏ?ε Ï?ο έÏ?γο.\n"
 
 #: ../plugins/project-wizard/druid.c:879
 msgid "Install missing packages"
 msgstr "Î?γκαÏ?άÏ?Ï?αÏ?η Ï?ακέÏ?Ï?ν Ï?οÏ? λείÏ?οÏ?ν"
 
 #: ../plugins/project-wizard/druid.c:887
-msgid ""
-"The missing programs are usually part of some distrubution packages and can "
-"be searched for in your Application Manager. Similarly, the development "
-"packages are contained in special packages that your distribution provides "
-"to allow development of projects based on them. They usually end with a \"-"
-"dev\" or \"-devel\" suffix in package names and can be found by searching in "
-"your Application Manager."
-msgstr ""
-"Τα Ï?Ï?ογÏ?άμμαÏ?α Ï?οÏ? λείÏ?οÏ?ν Ï?Ï?νήθÏ?Ï? Ï?εÏ?ιλαμβάνονÏ?αι Ï?Ï?α Ï?ακέÏ?α Ï?Ï?ν διανομÏ?ν "
-"και μÏ?οÏ?οÏ?ν να βÏ?εθοÏ?ν μέÏ?Ï? Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?Ï?οÏ?θαÏ?αίÏ?εÏ?ηÏ? εÏ?αÏ?μογÏ?ν. "
-"Î?νÏ?ίÏ?Ï?οιÏ?α, Ï?α Ï?ακέÏ?α Ï?Ï?ογÏ?αμμαÏ?ιÏ?μοÏ? Ï?εÏ?ιλαμβάνονÏ?αι Ï?ε ειδικά Ï?ακέÏ?α Ï?ηÏ? "
-"διανομήÏ? Ï?αÏ? Ï?οÏ? εÏ?ιÏ?Ï?έÏ?ει Ï?ην ανάÏ?Ï?Ï?ξη έÏ?γÏ?ν βαÏ?ιÏ?μένÏ?ν Ï?ε αÏ?Ï?ά. ΣÏ?νήθÏ?Ï?, "
-"Ï?α ονÏ?μαÏ?α Ï?Ï?ν Ï?ακέÏ?Ï?ν λήγοÏ?ν Ï?ε «-dev» ή «-devel» και μÏ?οÏ?οÏ?ν να βÏ?εθοÏ?ν μέÏ?Ï? "
-"Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?Ï?οÏ?θαÏ?αίÏ?εÏ?ηÏ? εÏ?αÏ?μογÏ?ν."
+msgid "The missing programs are usually part of some distrubution packages and can be searched for in your Application Manager. Similarly, the development packages are contained in special packages that your distribution provides to allow development of projects based on them. They usually end with a \"-dev\" or \"-devel\" suffix in package names and can be found by searching in your Application Manager."
+msgstr "Τα Ï?Ï?ογÏ?άμμαÏ?α Ï?οÏ? λείÏ?οÏ?ν Ï?Ï?νήθÏ?Ï? Ï?εÏ?ιλαμβάνονÏ?αι Ï?Ï?α Ï?ακέÏ?α Ï?Ï?ν διανομÏ?ν και μÏ?οÏ?οÏ?ν να βÏ?εθοÏ?ν μέÏ?Ï? Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?Ï?οÏ?θαÏ?αίÏ?εÏ?ηÏ? εÏ?αÏ?μογÏ?ν. Î?νÏ?ίÏ?Ï?οιÏ?α, Ï?α Ï?ακέÏ?α Ï?Ï?ογÏ?αμμαÏ?ιÏ?μοÏ? Ï?εÏ?ιλαμβάνονÏ?αι Ï?ε ειδικά Ï?ακέÏ?α Ï?ηÏ? διανομήÏ? Ï?αÏ? Ï?οÏ? εÏ?ιÏ?Ï?έÏ?ει Ï?ην ανάÏ?Ï?Ï?ξη έÏ?γÏ?ν βαÏ?ιÏ?μένÏ?ν Ï?ε αÏ?Ï?ά. ΣÏ?νήθÏ?Ï?, Ï?α ονÏ?μαÏ?α Ï?Ï?ν Ï?ακέÏ?Ï?ν λήγοÏ?ν Ï?ε «-dev» ή «-devel» και μÏ?οÏ?οÏ?ν να βÏ?εθοÏ?ν μέÏ?Ï? Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?Ï?οÏ?θαÏ?αίÏ?εÏ?ηÏ? εÏ?αÏ?μογÏ?ν."
 
 #: ../plugins/project-wizard/druid.c:895
 msgid "Missing components"
@@ -7705,9 +7649,7 @@ msgstr "Î?είÏ?οÏ?ν Ï?Ï?Ï?Ï?αÏ?ικά"
 #: ../plugins/project-wizard/druid.c:1027
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
-msgstr ""
-"Î?ίναι αδÏ?ναÏ?η η καÏ?αÏ?κεÏ?ή διεÏ?αÏ?ήÏ? Ï?Ï?ήÏ?Ï?η για Ï?ον οδηγÏ? Ï?οÏ? έÏ?γοÏ? με "
-"ανάγνÏ?Ï?η Ï?οÏ? %s."
+msgstr "Î?ίναι αδÏ?ναÏ?η η καÏ?αÏ?κεÏ?ή διεÏ?αÏ?ήÏ? Ï?Ï?ήÏ?Ï?η για Ï?ον οδηγÏ? Ï?οÏ? έÏ?γοÏ? με ανάγνÏ?Ï?η Ï?οÏ? %s."
 
 #: ../plugins/project-wizard/install.c:406
 msgid "New project has been created successfully."
@@ -7764,13 +7706,15 @@ msgstr "Î?Ï?ιλογή καÏ?αλÏ?γοÏ?"
 msgid "Select file"
 msgstr "Î?Ï?ιλογή αÏ?Ï?είοÏ?"
 
-#: ../plugins/project-wizard/property.c:382 ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:382
+#: ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "Î?Ï?ιλογή αÏ?Ï?είοÏ? εικÏ?ναÏ?"
 
 #
 #: ../plugins/project-wizard/property.c:407
-#: ../plugins/project-wizard/property.c:497 ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:497
+#: ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "Î?Ï?ιλογή εικονιδίοÏ?"
@@ -7809,6 +7753,8 @@ msgid "A generic Xlib project"
 msgstr "Î?Ï?γο Xlib γενικήÏ? μοÏ?Ï?ήÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:7
+#, fuzzy
+#| msgid "A generic Java project using automake project management"
 msgid "A generic java project using automake project management"
 msgstr "Î?Ï?γο Java γενικήÏ? μοÏ?Ï?ήÏ? με Ï?Ï?ήÏ?η automake για Ï?η διαÏ?είÏ?ιÏ?η Ï?οÏ? έÏ?γοÏ?"
 
@@ -7817,22 +7763,22 @@ msgid "A generic minimal and flat project"
 msgstr "Î?Ï?ίÏ?εδο και ελάÏ?ιÏ?Ï?Ï?ν Ï?Ï?οδιαγÏ?αÏ?Ï?ν έÏ?γο γενικήÏ? μοÏ?Ï?ήÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:9
-msgid ""
-"A generic natively compiled java project using the GNU Java Compiler (gcj)"
-msgstr ""
-"Î?Ï?γο Java γενικήÏ? μοÏ?Ï?ήÏ? Ï?οÏ? μεÏ?αγλÏ?Ï?Ï?ίζεÏ?αι εγγενÏ?Ï? με Ï?Ï?ήÏ?η Ï?οÏ? GNU Java "
-"Compiler (gcj)"
+#| msgid ""
+#| "A generic natively compiled Java project using the GNU Java Compiler (gcj)"
+msgid "A generic natively compiled java project using the GNU Java Compiler (gcj)"
+msgstr "Î?Ï?γο Java γενικήÏ? μοÏ?Ï?ήÏ? Ï?οÏ? μεÏ?αγλÏ?Ï?Ï?ίζεÏ?αι εγγενÏ?Ï? με Ï?Ï?ήÏ?η Ï?οÏ? GNU Java Compiler (gcj)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:10
 msgid "A generic project"
 msgstr "Î?Ï?γο γενικήÏ? μοÏ?Ï?ήÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:11
+#| msgid "A generic Python project using automake project management"
 msgid "A generic python project using automake project management"
-msgstr ""
-"Î?Ï?γο Python γενικήÏ? μοÏ?Ï?ήÏ? με Ï?Ï?ήÏ?η automake για Ï?η διαÏ?είÏ?ιÏ?η Ï?οÏ? έÏ?γοÏ?"
+msgstr "Î?Ï?γο Python γενικήÏ? μοÏ?Ï?ήÏ? με Ï?Ï?ήÏ?η automake για Ï?η διαÏ?είÏ?ιÏ?η Ï?οÏ? έÏ?γοÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:12
+#| msgid "A generic wxWidgets project"
 msgid "A generic wx Widgets project"
 msgstr "Î?Ï?γο γενικήÏ? μοÏ?Ï?ήÏ? wx Widgets "
 
@@ -7862,22 +7808,15 @@ msgstr "ΠÏ?οÏ?θήκη Ï?Ï?οÏ?Ï?ήÏ?ιξηÏ? βιβλιοθήκηÏ? κοιν
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:19
 msgid "Adds C++ support to the project so that C++ source files can be built"
-msgstr ""
-"ΠÏ?οÏ?θέÏ?ει Ï?Ï?οÏ?Ï?ήÏ?ιξη για C++ Ï?Ï?ο έÏ?γο έÏ?Ï?ι Ï?Ï?Ï?ε Ï?α αÏ?Ï?εία Ï?ηγαίοÏ? κÏ?δικα Ï?ηÏ? "
-"C++ να μÏ?οÏ?οÏ?ν να Ï?Ï?εδιαÏ?Ï?οÏ?ν"
+msgstr "ΠÏ?οÏ?θέÏ?ει Ï?Ï?οÏ?Ï?ήÏ?ιξη για C++ Ï?Ï?ο έÏ?γο έÏ?Ï?ι Ï?Ï?Ï?ε Ï?α αÏ?Ï?εία Ï?ηγαίοÏ? κÏ?δικα Ï?ηÏ? C++ να μÏ?οÏ?οÏ?ν να Ï?Ï?εδιαÏ?Ï?οÏ?ν"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:20
 msgid "Adds support for building shared libraries in your project"
-msgstr ""
-"ΠÏ?οÏ?θέÏ?ει Ï?Ï?οÏ?Ï?ήÏ?ιξη για καÏ?αÏ?κεÏ?ή βιβλιοθηκÏ?ν κοινήÏ? Ï?Ï?ήÏ?ηÏ? Ï?Ï?ο έÏ?γο Ï?αÏ?"
+msgstr "ΠÏ?οÏ?θέÏ?ει Ï?Ï?οÏ?Ï?ήÏ?ιξη για καÏ?αÏ?κεÏ?ή βιβλιοθηκÏ?ν κοινήÏ? Ï?Ï?ήÏ?ηÏ? Ï?Ï?ο έÏ?γο Ï?αÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:21
-msgid ""
-"Adds support for internationalization so that your project can have "
-"translations in different languages"
-msgstr ""
-"ΠÏ?οÏ?θέÏ?ει Ï?Ï?οÏ?Ï?ήÏ?ιξη για διεθνοÏ?οίηÏ?η έÏ?Ï?ι Ï?Ï?Ï?ε Ï?ο έÏ?γο Ï?αÏ? να μÏ?οÏ?εί να "
-"έÏ?ει μεÏ?αÏ?Ï?άÏ?ειÏ? Ï?ε διαÏ?οÏ?εÏ?ικέÏ? γλÏ?Ï?Ï?εÏ?"
+msgid "Adds support for internationalization so that your project can have translations in different languages"
+msgstr "ΠÏ?οÏ?θέÏ?ει Ï?Ï?οÏ?Ï?ήÏ?ιξη για διεθνοÏ?οίηÏ?η έÏ?Ï?ι Ï?Ï?Ï?ε Ï?ο έÏ?γο Ï?αÏ? να μÏ?οÏ?εί να έÏ?ει μεÏ?αÏ?Ï?άÏ?ειÏ? Ï?ε διαÏ?οÏ?εÏ?ικέÏ? γλÏ?Ï?Ï?εÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:22
 msgid "Anjuta Plugin"
@@ -7904,13 +7843,11 @@ msgid "Build library as"
 msgstr "Î?αÏ?αÏ?κεÏ?ή βιβλιοθήκηÏ? Ï?Ï?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:29
-msgid ""
-"Comma separated, other plugins that this plugin depends on. It could be "
-"either primary interface name or plugin location (library:class)"
-msgstr ""
-"Î?ιαÏ?Ï?Ï?ιÏ?μένεÏ? με κÏ?μμα, άλλεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? αÏ?Ï? Ï?ιÏ? οÏ?οίεÏ? εξαÏ?Ï?άÏ?αι "
-"αÏ?Ï?ή η Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία. Î?α μÏ?οÏ?οÏ?Ï?ε να είναι είÏ?ε Ï?ο Ï?Ï?Ï?Ï?εÏ?ον Ï?νομα "
-"διεÏ?αÏ?ήÏ? ή η Ï?οÏ?οθεÏ?ία Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ? (βιβλιοθήκη:κλάÏ?η)"
+#| msgid ""
+#| "Comma-separated, other plugins that this plugin depends on. It could be "
+#| "either primary interface name or plugin location (library:class)"
+msgid "Comma separated, other plugins that this plugin depends on. It could be either primary interface name or plugin location (library:class)"
+msgstr "Î?ιαÏ?Ï?Ï?ιÏ?μένεÏ? με κÏ?μμα, άλλεÏ? Ï?Ï?Ï?Ï?θεÏ?εÏ? λειÏ?οÏ?Ï?γίεÏ? αÏ?Ï? Ï?ιÏ? οÏ?οίεÏ? εξαÏ?Ï?άÏ?αι αÏ?Ï?ή η Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία. Î?α μÏ?οÏ?οÏ?Ï?ε να είναι είÏ?ε Ï?ο Ï?Ï?Ï?Ï?εÏ?ον Ï?νομα διεÏ?αÏ?ήÏ? ή η Ï?οÏ?οθεÏ?ία Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ? (βιβλιοθήκη:κλάÏ?η)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:30
 msgid "Configure external packages"
@@ -7921,10 +7858,12 @@ msgid "Configure external packages:"
 msgstr "ΡÏ?θμιÏ?η εξÏ?Ï?εÏ?ικÏ?ν Ï?ακέÏ?Ï?ν:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:32
+#| msgid "Create GtkBuilder interface file"
 msgid "Create Gtk Builder interface file"
 msgstr "Î?ημιοÏ?Ï?γία αÏ?Ï?είοÏ? διεÏ?αÏ?ήÏ? για Ï?ο Gtk Builder"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:33
+#| msgid "Create a template GtkBuilder interface file"
 msgid "Create a template Gtk Builder interface file"
 msgstr "Î?ημιοÏ?Ï?γία ενÏ?Ï? Ï?Ï?Ï?Ï?Ï?Ï?οÏ? αÏ?Ï?είοÏ? διεÏ?αÏ?ήÏ? Ï?οÏ? Gtk Builder"
 
@@ -7959,8 +7898,7 @@ msgstr "Î?λ. Î?ιεÏ?θÏ?νÏ?η:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:43
 msgid "GCJ needs to know which class contains the main() function"
-msgstr ""
-"Το gcj Ï?Ï?ειάζεÏ?αι να γνÏ?Ï?ίζει Ï?οια κλάÏ?η Ï?εÏ?ιέÏ?ει Ï?ην κÏ?Ï?ια Ï?Ï?νάÏ?Ï?ηÏ?η ()"
+msgstr "Το gcj Ï?Ï?ειάζεÏ?αι να γνÏ?Ï?ίζει Ï?οια κλάÏ?η Ï?εÏ?ιέÏ?ει Ï?ην κÏ?Ï?ια Ï?Ï?νάÏ?Ï?ηÏ?η ()"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GNOME Applet"
@@ -7997,26 +7935,23 @@ msgid "Generic JavaScript"
 msgstr "Javascript γενικήÏ? μοÏ?Ï?ήÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:53
+#| msgid "Generic gcj compiled Java"
 msgid "Generic gcj compiled java"
 msgstr "Java γενικήÏ? μοÏ?Ï?ήÏ? μεÏ?αγλÏ?Ï?Ï?ιÏ?μένη με gcj"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:54
+#| msgid "Generic Java (automake)"
 msgid "Generic java (automake)"
 msgstr "Java γενικήÏ? μοÏ?Ï?ήÏ? (automake)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:55
+#| msgid "Generic Python (automake)"
 msgid "Generic python (automake)"
 msgstr "Python γενικήÏ? μοÏ?Ï?ήÏ? (automake)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:56
-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 "
-"'libgnomeui-2.0 >= 2.2.0'"
-msgstr ""
-"Î?Ï?Ï?Ï?ε ένα Ï?νομα Ï?ακέÏ?οÏ? Ï?οÏ? Ï?ο έÏ?γο Ï?αÏ? αÏ?αιÏ?εί. Î?Ï?οÏ?εί εÏ?ίÏ?ηÏ? να Ï?αÏ? "
-"Ï?Ï?ενθÏ?μίζεÏ?αι Ï?οια είναι η αÏ?αιÏ?οÏ?μενη έκδοÏ?η για Ï?ο Ï?ακέÏ?ο Ï?αÏ?. Î?ια "
-"Ï?αÏ?άδειγμα, Ï?ο 'libgnomeui-2.0' ή Ï?ο 'libgnomeui-2.0 >= 2.2.0'"
+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 'libgnomeui-2.0 >= 2.2.0'"
+msgstr "Î?Ï?Ï?Ï?ε ένα Ï?νομα Ï?ακέÏ?οÏ? Ï?οÏ? Ï?ο έÏ?γο Ï?αÏ? αÏ?αιÏ?εί. Î?Ï?οÏ?εί εÏ?ίÏ?ηÏ? να Ï?αÏ? Ï?Ï?ενθÏ?μίζεÏ?αι Ï?οια είναι η αÏ?αιÏ?οÏ?μενη έκδοÏ?η για Ï?ο Ï?ακέÏ?ο Ï?αÏ?. Î?ια Ï?αÏ?άδειγμα, Ï?ο 'libgnomeui-2.0' ή Ï?ο 'libgnomeui-2.0 >= 2.2.0'"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:57
 msgid "Icon File:"
@@ -8108,6 +8043,7 @@ msgid "Plugin class name"
 msgstr "Î?νομα κλάÏ?ηÏ? Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:80
+#| msgid "Plugin has menus and/or toolbars"
 msgid "Plugin has menus or/and toolbars"
 msgstr "Î? Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?εÏ?ιέÏ?ει μενοÏ? ή/και γÏ?αμμέÏ? εÏ?γαλείÏ?ν"
 
@@ -8120,6 +8056,7 @@ msgid "Project Name:"
 msgstr "Î?νομα έÏ?γοÏ?:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:83
+#| msgid "Project directory, output file, etc."
 msgid "Project directory, output file etc."
 msgstr "Î? καÏ?άλογοÏ? Ï?οÏ? έÏ?γοÏ?, Ï?ο αÏ?Ï?είο εξÏ?δοÏ?, κλÏ?."
 
@@ -8128,12 +8065,11 @@ msgid "Project directory:"
 msgstr "Î?αÏ?άλογοÏ? έÏ?γοÏ?:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:85
-msgid ""
-"Project name must not contain spaces, because it will be the name of the "
-"project build target (executable, library etc.)"
-msgstr ""
-"Το Ï?νομα Ï?οÏ? έÏ?γοÏ? δεν Ï?Ï?έÏ?ει να Ï?εÏ?ιέÏ?ει κενά, εÏ?ειδή αÏ?Ï?Ï? θα είναι Ï?ο "
-"Ï?νομα Ï?οÏ? Ï?ελικοÏ? Ï?Ï?οÏ?Ï?νÏ?οÏ? Ï?οÏ? έÏ?γοÏ? (εκÏ?ελέÏ?ιμο, βιβλιοθήκη, κ.λÏ?.)"
+#| msgid ""
+#| "Project name must not contain spaces, because it will be the name of the "
+#| "project build target (executable, library, etc.)"
+msgid "Project name must not contain spaces, because it will be the name of the project build target (executable, library etc.)"
+msgstr "Το Ï?νομα Ï?οÏ? έÏ?γοÏ? δεν Ï?Ï?έÏ?ει να Ï?εÏ?ιέÏ?ει κενά, εÏ?ειδή αÏ?Ï?Ï? θα είναι Ï?ο Ï?νομα Ï?οÏ? Ï?ελικοÏ? Ï?Ï?οÏ?Ï?νÏ?οÏ? Ï?οÏ? έÏ?γοÏ? (εκÏ?ελέÏ?ιμο, βιβλιοθήκη, κ.λÏ?.)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:86
 msgid "Project name:"
@@ -8145,6 +8081,7 @@ msgid "Project options"
 msgstr "Î?διÏ?Ï?ηÏ?εÏ? έÏ?γοÏ?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:88
+#| msgid "Python web project using Django Web Framework"
 msgid "Python webproject using Django Web Framework"
 msgstr "Î?ιαδικÏ?Ï?ακÏ? έÏ?γο Python Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιεί Ï?ο Django Web Framework"
 
@@ -8219,8 +8156,7 @@ msgstr "Î?ι Ï?ιμέÏ? Ï?οÏ? κέλÏ?Ï?οÏ? Ï?οÏ? θα Ï?Ï?οβληθοÏ?ν"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:106
 msgid "Use pkg-config to add library support from other packages"
-msgstr ""
-"ΧÏ?ήÏ?η Ï?οÏ? pkg-config για Ï?Ï?οÏ?θήκη Ï?Ï?οÏ?Ï?ήÏ?ιξηÏ? βιβλιοθήκηÏ? αÏ?Ï? άλλα Ï?ακέÏ?α"
+msgstr "ΧÏ?ήÏ?η Ï?οÏ? pkg-config για Ï?Ï?οÏ?θήκη Ï?Ï?οÏ?Ï?ήÏ?ιξηÏ? βιβλιοθήκηÏ? αÏ?Ï? άλλα Ï?ακέÏ?α"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:107
 msgid "Value Name:"
@@ -8248,10 +8184,10 @@ msgid "Xlib dock"
 msgstr "Xlib dock"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:114
+#| msgid ""
+#| "gtk-doc is used to compile API documentation for GObject-based classes"
 msgid "gtk-doc is used to compile API documentations for GObject based classes"
-msgstr ""
-"Το gtk-doc Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι για Ï?η μεÏ?αγλÏ?Ï?Ï?ιÏ?η Ï?Ï?ν Ï?εκμηÏ?ιÏ?Ï?εÏ?ν API για Ï?ιÏ? "
-"κλάÏ?ειÏ? Ï?οÏ? βαÏ?ίζονÏ?αι Ï?Ï?ο GObject"
+msgstr "Το gtk-doc Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι για Ï?η μεÏ?αγλÏ?Ï?Ï?ιÏ?η Ï?Ï?ν Ï?εκμηÏ?ιÏ?Ï?εÏ?ν API για Ï?ιÏ? κλάÏ?ειÏ? Ï?οÏ? βαÏ?ίζονÏ?αι Ï?Ï?ο GObject"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:115
 msgid "project name"
@@ -8513,7 +8449,8 @@ msgid "Find _Next"
 msgstr "Î?Ï?Ï?εÏ?η Î?Ï?ο_μένοÏ?"
 
 #
-#: ../plugins/search/plugin.c:72 ../plugins/search/plugin.c:76
+#: ../plugins/search/plugin.c:72
+#: ../plugins/search/plugin.c:76
 msgid "Repeat the last Find command"
 msgstr "Î?Ï?ανάληÏ?η Ï?ηÏ? Ï?ελεÏ?Ï?αίαÏ? ενÏ?ολήÏ? αναζήÏ?ηÏ?ηÏ?"
 
@@ -8527,13 +8464,11 @@ msgstr "Î?ναζήÏ?ηÏ?η και α_νÏ?ικαÏ?άÏ?Ï?αÏ?η..."
 
 #
 #: ../plugins/search/plugin.c:80
-msgid ""
-"Search for and replace a string or regular expression with another string"
-msgstr ""
-"Î?ναζήÏ?ηÏ?η και ανÏ?ικαÏ?άÏ?Ï?αÏ?η αλÏ?αÏ?ιθμηÏ?ικοÏ? ή κανονικήÏ? έκÏ?Ï?αÏ?ηÏ? με άλλο "
-"αλÏ?αÏ?ιθμηÏ?ικÏ?"
+msgid "Search for and replace a string or regular expression with another string"
+msgstr "Î?ναζήÏ?ηÏ?η και ανÏ?ικαÏ?άÏ?Ï?αÏ?η αλÏ?αÏ?ιθμηÏ?ικοÏ? ή κανονικήÏ? έκÏ?Ï?αÏ?ηÏ? με άλλο αλÏ?αÏ?ιθμηÏ?ικÏ?"
 
-#: ../plugins/search/plugin.c:82 ../plugins/search/plugin.c:83
+#: ../plugins/search/plugin.c:82
+#: ../plugins/search/plugin.c:83
 msgid "Search and Replace"
 msgstr "Î?ναζήÏ?ηÏ?η και ανÏ?ικαÏ?άÏ?Ï?αÏ?η"
 
@@ -8653,8 +8588,7 @@ msgstr[1] "%d Ï?αιÏ?ιάÏ?μαÏ?α Ï?ηÏ? αναζήÏ?ηÏ?ηÏ? έÏ?οÏ?ν αν
 
 #: ../plugins/search/search-replace.c:1298
 msgid "Unable to build user interface for Search and Replace"
-msgstr ""
-"Î?ίναι αδÏ?ναÏ?η η καÏ?αÏ?κεÏ?ή διεÏ?ιÏ?άνειαÏ? Ï?Ï?ήÏ?Ï?η για Î?ναζήÏ?ηÏ?η και Î?νÏ?ικαÏ?άÏ?Ï?αÏ?η"
+msgstr "Î?ίναι αδÏ?ναÏ?η η καÏ?αÏ?κεÏ?ή διεÏ?ιÏ?άνειαÏ? Ï?Ï?ήÏ?Ï?η για Î?ναζήÏ?ηÏ?η και Î?νÏ?ικαÏ?άÏ?Ï?αÏ?η"
 
 #: ../plugins/sourceview/sourceview.c:374
 #, c-format
@@ -8685,9 +8619,7 @@ msgstr "Î?εν ήÏ?αν δÏ?ναÏ?Ï? να ανοίξει Ï?ο %s: %s"
 #: ../plugins/sourceview/sourceview.c:502
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
-msgstr ""
-"Το αÏ?Ï?είο «%s» είναι μÏ?νο για ανάγνÏ?Ï?η! Î?έλεÏ?ε, Ï?αÏ?Ï?λα αÏ?Ï?ά, να Ï?ο "
-"εÏ?εξεÏ?γαÏ?Ï?είÏ?ε;"
+msgstr "Το αÏ?Ï?είο «%s» είναι μÏ?νο για ανάγνÏ?Ï?η! Î?έλεÏ?ε, Ï?αÏ?Ï?λα αÏ?Ï?ά, να Ï?ο εÏ?εξεÏ?γαÏ?Ï?είÏ?ε;"
 
 #
 #. Could not open <filename>: <error message>
@@ -8700,9 +8632,7 @@ msgstr "Î?δÏ?ναμία αÏ?οθήκεÏ?Ï?ηÏ? Ï?οÏ? %s: %s"
 #: ../plugins/sourceview/sourceview-io.c:273
 #, c-format
 msgid "Could not save file because filename not yet specified"
-msgstr ""
-"Î?εν ήÏ?αν δÏ?ναÏ?ή η αÏ?οθήκεÏ?Ï?η Ï?οÏ? αÏ?Ï?είοÏ? γιαÏ?ί δεν έÏ?ει οÏ?ιÏ?Ï?εί ακÏ?μη Ï?νομα "
-"αÏ?Ï?είοÏ?"
+msgstr "Î?εν ήÏ?αν δÏ?ναÏ?ή η αÏ?οθήκεÏ?Ï?η Ï?οÏ? αÏ?Ï?είοÏ? γιαÏ?ί δεν έÏ?ει οÏ?ιÏ?Ï?εί ακÏ?μη Ï?νομα αÏ?Ï?είοÏ?"
 
 #: ../plugins/sourceview/sourceview-io.c:503
 #, c-format
@@ -8723,6 +8653,7 @@ msgid "Create backup files"
 msgstr "Î?ημιοÏ?Ï?γία ανÏ?ιγÏ?άÏ?Ï?ν αÏ?Ï?αλείαÏ?"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
+#| msgid "Enable autocompletion"
 msgid "Enable autocompletion for document words"
 msgstr "Î?νεÏ?γοÏ?οίηÏ?η αÏ?Ï?Ï?μαÏ?ηÏ? Ï?Ï?μÏ?λήÏ?Ï?Ï?ηÏ? για Ï?ιÏ? λέξειÏ? Ï?οÏ? εγγÏ?άÏ?οÏ?"
 
@@ -8805,7 +8736,8 @@ msgstr "ΧÏ?ήÏ?η γÏ?αμμαÏ?οÏ?ειÏ?άÏ? θέμαÏ?οÏ?"
 
 #
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
-#: ../src/anjuta-app.c:493 ../src/anjuta-app.c:498
+#: ../src/anjuta-app.c:493
+#: ../src/anjuta-app.c:498
 msgid "View"
 msgstr "ΠÏ?οβολή"
 
@@ -8813,7 +8745,8 @@ msgstr "ΠÏ?οβολή"
 msgid "Wrap long lines to fit on paper"
 msgstr "Î?ναδίÏ?λÏ?Ï?η μακÏ?Ï?ν γÏ?αμμÏ?ν για να Ï?αιÏ?ιάζοÏ?ν Ï?Ï?ο μέγεθοÏ? Ï?οÏ? Ï?αÏ?Ï?ιοÏ?"
 
-#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:362
+#: ../plugins/starter/plugin.c:70
+#: ../plugins/starter/starter.c:362
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "Î?κκίνηÏ?η"
@@ -9022,19 +8955,22 @@ msgstr "κÏ?Ï?μοÏ?"
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:52 ../plugins/subversion/plugin.c:151
+#: ../plugins/subversion/plugin.c:52
+#: ../plugins/subversion/plugin.c:151
 msgid "_Subversion"
 msgstr "_Subversion"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:62 ../plugins/subversion/plugin.c:177
+#: ../plugins/subversion/plugin.c:62
+#: ../plugins/subversion/plugin.c:177
 msgid "Add a new file/directory to the Subversion tree"
 msgstr "ΠÏ?οÏ?θήκη νέοÏ? αÏ?Ï?είοÏ?/καÏ?αλÏ?γοÏ? Ï?Ï?ο δένÏ?Ï?ο Ï?οÏ? subvesion"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:70 ../plugins/subversion/plugin.c:185
+#: ../plugins/subversion/plugin.c:70
+#: ../plugins/subversion/plugin.c:185
 msgid "Remove a file/directory from Subversion tree"
 msgstr "Î?Ï?αίÏ?εÏ?η αÏ?Ï?είοÏ?/καÏ?αλÏ?γοÏ? αÏ?Ï? Ï?ο δένÏ?Ï?ο αναÏ?Ï?οÏ?ήÏ?"
 
@@ -9046,13 +8982,15 @@ msgstr "Î?νÏ?Ï?μάÏ?Ï?Ï?η αλλαγÏ?ν Ï?Ï?ο δένÏ?Ï?ο αναÏ?Ï?οÏ?ή
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
+#: ../plugins/subversion/plugin.c:84
+#: ../plugins/subversion/plugin.c:167
 msgid "_Revertâ?¦"
 msgstr "_Î?Ï?αναÏ?οÏ?ά..."
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:86 ../plugins/subversion/plugin.c:169
+#: ../plugins/subversion/plugin.c:86
+#: ../plugins/subversion/plugin.c:169
 msgid "Revert changes to your working copy."
 msgstr "Î?Ï?αναÏ?οÏ?ά αλλαγÏ?ν Ï?Ï?ο ενεÏ?γÏ? Ï?αÏ? ανÏ?ίγÏ?αÏ?ο."
 
@@ -9071,13 +9009,15 @@ msgstr "Î?Ï?ίλÏ?Ï?η Ï?Ï?γκÏ?οÏ?Ï?εÏ?ν Ï?Ï?ο ενεÏ?γÏ? ανÏ?ίγÏ?α
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
+#: ../plugins/subversion/plugin.c:100
+#: ../plugins/subversion/plugin.c:159
 msgid "_Updateâ?¦"
 msgstr "Î?νη_μέÏ?Ï?Ï?η..."
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
+#: ../plugins/subversion/plugin.c:102
+#: ../plugins/subversion/plugin.c:161
 msgid "Syncronize your local copy with the Subversion tree"
 msgstr "ΣÏ?γÏ?Ï?ονιÏ?μÏ?Ï? Ï?οÏ? Ï?οÏ?ικοÏ? Ï?αÏ? ανÏ?ιγÏ?άÏ?οÏ? με Ï?ο δένÏ?Ï?ο Ï?οÏ? Subversion"
 
@@ -9089,7 +9029,8 @@ msgstr "Î?νÏ?ιγÏ?αÏ?ή αÏ?Ï?είÏ?ν/Ï?ακέλÏ?ν..."
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:110 ../plugins/subversion/plugin.c:201
+#: ../plugins/subversion/plugin.c:110
+#: ../plugins/subversion/plugin.c:201
 msgid "Copy files/folders in the repository"
 msgstr "Î?νÏ?ιγÏ?αÏ?ή αÏ?Ï?είÏ?ν/Ï?ακέλÏ?ν Ï?Ï?ο Ï?Ï?Ï?ο αÏ?Ï?θεÏ?ηÏ?"
 
@@ -9103,9 +9044,7 @@ msgstr "Î?άνÏ?ε εναλλαγή Ï?ε ένα κλάδο/εÏ?ικέÏ?α..."
 #. short-cut
 #: ../plugins/subversion/plugin.c:118
 msgid "Switch your local copy to a branch or tag in the repository"
-msgstr ""
-"Î?άνÏ?ε εναλλαγή Ï?οÏ? Ï?οÏ?ικοÏ? Ï?αÏ? ανÏ?ιγÏ?άÏ?οÏ? Ï?ε ένα κλάδο ή μια εÏ?ικέÏ?α Ï?Ï?ο "
-"Ï?Ï?Ï?ο αÏ?οθήκεÏ?Ï?ηÏ?"
+msgstr "Î?άνÏ?ε εναλλαγή Ï?οÏ? Ï?οÏ?ικοÏ? Ï?αÏ? ανÏ?ιγÏ?άÏ?οÏ? Ï?ε ένα κλάδο ή μια εÏ?ικέÏ?α Ï?Ï?ο Ï?Ï?Ï?ο αÏ?οθήκεÏ?Ï?ηÏ?"
 
 #. Action name
 #. Stock icon, if any
@@ -9122,13 +9061,15 @@ msgstr "ΣÏ?γÏ?Ï?νεÏ?Ï?η αλλαγÏ?ν Ï?Ï?ο ενεÏ?γÏ? ανÏ?ίγÏ?αÏ?
 #
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
+#: ../plugins/subversion/plugin.c:132
+#: ../plugins/subversion/plugin.c:191
 msgid "_View Logâ?¦"
 msgstr "ΠÏ?οβο_λή αναÏ?οÏ?άÏ?..."
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:134 ../plugins/subversion/plugin.c:193
+#: ../plugins/subversion/plugin.c:134
+#: ../plugins/subversion/plugin.c:193
 msgid "View file history"
 msgstr "ΠÏ?οβολή Ï?οÏ? ιÏ?Ï?οÏ?ικοÏ? αÏ?Ï?είοÏ?"
 
@@ -9140,7 +9081,8 @@ msgstr "_Î?ιαÏ?οÏ?έÏ? (diff)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:142 ../plugins/subversion/plugin.c:209
+#: ../plugins/subversion/plugin.c:142
+#: ../plugins/subversion/plugin.c:209
 msgid "Diff local tree with repository"
 msgstr "Î?λλαγή Ï?οÏ?ικοÏ? δένÏ?Ï?οÏ? με Ï?ο Ï?Ï?Ï?ο αÏ?Ï?θεÏ?ηÏ?"
 
@@ -9424,7 +9366,8 @@ msgstr "έγινε εÏ?εξεÏ?γαÏ?ία %d αÏ?Ï?είÏ?ν αÏ?Ï? %d"
 msgid "Populating symbol databaseâ?¦"
 msgstr "Î?ίνεÏ?αι η ανάκÏ?ηÏ?η Ï?Ï?ν Ï?Ï?μβÏ?λÏ?ν..."
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2352
+#: ../plugins/symbol-db/plugin.c:2480
 msgid "Symbols"
 msgstr "ΣÏ?μβολα"
 
@@ -9472,12 +9415,8 @@ msgid "Automatically update symbols without saving file"
 msgstr "Î?Ï?Ï?Ï?μαÏ?η ενημέÏ?Ï?Ï?η Ï?Ï?ν Ï?Ï?μβÏ?λÏ?ν Ï?Ï?Ï?ίÏ? αÏ?οθήκεÏ?Ï?η Ï?οÏ? αÏ?Ï?είοÏ?"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid ""
-"Automatically update the file's symbols without saving. The update occurs "
-"after 10 seconds without keypresses by the user."
-msgstr ""
-"Î?Ï?Ï?Ï?μαÏ?η ενημέÏ?Ï?Ï?η Ï?Ï?ν Ï?Ï?μβÏ?λÏ?ν Ï?οÏ? αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? αÏ?οθήκεÏ?Ï?η. Î? ενημέÏ?Ï?Ï?η "
-"Ï?Ï?μβαίνει 10 δεÏ?Ï?εÏ?Ï?λεÏ?Ï?α μεÏ?ά Ï?οÏ? ο Ï?Ï?ήÏ?Ï?ηÏ? θα Ï?αÏ?ήÏ?ει Ï?ο Ï?ελεÏ?Ï?αίο Ï?λήκÏ?Ï?ο."
+msgid "Automatically update the file's symbols without saving. The update occurs after 10 seconds without keypresses by the user."
+msgstr "Î?Ï?Ï?Ï?μαÏ?η ενημέÏ?Ï?Ï?η Ï?Ï?ν Ï?Ï?μβÏ?λÏ?ν Ï?οÏ? αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? αÏ?οθήκεÏ?Ï?η. Î? ενημέÏ?Ï?Ï?η Ï?Ï?μβαίνει 10 δεÏ?Ï?εÏ?Ï?λεÏ?Ï?α μεÏ?ά Ï?οÏ? ο Ï?Ï?ήÏ?Ï?ηÏ? θα Ï?αÏ?ήÏ?ει Ï?ο Ï?ελεÏ?Ï?αίο Ï?λήκÏ?Ï?ο."
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
 msgid "Available API tags"
@@ -9492,21 +9431,12 @@ msgid "Parallel scan of project and global symbols"
 msgstr "ΠαÏ?άλληλη Ï?άÏ?Ï?Ï?η Ï?Ï?ν Ï?Ï?μβÏ?λÏ?ν Ï?οÏ? έÏ?γοÏ? και Ï?Ï?ν καθολικÏ?ν Ï?Ï?μβÏ?λÏ?ν"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
-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 ""
-"Î?Ï?Ï?ή η εÏ?ιλογή ενεÏ?γοÏ?οιεί Ï?α Ï?Ï?οεÏ?ιλεγμένα Ï?ακέÏ?α Ï?οÏ? αÏ?αιÏ?οÏ?νÏ?αι αÏ?Ï? Ï?ο "
-"ανοικÏ?Ï? έÏ?γο, Ï?.Ï?. Ï?η Glib και Ï?η GTK+ αν δημιοÏ?Ï?γείÏ?ε ένα έÏ?γο GTK+ (μÏ?οÏ?εί "
-"να αÏ?αιÏ?εί αÏ?κεÏ?ή ιÏ?Ï?Ï? αÏ?Ï? Ï?ον εÏ?εξεÏ?γαÏ?Ï?ή)"
+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 "Î?Ï?Ï?ή η εÏ?ιλογή ενεÏ?γοÏ?οιεί Ï?α Ï?Ï?οεÏ?ιλεγμένα Ï?ακέÏ?α Ï?οÏ? αÏ?αιÏ?οÏ?νÏ?αι αÏ?Ï? Ï?ο ανοικÏ?Ï? έÏ?γο, Ï?.Ï?. Ï?η Glib και Ï?η GTK+ αν δημιοÏ?Ï?γείÏ?ε ένα έÏ?γο GTK+ (μÏ?οÏ?εί να αÏ?αιÏ?εί αÏ?κεÏ?ή ιÏ?Ï?Ï? αÏ?Ï? Ï?ον εÏ?εξεÏ?γαÏ?Ï?ή)"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
-msgid ""
-"This option means that the global system packages will be scanned "
-"simultaneously with the project's ones"
-msgstr ""
-"Î?Ï?Ï?ή η εÏ?ιλογή Ï?ημαίνει Ï?Ï?ι Ï?α Ï?ακέÏ?α Ï?οÏ? καθολικοÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? Ï?αÏ?Ï?νονÏ?αι "
-"Ï?αÏ?Ï?Ï?Ï?Ï?ονα με εκείνα Ï?οÏ? έÏ?γοÏ?"
+msgid "This option means that the global system packages will be scanned simultaneously with the project's ones"
+msgstr "Î?Ï?Ï?ή η εÏ?ιλογή Ï?ημαίνει Ï?Ï?ι Ï?α Ï?ακέÏ?α Ï?οÏ? καθολικοÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? Ï?αÏ?Ï?νονÏ?αι Ï?αÏ?Ï?Ï?Ï?Ï?ονα με εκείνα Ï?οÏ? έÏ?γοÏ?"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
 msgid "Terminal options"
@@ -9537,7 +9467,8 @@ msgid "terminal operations"
 msgstr "λειÏ?οÏ?Ï?γίεÏ? Ï?εÏ?μαÏ?ικοÏ?"
 
 #
-#: ../plugins/terminal/terminal.c:799 ../plugins/terminal/terminal.c:968
+#: ../plugins/terminal/terminal.c:799
+#: ../plugins/terminal/terminal.c:968
 #: ../plugins/terminal/terminal.c:1021
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
@@ -9589,8 +9520,10 @@ msgid "Tool Editor"
 msgstr "Î?Ï?εξεÏ?γαÏ?Ï?ήÏ? εÏ?γαλείÏ?ν"
 
 #
-#: ../plugins/tools/anjuta-tools.ui.h:18 ../plugins/tools/plugin.c:256
-#: ../plugins/tools/plugin.c:263 ../plugins/tools/anjuta-tools.plugin.in.h:1
+#: ../plugins/tools/anjuta-tools.ui.h:18
+#: ../plugins/tools/plugin.c:256
+#: ../plugins/tools/plugin.c:263
+#: ../plugins/tools/anjuta-tools.plugin.in.h:1
 msgid "Tools"
 msgstr "Î?Ï?γαλεία"
 
@@ -9648,12 +9581,8 @@ msgid "A tool with the same name already exists!"
 msgstr "Î¥Ï?άÏ?Ï?ει ήδη εÏ?γαλείο με Ï?ο ίδιο Ï?νομα."
 
 #: ../plugins/tools/editor.c:824
-msgid ""
-"The shortcut is already used by another component in Anjuta. Do you want to "
-"keep it anyway?"
-msgstr ""
-"Î? Ï?Ï?νÏ?Ï?μεÏ?Ï?η έÏ?ει ήδη Ï?Ï?ηÏ?ιμοÏ?οιηθεί αÏ?Ï? άλλο Ï?εÏ?ιεÏ?Ï?μενο Ï?Ï?ο anjuta. Î?έλεÏ?ε "
-"να Ï?η διαÏ?ηÏ?ήÏ?εÏ?ε οÏ?Ï?Ï?δήÏ?οÏ?ε;"
+msgid "The shortcut is already used by another component in Anjuta. Do you want to keep it anyway?"
+msgstr "Î? Ï?Ï?νÏ?Ï?μεÏ?Ï?η έÏ?ει ήδη Ï?Ï?ηÏ?ιμοÏ?οιηθεί αÏ?Ï? άλλο Ï?εÏ?ιεÏ?Ï?μενο Ï?Ï?ο anjuta. Î?έλεÏ?ε να Ï?η διαÏ?ηÏ?ήÏ?εÏ?ε οÏ?Ï?Ï?δήÏ?οÏ?ε;"
 
 #: ../plugins/tools/editor.c:908
 msgid "Unable to edit script"
@@ -9750,32 +9679,23 @@ msgstr "Î?Ï?ιλεγμένοÏ? Ï?άκελοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?
 
 #: ../plugins/tools/variable.c:88
 msgid "Selected full file name in the file manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένο Ï?λήÏ?εÏ? Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή "
-"Ï?αÏ?αθÏ?Ï?Ï?ν"
+msgstr "Î?Ï?ιλεγμένο Ï?λήÏ?εÏ? Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?αÏ?αθÏ?Ï?Ï?ν"
 
 #: ../plugins/tools/variable.c:89
 msgid "Selected full file name without extension in the file manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένο Ï?λήÏ?εÏ? Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? εÏ?έκÏ?αÏ?η Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? "
-"διαÏ?ειÏ?ιÏ?Ï?ή Ï?αÏ?αθÏ?Ï?Ï?ν"
+msgstr "Î?Ï?ιλεγμένο Ï?λήÏ?εÏ? Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? εÏ?έκÏ?αÏ?η Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?αÏ?αθÏ?Ï?Ï?ν"
 
 #: ../plugins/tools/variable.c:90
 msgid "Selected file name in the file manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένο Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?αÏ?αθÏ?Ï?Ï?ν"
+msgstr "Î?Ï?ιλεγμένο Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?αÏ?αθÏ?Ï?Ï?ν"
 
 #: ../plugins/tools/variable.c:91
 msgid "Selected file name without extension in the file manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένο Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? εÏ?έκÏ?αÏ?η Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? "
-"διαÏ?ειÏ?ιÏ?Ï?ή Ï?αÏ?αθÏ?Ï?Ï?ν"
+msgstr "Î?Ï?ιλεγμένο Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? εÏ?έκÏ?αÏ?η Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?αÏ?αθÏ?Ï?Ï?ν"
 
 #: ../plugins/tools/variable.c:92
 msgid "Selected file's extension in the file manager plugin"
-msgstr ""
-"Î?Ï?έκÏ?αÏ?η Ï?οÏ? εÏ?ιλεγμένοÏ? αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή "
-"Ï?αÏ?αθÏ?Ï?Ï?ν"
+msgstr "Î?Ï?έκÏ?αÏ?η Ï?οÏ? εÏ?ιλεγμένοÏ? αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή Ï?αÏ?αθÏ?Ï?Ï?ν"
 
 #: ../plugins/tools/variable.c:93
 msgid "Selected URI in the project manager plugin"
@@ -9787,31 +9707,23 @@ msgstr "Î?Ï?ιλεγμένοÏ? Ï?άκελοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?
 
 #: ../plugins/tools/variable.c:95
 msgid "Selected full file name in the project manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένο Ï?λήÏ?εÏ? Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή "
-"έÏ?γοÏ?"
+msgstr "Î?Ï?ιλεγμένο Ï?λήÏ?εÏ? Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
 
 #: ../plugins/tools/variable.c:96
 msgid "Selected full file name without extension in the project manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένο Ï?λήÏ?εÏ? Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? εÏ?έκÏ?αÏ?η Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? "
-"διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
+msgstr "Î?Ï?ιλεγμένο Ï?λήÏ?εÏ? Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? εÏ?έκÏ?αÏ?η Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
 
 #: ../plugins/tools/variable.c:97
 msgid "Selected file name in the project manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένο Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
+msgstr "Î?Ï?ιλεγμένο Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
 
 #: ../plugins/tools/variable.c:98
 msgid "Selected file name without extension in the project manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένο Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? εÏ?έκÏ?αÏ?η Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? "
-"διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
+msgstr "Î?Ï?ιλεγμένο Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ίÏ? εÏ?έκÏ?αÏ?η Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
 
 #: ../plugins/tools/variable.c:99
 msgid "Selected file extension in the project manager plugin"
-msgstr ""
-"Î?Ï?ιλεγμένη εÏ?έκÏ?αÏ?η αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
+msgstr "Î?Ï?ιλεγμένη εÏ?έκÏ?αÏ?η αÏ?Ï?είοÏ? Ï?Ï?ην Ï?Ï?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? διαÏ?ειÏ?ιÏ?Ï?ή έÏ?γοÏ?"
 
 #: ../plugins/tools/variable.c:100
 msgid "Currently edited file name"
@@ -9965,9 +9877,7 @@ msgstr "_Î?λείδÏ?μα διαÏ?άξεÏ?ν Ï?Ï?οÏ?άÏ?Ï?ηÏ?ηÏ?"
 
 #: ../src/anjuta-actions.h:52
 msgid "Lock the current dock layout so that widgets cannot be moved"
-msgstr ""
-"Î?λείδÏ?μα Ï?ηÏ? Ï?Ï?έÏ?οÏ?Ï?αÏ? διάÏ?αξηÏ? Ï?Ï?οÏ?αÏ?Ï?ήÏ?εÏ?ν έÏ?Ï?ι Ï?Ï?Ï?ε οι μικÏ?οεÏ?αÏ?μογέÏ? να "
-"μην μÏ?οÏ?οÏ?ν να μεÏ?ακινηθοÏ?ν"
+msgstr "Î?λείδÏ?μα Ï?ηÏ? Ï?Ï?έÏ?οÏ?Ï?αÏ? διάÏ?αξηÏ? Ï?Ï?οÏ?αÏ?Ï?ήÏ?εÏ?ν έÏ?Ï?ι Ï?Ï?Ï?ε οι μικÏ?οεÏ?αÏ?μογέÏ? να μην μÏ?οÏ?οÏ?ν να μεÏ?ακινηθοÏ?ν"
 
 #
 #: ../src/anjuta-actions.h:55
@@ -10033,8 +9943,7 @@ msgstr "Î?ναÏ?οÏ?ά _Ï?Ï?οβλημάÏ?Ï?ν/διοÏ?θÏ?Ï?εÏ?ν/αÏ?αιÏ?ή
 #
 #: ../src/anjuta-actions.h:84
 msgid "Submit a bug report, patch or feature request for Anjuta"
-msgstr ""
-"Î¥Ï?οβολή αναÏ?οÏ?άÏ? Ï?Ï?άλμαÏ?οÏ?, διÏ?Ï?θÏ?Ï?ηÏ? ή ζήÏ?ηÏ?ηÏ? Ï?Ï?οιÏ?είοÏ? για Ï?ο anjuta"
+msgstr "Î¥Ï?οβολή αναÏ?οÏ?άÏ? Ï?Ï?άλμαÏ?οÏ?, διÏ?Ï?θÏ?Ï?ηÏ? ή ζήÏ?ηÏ?ηÏ? Ï?Ï?οιÏ?είοÏ? για Ï?ο anjuta"
 
 #
 #: ../src/anjuta-actions.h:87
@@ -10096,8 +10005,7 @@ msgstr "Î?α μην εμÏ?ανίζεÏ?αι η οθÏ?νη εκκίνηÏ?ηÏ?"
 
 #: ../src/main.c:88
 msgid "Start a new instance and do not open the file in an existing instance"
-msgstr ""
-"Î?εκίνημα μιαÏ? νέαÏ? διεÏ?γαÏ?ίαÏ? και μη άνοιγμα Ï?οÏ? αÏ?Ï?είοÏ? Ï?ε μια Ï?Ï?άÏ?Ï?οÏ?Ï?α"
+msgstr "Î?εκίνημα μιαÏ? νέαÏ? διεÏ?γαÏ?ίαÏ? και μη άνοιγμα Ï?οÏ? αÏ?Ï?είοÏ? Ï?ε μια Ï?Ï?άÏ?Ï?οÏ?Ï?α"
 
 #: ../src/main.c:94
 msgid "Do not open last session on startup"
@@ -10109,9 +10017,7 @@ msgstr "Î?α μην ανοίγει Ï?ο Ï?ελεÏ?Ï?αίο έÏ?γο και Ï?α
 
 #: ../src/main.c:106
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
-msgstr ""
-"Î?ανονικÏ?Ï? Ï?εÏ?μαÏ?ιÏ?μÏ?Ï? Ï?οÏ? Anjuta αÏ?ελεÏ?θεÏ?Ï?νονÏ?αÏ? Ï?λοÏ?Ï? Ï?οÏ?Ï? Ï?Ï?Ï?οÏ?Ï? (για "
-"αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?η)"
+msgstr "Î?ανονικÏ?Ï? Ï?εÏ?μαÏ?ιÏ?μÏ?Ï? Ï?οÏ? Anjuta αÏ?ελεÏ?θεÏ?Ï?νονÏ?αÏ? Ï?λοÏ?Ï? Ï?οÏ?Ï? Ï?Ï?Ï?οÏ?Ï? (για αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?η)"
 
 #
 #: ../src/main.c:174
@@ -10203,9 +10109,7 @@ msgstr "Î?Ï?ικέÏ?εÏ? κοÏ?μÏ?ιÏ?ν εÏ?γαλειοθήκηÏ?:"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
 msgid "Do not display warning if not using a Debug configuration"
-msgstr ""
-"Î?α μην εμÏ?ανίζεÏ?αι Ï?Ï?οειδοÏ?οίηÏ?η αν δε Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι η Ï?Ï?θμιÏ?η "
-"αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?"
+msgstr "Î?α μην εμÏ?ανίζεÏ?αι Ï?Ï?οειδοÏ?οίηÏ?η αν δε Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι η Ï?Ï?θμιÏ?η αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
@@ -10213,8 +10117,7 @@ msgstr "ΠÏ?οÏ?θήκη '(' μεÏ?ά Ï?οÏ? η Ï?Ï?νάÏ?Ï?ηÏ?η καλεί Ï?
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
 msgid "Add a space after function call autocompletion"
-msgstr ""
-"ΠÏ?οÏ?θήκη ενÏ?Ï? διαÏ?Ï?ήμαÏ?οÏ? Ï?Ï?αν η Ï?Ï?νάÏ?Ï?ηÏ?η καλεί Ï?ην αÏ?Ï?Ï?μαÏ?η Ï?Ï?μÏ?λήÏ?Ï?Ï?η"
+msgstr "ΠÏ?οÏ?θήκη ενÏ?Ï? διαÏ?Ï?ήμαÏ?οÏ? Ï?Ï?αν η Ï?Ï?νάÏ?Ï?ηÏ?η καλεί Ï?ην αÏ?Ï?Ï?μαÏ?η Ï?Ï?μÏ?λήÏ?Ï?Ï?η"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
 msgid "Auto-complete"
@@ -10282,9 +10185,7 @@ msgstr "Î?Ï?Ï?Ï?μαÏ?η εÏ?οÏ?ή"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1889
 msgid "Auto-indent current line or selection based on indentation settings"
-msgstr ""
-"Î?Ï?Ï?Ï?μαÏ?η εÏ?οÏ?ή Ï?Ï?ην Ï?Ï?έÏ?οÏ?Ï?α γÏ?αμμή ή εÏ?ιλογή βάÏ?ει Ï?Ï?θμίÏ?εÏ?ν "
-"ενδοÏ?αÏ?αγÏ?αÏ?οÏ?οίηÏ?ηÏ?"
+msgstr "Î?Ï?Ï?Ï?μαÏ?η εÏ?οÏ?ή Ï?Ï?ην Ï?Ï?έÏ?οÏ?Ï?α γÏ?αμμή ή εÏ?ιλογή βάÏ?ει Ï?Ï?θμίÏ?εÏ?ν ενδοÏ?αÏ?αγÏ?αÏ?οÏ?οίηÏ?ηÏ?"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1894
 msgid "Swap .h/.c"
@@ -10307,7 +10208,8 @@ msgstr "C/C++/Java/Vala"
 msgid "C/C++"
 msgstr "C/C++"
 
-#: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
+#: ../plugins/sourceview/plugin.c:232
+#: ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "Î?Ï?εξεÏ?γαÏ?Ï?ήÏ? GtkSourceView"
 
@@ -10445,9 +10347,7 @@ msgstr "ΠÏ?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? Ï?Ï?οÏ?Ï?ηÏ?ίζει C++
 
 #: ../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++ και Java για Ï?Ï?μÏ?λήÏ?Ï?Ï?η κÏ?δικα, "
-"αÏ?Ï?Ï?μαÏ?η ενδοÏ?αÏ?αγÏ?αÏ?οÏ?οίηÏ?η κλÏ?."
+msgstr "ΠÏ?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία Ï?οÏ? Ï?Ï?οÏ?Ï?ηÏ?ίζει C++ και Java για Ï?Ï?μÏ?λήÏ?Ï?Ï?η κÏ?δικα, αÏ?Ï?Ï?μαÏ?η ενδοÏ?αÏ?αγÏ?αÏ?οÏ?οίηÏ?η κλÏ?."
 
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:2
 msgid "Project Assistant"
@@ -10501,8 +10401,7 @@ msgstr "ΠÏ?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία διαÏ?ειÏ?ιÏ?Ï?ή αÏ?οÏ?Ï?
 
 #: ../plugins/run-program/anjuta-run-program.plugin.in.h:1
 msgid "Allow to execute program without debugger."
-msgstr ""
-"Î?α εÏ?ιÏ?Ï?έÏ?εÏ?αι η εκÏ?έλεÏ?η Ï?οÏ? Ï?Ï?ογÏ?άμμαÏ?οÏ? Ï?Ï?Ï?ίÏ? Ï?ην εÏ?αÏ?μογή αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?."
+msgstr "Î?α εÏ?ιÏ?Ï?έÏ?εÏ?αι η εκÏ?έλεÏ?η Ï?οÏ? Ï?Ï?ογÏ?άμμαÏ?οÏ? Ï?Ï?Ï?ίÏ? Ï?ην εÏ?αÏ?μογή αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ?."
 
 #: ../plugins/run-program/anjuta-run-program.plugin.in.h:2
 msgid "Run Program"
@@ -10514,8 +10413,7 @@ msgstr "Î?ιαÏ?ειÏ?ιÏ?Ï?ήÏ? γλÏ?Ï?Ï?Ï?ν"
 
 #: ../plugins/language-manager/language-manager.plugin.in.h:2
 msgid "Plugin to keep track of multiple programming languages"
-msgstr ""
-"ΠÏ?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία για Ï?η διαÏ?είÏ?ιÏ?η Ï?ολλαÏ?λÏ?ν γλÏ?Ï?Ï?Ï?ν Ï?Ï?ογÏ?αμμαÏ?ιÏ?μοÏ?"
+msgstr "ΠÏ?Ï?Ï?θεÏ?η λειÏ?οÏ?Ï?γία για Ï?η διαÏ?είÏ?ιÏ?η Ï?ολλαÏ?λÏ?ν γλÏ?Ï?Ï?Ï?ν Ï?Ï?ογÏ?αμμαÏ?ιÏ?μοÏ?"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile.plugin.in.h:1
 msgid "Makefile backend"
diff --git a/po/es.po b/po/es.po
index fba6855..0e51b2c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,13 +7,14 @@
 # Francisco Javier F. Serrador <serrador cvs gnome es>, 2003, 2005.
 # Francisco Javier F. Serrador <serrador cvs gnome org>, 2005, 2006.
 # Jorge González <jorgegonz svn gnome org>, 2007, 2008, 2009, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-03-22 22:11+0000\n"
-"PO-Revision-Date: 2010-03-22 23:23+0100\n"
+"POT-Creation-Date: 2010-04-17 00:05+0000\n"
+"PO-Revision-Date: 2010-04-17 18:56+0200\n"
 "Last-Translator: Jorge González <jorgegonz svn gnome org>\n"
 "Language-Team: Español <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -440,7 +441,7 @@ msgid "If you do not save, all your changes will be lost."
 msgstr "Si no guarda, se perderán todos sus cambios."
 
 #: ../libanjuta/anjuta-save-prompt.c:189
-#: ../plugins/document-manager/plugin.c:603
+#: ../plugins/document-manager/plugin.c:606
 msgid "Save"
 msgstr "Guardar"
 
@@ -1417,8 +1418,8 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ignorar el archivo .cvsrc (recomendado)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2327
-#: ../plugins/symbol-db/plugin.c:2397
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2124
+#: ../plugins/symbol-db/plugin.c:2166
 msgid "Local"
 msgstr "Local"
 
@@ -2462,7 +2463,7 @@ msgstr "Archivo"
 
 #: ../plugins/debug-manager/stack_trace.c:642
 #: ../plugins/debug-manager/threads.c:460
-#: ../plugins/document-manager/plugin.c:943
+#: ../plugins/document-manager/plugin.c:946
 msgid "Line"
 msgstr "Línea"
 
@@ -2596,70 +2597,66 @@ msgstr "Operaciones de vigilancia"
 msgid "Watches"
 msgstr "Vigilancias"
 
-#: ../plugins/devhelp/plugin.c:201
+#: ../plugins/devhelp/plugin.c:202
 msgid "Search Help:"
 msgstr "Buscar en la ayuda:"
 
-#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:239
+#: ../plugins/devhelp/plugin.c:223 ../plugins/document-manager/plugin.c:242
 #: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:313
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: ../plugins/devhelp/plugin.c:231
+#: ../plugins/devhelp/plugin.c:232
 msgid "_API Reference"
 msgstr "Referencia del _API"
 
-#: ../plugins/devhelp/plugin.c:233
+#: ../plugins/devhelp/plugin.c:234
 msgid "Browse API Pages"
 msgstr "Examinar las páginas del API"
 
-#: ../plugins/devhelp/plugin.c:243
+#: ../plugins/devhelp/plugin.c:244
 msgid "_Context Help"
 msgstr "Ayuda _contextual"
 
-#: ../plugins/devhelp/plugin.c:245
+#: ../plugins/devhelp/plugin.c:246
 msgid "Search help for the current word in the editor"
 msgstr "Buscar una cadena o expresión en el editor"
 
-#: ../plugins/devhelp/plugin.c:251
+#: ../plugins/devhelp/plugin.c:252
 msgid "_Search Help"
 msgstr "_Buscar ayuda"
 
-#: ../plugins/devhelp/plugin.c:253
+#: ../plugins/devhelp/plugin.c:254
 msgid "Search for a term in help"
 msgstr "Buscar un término en la ayuda"
 
-#: ../plugins/devhelp/plugin.c:358
+#: ../plugins/devhelp/plugin.c:327
 msgid "Help operations"
 msgstr "Operaciones con ayuda"
 
-#: ../plugins/devhelp/plugin.c:368
+#: ../plugins/devhelp/plugin.c:346 ../plugins/devhelp/plugin.c:464
+#: ../src/anjuta-app.c:502
+msgid "Help"
+msgstr "Ayuda"
+
+#: ../plugins/devhelp/plugin.c:357
 msgid "Contents"
 msgstr "Contenido"
 
-#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
+#: ../plugins/devhelp/plugin.c:363 ../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:2331
-#: ../plugins/symbol-db/plugin.c:2447
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2134
+#: ../plugins/symbol-db/plugin.c:2183
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/devhelp/plugin.c:375 ../plugins/devhelp/plugin.c:495
-#: ../src/anjuta-app.c:502
-msgid "Help"
-msgstr "Ayuda"
-
-#: ../plugins/devhelp/plugin.c:405 ../plugins/devhelp/plugin.c:500
+#: ../plugins/devhelp/plugin.c:381 ../plugins/devhelp/plugin.c:469
 msgid "Help display"
 msgstr "Visor de ayuda"
 
-#: ../plugins/devhelp/plugin.c:422
-msgid "Online"
-msgstr "En línea"
-
-#: ../plugins/document-manager/action-callbacks.c:277
+#: ../plugins/document-manager/action-callbacks.c:314
 #, c-format
 msgid ""
 "Are you sure you want to reload '%s'?\n"
@@ -2668,7 +2665,7 @@ msgstr ""
 "¿Seguro que desea recargar «%s». ?\n"
 "Perderá todas las modificaciones sin guardar."
 
-#: ../plugins/document-manager/action-callbacks.c:286
+#: ../plugins/document-manager/action-callbacks.c:323
 msgid "_Reload"
 msgstr "Re_cargar"
 
@@ -2682,7 +2679,7 @@ msgstr "Quitar marcador"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:331
 #: ../plugins/document-manager/anjuta-bookmarks.c:393
-#: ../plugins/document-manager/plugin.c:418
+#: ../plugins/document-manager/plugin.c:421
 msgid "Bookmarks"
 msgstr "Marcadores"
 
@@ -2695,26 +2692,26 @@ msgstr "Renombrar"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../plugins/document-manager/anjuta-docman.c:399
+#: ../plugins/document-manager/anjuta-docman.c:438
 msgid "Close file"
 msgstr "Cerrar archivo"
 
-#: ../plugins/document-manager/anjuta-docman.c:447
+#: ../plugins/document-manager/anjuta-docman.c:486
 msgid "Path:"
 msgstr "Ruta:"
 
-#: ../plugins/document-manager/anjuta-docman.c:564
+#: ../plugins/document-manager/anjuta-docman.c:603
 #: ../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 "Abre un archivo"
 
-#: ../plugins/document-manager/anjuta-docman.c:583
+#: ../plugins/document-manager/anjuta-docman.c:622
 #: ../plugins/message-view/message-view.c:94
 msgid "Save file as"
 msgstr "Guardar archivo como"
 
-#: ../plugins/document-manager/anjuta-docman.c:664
+#: ../plugins/document-manager/anjuta-docman.c:703
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -2723,11 +2720,11 @@ msgstr ""
 "El archivo «%s» ya existe.\n"
 "¿Desea sobreescribirlo con el que está intentando guardar?"
 
-#: ../plugins/document-manager/anjuta-docman.c:673
+#: ../plugins/document-manager/anjuta-docman.c:712
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: ../plugins/document-manager/anjuta-docman.c:1390
+#: ../plugins/document-manager/anjuta-docman.c:1429
 msgid "[read-only]"
 msgstr "[sólo-lectura]"
 
@@ -2832,128 +2829,138 @@ msgid "Close all files"
 msgstr "Cierra todos los archivos"
 
 #: ../plugins/document-manager/plugin.c:164
+#| msgid "Close file"
+msgid "Close Other"
+msgstr "Cerrar otro"
+
+#: ../plugins/document-manager/plugin.c:165
+#| msgid "Close the current file"
+msgid "Close other documents"
+msgstr "Cerrar otros documentos"
+
+#: ../plugins/document-manager/plugin.c:167
 msgid "Reload F_ile"
 msgstr "Recargar _archivo"
 
-#: ../plugins/document-manager/plugin.c:165
+#: ../plugins/document-manager/plugin.c:168
 msgid "Reload current file"
 msgstr "Recarga el archivo actual"
 
-#: ../plugins/document-manager/plugin.c:167
+#: ../plugins/document-manager/plugin.c:170
 msgid "Recent _Files"
 msgstr "_Archivos recientes"
 
-#: ../plugins/document-manager/plugin.c:171
+#: ../plugins/document-manager/plugin.c:174
 msgid "_Printâ?¦"
 msgstr "_Imprimirâ?¦"
 
-#: ../plugins/document-manager/plugin.c:172
+#: ../plugins/document-manager/plugin.c:175
 msgid "Print the current file"
 msgstr "Imprime el archivo actual"
 
-#: ../plugins/document-manager/plugin.c:179
+#: ../plugins/document-manager/plugin.c:182
 msgid "_Print Preview"
 msgstr "Vista previa de im_presión"
 
-#: ../plugins/document-manager/plugin.c:180
+#: ../plugins/document-manager/plugin.c:183
 msgid "Preview the current file in print format"
 msgstr "Vista previa de impresión del archivo actual"
 
-#: ../plugins/document-manager/plugin.c:185
+#: ../plugins/document-manager/plugin.c:188
 msgid "_Transform"
 msgstr "_Transformar"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:186
+#: ../plugins/document-manager/plugin.c:189
 msgid "_Make Selection Uppercase"
 msgstr "Convertir selección a _mayúsculas"
 
-#: ../plugins/document-manager/plugin.c:187
+#: ../plugins/document-manager/plugin.c:190
 msgid "Make the selected text uppercase"
 msgstr "Convierte el texto seleccionado en mayúsculas"
 
-#: ../plugins/document-manager/plugin.c:189
+#: ../plugins/document-manager/plugin.c:192
 msgid "Make Selection Lowercase"
 msgstr "Convertir selección a minúsculas"
 
-#: ../plugins/document-manager/plugin.c:190
+#: ../plugins/document-manager/plugin.c:193
 msgid "Make the selected text lowercase"
 msgstr "Convierte el texto seleccionado en minúsculas"
 
-#: ../plugins/document-manager/plugin.c:192
+#: ../plugins/document-manager/plugin.c:195
 msgid "Convert EOL to CRLF"
 msgstr "Convertir EOL a CRLF"
 
-#: ../plugins/document-manager/plugin.c:193
+#: ../plugins/document-manager/plugin.c:196
 msgid "Convert End Of Line characters to DOS EOL (CRLF)"
 msgstr "Convierte los caracteres de fin de línea a EOL tipo DOS (CRLF)"
 
-#: ../plugins/document-manager/plugin.c:195
+#: ../plugins/document-manager/plugin.c:198
 msgid "Convert EOL to LF"
 msgstr "Convertir EOL a LF"
 
-#: ../plugins/document-manager/plugin.c:196
+#: ../plugins/document-manager/plugin.c:199
 msgid "Convert End Of Line characters to Unix EOL (LF)"
 msgstr "Convierte los caracteres de fin de línea a EOL tipo Unix (LF)"
 
-#: ../plugins/document-manager/plugin.c:198
+#: ../plugins/document-manager/plugin.c:201
 msgid "Convert EOL to CR"
 msgstr "Convertir EOL a CR"
 
-#: ../plugins/document-manager/plugin.c:199
+#: ../plugins/document-manager/plugin.c:202
 msgid "Convert End Of Line characters to Mac OS EOL (CR)"
 msgstr "Convierte los caracteres de fin de línea a EOL tipo Mac OS (CR)"
 
-#: ../plugins/document-manager/plugin.c:201
+#: ../plugins/document-manager/plugin.c:204
 msgid "Convert EOL to Majority EOL"
 msgstr "Convertir EOL a mayoría de EOL"
 
-#: ../plugins/document-manager/plugin.c:202
+#: ../plugins/document-manager/plugin.c:205
 msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr ""
 "Convertir caracteres de fin de línea a la mayoría de los EOL en el archivo"
 
-#: ../plugins/document-manager/plugin.c:207
+#: ../plugins/document-manager/plugin.c:210
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../plugins/document-manager/plugin.c:209
+#: ../plugins/document-manager/plugin.c:212
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ../plugins/document-manager/plugin.c:210
+#: ../plugins/document-manager/plugin.c:213
 msgid "Select all text in the editor"
 msgstr "Selecciona todo el texto en el editor"
 
-#: ../plugins/document-manager/plugin.c:212
+#: ../plugins/document-manager/plugin.c:215
 msgid "Select _Code Block"
 msgstr "Seleccionar _bloque de código"
 
-#: ../plugins/document-manager/plugin.c:213
+#: ../plugins/document-manager/plugin.c:216
 msgid "Select the current code block"
 msgstr "Selecciona el bloque de código actual"
 
-#: ../plugins/document-manager/plugin.c:218
+#: ../plugins/document-manager/plugin.c:221
 msgid "Co_mment"
 msgstr "Co_mentario"
 
 #. Block comment: Uses line-comment (comment that affects only single line
 #. such as '//' or '#') and comments a block of lines.
-#: ../plugins/document-manager/plugin.c:221
+#: ../plugins/document-manager/plugin.c:224
 msgid "_Block Comment/Uncomment"
 msgstr "Comentar/Descomentar en _bloque"
 
-#: ../plugins/document-manager/plugin.c:222
+#: ../plugins/document-manager/plugin.c:225
 msgid "Block comment the selected text"
 msgstr "Convertir la selección en un bloque de comentarios"
 
 #. Box comment: Uses stream-comment to comment a block of lines, usually with
 #. some decorations, to give an appearance of box.
-#: ../plugins/document-manager/plugin.c:226
+#: ../plugins/document-manager/plugin.c:229
 msgid "Bo_x Comment/Uncomment"
 msgstr "Comentar/Descomentar en _caja"
 
-#: ../plugins/document-manager/plugin.c:227
+#: ../plugins/document-manager/plugin.c:230
 msgid "Box comment the selected text"
 msgstr "Convertir la selección en una caja de comentarios"
 
@@ -2961,421 +2968,421 @@ msgstr "Convertir la selección en una caja de comentarios"
 #. characters -- has start and end comment code) and comments any code from
 #. arbitrary start position to arbitrary end position (can be in middle of
 #. lines).
-#: ../plugins/document-manager/plugin.c:233
+#: ../plugins/document-manager/plugin.c:236
 msgid "_Stream Comment/Uncomment"
 msgstr "Comentar/Descomentar en _flujo"
 
-#: ../plugins/document-manager/plugin.c:234
+#: ../plugins/document-manager/plugin.c:237
 msgid "Stream comment the selected text"
 msgstr "Comentar el texto seleccionado en flujo"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:240
+#: ../plugins/document-manager/plugin.c:243
 msgid "_Line Numberâ?¦"
 msgstr "_Número de línea�"
 
-#: ../plugins/document-manager/plugin.c:241
+#: ../plugins/document-manager/plugin.c:244
 msgid "Go to a particular line in the editor"
 msgstr "Ir a un número de línea en el editor"
 
-#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/document-manager/plugin.c:246
 msgid "Matching _Brace"
 msgstr "Llave _compañera"
 
-#: ../plugins/document-manager/plugin.c:244
+#: ../plugins/document-manager/plugin.c:247
 msgid "Go to the matching brace in the editor"
 msgstr "Ir a la llave compañera en el editor"
 
-#: ../plugins/document-manager/plugin.c:246
+#: ../plugins/document-manager/plugin.c:249
 msgid "_Start of Block"
 msgstr "_Inicio de bloque"
 
-#: ../plugins/document-manager/plugin.c:247
+#: ../plugins/document-manager/plugin.c:250
 msgid "Go to the start of the current block"
 msgstr "Ir al principio del bloque de código actual"
 
-#: ../plugins/document-manager/plugin.c:249
+#: ../plugins/document-manager/plugin.c:252
 msgid "_End of Block"
 msgstr "_Fin de bloque"
 
-#: ../plugins/document-manager/plugin.c:250
+#: ../plugins/document-manager/plugin.c:253
 msgid "Go to the end of the current block"
 msgstr "Ir al final del bloque de código actual"
 
-#: ../plugins/document-manager/plugin.c:252
+#: ../plugins/document-manager/plugin.c:255
 msgid "Previous _History"
 msgstr "_Histórico anterior"
 
-#: ../plugins/document-manager/plugin.c:253
+#: ../plugins/document-manager/plugin.c:256
 msgid "Go to previous history"
 msgstr "Ir al histórico anterior"
 
-#: ../plugins/document-manager/plugin.c:255
+#: ../plugins/document-manager/plugin.c:258
 msgid "Next Histor_y"
 msgstr "H_istórico siguiente"
 
-#: ../plugins/document-manager/plugin.c:256
+#: ../plugins/document-manager/plugin.c:259
 msgid "Go to next history"
 msgstr "Ir al siguiente histórico"
 
-#: ../plugins/document-manager/plugin.c:261 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:264 ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../plugins/document-manager/plugin.c:262
+#: ../plugins/document-manager/plugin.c:265
 msgid "_Quick Search"
 msgstr "_Búsqueda rápida"
 
-#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/document-manager/plugin.c:266
 msgid "Quick editor embedded search"
 msgstr "Búsqueda empotrada rápida del editor"
 
-#: ../plugins/document-manager/plugin.c:265
+#: ../plugins/document-manager/plugin.c:268
 msgid "Quick _ReSearch"
 msgstr "_Repetir búsqueda rápida"
 
-#: ../plugins/document-manager/plugin.c:266
+#: ../plugins/document-manager/plugin.c:269
 msgid "Repeat quick search"
 msgstr "Repetir la búsqueda rápida"
 
-#: ../plugins/document-manager/plugin.c:271 ../plugins/gtodo/interface.c:168
+#: ../plugins/document-manager/plugin.c:274 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
 #: ../plugins/language-support-cpp-java/plugin.c:1882
 msgid "_Edit"
 msgstr "_Editar"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:272
+#: ../plugins/document-manager/plugin.c:275
 msgid "_Editor"
 msgstr "_Editor"
 
-#: ../plugins/document-manager/plugin.c:279
+#: ../plugins/document-manager/plugin.c:282
 msgid "_Add Editor View"
 msgstr "_Añadir vista del editor"
 
-#: ../plugins/document-manager/plugin.c:280
+#: ../plugins/document-manager/plugin.c:283
 msgid "Add one more view of current document"
 msgstr "Añade una vista más del documento actual"
 
-#: ../plugins/document-manager/plugin.c:282
+#: ../plugins/document-manager/plugin.c:285
 msgid "_Remove Editor View"
 msgstr "_Quitar vista del editor"
 
-#: ../plugins/document-manager/plugin.c:283
+#: ../plugins/document-manager/plugin.c:286
 msgid "Remove current view of the document"
 msgstr "Quita la vista actual del documento"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:288
 msgid "U_ndo"
 msgstr "Des_hacer"
 
-#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4076
+#: ../plugins/document-manager/plugin.c:289 ../plugins/glade/plugin.c:4076
 msgid "Undo the last action"
 msgstr "Deshace la última acción"
 
-#: ../plugins/document-manager/plugin.c:288
+#: ../plugins/document-manager/plugin.c:291
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: ../plugins/document-manager/plugin.c:289
+#: ../plugins/document-manager/plugin.c:292
 msgid "Redo the last undone action"
 msgstr "Rehace la última acción deshecha"
 
-#: ../plugins/document-manager/plugin.c:291
+#: ../plugins/document-manager/plugin.c:294
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ../plugins/document-manager/plugin.c:292
+#: ../plugins/document-manager/plugin.c:295
 msgid "Cut the selected text from the editor to the clipboard"
 msgstr "Corta el texto seleccionado al portapapeles"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:609
+#: ../plugins/document-manager/plugin.c:297 ../plugins/terminal/terminal.c:609
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../plugins/document-manager/plugin.c:295
+#: ../plugins/document-manager/plugin.c:298
 msgid "Copy the selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ../plugins/document-manager/plugin.c:297 ../plugins/terminal/terminal.c:617
+#: ../plugins/document-manager/plugin.c:300 ../plugins/terminal/terminal.c:617
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../plugins/document-manager/plugin.c:298
+#: ../plugins/document-manager/plugin.c:301
 msgid "Paste the content of clipboard at the current position"
 msgstr "Pega el contenido del portapapeles a la posición actual"
 
-#: ../plugins/document-manager/plugin.c:306
+#: ../plugins/document-manager/plugin.c:309
 msgid "_Clear"
 msgstr "_Borrar"
 
-#: ../plugins/document-manager/plugin.c:307
+#: ../plugins/document-manager/plugin.c:310
 msgid "Delete the selected text from the editor"
 msgstr "Borra el texto seleccionado del editor"
 
-#: ../plugins/document-manager/plugin.c:310
+#: ../plugins/document-manager/plugin.c:313
 msgid "_Auto-Complete"
 msgstr "_Autocompletar"
 
-#: ../plugins/document-manager/plugin.c:311
+#: ../plugins/document-manager/plugin.c:314
 msgid "Auto-complete the current word"
 msgstr "Autocompletar la palabra actual"
 
-#: ../plugins/document-manager/plugin.c:316
+#: ../plugins/document-manager/plugin.c:319
 msgid "_Line Number Margin"
 msgstr "Margen de _números línea"
 
-#: ../plugins/document-manager/plugin.c:317
+#: ../plugins/document-manager/plugin.c:320
 msgid "Show/Hide line numbers"
 msgstr "Mostrar/Ocultar número de línea en el margen"
 
-#: ../plugins/document-manager/plugin.c:319
+#: ../plugins/document-manager/plugin.c:322
 msgid "_Marker Margin"
 msgstr "_Margen de marcadores"
 
-#: ../plugins/document-manager/plugin.c:320
+#: ../plugins/document-manager/plugin.c:323
 msgid "Show/Hide marker margin"
 msgstr "Mostrar/Ocultar marcadores de márgenes"
 
-#: ../plugins/document-manager/plugin.c:322
+#: ../plugins/document-manager/plugin.c:325
 msgid "_Code Fold Margin"
 msgstr "Margen de plegado del _código"
 
-#: ../plugins/document-manager/plugin.c:323
+#: ../plugins/document-manager/plugin.c:326
 msgid "Show/Hide code fold margin"
 msgstr "Mostrar/Ocultar margen de persiana de código"
 
-#: ../plugins/document-manager/plugin.c:325
+#: ../plugins/document-manager/plugin.c:328
 msgid "_Indentation Guides"
 msgstr "Guías de _sangría"
 
-#: ../plugins/document-manager/plugin.c:326
+#: ../plugins/document-manager/plugin.c:329
 msgid "Show/Hide indentation guides"
 msgstr "Mostrar/Ocultar las guías de sangría"
 
-#: ../plugins/document-manager/plugin.c:328
+#: ../plugins/document-manager/plugin.c:331
 msgid "_White Space"
 msgstr "_Espacios en blanco"
 
-#: ../plugins/document-manager/plugin.c:329
+#: ../plugins/document-manager/plugin.c:332
 msgid "Show/Hide white spaces"
 msgstr "Mostrar/Ocultar espacios en blanco"
 
-#: ../plugins/document-manager/plugin.c:331
+#: ../plugins/document-manager/plugin.c:334
 msgid "_Line End Characters"
 msgstr "Mostrar fin de _línea"
 
-#: ../plugins/document-manager/plugin.c:332
+#: ../plugins/document-manager/plugin.c:335
 msgid "Show/Hide line end characters"
 msgstr "Mostrar/ocultar los caracteres de fin de línea"
 
-#: ../plugins/document-manager/plugin.c:334
+#: ../plugins/document-manager/plugin.c:337
 msgid "Line _Wrapping"
 msgstr "_Ajuste de línea"
 
-#: ../plugins/document-manager/plugin.c:335
+#: ../plugins/document-manager/plugin.c:338
 msgid "Enable/disable line wrapping"
 msgstr "Activar/desactivar ajuste de línea"
 
-#: ../plugins/document-manager/plugin.c:340
+#: ../plugins/document-manager/plugin.c:343
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: ../plugins/document-manager/plugin.c:341
+#: ../plugins/document-manager/plugin.c:344
 msgid "Zoom in: Increase font size"
 msgstr "Ampliar: Incrementar el tamaño de la letra"
 
-#: ../plugins/document-manager/plugin.c:343
+#: ../plugins/document-manager/plugin.c:346
 msgid "Zoom Out"
 msgstr "Reducir"
 
-#: ../plugins/document-manager/plugin.c:344
+#: ../plugins/document-manager/plugin.c:347
 msgid "Zoom out: Decrease font size"
 msgstr "Reducir: Reducir el tamaño de la letra"
 
-#: ../plugins/document-manager/plugin.c:349
+#: ../plugins/document-manager/plugin.c:352
 msgid "_Highlight Mode"
 msgstr "Modo de _resaltado"
 
-#: ../plugins/document-manager/plugin.c:353
+#: ../plugins/document-manager/plugin.c:356
 msgid "_Close All Folds"
 msgstr "_Cerrar todos los pliegues"
 
-#: ../plugins/document-manager/plugin.c:354
+#: ../plugins/document-manager/plugin.c:357
 msgid "Close all code folds in the editor"
 msgstr "Cierra todos los pliegues de código en el editor"
 
-#: ../plugins/document-manager/plugin.c:356
+#: ../plugins/document-manager/plugin.c:359
 msgid "_Open All Folds"
 msgstr "_Abrir todos los pliegues"
 
-#: ../plugins/document-manager/plugin.c:357
+#: ../plugins/document-manager/plugin.c:360
 msgid "Open all code folds in the editor"
 msgstr "Abrir todos los pliegues de código en el editor"
 
-#: ../plugins/document-manager/plugin.c:359
+#: ../plugins/document-manager/plugin.c:362
 msgid "_Toggle Current Fold"
 msgstr "_Cambiar pliegue actual"
 
-#: ../plugins/document-manager/plugin.c:360
+#: ../plugins/document-manager/plugin.c:363
 msgid "Toggle current code fold in the editor"
 msgstr "Cambiar pliegue actual del código en el editor"
 
-#: ../plugins/document-manager/plugin.c:365
+#: ../plugins/document-manager/plugin.c:368
 msgid "_Documents"
 msgstr "_Documentos"
 
-#: ../plugins/document-manager/plugin.c:366
+#: ../plugins/document-manager/plugin.c:369
 msgid "Previous Document"
 msgstr "Documento anterior"
 
-#: ../plugins/document-manager/plugin.c:367
+#: ../plugins/document-manager/plugin.c:370
 msgid "Switch to previous document"
 msgstr "Cambiar al documento anterior"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:372
 msgid "Next Document"
 msgstr "Siguiente documento"
 
-#: ../plugins/document-manager/plugin.c:370
+#: ../plugins/document-manager/plugin.c:373
 msgid "Switch to next document"
 msgstr "Cambiar al siguiente documento"
 
-#: ../plugins/document-manager/plugin.c:375
+#: ../plugins/document-manager/plugin.c:378
 msgid "Bookmar_k"
 msgstr "_Marcar"
 
-#: ../plugins/document-manager/plugin.c:376
+#: ../plugins/document-manager/plugin.c:379
 msgid "_Add Bookmark"
 msgstr "_Añadir marcador"
 
-#: ../plugins/document-manager/plugin.c:377
+#: ../plugins/document-manager/plugin.c:380
 msgid "Add a bookmark at the current line position"
 msgstr "Añadir un marcador en la posición de línea actual"
 
-#: ../plugins/document-manager/plugin.c:379
+#: ../plugins/document-manager/plugin.c:382
 msgid "_Previous Bookmark"
 msgstr "Marcador _anterior"
 
-#: ../plugins/document-manager/plugin.c:380
+#: ../plugins/document-manager/plugin.c:383
 msgid "Jump to the previous bookmark in the file"
 msgstr "Ir al marcador anterior en este documento"
 
-#: ../plugins/document-manager/plugin.c:382
+#: ../plugins/document-manager/plugin.c:385
 msgid "_Next Bookmark"
 msgstr "Marcador _siguiente"
 
-#: ../plugins/document-manager/plugin.c:383
+#: ../plugins/document-manager/plugin.c:386
 msgid "Jump to the next bookmark in the file"
 msgstr "Ir al siguiente marcador en este documento"
 
-#: ../plugins/document-manager/plugin.c:385
+#: ../plugins/document-manager/plugin.c:388
 msgid "_Clear All Bookmarks"
 msgstr "_Vacía todos los marcadores"
 
-#: ../plugins/document-manager/plugin.c:386
+#: ../plugins/document-manager/plugin.c:389
 msgid "Clear bookmarks"
 msgstr "Vaciar marcadores"
 
-#: ../plugins/document-manager/plugin.c:405
+#: ../plugins/document-manager/plugin.c:408
 msgid "Editor file operations"
 msgstr "Operaciones de edición de archivos"
 
-#: ../plugins/document-manager/plugin.c:406
+#: ../plugins/document-manager/plugin.c:409
 msgid "Editor print operations"
 msgstr "Operaciones de edición de impresión"
 
-#: ../plugins/document-manager/plugin.c:407
+#: ../plugins/document-manager/plugin.c:410
 msgid "Editor text transformation"
 msgstr "Transformación del editor de texto"
 
-#: ../plugins/document-manager/plugin.c:408
+#: ../plugins/document-manager/plugin.c:411
 msgid "Editor text selection"
 msgstr "Selección de texto del editor"
 
 #. { actions_insert, G_N_ELEMENTS (actions_insert), "ActionGroupEditorInsert", N_("Editor text insertions") },
-#: ../plugins/document-manager/plugin.c:410
+#: ../plugins/document-manager/plugin.c:413
 msgid "Editor code commenting"
 msgstr "Comentado de código del editor"
 
-#: ../plugins/document-manager/plugin.c:411
+#: ../plugins/document-manager/plugin.c:414
 msgid "Editor navigations"
 msgstr "Navegación con el editor"
 
-#: ../plugins/document-manager/plugin.c:412
+#: ../plugins/document-manager/plugin.c:415
 msgid "Editor edit operations"
 msgstr "Operaciones de edición del editor"
 
-#: ../plugins/document-manager/plugin.c:413
+#: ../plugins/document-manager/plugin.c:416
 msgid "Editor zoom operations"
 msgstr "Operaciones de ampliación del editor"
 
-#: ../plugins/document-manager/plugin.c:414
+#: ../plugins/document-manager/plugin.c:417
 msgid "Editor syntax highlighting styles"
 msgstr "Estilos de resaltado de sintaxis del editor"
 
-#: ../plugins/document-manager/plugin.c:415
+#: ../plugins/document-manager/plugin.c:418
 msgid "Editor text formating"
 msgstr "Formateado del texto del editor"
 
-#: ../plugins/document-manager/plugin.c:416
+#: ../plugins/document-manager/plugin.c:419
 msgid "Simple searching"
 msgstr "Busqueda simple"
 
-#: ../plugins/document-manager/plugin.c:417
-#: ../plugins/document-manager/plugin.c:1734
-#: ../plugins/document-manager/plugin.c:2151
-#: ../plugins/document-manager/plugin.c:2161
+#: ../plugins/document-manager/plugin.c:420
+#: ../plugins/document-manager/plugin.c:1737
+#: ../plugins/document-manager/plugin.c:2154
+#: ../plugins/document-manager/plugin.c:2164
 msgid "Documents"
 msgstr "Documentos"
 
-#: ../plugins/document-manager/plugin.c:422
+#: ../plugins/document-manager/plugin.c:425
 msgid "Editor view settings"
 msgstr "Configuración de la vista del editor"
 
-#: ../plugins/document-manager/plugin.c:607
+#: ../plugins/document-manager/plugin.c:610
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../plugins/document-manager/plugin.c:613
+#: ../plugins/document-manager/plugin.c:616
 msgid "Go to"
 msgstr "Ir a"
 
-#: ../plugins/document-manager/plugin.c:928
+#: ../plugins/document-manager/plugin.c:931
 msgid "OVR"
 msgstr "SOB"
 
-#: ../plugins/document-manager/plugin.c:932
+#: ../plugins/document-manager/plugin.c:935
 msgid "INS"
 msgstr "INS"
 
-#: ../plugins/document-manager/plugin.c:938
 #: ../plugins/document-manager/plugin.c:941
+#: ../plugins/document-manager/plugin.c:944
 msgid "Zoom"
 msgstr "Ampliación"
 
-#: ../plugins/document-manager/plugin.c:944
+#: ../plugins/document-manager/plugin.c:947
 msgid "Col"
 msgstr "Col"
 
-#: ../plugins/document-manager/plugin.c:945
+#: ../plugins/document-manager/plugin.c:948
 msgid "Mode"
 msgstr "Modo"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1025
+#: ../plugins/document-manager/plugin.c:1028
 msgid "Automatic"
 msgstr "Automático"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1558
+#: ../plugins/document-manager/plugin.c:1561
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "Falló el autoguardado para el archivo %s"
 
-#: ../plugins/document-manager/plugin.c:1572
+#: ../plugins/document-manager/plugin.c:1575
 msgid "Autosave completed"
 msgstr "Completado el autoguardado"
 
@@ -3655,7 +3662,7 @@ msgid "Filter"
 msgstr "Filtro"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2329 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2129 ../plugins/symbol-db/plugin.c:2178
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Global"
@@ -6498,7 +6505,6 @@ msgid "No Date"
 msgstr "Sin fecha"
 
 #: ../plugins/macro/anjuta-macro.ui.h:2
-#| msgid "Edit"
 msgid "Editâ?¦"
 msgstr "Editarâ?¦"
 
@@ -6672,7 +6678,7 @@ msgstr "Estilo de indicador de mensaje de advertencia:"
 msgid "Warnings:"
 msgstr "Advertencias:"
 
-#: ../plugins/message-view/anjuta-msgman.c:99
+#: ../plugins/message-view/anjuta-msgman.c:76
 msgid "Close all message tabs"
 msgstr "Cerrar todas las solapas de mensajes"
 
@@ -9025,39 +9031,39 @@ msgstr "_Buscar símbolo�"
 msgid "Find Symbol"
 msgstr "Buscar símbolo"
 
-#: ../plugins/symbol-db/plugin.c:1173
+#: ../plugins/symbol-db/plugin.c:1023
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%s: Generando herenciasâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:1178
+#: ../plugins/symbol-db/plugin.c:1028
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%s: %d archivos analizados de %d"
 
-#: ../plugins/symbol-db/plugin.c:1209
+#: ../plugins/symbol-db/plugin.c:1059
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "Generando herenciasâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:1211
+#: ../plugins/symbol-db/plugin.c:1061
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "%d archivos analizados de %d"
 
-#: ../plugins/symbol-db/plugin.c:1979
+#: ../plugins/symbol-db/plugin.c:1788
 msgid "Populating symbol databaseâ?¦"
 msgstr "Llenando la BB. DD. de símbolos�"
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2114 ../plugins/symbol-db/plugin.c:2209
 msgid "Symbols"
 msgstr "Símbolos"
 
-#: ../plugins/symbol-db/plugin.c:2489
+#: ../plugins/symbol-db/plugin.c:2218
 msgid "SymbolDb popup actions"
 msgstr "Acciones emergentes de la BB DD de símbolos"
 
-#: ../plugins/symbol-db/plugin.c:2497
+#: ../plugins/symbol-db/plugin.c:2226
 msgid "SymbolDb menu actions"
 msgstr "Acciones del menú de la BB DD de símbolos"
 
@@ -9079,15 +9085,6 @@ msgstr "Etiquetas del API"
 msgid "Resuming glb scan."
 msgstr "Resumiendo el análisis glb."
 
-#: ../plugins/symbol-db/symbol-db-view-locals.c:326
-#: ../plugins/symbol-db/symbol-db-view.c:1412
-msgid "Symbol"
-msgstr "Símbolo"
-
-#: ../plugins/symbol-db/symbol-db-view.c:798
-msgid "Loadingâ?¦"
-msgstr "Cargandoâ?¦"
-
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
 msgid "Automatically scan project's packages"
 msgstr "Analizar automáticamente los paquetes del proyecto"
@@ -10173,6 +10170,15 @@ msgstr "Resaltar punto y coma perdido"
 msgid "Min character for completion "
 msgstr "Caracteres mínimos para autocompletado "
 
+#~ msgid "Online"
+#~ msgstr "En línea"
+
+#~ msgid "Symbol"
+#~ msgstr "Símbolo"
+
+#~ msgid "Loadingâ?¦"
+#~ msgstr "Cargandoâ?¦"
+
 #~ msgid "Edit&#x2026;"
 #~ msgstr "Editar&#x2026;"
 
diff --git a/po/fr.po b/po/fr.po
index 8396666..e175c27 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: anjuta.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-03-22 22:11+0000\n"
-"PO-Revision-Date: 2010-03-23 08:27+0100\n"
+"POT-Creation-Date: 2010-03-03 20:33+0000\n"
+"PO-Revision-Date: 2010-05-10 18:28+0200\n"
 "Last-Translator: Claude Paroz <claude 2xlibre net>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
 "MIME-Version: 1.0\n"
@@ -271,8 +271,8 @@ msgid ""
 "many suitable plugins. Removing the preferred plugin will let Anjuta prompt "
 "you again to choose different plugin."
 msgstr ""
-"Ce sont les greffons que vous avez sélectionné lorsque Anjuta vous l'a "
-"proposé. La suppression des greffons favoris permettra à Anjuta de vous "
+"Ce sont les greffons que vous avez sélectionnés lorsque Anjuta vous l'a "
+"proposé. La suppression des greffons favoris permet à Anjuta de vous "
 "demander à nouveau de choisir des greffons."
 
 #: ../libanjuta/anjuta-plugin-manager.c:1223
@@ -773,12 +773,12 @@ msgstr "L'exécutable « %s » n'est pas à jour."
 #. * 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:168
+#: ../plugins/build-basic-autotools/plugin.c:167
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr ""
 "make(\\[\\d+\\])?:\\s+entrant\\s+dans\\s+le\\s+répertoire\\s+«\\s+(.+)\\s+»"
 
-#: ../plugins/build-basic-autotools/plugin.c:169
+#: ../plugins/build-basic-autotools/plugin.c:168
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr ""
 "make(\\[\\d+\\])?:\\s+entrant\\s+dans\\s+le\\s+répertoire\\s+«\\s+(.+)\\s+»"
@@ -788,82 +788,82 @@ msgstr ""
 #. * 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:177
+#: ../plugins/build-basic-autotools/plugin.c:176
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+quittant\\s+le\\s+répertoire\\s+«\\s+(.+)\\s+»"
 
-#: ../plugins/build-basic-autotools/plugin.c:178
+#: ../plugins/build-basic-autotools/plugin.c:177
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+quittant\\s+le\\s+répertoire\\s+«\\s+(.+)\\s+»"
 
-#: ../plugins/build-basic-autotools/plugin.c:846
+#: ../plugins/build-basic-autotools/plugin.c:845
 #, c-format
 msgid "Entering: %s"
 msgstr "Entrant : %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:882
+#: ../plugins/build-basic-autotools/plugin.c:881
 #, c-format
 msgid "Leaving: %s"
 msgstr "Quittant : %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:915
+#: ../plugins/build-basic-autotools/plugin.c:914
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "avertissement :"
 
-#: ../plugins/build-basic-autotools/plugin.c:921
+#: ../plugins/build-basic-autotools/plugin.c:920
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "erreur : "
 
-#: ../plugins/build-basic-autotools/plugin.c:1038
+#: ../plugins/build-basic-autotools/plugin.c:1037
 #, c-format
 msgid "Command exited with status %d"
 msgstr "Commande terminée avec l'état %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1048
-#: ../plugins/build-basic-autotools/plugin.c:1524
+#: ../plugins/build-basic-autotools/plugin.c:1047
+#: ../plugins/build-basic-autotools/plugin.c:1523
 #, c-format
 msgid "Command canceled by user"
 msgstr "Commande annulée par l'utilisateur"
 
-#: ../plugins/build-basic-autotools/plugin.c:1053
+#: ../plugins/build-basic-autotools/plugin.c:1052
 #, c-format
 msgid "Command aborted by user"
 msgstr "Commande interrompue par l'utilisateur"
 
-#: ../plugins/build-basic-autotools/plugin.c:1058
+#: ../plugins/build-basic-autotools/plugin.c:1057
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "Commande terminée avec le signal %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1066
+#: ../plugins/build-basic-autotools/plugin.c:1065
 msgid "Command terminated for an unknown reason"
 msgstr "Commande terminée pour une raison inconnue"
 
-#: ../plugins/build-basic-autotools/plugin.c:1084
+#: ../plugins/build-basic-autotools/plugin.c:1083
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "Temps total : %lu secondes\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1091
+#: ../plugins/build-basic-autotools/plugin.c:1090
 msgid "Completed unsuccessfully\n"
 msgstr "Terminé sur un échec\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1099
+#: ../plugins/build-basic-autotools/plugin.c:1098
 #: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "Terminé avec succès\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:1187
+#: ../plugins/build-basic-autotools/plugin.c:1186
 #, c-format
 msgid "Build %d: %s"
 msgstr "Construction n°%d : %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1518
+#: ../plugins/build-basic-autotools/plugin.c:1517
 msgid ""
 "Before using this new configuration, the default one needs to be removed. Do "
 "you want to do that ?"
@@ -871,205 +871,205 @@ msgstr ""
 "Avant d'utiliser cette nouvelle configuration, celle par défaut doit être "
 "effacée. Voulez-vous réellement faire cela ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1822
+#: ../plugins/build-basic-autotools/plugin.c:1820
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr ""
 "Impossible de compiler « %s » : aucune règle de compilation n'est définie "
 "pour ce type de fichier."
 
-#: ../plugins/build-basic-autotools/plugin.c:1957
+#: ../plugins/build-basic-autotools/plugin.c:1955
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr ""
 "Impossible de configurer le projet : script de configuration manquant dans %"
 "s."
 
-#: ../plugins/build-basic-autotools/plugin.c:2438
-#: ../plugins/build-basic-autotools/plugin.c:2512
-#: ../plugins/build-basic-autotools/plugin.c:2522
-#: ../plugins/build-basic-autotools/plugin.c:2540
-#: ../plugins/build-basic-autotools/plugin.c:2550
-#: ../plugins/build-basic-autotools/plugin.c:2607
+#: ../plugins/build-basic-autotools/plugin.c:2432
+#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../plugins/build-basic-autotools/plugin.c:2516
+#: ../plugins/build-basic-autotools/plugin.c:2534
+#: ../plugins/build-basic-autotools/plugin.c:2544
+#: ../plugins/build-basic-autotools/plugin.c:2601
 #, c-format
 msgid "_Build"
 msgstr "_Construire"
 
-#: ../plugins/build-basic-autotools/plugin.c:2442
+#: ../plugins/build-basic-autotools/plugin.c:2436
 msgid "_Build Project"
 msgstr "_Construire le projet"
 
-#: ../plugins/build-basic-autotools/plugin.c:2443
+#: ../plugins/build-basic-autotools/plugin.c:2437
 msgid "Build whole project"
 msgstr "Construit l'ensemble du projet"
 
-#: ../plugins/build-basic-autotools/plugin.c:2448
+#: ../plugins/build-basic-autotools/plugin.c:2442
 msgid "_Install Project"
 msgstr "_Installer le projet"
 
-#: ../plugins/build-basic-autotools/plugin.c:2449
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "Install whole project"
 msgstr "Installe l'ensemble du projet"
 
-#: ../plugins/build-basic-autotools/plugin.c:2454
+#: ../plugins/build-basic-autotools/plugin.c:2448
 msgid "_Clean Project"
 msgstr "_Nettoyer le projet"
 
-#: ../plugins/build-basic-autotools/plugin.c:2455
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "Clean whole project"
 msgstr "Nettoie l'ensemble du projet"
 
-#: ../plugins/build-basic-autotools/plugin.c:2460
+#: ../plugins/build-basic-autotools/plugin.c:2454
 msgid "C_onfigure Projectâ?¦"
 msgstr "C_onfigurer le projetâ?¦"
 
-#: ../plugins/build-basic-autotools/plugin.c:2461
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "Configure project"
 msgstr "Configure le projet"
 
-#: ../plugins/build-basic-autotools/plugin.c:2466
+#: ../plugins/build-basic-autotools/plugin.c:2460
 msgid "Build _Tarball"
 msgstr "Construire l'archive _tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2467
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "Build project tarball distribution"
 msgstr "Construit l'archive tarball de distribution du projet"
 
-#: ../plugins/build-basic-autotools/plugin.c:2472
+#: ../plugins/build-basic-autotools/plugin.c:2466
 msgid "_Build Module"
 msgstr "_Construire le module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2473
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build module associated with current file"
 msgstr "Construit le module associé au fichier actuel"
 
-#: ../plugins/build-basic-autotools/plugin.c:2478
+#: ../plugins/build-basic-autotools/plugin.c:2472
 msgid "_Install Module"
 msgstr "_Installer le module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2479
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "Install module associated with current file"
 msgstr "Installe le module associé au fichier actuel"
 
-#: ../plugins/build-basic-autotools/plugin.c:2484
+#: ../plugins/build-basic-autotools/plugin.c:2478
 msgid "_Clean Module"
 msgstr "_Nettoyer le module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2485
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "Clean module associated with current file"
 msgstr "Nettoie le module associé au fichier actuel"
 
-#: ../plugins/build-basic-autotools/plugin.c:2490
+#: ../plugins/build-basic-autotools/plugin.c:2484
 msgid "Co_mpile File"
 msgstr "_Compiler le fichier"
 
-#: ../plugins/build-basic-autotools/plugin.c:2491
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "Compile current editor file"
 msgstr "Compile le fichier actuel de l'éditeur"
 
-#: ../plugins/build-basic-autotools/plugin.c:2496
+#: ../plugins/build-basic-autotools/plugin.c:2490
 msgid "Select Configuration"
 msgstr "Sélectionner la configuration"
 
-#: ../plugins/build-basic-autotools/plugin.c:2497
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Select current configuration"
 msgstr "Sélectionne la configuration actuelle"
 
-#: ../plugins/build-basic-autotools/plugin.c:2502
+#: ../plugins/build-basic-autotools/plugin.c:2496
 msgid "Remove Configuration"
 msgstr "Enlever la configuration"
 
-#: ../plugins/build-basic-autotools/plugin.c:2503
+#: ../plugins/build-basic-autotools/plugin.c:2497
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr ""
 "Nettoie le projet (« distclean ») et enlève le répertoire de configuration si "
 "possible"
 
-#: ../plugins/build-basic-autotools/plugin.c:2516
-#: ../plugins/build-basic-autotools/plugin.c:2544
+#: ../plugins/build-basic-autotools/plugin.c:2510
+#: ../plugins/build-basic-autotools/plugin.c:2538
 msgid "_Compile"
 msgstr "_Compiler"
 
-#: ../plugins/build-basic-autotools/plugin.c:2517
-#: ../plugins/build-basic-autotools/plugin.c:2545
+#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2539
 msgid "Compile file"
 msgstr "Compile le fichier"
 
-#: ../plugins/build-basic-autotools/plugin.c:2523
-#: ../plugins/build-basic-autotools/plugin.c:2551
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "Build module"
 msgstr "Construit le module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2528
-#: ../plugins/build-basic-autotools/plugin.c:2556
-#: ../plugins/build-basic-autotools/plugin.c:2614
+#: ../plugins/build-basic-autotools/plugin.c:2522
+#: ../plugins/build-basic-autotools/plugin.c:2550
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Install"
 msgstr "_Installer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2529
-#: ../plugins/build-basic-autotools/plugin.c:2557
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2551
 msgid "Install module"
 msgstr "Installe le module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2534
-#: ../plugins/build-basic-autotools/plugin.c:2562
-#: ../plugins/build-basic-autotools/plugin.c:2621
+#: ../plugins/build-basic-autotools/plugin.c:2528
+#: ../plugins/build-basic-autotools/plugin.c:2556
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Clean"
 msgstr "_Nettoyer"
 
-#: ../plugins/build-basic-autotools/plugin.c:2535
-#: ../plugins/build-basic-autotools/plugin.c:2563
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
 msgid "Clean module"
 msgstr "Nettoie le module"
 
-#: ../plugins/build-basic-autotools/plugin.c:2568
+#: ../plugins/build-basic-autotools/plugin.c:2562
 msgid "_Cancel command"
 msgstr "_Annuler la commande"
 
-#: ../plugins/build-basic-autotools/plugin.c:2569
+#: ../plugins/build-basic-autotools/plugin.c:2563
 msgid "Cancel build command"
 msgstr "Annule la commande de construction"
 
-#: ../plugins/build-basic-autotools/plugin.c:2607
+#: ../plugins/build-basic-autotools/plugin.c:2601
 #, c-format
 msgid "_Build (%s)"
 msgstr "Con_struire (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2614
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Install (%s)"
 msgstr "_Installer (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2621
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Clean (%s)"
 msgstr "_Nettoyer (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2629
+#: ../plugins/build-basic-autotools/plugin.c:2623
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "Co_mpiler (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2629
+#: ../plugins/build-basic-autotools/plugin.c:2623
 #, c-format
 msgid "Co_mpile"
 msgstr "Co_mpiler"
 
-#: ../plugins/build-basic-autotools/plugin.c:3165
+#: ../plugins/build-basic-autotools/plugin.c:3159
 msgid "Build commands"
 msgstr "Commandes de construction"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3174
+#: ../plugins/build-basic-autotools/plugin.c:3168
 msgid "Build popup commands"
 msgstr "Commandes contextuelles de construction"
 
-#: ../plugins/build-basic-autotools/plugin.c:3556
-#: ../plugins/build-basic-autotools/plugin.c:3564
+#: ../plugins/build-basic-autotools/plugin.c:3550
+#: ../plugins/build-basic-autotools/plugin.c:3558
 msgid "Build Autotools"
 msgstr "Construire les « autotools »"
 
@@ -1435,8 +1435,8 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ignorer les fichiers .cvsrc (recommandé)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2327
-#: ../plugins/symbol-db/plugin.c:2397
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2329
+#: ../plugins/symbol-db/plugin.c:2399
 msgid "Local"
 msgstr "Local"
 
@@ -2660,8 +2660,8 @@ msgstr "Sommaire"
 #: ../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:2331
-#: ../plugins/symbol-db/plugin.c:2447
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2333
+#: ../plugins/symbol-db/plugin.c:2449
 msgid "Search"
 msgstr "Rechercher"
 
@@ -3060,7 +3060,7 @@ msgstr "Répète la recherche rapide"
 
 #: ../plugins/document-manager/plugin.c:271 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1882
+#: ../plugins/language-support-cpp-java/plugin.c:1878
 msgid "_Edit"
 msgstr "Ã?_dition"
 
@@ -3448,7 +3448,6 @@ msgstr ""
 "classe « %s »"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:937
-#: ../plugins/starter/starter.c:111
 #, c-format
 msgid "Open '%s'"
 msgstr "Ouverture de %s"
@@ -3679,7 +3678,7 @@ msgid "Filter"
 msgstr "Filtre"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2329 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2331 ../plugins/symbol-db/plugin.c:2425
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Global"
@@ -3692,15 +3691,15 @@ msgstr "Répertoire racine si aucun projet n'est ouvert :"
 msgid "Loading..."
 msgstr "Chargementâ?¦"
 
-#: ../plugins/file-manager/file-view.c:569
+#: ../plugins/file-manager/file-view.c:567
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: ../plugins/file-manager/file-view.c:656
+#: ../plugins/file-manager/file-view.c:654
 msgid "Base URI"
 msgstr "URI de base"
 
-#: ../plugins/file-manager/file-view.c:657
+#: ../plugins/file-manager/file-view.c:655
 msgid "URI of the top-most path displayed"
 msgstr "URI de l'emplacement le plus affiché"
 
@@ -3760,7 +3759,7 @@ msgid "Name:"
 msgstr "Nom :"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/starter/starter.c:422
+#: ../plugins/starter/starter.c:409
 msgid "New File"
 msgstr "Nouveau fichier"
 
@@ -6369,7 +6368,7 @@ msgstr "�levée"
 #, c-format
 msgid "When you delete the category \"%s\", all containing items are lost"
 msgstr ""
-"En supprimant la catégorie « %s », vous supprimer aussi les tâches qu'elle "
+"En supprimant la catégorie « %s », vous supprimez aussi les tâches qu'elle "
 "contient."
 
 #: ../plugins/gtodo/mcategory.c:146
@@ -6540,7 +6539,7 @@ msgid "No Date"
 msgstr "Sans date"
 
 #: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "Editâ?¦"
+msgid "Edit&#x2026;"
 msgstr "Modifierâ?¦"
 
 #: ../plugins/macro/anjuta-macro.ui.h:3
@@ -7748,7 +7747,7 @@ msgid ""
 "the required version of the package. For example, 'libgnomeui-2.0' or "
 "'libgnomeui-2.0 >= 2.2.0'"
 msgstr ""
-"Renseignez un nom de paquet nécessaire à votre projet. Vous devez aussi, "
+"Renseignez un nom de paquet nécessaire à votre projet. Vous devez aussi "
 "préciser la version requise. Par exemple, « libgnomeui-2.0 » ou bien "
 "« libgnomeui-2.0 >= 2.2.0 »"
 
@@ -8370,7 +8369,7 @@ msgstr[1] "%d correspondances ont été remplacées."
 msgid "Unable to build user interface for Search and Replace"
 msgstr "Impossible d'initialiser l'interface « Rechercher et remplacer »"
 
-#: ../plugins/sourceview/sourceview.c:374
+#: ../plugins/sourceview/sourceview.c:366
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8379,7 +8378,7 @@ msgstr ""
 "Le fichier « %s » sur le disque est plus récent que le tampon actuel.\n"
 "Voulez-vous le recharger ?"
 
-#: ../plugins/sourceview/sourceview.c:411
+#: ../plugins/sourceview/sourceview.c:403
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8389,19 +8388,19 @@ msgstr ""
 "Voulez-vous le fermer ?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:448
+#: ../plugins/sourceview/sourceview.c:440
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "Impossible d'ouvrir %s : %s"
 
-#: ../plugins/sourceview/sourceview.c:502
+#: ../plugins/sourceview/sourceview.c:494
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr ""
 "Le fichier « %s » est en lecture seule ! Désirez-vous l'éditer quand même ?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:561
+#: ../plugins/sourceview/sourceview.c:553
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "Impossible d'enregistrer %s : %s"
@@ -8516,32 +8515,32 @@ msgid "Wrap long lines to fit on paper"
 msgstr ""
 "Mettre à la ligne les longues lignes pour qu'elles tiennent sur le papier"
 
-#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:362
+#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:349
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "Lanceur"
 
-#: ../plugins/starter/starter.c:403
+#: ../plugins/starter/starter.c:390
 msgid "Create File/Project"
 msgstr "Créer un fichier/projet"
 
-#: ../plugins/starter/starter.c:437
+#: ../plugins/starter/starter.c:424
 msgid "Recent Projects"
 msgstr "Projets récents"
 
-#: ../plugins/starter/starter.c:468
+#: ../plugins/starter/starter.c:455
 msgid "Links"
 msgstr "Liens"
 
-#: ../plugins/starter/starter.c:487
+#: ../plugins/starter/starter.c:474
 msgid "Anjuta Home Page"
 msgstr "Site Web d'Anjuta"
 
-#: ../plugins/starter/starter.c:493
+#: ../plugins/starter/starter.c:480
 msgid "Anjuta Manual"
 msgstr "Manuel d'Anjuta"
 
-#: ../plugins/starter/starter.c:499
+#: ../plugins/starter/starter.c:486
 msgid "GNOME Online API Documentation"
 msgstr "Documentation en ligne des API GNOME"
 
@@ -9082,39 +9081,39 @@ msgstr "_Rechercher le symboleâ?¦"
 msgid "Find Symbol"
 msgstr "Recherche de symbole"
 
-#: ../plugins/symbol-db/plugin.c:1173
+#: ../plugins/symbol-db/plugin.c:1175
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%s : génération des héritages�"
 
-#: ../plugins/symbol-db/plugin.c:1178
+#: ../plugins/symbol-db/plugin.c:1180
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%s : %d fichiers analysés sur %d"
 
-#: ../plugins/symbol-db/plugin.c:1209
+#: ../plugins/symbol-db/plugin.c:1211
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "Génération des héritages�"
 
-#: ../plugins/symbol-db/plugin.c:1211
+#: ../plugins/symbol-db/plugin.c:1213
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "%d fichiers analysés sur %d"
 
-#: ../plugins/symbol-db/plugin.c:1979
+#: ../plugins/symbol-db/plugin.c:1981
 msgid "Populating symbol databaseâ?¦"
 msgstr "Remplissage de la base de données des symboles�"
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2354 ../plugins/symbol-db/plugin.c:2482
 msgid "Symbols"
 msgstr "Symboles"
 
-#: ../plugins/symbol-db/plugin.c:2489
+#: ../plugins/symbol-db/plugin.c:2491
 msgid "SymbolDb popup actions"
 msgstr "Opérations contextuelles de la base de données des symboles"
 
-#: ../plugins/symbol-db/plugin.c:2497
+#: ../plugins/symbol-db/plugin.c:2499
 msgid "SymbolDb menu actions"
 msgstr "Actions de menus de la base de données des symboles"
 
@@ -9137,11 +9136,11 @@ msgid "Resuming glb scan."
 msgstr "Reprendre l'examen glb"
 
 #: ../plugins/symbol-db/symbol-db-view-locals.c:326
-#: ../plugins/symbol-db/symbol-db-view.c:1412
+#: ../plugins/symbol-db/symbol-db-view.c:1413
 msgid "Symbol"
 msgstr "Symbole"
 
-#: ../plugins/symbol-db/symbol-db-view.c:798
+#: ../plugins/symbol-db/symbol-db-view.c:799
 msgid "Loadingâ?¦"
 msgstr "Chargementâ?¦"
 
@@ -9728,44 +9727,44 @@ msgstr "Raccourcis"
 msgid "Value doesn't exist"
 msgstr "Cette valeur n'existe pas"
 
-#: ../src/main.c:74
+#: ../src/main.c:62
 msgid "Specify the size and location of the main window"
 msgstr "Indique la taille et la position de la fenêtre principale"
 
 #. This is the format you can specify the size andposition
 #. * of the window on command line
-#: ../src/main.c:77
+#: ../src/main.c:65
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "LARGEURxHAUTEUR+X+Y"
 
-#: ../src/main.c:82
+#: ../src/main.c:70
 msgid "Do not show the splash screen"
 msgstr "Ne pas afficher le logo de démarrage"
 
-#: ../src/main.c:88
+#: ../src/main.c:76
 msgid "Start a new instance and do not open the file in an existing instance"
 msgstr ""
 "Commencer une nouvelle instance et ne pas ouvrir le fichier dans une "
 "instance existante."
 
-#: ../src/main.c:94
+#: ../src/main.c:82
 msgid "Do not open last session on startup"
 msgstr "Ne pas ouvrir la dernière session au démarrage"
 
-#: ../src/main.c:100
+#: ../src/main.c:88
 msgid "Do not open last project and files on startup"
 msgstr "Ne pas ouvrir le dernier projet et fichiers au démarrage"
 
-#: ../src/main.c:106
+#: ../src/main.c:94
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr ""
 "Fermer Anjuta proprement en libérant toutes les ressources (pour le débogage)"
 
-#: ../src/main.c:174
+#: ../src/main.c:156
 msgid "- Integrated Development Environment"
 msgstr "- Environnement de développement intégré"
 
-#: ../src/main.c:250
+#: ../src/main.c:232
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -9920,34 +9919,34 @@ msgstr "Indentation intelligente"
 msgid "Statement indentation size in spaces:"
 msgstr "Taille de l'indentation de la déclaration en espaces :"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1888
+#: ../plugins/language-support-cpp-java/plugin.c:1884
 msgid "Auto-Indent"
 msgstr "Indentation automatique"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1889
+#: ../plugins/language-support-cpp-java/plugin.c:1885
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr ""
 "Indentation automatique de la ligne actuelle ou de la sélection en fonction "
 "des paramètres d'indentation"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1894
+#: ../plugins/language-support-cpp-java/plugin.c:1890
 msgid "Swap .h/.c"
 msgstr "Basculer .h/.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1895
+#: ../plugins/language-support-cpp-java/plugin.c:1891
 msgid "Swap C header and source files"
 msgstr "Bascule entre les fichiers d'en-tête et les fichiers de source C"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1936
+#: ../plugins/language-support-cpp-java/plugin.c:1932
 msgid "C++/Java Assistance"
 msgstr "Assistance C++/Java"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2048
-#: ../plugins/language-support-cpp-java/plugin.c:2061
+#: ../plugins/language-support-cpp-java/plugin.c:2044
+#: ../plugins/language-support-cpp-java/plugin.c:2057
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
-#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1368
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1070
 msgid "C/C++"
 msgstr "C/C++"
 
diff --git a/po/gl.po b/po/gl.po
index 8cc7947..43f129a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,10 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta-master-po-gl-1952\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-03-22 22:24+0000\n"
-"PO-Revision-Date: 2010-03-22 23:33+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-17 16:05+0200\n"
+"PO-Revision-Date: 2010-04-17 16:04+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez ubuntu com>\n"
 "Language-Team: Galician <gnome g11n net>\n"
 "MIME-Version: 1.0\n"
@@ -439,7 +438,7 @@ msgid "If you do not save, all your changes will be lost."
 msgstr "Se non os garda perderanse todos os cambios que fixo."
 
 #: ../libanjuta/anjuta-save-prompt.c:189
-#: ../plugins/document-manager/plugin.c:603
+#: ../plugins/document-manager/plugin.c:606
 msgid "Save"
 msgstr "Gardar"
 
@@ -1414,8 +1413,8 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ignorar o ficheiro .cvsrc (recomendado)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2327
-#: ../plugins/symbol-db/plugin.c:2397
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2124
+#: ../plugins/symbol-db/plugin.c:2166
 msgid "Local"
 msgstr "Local"
 
@@ -2457,7 +2456,7 @@ msgstr "Ficheiro"
 
 #: ../plugins/debug-manager/stack_trace.c:642
 #: ../plugins/debug-manager/threads.c:460
-#: ../plugins/document-manager/plugin.c:943
+#: ../plugins/document-manager/plugin.c:946
 msgid "Line"
 msgstr "Liña"
 
@@ -2591,70 +2590,66 @@ msgstr "Operacións de punto de vixilancia"
 msgid "Watches"
 msgstr "Punto de vixilancia"
 
-#: ../plugins/devhelp/plugin.c:201
+#: ../plugins/devhelp/plugin.c:202
 msgid "Search Help:"
 msgstr "Buscar na axuda:"
 
-#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:239
+#: ../plugins/devhelp/plugin.c:223 ../plugins/document-manager/plugin.c:242
 #: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:313
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: ../plugins/devhelp/plugin.c:231
+#: ../plugins/devhelp/plugin.c:232
 msgid "_API Reference"
 msgstr "Referencia da _API"
 
-#: ../plugins/devhelp/plugin.c:233
+#: ../plugins/devhelp/plugin.c:234
 msgid "Browse API Pages"
 msgstr "Navegar nas páxinas da API"
 
-#: ../plugins/devhelp/plugin.c:243
+#: ../plugins/devhelp/plugin.c:244
 msgid "_Context Help"
 msgstr "Axuda _contextual"
 
-#: ../plugins/devhelp/plugin.c:245
+#: ../plugins/devhelp/plugin.c:246
 msgid "Search help for the current word in the editor"
 msgstr "Buscar na axuda a palabra seleccionada no editor"
 
-#: ../plugins/devhelp/plugin.c:251
+#: ../plugins/devhelp/plugin.c:252
 msgid "_Search Help"
 msgstr "_Buscar na axuda"
 
-#: ../plugins/devhelp/plugin.c:253
+#: ../plugins/devhelp/plugin.c:254
 msgid "Search for a term in help"
 msgstr "Buscar un termo na axuda"
 
-#: ../plugins/devhelp/plugin.c:358
+#: ../plugins/devhelp/plugin.c:327
 msgid "Help operations"
 msgstr "Operacións da axuda"
 
-#: ../plugins/devhelp/plugin.c:368
+#: ../plugins/devhelp/plugin.c:346 ../plugins/devhelp/plugin.c:464
+#: ../src/anjuta-app.c:502
+msgid "Help"
+msgstr "Axuda"
+
+#: ../plugins/devhelp/plugin.c:357
 msgid "Contents"
 msgstr "Contidos"
 
-#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
+#: ../plugins/devhelp/plugin.c:363 ../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:2331
-#: ../plugins/symbol-db/plugin.c:2447
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2134
+#: ../plugins/symbol-db/plugin.c:2183
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/devhelp/plugin.c:375 ../plugins/devhelp/plugin.c:495
-#: ../src/anjuta-app.c:502
-msgid "Help"
-msgstr "Axuda"
-
-#: ../plugins/devhelp/plugin.c:405 ../plugins/devhelp/plugin.c:500
+#: ../plugins/devhelp/plugin.c:381 ../plugins/devhelp/plugin.c:469
 msgid "Help display"
 msgstr "Mostrar a axuda"
 
-#: ../plugins/devhelp/plugin.c:422
-msgid "Online"
-msgstr "En liña"
-
-#: ../plugins/document-manager/action-callbacks.c:277
+#: ../plugins/document-manager/action-callbacks.c:314
 #, c-format
 msgid ""
 "Are you sure you want to reload '%s'?\n"
@@ -2663,7 +2658,7 @@ msgstr ""
 "Está seguro de que quere recargar '%s'?\n"
 "Perderanse todos os cambios que non gardou."
 
-#: ../plugins/document-manager/action-callbacks.c:286
+#: ../plugins/document-manager/action-callbacks.c:323
 msgid "_Reload"
 msgstr "_Recargar"
 
@@ -2677,7 +2672,7 @@ msgstr "Eliminar o marcador"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:331
 #: ../plugins/document-manager/anjuta-bookmarks.c:393
-#: ../plugins/document-manager/plugin.c:418
+#: ../plugins/document-manager/plugin.c:421
 msgid "Bookmarks"
 msgstr "Marcadores"
 
@@ -2690,26 +2685,26 @@ msgstr "_Renomear"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../plugins/document-manager/anjuta-docman.c:399
+#: ../plugins/document-manager/anjuta-docman.c:438
 msgid "Close file"
 msgstr "Pechar o ficheiro"
 
-#: ../plugins/document-manager/anjuta-docman.c:447
+#: ../plugins/document-manager/anjuta-docman.c:486
 msgid "Path:"
 msgstr "Camiño:"
 
-#: ../plugins/document-manager/anjuta-docman.c:564
+#: ../plugins/document-manager/anjuta-docman.c:603
 #: ../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 "Abrir o ficheiro"
 
-#: ../plugins/document-manager/anjuta-docman.c:583
+#: ../plugins/document-manager/anjuta-docman.c:622
 #: ../plugins/message-view/message-view.c:94
 msgid "Save file as"
 msgstr "Gardar ficheiro como"
 
-#: ../plugins/document-manager/anjuta-docman.c:664
+#: ../plugins/document-manager/anjuta-docman.c:703
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -2718,11 +2713,11 @@ msgstr ""
 "O ficheiro '%s' xa existe.\n"
 "Quere substituír este ficheiro polo que está gardando?"
 
-#: ../plugins/document-manager/anjuta-docman.c:673
+#: ../plugins/document-manager/anjuta-docman.c:712
 msgid "_Replace"
 msgstr "Substituí_r"
 
-#: ../plugins/document-manager/anjuta-docman.c:1390
+#: ../plugins/document-manager/anjuta-docman.c:1429
 msgid "[read-only]"
 msgstr "[só de lectura]"
 
@@ -2828,129 +2823,137 @@ msgid "Close all files"
 msgstr "Pechar todos os ficheiros"
 
 #: ../plugins/document-manager/plugin.c:164
+msgid "Close Other"
+msgstr "Pechar os outros"
+
+#: ../plugins/document-manager/plugin.c:165
+msgid "Close other documents"
+msgstr "Pechar os outros documentos"
+
+#: ../plugins/document-manager/plugin.c:167
 msgid "Reload F_ile"
 msgstr "Recargar o f_icheiro"
 
-#: ../plugins/document-manager/plugin.c:165
+#: ../plugins/document-manager/plugin.c:168
 msgid "Reload current file"
 msgstr "Recargar o ficheiro actual"
 
-#: ../plugins/document-manager/plugin.c:167
+#: ../plugins/document-manager/plugin.c:170
 msgid "Recent _Files"
 msgstr "_Ficheiros recentes"
 
-#: ../plugins/document-manager/plugin.c:171
+#: ../plugins/document-manager/plugin.c:174
 msgid "_Printâ?¦"
 msgstr "Imprimir"
 
-#: ../plugins/document-manager/plugin.c:172
+#: ../plugins/document-manager/plugin.c:175
 msgid "Print the current file"
 msgstr "Imprimir o ficheiro actual"
 
-#: ../plugins/document-manager/plugin.c:179
+#: ../plugins/document-manager/plugin.c:182
 msgid "_Print Preview"
 msgstr "Previsualización de _impresión"
 
-#: ../plugins/document-manager/plugin.c:180
+#: ../plugins/document-manager/plugin.c:183
 msgid "Preview the current file in print format"
 msgstr "Previsualizar o ficheiro actual en formato de impresión"
 
-#: ../plugins/document-manager/plugin.c:185
+#: ../plugins/document-manager/plugin.c:188
 msgid "_Transform"
 msgstr "_Transformar"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:186
+#: ../plugins/document-manager/plugin.c:189
 msgid "_Make Selection Uppercase"
 msgstr "_Pór a selección en maiúsculas"
 
-#: ../plugins/document-manager/plugin.c:187
+#: ../plugins/document-manager/plugin.c:190
 msgid "Make the selected text uppercase"
 msgstr "Pór o texto seleccionado en maiúsculas"
 
-#: ../plugins/document-manager/plugin.c:189
+#: ../plugins/document-manager/plugin.c:192
 msgid "Make Selection Lowercase"
 msgstr "Pór a selección en minúsculas"
 
-#: ../plugins/document-manager/plugin.c:190
+#: ../plugins/document-manager/plugin.c:193
 msgid "Make the selected text lowercase"
 msgstr "Pór o texto seleccionado en minúsculas"
 
-#: ../plugins/document-manager/plugin.c:192
+#: ../plugins/document-manager/plugin.c:195
 msgid "Convert EOL to CRLF"
 msgstr "Converter EOL en CRLF"
 
-#: ../plugins/document-manager/plugin.c:193
+#: ../plugins/document-manager/plugin.c:196
 msgid "Convert End Of Line characters to DOS EOL (CRLF)"
 msgstr "Converter os caracteres End Of Line en DOS EOL (CRLF)"
 
-#: ../plugins/document-manager/plugin.c:195
+#: ../plugins/document-manager/plugin.c:198
 msgid "Convert EOL to LF"
 msgstr "Converter EOL en LF"
 
-#: ../plugins/document-manager/plugin.c:196
+#: ../plugins/document-manager/plugin.c:199
 msgid "Convert End Of Line characters to Unix EOL (LF)"
 msgstr "Converter os caracteres End Of Line en Unix EOL (LF)"
 
-#: ../plugins/document-manager/plugin.c:198
+#: ../plugins/document-manager/plugin.c:201
 msgid "Convert EOL to CR"
 msgstr "Converter EOL en CR"
 
-#: ../plugins/document-manager/plugin.c:199
+#: ../plugins/document-manager/plugin.c:202
 msgid "Convert End Of Line characters to Mac OS EOL (CR)"
 msgstr "Converter os caracteres End Of Line en Mac OS EOL (CR)"
 
-#: ../plugins/document-manager/plugin.c:201
+#: ../plugins/document-manager/plugin.c:204
 msgid "Convert EOL to Majority EOL"
 msgstr "Converter EOL en EOL maioritario"
 
-#: ../plugins/document-manager/plugin.c:202
+#: ../plugins/document-manager/plugin.c:205
 msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr ""
 "Converter os caracteres End Of Line na maioría dos EOL que se encontraron no "
 "ficheiro"
 
-#: ../plugins/document-manager/plugin.c:207
+#: ../plugins/document-manager/plugin.c:210
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../plugins/document-manager/plugin.c:209
+#: ../plugins/document-manager/plugin.c:212
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ../plugins/document-manager/plugin.c:210
+#: ../plugins/document-manager/plugin.c:213
 msgid "Select all text in the editor"
 msgstr "Seleccionar todo o texto do editor"
 
-#: ../plugins/document-manager/plugin.c:212
+#: ../plugins/document-manager/plugin.c:215
 msgid "Select _Code Block"
 msgstr "Seleccionar bloque de _código"
 
-#: ../plugins/document-manager/plugin.c:213
+#: ../plugins/document-manager/plugin.c:216
 msgid "Select the current code block"
 msgstr "Seleccionar o bloque de código actual"
 
-#: ../plugins/document-manager/plugin.c:218
+#: ../plugins/document-manager/plugin.c:221
 msgid "Co_mment"
 msgstr "Co_mentario"
 
 #. Block comment: Uses line-comment (comment that affects only single line
 #. such as '//' or '#') and comments a block of lines.
-#: ../plugins/document-manager/plugin.c:221
+#: ../plugins/document-manager/plugin.c:224
 msgid "_Block Comment/Uncomment"
 msgstr "Comentar ou descomentar o _bloque"
 
-#: ../plugins/document-manager/plugin.c:222
+#: ../plugins/document-manager/plugin.c:225
 msgid "Block comment the selected text"
 msgstr "Comentar en bloque o texto seleccionado"
 
 #. Box comment: Uses stream-comment to comment a block of lines, usually with
 #. some decorations, to give an appearance of box.
-#: ../plugins/document-manager/plugin.c:226
+#: ../plugins/document-manager/plugin.c:229
 msgid "Bo_x Comment/Uncomment"
 msgstr "Comentar ou descomentar en cai_xa"
 
-#: ../plugins/document-manager/plugin.c:227
+#: ../plugins/document-manager/plugin.c:230
 msgid "Box comment the selected text"
 msgstr "Comentar en caixa o texto seleccionado"
 
@@ -2958,421 +2961,421 @@ msgstr "Comentar en caixa o texto seleccionado"
 #. characters -- has start and end comment code) and comments any code from
 #. arbitrary start position to arbitrary end position (can be in middle of
 #. lines).
-#: ../plugins/document-manager/plugin.c:233
+#: ../plugins/document-manager/plugin.c:236
 msgid "_Stream Comment/Uncomment"
 msgstr "Comentar ou descomentar en _fluxo"
 
-#: ../plugins/document-manager/plugin.c:234
+#: ../plugins/document-manager/plugin.c:237
 msgid "Stream comment the selected text"
 msgstr "Comentar en fluxo o texto seleccionado"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:240
+#: ../plugins/document-manager/plugin.c:243
 msgid "_Line Numberâ?¦"
 msgstr "Número de _liña..."
 
-#: ../plugins/document-manager/plugin.c:241
+#: ../plugins/document-manager/plugin.c:244
 msgid "Go to a particular line in the editor"
 msgstr "Ir a un número de liña específico no editor"
 
-#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/document-manager/plugin.c:246
 msgid "Matching _Brace"
 msgstr "Cha_ve correspondente"
 
-#: ../plugins/document-manager/plugin.c:244
+#: ../plugins/document-manager/plugin.c:247
 msgid "Go to the matching brace in the editor"
 msgstr "Ir á chave correspondente no editor"
 
-#: ../plugins/document-manager/plugin.c:246
+#: ../plugins/document-manager/plugin.c:249
 msgid "_Start of Block"
 msgstr "_Principio do bloque"
 
-#: ../plugins/document-manager/plugin.c:247
+#: ../plugins/document-manager/plugin.c:250
 msgid "Go to the start of the current block"
 msgstr "Ir ao principio do bloque actual"
 
-#: ../plugins/document-manager/plugin.c:249
+#: ../plugins/document-manager/plugin.c:252
 msgid "_End of Block"
 msgstr "_Final do bloque"
 
-#: ../plugins/document-manager/plugin.c:250
+#: ../plugins/document-manager/plugin.c:253
 msgid "Go to the end of the current block"
 msgstr "Ir ao final do bloque actual"
 
-#: ../plugins/document-manager/plugin.c:252
+#: ../plugins/document-manager/plugin.c:255
 msgid "Previous _History"
 msgstr "_Historial anterior"
 
-#: ../plugins/document-manager/plugin.c:253
+#: ../plugins/document-manager/plugin.c:256
 msgid "Go to previous history"
 msgstr "Ir ao historial anterior"
 
-#: ../plugins/document-manager/plugin.c:255
+#: ../plugins/document-manager/plugin.c:258
 msgid "Next Histor_y"
 msgstr "Seguinte h_istorial"
 
-#: ../plugins/document-manager/plugin.c:256
+#: ../plugins/document-manager/plugin.c:259
 msgid "Go to next history"
 msgstr "Ir ao seguinte historial"
 
-#: ../plugins/document-manager/plugin.c:261 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:264 ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../plugins/document-manager/plugin.c:262
+#: ../plugins/document-manager/plugin.c:265
 msgid "_Quick Search"
 msgstr "Busca _rápida"
 
-#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/document-manager/plugin.c:266
 msgid "Quick editor embedded search"
 msgstr "Busca rápida incorporada no editor"
 
-#: ../plugins/document-manager/plugin.c:265
+#: ../plugins/document-manager/plugin.c:268
 msgid "Quick _ReSearch"
 msgstr "Re_petir a busca rápida"
 
-#: ../plugins/document-manager/plugin.c:266
+#: ../plugins/document-manager/plugin.c:269
 msgid "Repeat quick search"
 msgstr "Repetir a busca rápida"
 
-#: ../plugins/document-manager/plugin.c:271 ../plugins/gtodo/interface.c:168
+#: ../plugins/document-manager/plugin.c:274 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
 #: ../plugins/language-support-cpp-java/plugin.c:1882
 msgid "_Edit"
 msgstr "_Editar"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:272
+#: ../plugins/document-manager/plugin.c:275
 msgid "_Editor"
 msgstr "_Editor"
 
-#: ../plugins/document-manager/plugin.c:279
+#: ../plugins/document-manager/plugin.c:282
 msgid "_Add Editor View"
 msgstr "En_gadir visualización do editor"
 
-#: ../plugins/document-manager/plugin.c:280
+#: ../plugins/document-manager/plugin.c:283
 msgid "Add one more view of current document"
 msgstr "Engadir unha visualización máis do documento actual"
 
-#: ../plugins/document-manager/plugin.c:282
+#: ../plugins/document-manager/plugin.c:285
 msgid "_Remove Editor View"
 msgstr "_Eliminar a visualización do editor"
 
-#: ../plugins/document-manager/plugin.c:283
+#: ../plugins/document-manager/plugin.c:286
 msgid "Remove current view of the document"
 msgstr "Eliminar a visualización actual do documento"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:288
 msgid "U_ndo"
 msgstr "_Desfacer"
 
-#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4076
+#: ../plugins/document-manager/plugin.c:289 ../plugins/glade/plugin.c:4076
 msgid "Undo the last action"
 msgstr "Desfacer a última acción"
 
-#: ../plugins/document-manager/plugin.c:288
+#: ../plugins/document-manager/plugin.c:291
 msgid "_Redo"
 msgstr "_Refacer"
 
-#: ../plugins/document-manager/plugin.c:289
+#: ../plugins/document-manager/plugin.c:292
 msgid "Redo the last undone action"
 msgstr "Refacer a última acción desfeita"
 
-#: ../plugins/document-manager/plugin.c:291
+#: ../plugins/document-manager/plugin.c:294
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: ../plugins/document-manager/plugin.c:292
+#: ../plugins/document-manager/plugin.c:295
 msgid "Cut the selected text from the editor to the clipboard"
 msgstr "Cortar o texto seleccionado no editor e mantelo no portapapeis"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:609
+#: ../plugins/document-manager/plugin.c:297 ../plugins/terminal/terminal.c:609
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../plugins/document-manager/plugin.c:295
+#: ../plugins/document-manager/plugin.c:298
 msgid "Copy the selected text to the clipboard"
 msgstr "Copiar o texto seleccionado no portapapeis"
 
-#: ../plugins/document-manager/plugin.c:297 ../plugins/terminal/terminal.c:617
+#: ../plugins/document-manager/plugin.c:300 ../plugins/terminal/terminal.c:617
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../plugins/document-manager/plugin.c:298
+#: ../plugins/document-manager/plugin.c:301
 msgid "Paste the content of clipboard at the current position"
 msgstr "Pegar o contido do portapapeis na posición do cursor"
 
-#: ../plugins/document-manager/plugin.c:306
+#: ../plugins/document-manager/plugin.c:309
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../plugins/document-manager/plugin.c:307
+#: ../plugins/document-manager/plugin.c:310
 msgid "Delete the selected text from the editor"
 msgstr "Quere eliminar o texto seleccionado do editor"
 
-#: ../plugins/document-manager/plugin.c:310
+#: ../plugins/document-manager/plugin.c:313
 msgid "_Auto-Complete"
 msgstr "Completar _automaticamente"
 
-#: ../plugins/document-manager/plugin.c:311
+#: ../plugins/document-manager/plugin.c:314
 msgid "Auto-complete the current word"
 msgstr "Completar automaticamente a palabra actual"
 
-#: ../plugins/document-manager/plugin.c:316
+#: ../plugins/document-manager/plugin.c:319
 msgid "_Line Number Margin"
 msgstr "Marxe do número de _liña"
 
-#: ../plugins/document-manager/plugin.c:317
+#: ../plugins/document-manager/plugin.c:320
 msgid "Show/Hide line numbers"
 msgstr "Mostrar ou ocultar os números de liña"
 
-#: ../plugins/document-manager/plugin.c:319
+#: ../plugins/document-manager/plugin.c:322
 msgid "_Marker Margin"
 msgstr "Marxe do _marcador"
 
-#: ../plugins/document-manager/plugin.c:320
+#: ../plugins/document-manager/plugin.c:323
 msgid "Show/Hide marker margin"
 msgstr "Mostrar ou ocultar a marxe do marcador"
 
-#: ../plugins/document-manager/plugin.c:322
+#: ../plugins/document-manager/plugin.c:325
 msgid "_Code Fold Margin"
 msgstr "Marxe de dobra do _código"
 
-#: ../plugins/document-manager/plugin.c:323
+#: ../plugins/document-manager/plugin.c:326
 msgid "Show/Hide code fold margin"
 msgstr "Mostrar ou ocultar a marxe de dobra do código"
 
-#: ../plugins/document-manager/plugin.c:325
+#: ../plugins/document-manager/plugin.c:328
 msgid "_Indentation Guides"
 msgstr "Guías da s_angría"
 
-#: ../plugins/document-manager/plugin.c:326
+#: ../plugins/document-manager/plugin.c:329
 msgid "Show/Hide indentation guides"
 msgstr "Mostrar ou ocultar as guías da sangría"
 
-#: ../plugins/document-manager/plugin.c:328
+#: ../plugins/document-manager/plugin.c:331
 msgid "_White Space"
 msgstr "Espazo en _branco"
 
-#: ../plugins/document-manager/plugin.c:329
+#: ../plugins/document-manager/plugin.c:332
 msgid "Show/Hide white spaces"
 msgstr "Mostrar ou ocultar os espazos en branco"
 
-#: ../plugins/document-manager/plugin.c:331
+#: ../plugins/document-manager/plugin.c:334
 msgid "_Line End Characters"
 msgstr "Caracteres de fin de _liña"
 
-#: ../plugins/document-manager/plugin.c:332
+#: ../plugins/document-manager/plugin.c:335
 msgid "Show/Hide line end characters"
 msgstr "Mostrar ou ocultar os caracteres de fin de liña"
 
-#: ../plugins/document-manager/plugin.c:334
+#: ../plugins/document-manager/plugin.c:337
 msgid "Line _Wrapping"
 msgstr "_Axuste de liñas"
 
-#: ../plugins/document-manager/plugin.c:335
+#: ../plugins/document-manager/plugin.c:338
 msgid "Enable/disable line wrapping"
 msgstr "Activar ou desactivar o axuste de liñas"
 
-#: ../plugins/document-manager/plugin.c:340
+#: ../plugins/document-manager/plugin.c:343
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: ../plugins/document-manager/plugin.c:341
+#: ../plugins/document-manager/plugin.c:344
 msgid "Zoom in: Increase font size"
 msgstr "Ampliar: aumentar o tamaño do tipo de letra"
 
-#: ../plugins/document-manager/plugin.c:343
+#: ../plugins/document-manager/plugin.c:346
 msgid "Zoom Out"
 msgstr "Reducir"
 
-#: ../plugins/document-manager/plugin.c:344
+#: ../plugins/document-manager/plugin.c:347
 msgid "Zoom out: Decrease font size"
 msgstr "Reducir: diminuír o tamaño do tipo de letra"
 
-#: ../plugins/document-manager/plugin.c:349
+#: ../plugins/document-manager/plugin.c:352
 msgid "_Highlight Mode"
 msgstr "Modo de _realce"
 
-#: ../plugins/document-manager/plugin.c:353
+#: ../plugins/document-manager/plugin.c:356
 msgid "_Close All Folds"
 msgstr "Pe_char todas as dobras"
 
-#: ../plugins/document-manager/plugin.c:354
+#: ../plugins/document-manager/plugin.c:357
 msgid "Close all code folds in the editor"
 msgstr "Pechar todas as dobras de código no editor"
 
-#: ../plugins/document-manager/plugin.c:356
+#: ../plugins/document-manager/plugin.c:359
 msgid "_Open All Folds"
 msgstr "_Abrir todas as dobras"
 
-#: ../plugins/document-manager/plugin.c:357
+#: ../plugins/document-manager/plugin.c:360
 msgid "Open all code folds in the editor"
 msgstr "Abrir todas as dobras de código no editor"
 
-#: ../plugins/document-manager/plugin.c:359
+#: ../plugins/document-manager/plugin.c:362
 msgid "_Toggle Current Fold"
 msgstr "_Alternar a dobra actual"
 
-#: ../plugins/document-manager/plugin.c:360
+#: ../plugins/document-manager/plugin.c:363
 msgid "Toggle current code fold in the editor"
 msgstr "Alternar a dobra de código actual no editor"
 
-#: ../plugins/document-manager/plugin.c:365
+#: ../plugins/document-manager/plugin.c:368
 msgid "_Documents"
 msgstr "_Documentos"
 
-#: ../plugins/document-manager/plugin.c:366
+#: ../plugins/document-manager/plugin.c:369
 msgid "Previous Document"
 msgstr "Documento anterior"
 
-#: ../plugins/document-manager/plugin.c:367
+#: ../plugins/document-manager/plugin.c:370
 msgid "Switch to previous document"
 msgstr "Cambiar ao documento anterior"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:372
 msgid "Next Document"
 msgstr "Documento seguinte"
 
-#: ../plugins/document-manager/plugin.c:370
+#: ../plugins/document-manager/plugin.c:373
 msgid "Switch to next document"
 msgstr "Cambiar ao seguinte documento"
 
-#: ../plugins/document-manager/plugin.c:375
+#: ../plugins/document-manager/plugin.c:378
 msgid "Bookmar_k"
 msgstr "Ma_rcador"
 
-#: ../plugins/document-manager/plugin.c:376
+#: ../plugins/document-manager/plugin.c:379
 msgid "_Add Bookmark"
 msgstr "_Engadir marcador"
 
-#: ../plugins/document-manager/plugin.c:377
+#: ../plugins/document-manager/plugin.c:380
 msgid "Add a bookmark at the current line position"
 msgstr "Engadir un marcador na posición de liña actual"
 
-#: ../plugins/document-manager/plugin.c:379
+#: ../plugins/document-manager/plugin.c:382
 msgid "_Previous Bookmark"
 msgstr "Marcador _anterior"
 
-#: ../plugins/document-manager/plugin.c:380
+#: ../plugins/document-manager/plugin.c:383
 msgid "Jump to the previous bookmark in the file"
 msgstr "Ir ao marcador anterior do ficheiro"
 
-#: ../plugins/document-manager/plugin.c:382
+#: ../plugins/document-manager/plugin.c:385
 msgid "_Next Bookmark"
 msgstr "Se_guinte marcador"
 
-#: ../plugins/document-manager/plugin.c:383
+#: ../plugins/document-manager/plugin.c:386
 msgid "Jump to the next bookmark in the file"
 msgstr "Ir ao seguinte marcador do ficheiro"
 
-#: ../plugins/document-manager/plugin.c:385
+#: ../plugins/document-manager/plugin.c:388
 msgid "_Clear All Bookmarks"
 msgstr "_Limpar todos os marcadores"
 
-#: ../plugins/document-manager/plugin.c:386
+#: ../plugins/document-manager/plugin.c:389
 msgid "Clear bookmarks"
 msgstr "Limpar os marcadores"
 
-#: ../plugins/document-manager/plugin.c:405
+#: ../plugins/document-manager/plugin.c:408
 msgid "Editor file operations"
 msgstr "Operacións con ficheiros do editor"
 
-#: ../plugins/document-manager/plugin.c:406
+#: ../plugins/document-manager/plugin.c:409
 msgid "Editor print operations"
 msgstr "Operacións de impresión do editor"
 
-#: ../plugins/document-manager/plugin.c:407
+#: ../plugins/document-manager/plugin.c:410
 msgid "Editor text transformation"
 msgstr "Transformación de texto do editor"
 
-#: ../plugins/document-manager/plugin.c:408
+#: ../plugins/document-manager/plugin.c:411
 msgid "Editor text selection"
 msgstr "Selección de texto do editor"
 
 #. { actions_insert, G_N_ELEMENTS (actions_insert), "ActionGroupEditorInsert", N_("Editor text insertions") },
-#: ../plugins/document-manager/plugin.c:410
+#: ../plugins/document-manager/plugin.c:413
 msgid "Editor code commenting"
 msgstr "Comentarios de código do editor"
 
-#: ../plugins/document-manager/plugin.c:411
+#: ../plugins/document-manager/plugin.c:414
 msgid "Editor navigations"
 msgstr "Navegacións do editor"
 
-#: ../plugins/document-manager/plugin.c:412
+#: ../plugins/document-manager/plugin.c:415
 msgid "Editor edit operations"
 msgstr "Operacións de edición do editor"
 
-#: ../plugins/document-manager/plugin.c:413
+#: ../plugins/document-manager/plugin.c:416
 msgid "Editor zoom operations"
 msgstr "Operacións de ampliación do editor"
 
-#: ../plugins/document-manager/plugin.c:414
+#: ../plugins/document-manager/plugin.c:417
 msgid "Editor syntax highlighting styles"
 msgstr "Estilos de realce de sintaxe do editor"
 
-#: ../plugins/document-manager/plugin.c:415
+#: ../plugins/document-manager/plugin.c:418
 msgid "Editor text formating"
 msgstr "Formatado de texto do editor"
 
-#: ../plugins/document-manager/plugin.c:416
+#: ../plugins/document-manager/plugin.c:419
 msgid "Simple searching"
 msgstr "Busca sinxela"
 
-#: ../plugins/document-manager/plugin.c:417
-#: ../plugins/document-manager/plugin.c:1734
-#: ../plugins/document-manager/plugin.c:2151
-#: ../plugins/document-manager/plugin.c:2161
+#: ../plugins/document-manager/plugin.c:420
+#: ../plugins/document-manager/plugin.c:1737
+#: ../plugins/document-manager/plugin.c:2154
+#: ../plugins/document-manager/plugin.c:2164
 msgid "Documents"
 msgstr "Documentos"
 
-#: ../plugins/document-manager/plugin.c:422
+#: ../plugins/document-manager/plugin.c:425
 msgid "Editor view settings"
 msgstr "Configuración de visualización do editor"
 
-#: ../plugins/document-manager/plugin.c:607
+#: ../plugins/document-manager/plugin.c:610
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../plugins/document-manager/plugin.c:613
+#: ../plugins/document-manager/plugin.c:616
 msgid "Go to"
 msgstr "Ir a"
 
-#: ../plugins/document-manager/plugin.c:928
+#: ../plugins/document-manager/plugin.c:931
 msgid "OVR"
 msgstr "SOB"
 
-#: ../plugins/document-manager/plugin.c:932
+#: ../plugins/document-manager/plugin.c:935
 msgid "INS"
 msgstr "INS"
 
-#: ../plugins/document-manager/plugin.c:938
 #: ../plugins/document-manager/plugin.c:941
+#: ../plugins/document-manager/plugin.c:944
 msgid "Zoom"
 msgstr "Ampliar"
 
-#: ../plugins/document-manager/plugin.c:944
+#: ../plugins/document-manager/plugin.c:947
 msgid "Col"
 msgstr "Col"
 
-#: ../plugins/document-manager/plugin.c:945
+#: ../plugins/document-manager/plugin.c:948
 msgid "Mode"
 msgstr "Modo"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1025
+#: ../plugins/document-manager/plugin.c:1028
 msgid "Automatic"
 msgstr "Automático"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1558
+#: ../plugins/document-manager/plugin.c:1561
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "Produciuse un fallo ao gardar automaticamente %s"
 
-#: ../plugins/document-manager/plugin.c:1572
+#: ../plugins/document-manager/plugin.c:1575
 msgid "Autosave completed"
 msgstr "Terminou de gardar automaticamente"
 
@@ -3652,7 +3655,7 @@ msgid "Filter"
 msgstr "Filtro"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2329 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2129 ../plugins/symbol-db/plugin.c:2178
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Global"
@@ -6665,7 +6668,7 @@ msgstr "Estilo do indicador de mensaxe de aviso:"
 msgid "Warnings:"
 msgstr "Avisos:"
 
-#: ../plugins/message-view/anjuta-msgman.c:99
+#: ../plugins/message-view/anjuta-msgman.c:76
 msgid "Close all message tabs"
 msgstr "Pechar todas os separadores de mensaxes"
 
@@ -9027,39 +9030,39 @@ msgstr "Encontrar o símbolo"
 msgid "Find Symbol"
 msgstr "Encontrar o símbolo"
 
-#: ../plugins/symbol-db/plugin.c:1173
+#: ../plugins/symbol-db/plugin.c:1023
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%s: Xeración de herdanzas..."
 
-#: ../plugins/symbol-db/plugin.c:1178
+#: ../plugins/symbol-db/plugin.c:1028
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%s: %d ficheiros escaneados fóra de %d"
 
-#: ../plugins/symbol-db/plugin.c:1209
+#: ../plugins/symbol-db/plugin.c:1059
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "Xeración de herdanzas..."
 
-#: ../plugins/symbol-db/plugin.c:1211
+#: ../plugins/symbol-db/plugin.c:1061
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "%d ficheiros escaneados fora de %d"
 
-#: ../plugins/symbol-db/plugin.c:1979
+#: ../plugins/symbol-db/plugin.c:1788
 msgid "Populating symbol databaseâ?¦"
 msgstr "Poboar a bd con símbolos..."
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2114 ../plugins/symbol-db/plugin.c:2209
 msgid "Symbols"
 msgstr "Símbolos"
 
-#: ../plugins/symbol-db/plugin.c:2489
+#: ../plugins/symbol-db/plugin.c:2218
 msgid "SymbolDb popup actions"
 msgstr "Accións en xanelas emerxentes de SymbolDb"
 
-#: ../plugins/symbol-db/plugin.c:2497
+#: ../plugins/symbol-db/plugin.c:2226
 msgid "SymbolDb menu actions"
 msgstr "Accións do menú de SymbolDb"
 
@@ -9081,15 +9084,6 @@ msgstr "Etiquetas API"
 msgid "Resuming glb scan."
 msgstr "Retomar a análise glb."
 
-#: ../plugins/symbol-db/symbol-db-view-locals.c:326
-#: ../plugins/symbol-db/symbol-db-view.c:1412
-msgid "Symbol"
-msgstr "Símbolo"
-
-#: ../plugins/symbol-db/symbol-db-view.c:798
-msgid "Loadingâ?¦"
-msgstr "Cargando..."
-
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
 msgid "Automatically scan project's packages"
 msgstr "Explorar paquetes de proxecto automaticamente"
@@ -10163,6 +10157,15 @@ msgstr "Realzar os puntos e comas que faltan"
 msgid "Min character for completion "
 msgstr "Mínimo de caracteres para o completado"
 
+#~ msgid "Online"
+#~ msgstr "En liña"
+
+#~ msgid "Symbol"
+#~ msgstr "Símbolo"
+
+#~ msgid "Loadingâ?¦"
+#~ msgstr "Cargando..."
+
 #~ msgid "Edit&#x2026;"
 #~ msgstr "Editar&#x2026;"
 
diff --git a/po/th.po b/po/th.po
index 8805097..d1abfb0 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: anjuta\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-01-27 11:01+0000\n"
-"PO-Revision-Date: 2010-02-03 03:15+0700\n"
-"Last-Translator: อา�ม ���ิ�ั��วา���� <knight2000 gmail com>\n"
+"POT-Creation-Date: 2010-04-17 09:55+0000\n"
+"PO-Revision-Date: 2010-04-25 17:28+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -192,7 +192,7 @@ msgstr "��ย"
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3267
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:104
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:151
-#: ../plugins/dir-project/dir-project.c:837
+#: ../plugins/dir-project/dir-project.c:802
 msgid "Unknown"
 msgstr "�ม��รา�"
 
@@ -241,7 +241,7 @@ msgstr "�หล�"
 msgid "Available Plugins"
 msgstr "�ลั��อิ��ี�มีอยู�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:736
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:773
 msgid "Preferred plugins"
 msgstr "�ลั��อิ��ี��ลือ����"
 
@@ -405,7 +405,7 @@ msgstr "�ระ�ภ�"
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:723
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:760
 #: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "�ั�ว��"
@@ -589,8 +589,8 @@ msgstr "อ�อ������ Pixbuf"
 msgid "The pixbuf to render."
 msgstr "pixbuf �ี��ะวา�"
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3041
-#: ../plugins/glade/plugin.c:3076
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3029
+#: ../plugins/glade/plugin.c:3064
 #, c-format
 msgid "Widget not found: %s"
 msgstr "�ม���วิ�����: %s"
@@ -739,11 +739,11 @@ msgstr "���ม��ร��รม '%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:167
+#: ../plugins/build-basic-autotools/plugin.c:168
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:168
+#: ../plugins/build-basic-autotools/plugin.c:169
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 
@@ -752,284 +752,284 @@ 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:176
+#: ../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:177
+#: ../plugins/build-basic-autotools/plugin.c:178
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:845
+#: ../plugins/build-basic-autotools/plugin.c:846
 #, c-format
 msgid "Entering: %s"
 msgstr "�ำลั����าสู�: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:881
+#: ../plugins/build-basic-autotools/plugin.c:882
 #, c-format
 msgid "Leaving: %s"
 msgstr "�ำลั�ออ��า�: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:914
+#: ../plugins/build-basic-autotools/plugin.c:915
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "�ำ��ือ�:"
 
-#: ../plugins/build-basic-autotools/plugin.c:920
+#: ../plugins/build-basic-autotools/plugin.c:921
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "��อ�ิ��ลา�:"
 
-#: ../plugins/build-basic-autotools/plugin.c:1037
+#: ../plugins/build-basic-autotools/plugin.c:1038
 #, c-format
 msgid "Command exited with status %d"
 msgstr "�ำสั�����าร�ำ�า���วยส�า�ะ %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1047
-#: ../plugins/build-basic-autotools/plugin.c:1523
+#: ../plugins/build-basic-autotools/plugin.c:1048
+#: ../plugins/build-basic-autotools/plugin.c:1524
 #, c-format
 msgid "Command canceled by user"
 msgstr "�ำสั���ู�ย��ลิ���ย�ู����"
 
-#: ../plugins/build-basic-autotools/plugin.c:1052
+#: ../plugins/build-basic-autotools/plugin.c:1053
 #, c-format
 msgid "Command aborted by user"
 msgstr "�ำสั���ู��ลิ��ำ��ย�ู����"
 
-#: ../plugins/build-basic-autotools/plugin.c:1057
+#: ../plugins/build-basic-autotools/plugin.c:1058
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "�ำสั���ู��ำ�ห�หยุ���ยสั��า� %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1065
+#: ../plugins/build-basic-autotools/plugin.c:1066
 msgid "Command terminated for an unknown reason"
 msgstr "�ำสั���ู��ำ�ห�หยุ���ย�ม��รา��ห�ุ�ล"
 
-#: ../plugins/build-basic-autotools/plugin.c:1083
+#: ../plugins/build-basic-autotools/plugin.c:1084
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "�วลา�ี�����ั��หม�: %lu วิ�า�ี\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1090
+#: ../plugins/build-basic-autotools/plugin.c:1091
 msgid "Completed unsuccessfully\n"
 msgstr "�ม�สำ�ร��\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1098
+#: ../plugins/build-basic-autotools/plugin.c:1099
 #: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "สำ�ร��\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:1186
+#: ../plugins/build-basic-autotools/plugin.c:1187
 #, c-format
 msgid "Build %d: %s"
 msgstr "�าร�ระ�อ�สร�า� %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1517
+#: ../plugins/build-basic-autotools/plugin.c:1518
 msgid ""
 "Before using this new configuration, the default one needs to be removed. Do "
 "you want to do that ?"
 msgstr "��อ�����าร�ั����า�หม��ี� ��อ�ล���า�ริยาย��อ� ยื�ยั��ี��ะ�ำ�����ั��หรือ�ม�?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1820
+#: ../plugins/build-basic-autotools/plugin.c:1822
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "�ม�สามาร��อม��ล� \"%s\": �ม�����ำห�����อม��ล��ว�สำหรั����ม��ิ��ี�"
 
-#: ../plugins/build-basic-autotools/plugin.c:1955
+#: ../plugins/build-basic-autotools/plugin.c:1957
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "�ม�สามาร��ั����า��ร��าร: �า�ส�ริ����ั����า�� %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:2432
-#: ../plugins/build-basic-autotools/plugin.c:2506
-#: ../plugins/build-basic-autotools/plugin.c:2516
-#: ../plugins/build-basic-autotools/plugin.c:2534
-#: ../plugins/build-basic-autotools/plugin.c:2544
-#: ../plugins/build-basic-autotools/plugin.c:2601
+#: ../plugins/build-basic-autotools/plugin.c:2438
+#: ../plugins/build-basic-autotools/plugin.c:2512
+#: ../plugins/build-basic-autotools/plugin.c:2522
+#: ../plugins/build-basic-autotools/plugin.c:2540
+#: ../plugins/build-basic-autotools/plugin.c:2550
+#: ../plugins/build-basic-autotools/plugin.c:2607
 #, c-format
 msgid "_Build"
 msgstr "�ระ�อ�_สร�า�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2436
+#: ../plugins/build-basic-autotools/plugin.c:2442
 msgid "_Build Project"
 msgstr "�ระ�อ�_สร�า���ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2437
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "Build whole project"
 msgstr "�ระ�อ�สร�า��ั����ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2442
+#: ../plugins/build-basic-autotools/plugin.c:2448
 msgid "_Install Project"
 msgstr "_�ิ��ั����ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2443
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "Install whole project"
 msgstr "�ิ��ั���ั����ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2448
+#: ../plugins/build-basic-autotools/plugin.c:2454
 msgid "_Clean Project"
 msgstr "�_����วา���ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2449
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "Clean whole project"
 msgstr "�����วา��ั����ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2454
+#: ../plugins/build-basic-autotools/plugin.c:2460
 msgid "C_onfigure Projectâ?¦"
 msgstr "_�ั����า��ร��าร�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2455
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "Configure project"
 msgstr "�ั����า��ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2460
+#: ../plugins/build-basic-autotools/plugin.c:2466
 msgid "Build _Tarball"
 msgstr "�ระ�อ�สร�า����ม_�าร�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2461
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build project tarball distribution"
 msgstr "�ระ�อ�สร�า����ม�าร������าย�อ���ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2466
+#: ../plugins/build-basic-autotools/plugin.c:2472
 msgid "_Build Module"
 msgstr "�ระ�อ�_สร�า�มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2467
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "Build module associated with current file"
 msgstr "�ระ�อ�สร�า�มอ�ูล�ี���ี�ยว�ั����ม�ั��ุ�ั�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2472
+#: ../plugins/build-basic-autotools/plugin.c:2478
 msgid "_Install Module"
 msgstr "_�ิ��ั��มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2473
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "Install module associated with current file"
 msgstr "�ิ��ั��มอ�ูล�ี���ี�ยว�ั����ม�ั��ุ�ั�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2478
+#: ../plugins/build-basic-autotools/plugin.c:2484
 msgid "_Clean Module"
 msgstr "�_����วา�มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2479
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "Clean module associated with current file"
 msgstr "�����วา�มอ�ูล�ี���ี�ยว�ั����ม�ั��ุ�ั�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2484
+#: ../plugins/build-basic-autotools/plugin.c:2490
 msgid "Co_mpile File"
 msgstr "�อ_ม��ล����ม"
 
-#: ../plugins/build-basic-autotools/plugin.c:2485
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Compile current editor file"
 msgstr "�อม��ล����ม�ั��ุ�ั��ี���ิ�อยู�����รื�อ�มือ�������อ�วาม"
 
-#: ../plugins/build-basic-autotools/plugin.c:2490
+#: ../plugins/build-basic-autotools/plugin.c:2496
 msgid "Select Configuration"
 msgstr "�ลือ���า�ั��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2491
+#: ../plugins/build-basic-autotools/plugin.c:2497
 msgid "Select current configuration"
 msgstr "�ลือ���า�ั���ั��ุ�ั�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2496
+#: ../plugins/build-basic-autotools/plugin.c:2502
 msgid "Remove Configuration"
 msgstr "ล���า�ั��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2497
+#: ../plugins/build-basic-autotools/plugin.c:2503
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr "ล�า���ร��าร (distclean) �ละล����ร��อรี��า�ั�� ��า�������������"
 
-#: ../plugins/build-basic-autotools/plugin.c:2510
-#: ../plugins/build-basic-autotools/plugin.c:2538
+#: ../plugins/build-basic-autotools/plugin.c:2516
+#: ../plugins/build-basic-autotools/plugin.c:2544
 msgid "_Compile"
 msgstr "_�อม��ล�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2511
-#: ../plugins/build-basic-autotools/plugin.c:2539
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "Compile file"
 msgstr "�อม��ล����ม"
 
-#: ../plugins/build-basic-autotools/plugin.c:2517
-#: ../plugins/build-basic-autotools/plugin.c:2545
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2551
 msgid "Build module"
 msgstr "�ระ�อ�สร�า�มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2522
-#: ../plugins/build-basic-autotools/plugin.c:2550
-#: ../plugins/build-basic-autotools/plugin.c:2608
+#: ../plugins/build-basic-autotools/plugin.c:2528
+#: ../plugins/build-basic-autotools/plugin.c:2556
+#: ../plugins/build-basic-autotools/plugin.c:2614
 #, c-format
 msgid "_Install"
 msgstr "_�ิ��ั��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2523
-#: ../plugins/build-basic-autotools/plugin.c:2551
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
 msgid "Install module"
 msgstr "�ิ��ั��มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2528
-#: ../plugins/build-basic-autotools/plugin.c:2556
-#: ../plugins/build-basic-autotools/plugin.c:2615
+#: ../plugins/build-basic-autotools/plugin.c:2534
+#: ../plugins/build-basic-autotools/plugin.c:2562
+#: ../plugins/build-basic-autotools/plugin.c:2621
 #, c-format
 msgid "_Clean"
 msgstr "�_����วา�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2529
-#: ../plugins/build-basic-autotools/plugin.c:2557
+#: ../plugins/build-basic-autotools/plugin.c:2535
+#: ../plugins/build-basic-autotools/plugin.c:2563
 msgid "Clean module"
 msgstr "�����วา�มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2562
+#: ../plugins/build-basic-autotools/plugin.c:2568
 msgid "_Cancel command"
 msgstr "_ย��ลิ��ำสั��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2563
+#: ../plugins/build-basic-autotools/plugin.c:2569
 msgid "Cancel build command"
 msgstr "ย��ลิ��ำสั���ระ�อ�สร�า�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2601
+#: ../plugins/build-basic-autotools/plugin.c:2607
 #, c-format
 msgid "_Build (%s)"
 msgstr "�ระ�อ�_สร�า� (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2608
+#: ../plugins/build-basic-autotools/plugin.c:2614
 #, c-format
 msgid "_Install (%s)"
 msgstr "_�ิ��ั�� (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2615
+#: ../plugins/build-basic-autotools/plugin.c:2621
 #, c-format
 msgid "_Clean (%s)"
 msgstr "�_����วา� (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2623
+#: ../plugins/build-basic-autotools/plugin.c:2629
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "�อ_ม��ล� (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2623
+#: ../plugins/build-basic-autotools/plugin.c:2629
 #, c-format
 msgid "Co_mpile"
 msgstr "�อ_ม��ล�"
 
-#: ../plugins/build-basic-autotools/plugin.c:3159
+#: ../plugins/build-basic-autotools/plugin.c:3165
 msgid "Build commands"
 msgstr "�ำสั���ระ�อ�สร�า�"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3168
+#: ../plugins/build-basic-autotools/plugin.c:3174
 msgid "Build popup commands"
 msgstr "�ำสั���ุ��ึ��สำหรั��ระ�อ�สร�า�"
 
-#: ../plugins/build-basic-autotools/plugin.c:3550
-#: ../plugins/build-basic-autotools/plugin.c:3558
+#: ../plugins/build-basic-autotools/plugin.c:3556
+#: ../plugins/build-basic-autotools/plugin.c:3564
 msgid "Build Autotools"
 msgstr "��รื�อ�มืออั���มั�ิสำหรั��ระ�อ�สร�า�"
 
-#: ../plugins/build-basic-autotools/program.c:323
+#: ../plugins/build-basic-autotools/program.c:326
 msgid "Command aborted"
 msgstr "�ลิ��ำ�ำสั���ล�ว"
 
@@ -1104,7 +1104,7 @@ msgstr "�ุ�สม�ั�ิ�ั�ว���อ��ลาส"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 #: ../plugins/file-wizard/file.c:103
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
+#: ../plugins/project-wizard/templates/translatable-strings.h:48
 msgid "General Public License (GPL)"
 msgstr "สั��าอ�ุ�า�สา�าร�ะ�ั�ว����ู (GPL)"
 
@@ -1122,7 +1122,7 @@ msgstr "�าร�ระ�าศ�ละ�ัว�ั����ั� in
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
 #: ../plugins/file-wizard/file.c:104
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
+#: ../plugins/project-wizard/templates/translatable-strings.h:62
 msgid "Lesser General Public License (LGPL)"
 msgstr "สั��าอ�ุ�า�สา�าร�ะ�ั�ว�������อ��ร���ู (LGPL)"
 
@@ -1140,7 +1140,7 @@ msgid "No License"
 msgstr "�ม�มีสั��าอ�ุ�า�"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
-#: ../plugins/glade/plugin.c:4445
+#: ../plugins/glade/plugin.c:4433
 msgid "Properties"
 msgstr "�ุ�สม�ั�ิ"
 
@@ -1206,7 +1206,7 @@ msgstr "��ื�อหา"
 
 #: ../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/breakpoints.c:1914
 #: ../plugins/debug-manager/debug_tree.c:126
 msgid "Type"
 msgstr "��ิ�"
@@ -1385,8 +1385,8 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "�ม�ส������ม .cvsrc (��ะ�ำ)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2320
-#: ../plugins/symbol-db/plugin.c:2390
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2331
+#: ../plugins/symbol-db/plugin.c:2377
 msgid "Local"
 msgstr "���าะ�ี�"
 
@@ -1405,7 +1405,7 @@ msgstr "�ื�อมอ�ูล:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/glade/plugin.c:3097
+#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/glade/plugin.c:3085
 #: ../plugins/search/anjuta-search.ui.h:25
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
@@ -1698,7 +1698,7 @@ msgid "Breakpoint properties"
 msgstr "�ุ�สม�ั�ิ�ุ��ั�"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
-#: ../plugins/debug-manager/breakpoints.c:1980
+#: ../plugins/debug-manager/breakpoints.c:1987
 msgid "Breakpoints"
 msgstr "�ุ��ั�"
 
@@ -1727,7 +1727,7 @@ msgid "Debugger:"
 msgstr "��ร��รม�ี�ั��:"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
-#: ../plugins/project-wizard/templates/translatable-strings.h:35
+#: ../plugins/project-wizard/templates/translatable-strings.h:34
 msgid "Description:"
 msgstr "�ำอ�ิ�าย:"
 
@@ -1770,7 +1770,7 @@ msgid "Kernel Signals"
 msgstr "สั��า���อร���ล"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/breakpoints.c:1914
 msgid "Location"
 msgstr "�ำ�ห���"
 
@@ -1890,147 +1890,147 @@ msgstr "_�อาออ��ั��หม�"
 msgid "_Value:"
 msgstr "_��า:"
 
-#: ../plugins/debug-manager/breakpoints.c:1673
+#: ../plugins/debug-manager/breakpoints.c:1680
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "ยื�ยั�ว�า��อ��ารล��ุ��ั��ั��หม�หรือ�ม�?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1770
+#: ../plugins/debug-manager/breakpoints.c:1777
 msgid "_Breakpoints"
 msgstr "�ุ�_�ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1778
+#: ../plugins/debug-manager/breakpoints.c:1785
 msgid "Toggle Breakpoint"
 msgstr "สลั��ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1780
+#: ../plugins/debug-manager/breakpoints.c:1787
 msgid "Toggle breakpoint at the current location"
 msgstr "สลั��ุ��ั��ี��ำ�ห����ั��ุ�ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1786
+#: ../plugins/debug-manager/breakpoints.c:1793
 msgid "Add Breakpointâ?¦"
 msgstr "��ิ�ม�ุ��ั��"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1788
+#: ../plugins/debug-manager/breakpoints.c:1795
 msgid "Add a breakpoint"
 msgstr "��ิ�ม�ุ��ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1794
+#: ../plugins/debug-manager/breakpoints.c:1801
 msgid "Remove Breakpoint"
 msgstr "ล��ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1796
+#: ../plugins/debug-manager/breakpoints.c:1803
 msgid "Remove a breakpoint"
 msgstr "ล��ุ��ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1802
+#: ../plugins/debug-manager/breakpoints.c:1809
 msgid "Edit Breakpoint"
 msgstr "������ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1804
+#: ../plugins/debug-manager/breakpoints.c:1811
 msgid "Edit breakpoint properties"
 msgstr "������ุ�สม�ั�ิ�ุ��ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1810
-#: ../plugins/debug-manager/breakpoints.c:1881
+#: ../plugins/debug-manager/breakpoints.c:1817
+#: ../plugins/debug-manager/breakpoints.c:1888
 msgid "Enable Breakpoint"
 msgstr "��ิ�����า��ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1812
-#: ../plugins/debug-manager/breakpoints.c:1882
+#: ../plugins/debug-manager/breakpoints.c:1819
+#: ../plugins/debug-manager/breakpoints.c:1889
 msgid "Enable a breakpoint"
 msgstr "��ิ�����า��ุ��ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1818
+#: ../plugins/debug-manager/breakpoints.c:1825
 msgid "Disable All Breakpoints"
 msgstr "�ิ��าร����า��ุ��ั��ั��หม�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1820
+#: ../plugins/debug-manager/breakpoints.c:1827
 msgid "Deactivate all breakpoints"
 msgstr "�ิ��าร�ำ�า��ุ��ั��ั��หม�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1826
+#: ../plugins/debug-manager/breakpoints.c:1833
 msgid "R_emove All Breakpoints"
 msgstr "_ล��ุ��ั��ั��หม�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1828
+#: ../plugins/debug-manager/breakpoints.c:1835
 msgid "Remove all breakpoints"
 msgstr "ล��ุ��ั��ั��หม�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1837
+#: ../plugins/debug-manager/breakpoints.c:1844
 msgid "Jump to Breakpoint"
 msgstr "�ระ������ี��ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1839
+#: ../plugins/debug-manager/breakpoints.c:1846
 msgid "Jump to breakpoint location"
 msgstr "�ระ������ี��ำ�ห����ุ��ั�"
 
-#: ../plugins/debug-manager/breakpoints.c:1876
+#: ../plugins/debug-manager/breakpoints.c:1883
 msgid "Disable Breakpoint"
 msgstr "�ิ��าร����า��ุ��ั�"
 
-#: ../plugins/debug-manager/breakpoints.c:1877
+#: ../plugins/debug-manager/breakpoints.c:1884
 msgid "Disable a breakpoint"
 msgstr "หยุ��ำ�า��ุ��ั�"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/breakpoints.c:1914
 #: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "��ิ�����า�"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/breakpoints.c:1914
 #: ../plugins/debug-manager/stack_trace.c:667
 #: ../plugins/debug-manager/threads.c:481
 msgid "Address"
 msgstr "�อ���รส"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Condition"
 msgstr "��ื�อ���"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Pass count"
 msgstr "�ำ�ว��รั���ี���า�"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "State"
 msgstr "ส�า�ะ"
 
-#: ../plugins/debug-manager/breakpoints.c:1957
-#: ../plugins/debug-manager/breakpoints.c:1963
+#: ../plugins/debug-manager/breakpoints.c:1964
+#: ../plugins/debug-manager/breakpoints.c:1970
 msgid "Breakpoint operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��ุ��ั�"
 
@@ -2556,69 +2556,65 @@ msgstr "�าร�ระ�ำ��ี�ยว�ั��าร���า
 msgid "Watches"
 msgstr "���า�ู"
 
-#: ../plugins/devhelp/plugin.c:201
+#: ../plugins/devhelp/plugin.c:202
 msgid "Search Help:"
 msgstr "���วิ�ี���:"
 
-#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:239
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:313
+#: ../plugins/devhelp/plugin.c:223 ../plugins/document-manager/plugin.c:239
+#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:314
 msgid "_Go to"
 msgstr "�_�ยั�"
 
-#: ../plugins/devhelp/plugin.c:231
+#: ../plugins/devhelp/plugin.c:232
 msgid "_API Reference"
 msgstr "�อ�สารอ�า�อิ� _API"
 
-#: ../plugins/devhelp/plugin.c:233
+#: ../plugins/devhelp/plugin.c:234
 msgid "Browse API Pages"
 msgstr "��อ��ูห��า API ��า��"
 
-#: ../plugins/devhelp/plugin.c:243
+#: ../plugins/devhelp/plugin.c:244
 msgid "_Context Help"
 msgstr "_วิ�ี����า��ริ��"
 
-#: ../plugins/devhelp/plugin.c:245
+#: ../plugins/devhelp/plugin.c:246
 msgid "Search help for the current word in the editor"
 msgstr "���วิ�ี���สำหรั��ำ�ั��ุ�ั�����รื�อ�มือ�����"
 
-#: ../plugins/devhelp/plugin.c:251
+#: ../plugins/devhelp/plugin.c:252
 msgid "_Search Help"
 msgstr "_���วิ�ี���"
 
-#: ../plugins/devhelp/plugin.c:253
+#: ../plugins/devhelp/plugin.c:254
 msgid "Search for a term in help"
 msgstr "���หา�ำ��วิ�ี���"
 
-#: ../plugins/devhelp/plugin.c:358
+#: ../plugins/devhelp/plugin.c:327
 msgid "Help operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั�วิ�ี���"
 
-#: ../plugins/devhelp/plugin.c:368
+#: ../plugins/devhelp/plugin.c:346 ../plugins/devhelp/plugin.c:464
+#: ../src/anjuta-app.c:502
+msgid "Help"
+msgstr "วิ�ี���"
+
+#: ../plugins/devhelp/plugin.c:357
 msgid "Contents"
 msgstr "��ื�อหา"
 
-#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
+#: ../plugins/devhelp/plugin.c:363 ../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:2324
-#: ../plugins/symbol-db/plugin.c:2440
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2341
+#: ../plugins/symbol-db/plugin.c:2427
 msgid "Search"
 msgstr "���หา"
 
-#: ../plugins/devhelp/plugin.c:375 ../plugins/devhelp/plugin.c:495
-#: ../src/anjuta-app.c:502
-msgid "Help"
-msgstr "วิ�ี���"
-
-#: ../plugins/devhelp/plugin.c:405 ../plugins/devhelp/plugin.c:500
+#: ../plugins/devhelp/plugin.c:381 ../plugins/devhelp/plugin.c:469
 msgid "Help display"
 msgstr "�ส��วิ�ี���"
 
-#: ../plugins/devhelp/plugin.c:422
-msgid "Online"
-msgstr "ออ��ล��"
-
 #: ../plugins/document-manager/action-callbacks.c:277
 #, c-format
 msgid ""
@@ -2655,26 +2651,26 @@ msgstr "��ลี�ย��ื�อ"
 msgid "Remove"
 msgstr "ล�"
 
-#: ../plugins/document-manager/anjuta-docman.c:399
+#: ../plugins/document-manager/anjuta-docman.c:438
 msgid "Close file"
 msgstr "�ิ����ม"
 
-#: ../plugins/document-manager/anjuta-docman.c:447
+#: ../plugins/document-manager/anjuta-docman.c:486
 msgid "Path:"
 msgstr "�า�:"
 
-#: ../plugins/document-manager/anjuta-docman.c:564
+#: ../plugins/document-manager/anjuta-docman.c:603
 #: ../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 "��ิ����ม"
 
-#: ../plugins/document-manager/anjuta-docman.c:583
+#: ../plugins/document-manager/anjuta-docman.c:622
 #: ../plugins/message-view/message-view.c:94
 msgid "Save file as"
 msgstr "�ั��ึ����ม����"
 
-#: ../plugins/document-manager/anjuta-docman.c:664
+#: ../plugins/document-manager/anjuta-docman.c:703
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -2683,11 +2679,11 @@ msgstr ""
 "มี���ม '%s' อยู���อ��ล�ว\n"
 "�ุ���อ��าร�ั��ึ��ั�หรือ�ม�?"
 
-#: ../plugins/document-manager/anjuta-docman.c:673
+#: ../plugins/document-manager/anjuta-docman.c:712
 msgid "_Replace"
 msgstr "�_���ี�"
 
-#: ../plugins/document-manager/anjuta-docman.c:1390
+#: ../plugins/document-manager/anjuta-docman.c:1429
 msgid "[read-only]"
 msgstr "[อ�า�อย�า���ียว]"
 
@@ -2999,7 +2995,7 @@ msgstr "�ำ��ำ�าร���หาอย�า��ร�ว"
 
 #: ../plugins/document-manager/plugin.c:271 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1878
+#: ../plugins/language-support-cpp-java/plugin.c:1882
 msgid "_Edit"
 msgstr "�_����"
 
@@ -3028,7 +3024,7 @@ msgstr "ล�มุมมอ��ั��ุ�ั��อ��อ�สา
 msgid "U_ndo"
 msgstr "�รี_ย��ื�"
 
-#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4088
+#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4076
 msgid "Undo the last action"
 msgstr "�รีย��ื���ิ�ั�ิ�ารล�าสุ�"
 
@@ -3382,6 +3378,7 @@ msgid "This function is not implemented for widgets of class '%s'"
 msgstr "�ั����ั��ี�ยั��ม��ำสำหรั�วิ������อ��ลาส '%s'"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:937
+#: ../plugins/starter/starter.c:111
 #, c-format
 msgid "Open '%s'"
 msgstr "��ิ� '%s'"
@@ -3610,7 +3607,7 @@ msgid "Filter"
 msgstr "�ัว�รอ�"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2322 ../plugins/symbol-db/plugin.c:2416
+#: ../plugins/symbol-db/plugin.c:2336 ../plugins/symbol-db/plugin.c:2403
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "ส�ว��ลา�"
@@ -3623,15 +3620,15 @@ msgstr "���ร��อรีรา���า�ม�มี��ร�
 msgid "Loading..."
 msgstr "�ำลั��หล�..."
 
-#: ../plugins/file-manager/file-view.c:567
+#: ../plugins/file-manager/file-view.c:569
 msgid "Filename"
 msgstr "�ื�อ���ม"
 
-#: ../plugins/file-manager/file-view.c:654
+#: ../plugins/file-manager/file-view.c:656
 msgid "Base URI"
 msgstr "URI �ั�����"
 
-#: ../plugins/file-manager/file-view.c:655
+#: ../plugins/file-manager/file-view.c:657
 msgid "URI of the top-most path displayed"
 msgstr "URI �อ��า�ระ�ั���สุ��ี��ส��"
 
@@ -3691,7 +3688,7 @@ msgid "Name:"
 msgstr "�ื�อ:"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/starter/starter.c:409
+#: ../plugins/starter/starter.c:422
 msgid "New File"
 msgstr "���ม�หม�"
 
@@ -3931,8 +3928,8 @@ msgstr "�า��ม��ู���อ�หรือ�����า�
 
 #: ../plugins/gbf-am/gbf-am-project.c:2751
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2713
-#: ../plugins/dir-project/dir-project.c:728
-#: ../plugins/dir-project/dir-project.c:800
+#: ../plugins/dir-project/dir-project.c:693
+#: ../plugins/dir-project/dir-project.c:765
 #, c-format
 msgid "Project doesn't exist or invalid path"
 msgstr "��ร��าร�ม�มีอยู�หรือ�า��ม��ู���อ�"
@@ -4087,7 +4084,7 @@ msgid "Package name:"
 msgstr "�ื�อ������:"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:863
-#: ../plugins/project-wizard/templates/translatable-strings.h:110
+#: ../plugins/project-wizard/templates/translatable-strings.h:109
 msgid "Version:"
 msgstr "รุ��:"
 
@@ -5762,11 +5759,11 @@ msgid "Automatically add resources"
 msgstr "��ิ�ม�รั�ยา�ร��ยอั���มั�ิ"
 
 #: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:762
-#: ../plugins/glade/plugin.c:3094
+#: ../plugins/glade/plugin.c:3082
 msgid "Designer"
 msgstr "��รื�อ�มือออ����"
 
-#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3096
+#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3084
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "��รื�อ�มือ�����"
@@ -5837,213 +5834,213 @@ msgid "Failed to save associations"
 msgstr "�ั��ึ��าร��ื�อม�ย��ม�สำ�ร��"
 
 #. iptCurrent:
-#: ../plugins/glade/plugin.c:1196
+#: ../plugins/glade/plugin.c:1184
 msgid "Current"
 msgstr "�ั��ุ�ั�"
 
 #. iptBeforeEnd:
-#: ../plugins/glade/plugin.c:1197
+#: ../plugins/glade/plugin.c:1185
 msgid "Before end"
 msgstr "��อ���ายสุ�"
 
 #. iptAfterBegin:
-#: ../plugins/glade/plugin.c:1198
+#: ../plugins/glade/plugin.c:1186
 msgid "After begin"
 msgstr "หลั��ุ��ริ�ม���"
 
 #. ipEOF:
-#: ../plugins/glade/plugin.c:1199
+#: ../plugins/glade/plugin.c:1187
 msgid "End of file"
 msgstr "��าย���ม"
 
-#: ../plugins/glade/plugin.c:1368
+#: ../plugins/glade/plugin.c:1356
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "�ม�สามาร����าสั����สั��า����"
 
-#: ../plugins/glade/plugin.c:1390
+#: ../plugins/glade/plugin.c:1378
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "ยั��ม�รอ�รั�ภาษา���อ�"
 
-#: ../plugins/glade/plugin.c:1403
+#: ../plugins/glade/plugin.c:1391
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "ยั��ม�รอ�รั�ภาษา Vala"
 
-#: ../plugins/glade/plugin.c:1962
+#: ../plugins/glade/plugin.c:1950
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "�ม�มี��รื�อ�มือ������ี���ื�อม�ย��ั���รื�อ�มือออ�����ี�"
 
-#: ../plugins/glade/plugin.c:1980
+#: ../plugins/glade/plugin.c:1968
 #, c-format
 msgid "Unknown editor language \"%s\""
 msgstr "�ม��รา�ภาษา�อ���รื�อ�มือ����� \"%s\""
 
-#: ../plugins/glade/plugin.c:2047 ../plugins/glade/plugin.c:2124
-#: ../plugins/glade/plugin.c:2249
+#: ../plugins/glade/plugin.c:2035 ../plugins/glade/plugin.c:2112
+#: ../plugins/glade/plugin.c:2237
 #, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "��ิ���อ�ิ��ลา���ะ��ิ�ม���า��ร� handler �หม�: %s"
 
-#: ../plugins/glade/plugin.c:2054 ../plugins/glade/plugin.c:2138
+#: ../plugins/glade/plugin.c:2042 ../plugins/glade/plugin.c:2126
 msgid "Couldn't find signal information"
 msgstr "หา��อมูล�อ�สั��า��ม���"
 
-#: ../plugins/glade/plugin.c:2081
+#: ../plugins/glade/plugin.c:2069
 msgid "Error while adding a new handler stub: No current editor"
 msgstr "��ิ���อ�ิ��ลา���ะ��ิ�ม���า��ร� handler �หม�: �ม�มี��รื�อ�มือ������ั��ุ�ั�"
 
-#: ../plugins/glade/plugin.c:2254
+#: ../plugins/glade/plugin.c:2242
 #, c-format
 msgid ""
 "To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
 msgstr "�ารหลี��ลี�ย���อ�วาม�ี� �ำ�����ย�ิ� \"%s\" �� �รั�����->��รื�อ�มือออ���� GUI Glade"
 
-#: ../plugins/glade/plugin.c:2324
+#: ../plugins/glade/plugin.c:2312
 msgid "Couldn't find an associated document"
 msgstr "หา�อ�สาร�ี���ื�อม�ย��ม���"
 
-#: ../plugins/glade/plugin.c:2390
+#: ../plugins/glade/plugin.c:2378
 msgid "Those documents are already associated"
 msgstr "�อ�สาร�หล�า�ั�������ื�อม�ย��ั��ล�ว"
 
-#: ../plugins/glade/plugin.c:2428
+#: ../plugins/glade/plugin.c:2416
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "�ม�สามาร�อ�า����ม: %s"
 
-#: ../plugins/glade/plugin.c:3095
+#: ../plugins/glade/plugin.c:3083
 msgid "Top level widget"
 msgstr "วิ�����ระ�ั���สุ�"
 
-#: ../plugins/glade/plugin.c:3686
+#: ../plugins/glade/plugin.c:3674
 msgid "Couldn't find a default signal name"
 msgstr "หา�ื�อสั��า��ริยาย�ม���"
 
-#: ../plugins/glade/plugin.c:3895
+#: ../plugins/glade/plugin.c:3883
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "��ร��าร %s �ม�มีวิ������ี��ม���ะ�ำ�ห���� �ละ�ม�มี�ั�หารุ���ม��ร��ั�"
 
-#: ../plugins/glade/plugin.c:3912
+#: ../plugins/glade/plugin.c:3900
 msgid "There is no Glade project"
 msgstr "�ม�มี��ร��าร Glade"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3998
+#: ../plugins/glade/plugin.c:3986
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:4006 ../plugins/glade/plugin.c:4008
+#: ../plugins/glade/plugin.c:3994 ../plugins/glade/plugin.c:3996
 msgid "Switch between designer/code"
 msgstr "สลั�ระหว�า���รื�อ�มือออ����/����"
 
-#: ../plugins/glade/plugin.c:4014 ../plugins/glade/plugin.c:4016
+#: ../plugins/glade/plugin.c:4002 ../plugins/glade/plugin.c:4004
 msgid "Insert handler stub"
 msgstr "��ร����า��ร� handler"
 
-#: ../plugins/glade/plugin.c:4022 ../plugins/glade/plugin.c:4024
+#: ../plugins/glade/plugin.c:4010 ../plugins/glade/plugin.c:4012
 msgid "Insert handler stub, autoposition"
 msgstr "��ร����า��ร� handler, �ั��ำ�ห���อั���มั�ิ"
 
-#: ../plugins/glade/plugin.c:4030
+#: ../plugins/glade/plugin.c:4018
 msgid "Associate last designer and last editor"
 msgstr "��ื�อม�ย����มล�าสุ�����รื�อ�มือออ�����ละ��รื�อ�มือ��������า��วย�ั�"
 
-#: ../plugins/glade/plugin.c:4032
+#: ../plugins/glade/plugin.c:4020
 msgid "Associate last designer and editor"
 msgstr "��ื�อม�ย����มล�าสุ�����รื�อ�มือออ��ละ��รื�อ�มือ��������า��วย�ั�"
 
-#: ../plugins/glade/plugin.c:4038 ../plugins/glade/plugin.c:4040
+#: ../plugins/glade/plugin.c:4026 ../plugins/glade/plugin.c:4028
 msgid "Associations dialogâ?¦"
 msgstr "�ล�อ�����อ��าร��ื�อม�ย��"
 
-#: ../plugins/glade/plugin.c:4046
+#: ../plugins/glade/plugin.c:4034
 msgid "Versioningâ?¦"
 msgstr "�าร�ั��ารรุ���"
 
-#: ../plugins/glade/plugin.c:4048
+#: ../plugins/glade/plugin.c:4036
 msgid "Switch between library versions and check deprecations"
 msgstr "สลั�ระหว�า�รุ����า�� �อ��ล�รารี �ละ�รว�สอ��าร����ั����ั��ี��ม���ะ�ำ�ห����"
 
-#: ../plugins/glade/plugin.c:4054 ../plugins/glade/plugin.c:4056
+#: ../plugins/glade/plugin.c:4042 ../plugins/glade/plugin.c:4044
 msgid "Set as default resource target"
 msgstr "�ำห���������าหมาย�รั�ยา�ร�ริยาย"
 
-#: ../plugins/glade/plugin.c:4064
+#: ../plugins/glade/plugin.c:4052
 msgid "Current default target"
 msgstr "���าหมาย�ริยาย�ั��ุ�ั�"
 
-#: ../plugins/glade/plugin.c:4072
+#: ../plugins/glade/plugin.c:4060
 msgid "Close the current file"
 msgstr "�ิ����ม�ั��ุ�ั�"
 
-#: ../plugins/glade/plugin.c:4080
+#: ../plugins/glade/plugin.c:4068
 msgid "Save the current file"
 msgstr "�ั��ึ����ม�ั��ุ�ั�"
 
-#: ../plugins/glade/plugin.c:4096
+#: ../plugins/glade/plugin.c:4084
 msgid "Redo the last action"
 msgstr "�ำ��ำ��ิ�ั�ิ�ารล�าสุ�"
 
-#: ../plugins/glade/plugin.c:4104
+#: ../plugins/glade/plugin.c:4092
 msgid "Cut the selection"
 msgstr "�ั�สิ���ี��ลือ�"
 
-#: ../plugins/glade/plugin.c:4112
+#: ../plugins/glade/plugin.c:4100
 msgid "Copy the selection"
 msgstr "�ั�ลอ�สิ���ี��ลือ�"
 
-#: ../plugins/glade/plugin.c:4120
+#: ../plugins/glade/plugin.c:4108
 msgid "Paste the clipboard"
 msgstr "��ะ��ื�อหา�า��ลิ��อร��"
 
-#: ../plugins/glade/plugin.c:4128
+#: ../plugins/glade/plugin.c:4116
 msgid "Delete the selection"
 msgstr "ล�สิ���ี��ลือ�"
 
-#: ../plugins/glade/plugin.c:4306
+#: ../plugins/glade/plugin.c:4294
 msgid "Glade designer operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���รื�อ�มือออ���� Glade"
 
-#: ../plugins/glade/plugin.c:4406
+#: ../plugins/glade/plugin.c:4394
 msgid "Go back in undo history"
 msgstr "ย�อ��ลั����ระวั�ิ�าร�รีย��ื�"
 
-#: ../plugins/glade/plugin.c:4408
+#: ../plugins/glade/plugin.c:4396
 msgid "Go forward in undo history"
 msgstr "����า�ห��า���ระวั�ิ�าร�รีย��ื�"
 
-#: ../plugins/glade/plugin.c:4430
+#: ../plugins/glade/plugin.c:4418
 msgid "Glade Clipboard"
 msgstr "�ลิ��อร�� Glade"
 
-#: ../plugins/glade/plugin.c:4435
+#: ../plugins/glade/plugin.c:4423
 msgid "Widgets"
 msgstr "วิ�����"
 
-#: ../plugins/glade/plugin.c:4440
+#: ../plugins/glade/plugin.c:4428
 msgid "Palette"
 msgstr "�ล�อ���รื�อ�มือ"
 
-#: ../plugins/glade/plugin.c:4694
+#: ../plugins/glade/plugin.c:4682
 #, c-format
 msgid "Not local file: %s"
 msgstr "�ม�������ม����รื�อ�: %s"
 
-#: ../plugins/glade/plugin.c:4715
+#: ../plugins/glade/plugin.c:4703
 #, c-format
 msgid "Could not open %s"
 msgstr "��ิ� %s �ม����"
 
-#: ../plugins/glade/plugin.c:4766
+#: ../plugins/glade/plugin.c:4754
 msgid "Could not create a new glade project."
 msgstr "สร�า���ร��าร glade ��ร��าร�หม��ม����"
 
-#: ../plugins/glade/plugin.c:5037 ../plugins/glade/plugin.c:5062
+#: ../plugins/glade/plugin.c:5025 ../plugins/glade/plugin.c:5050
 msgid "Glade GUI Designer"
 msgstr "��รื�อ�มือออ���� GUI Glade"
 
@@ -6424,8 +6421,8 @@ msgid "No Date"
 msgstr "�ม�มีวั��ี�"
 
 #: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "Edit&#x2026;"
-msgstr "�����&#x2026;"
+msgid "Editâ?¦"
+msgstr "������"
 
 #: ../plugins/macro/anjuta-macro.ui.h:3
 msgid "Macro details:"
@@ -6597,7 +6594,7 @@ msgstr "รู�����อ��ัว����ี��อ���อ
 msgid "Warnings:"
 msgstr "�ำ��ือ�:"
 
-#: ../plugins/message-view/anjuta-msgman.c:99
+#: ../plugins/message-view/anjuta-msgman.c:76
 msgid "Close all message tabs"
 msgstr "�ิ�������อ�วาม�ั��หม�"
 
@@ -6816,7 +6813,7 @@ msgid ""
 msgstr "�ม�สามาร� check out �า� URI \"%s\" �ี��ำห�� ��อ�ิ��ลา��ี����ือ: \"%s\""
 
 #: ../plugins/project-import/project-import.ui.h:1
-#: ../plugins/project-wizard/templates/translatable-strings.h:36
+#: ../plugins/project-wizard/templates/translatable-strings.h:35
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "�ลาย�า�:"
@@ -6897,7 +6894,7 @@ msgstr "�ื�อ_�ลุ�ม:"
 msgid "_Select file to addâ?¦"
 msgstr "�_ลือ����ม�ี��ะ��ิ�ม�"
 
-#: ../plugins/project-manager/gbf-project-model.c:250
+#: ../plugins/project-manager/gbf-project-model.c:231
 #: ../plugins/project-manager/plugin.c:1430
 #: ../plugins/project-manager/plugin.c:1513
 #: ../plugins/project-manager/plugin.c:1689
@@ -6905,11 +6902,11 @@ msgstr "�_ลือ����ม�ี��ะ��ิ�ม�"
 msgid "Project"
 msgstr "��ร��าร"
 
-#: ../plugins/project-manager/gbf-project-model.c:251
+#: ../plugins/project-manager/gbf-project-model.c:232
 msgid "GbfProject Object"
 msgstr "อ�อ������ GbfProject"
 
-#: ../plugins/project-manager/gbf-project-model.c:696
+#: ../plugins/project-manager/gbf-project-model.c:677
 msgid "No project loaded"
 msgstr "�ม�มี�าร�หล���ร��าร"
 
@@ -7162,11 +7159,11 @@ msgstr "�าร�ระ�ำ�อ���รื�อ�มือ�ั�
 msgid "Project manager popup actions"
 msgstr "�าร�ระ�ำ���ม�ู�ุ��ึ���อ���รื�อ�มือ�ั��าร��ร��าร"
 
-#: ../plugins/project-manager/plugin.c:2572
+#: ../plugins/project-manager/plugin.c:2471
 msgid "Initializing Projectâ?¦"
 msgstr "�ำลั��ั����า�ริ�ม�����ร��าร�"
 
-#: ../plugins/project-manager/plugin.c:2575
+#: ../plugins/project-manager/plugin.c:2474
 msgid "Project Loaded"
 msgstr "�หล���ร��าร�ล�ว"
 
@@ -7411,7 +7408,7 @@ msgid "A generic Xlib project"
 msgstr "��ร��าร Xlib ��รู��ั�ว��"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:7
-msgid "A generic Java project using automake project management"
+msgid "A generic java project using automake project management"
 msgstr "��ร��าร�าวา��รู��ั�ว�� ��ย�ั��าร��ร��าร��วย automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:8
@@ -7420,7 +7417,7 @@ msgstr "��ร��าร�ั�ว������ล���ี�ส
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:9
 msgid ""
-"A generic natively compiled Java project using the GNU Java Compiler (gcj)"
+"A generic natively compiled java project using the GNU Java Compiler (gcj)"
 msgstr "��ร��าร�าวา�ี��อม��ล���� native ��รู��ั�ว�� ��ย����อม���ลอร��าวา GNU (gcj)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:10
@@ -7428,12 +7425,12 @@ msgid "A generic project"
 msgstr "��ร��าร��รู��ั�ว��"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:11
-msgid "A generic Python project using automake project management"
+msgid "A generic python project using automake project management"
 msgstr "��ร��าร���อ���รู��ั�ว�� ��ย�ั��าร��ร��าร��วย automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:12
-msgid "A generic wxWidgets project"
-msgstr "��ร��าร wxWidgets ��รู��ั�ว��"
+msgid "A generic wx Widgets project"
+msgstr "��ร��าร wx Widgets ��รู��ั�ว��"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:13
 msgid "A sample SDL project"
@@ -7499,7 +7496,7 @@ msgstr "�ระ�อ�สร�า��ล�รารี����"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:29
 msgid ""
-"Comma-separated, other plugins that this plugin depends on. It could be "
+"Comma separated, other plugins that this plugin depends on. It could be "
 "either primary interface name or plugin location (library:class)"
 msgstr ""
 "ราย�ื�อ�ลั��อิ�อื���ี��ลั��อิ��ี���อ���� �ั����วย�ุลภา� อา������ื�ออิ���อร����หลั�หรือ�ำ�ห����อ��ลั��อิ� "
@@ -7514,91 +7511,90 @@ msgid "Configure external packages:"
 msgstr "�ั����า������ภาย�อ�:"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:32
-msgid "Create GtkBuilder interface file"
-msgstr "สร�า����มส�ว��ิ���อ�ู�����อ� GtkBuilder"
+msgid "Create Gtk Builder interface file"
+msgstr "สร�า����มส�ว��ิ���อ�ู�����อ� Gtk Builder"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:33
-#: ../plugins/project-wizard/templates/translatable-strings.h:34
-msgid "Create a template GtkBuilder interface file"
-msgstr "สร�า����ม�ม����ส�ว��ิ���อ�ู�����อ� GtkBuilder"
+msgid "Create a template Gtk Builder interface file"
+msgstr "สร�า����ม�ม����ส�ว��ิ���อ�ู�����อ� Gtk Builder"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:37
+#: ../plugins/project-wizard/templates/translatable-strings.h:36
 msgid "Display description of the applet"
 msgstr "�ส���ำอ�ิ�าย�อ���ล��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:38
+#: ../plugins/project-wizard/templates/translatable-strings.h:37
 msgid "Display description of the plugin"
 msgstr "�ส���ำอ�ิ�าย�ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:39
+#: ../plugins/project-wizard/templates/translatable-strings.h:38
 msgid "Display title of the applet"
 msgstr "�ส���ื�อ�อ���ล��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:40
+#: ../plugins/project-wizard/templates/translatable-strings.h:39
 msgid "Display title of the plugin"
 msgstr "�ส���ื�อ�ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:41
+#: ../plugins/project-wizard/templates/translatable-strings.h:40
 msgid "Django Project"
 msgstr "��ร��าร Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:42
+#: ../plugins/project-wizard/templates/translatable-strings.h:41
 msgid "Django Project information"
 msgstr "��อมูล��ร��าร Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:43
+#: ../plugins/project-wizard/templates/translatable-strings.h:42
 msgid "Email address:"
 msgstr "�ี�อยู�อี�มล:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
+#: ../plugins/project-wizard/templates/translatable-strings.h:43
 msgid "GCJ needs to know which class contains the main() function"
 msgstr "GCJ �ำ������อ�รู�ว�า�ลาส���รร�ุ�ั����ั� main()"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
+#: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GNOME Applet"
 msgstr "�อ���ล�� GNOME"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
+#: ../plugins/project-wizard/templates/translatable-strings.h:45
 msgid "GTK+"
 msgstr "GTK+"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:47
+#: ../plugins/project-wizard/templates/translatable-strings.h:46
 msgid "GTKmm"
 msgstr "GTKmm"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
+#: ../plugins/project-wizard/templates/translatable-strings.h:47
 msgid "General Project Information"
 msgstr "��อมูล�ั�ว���อ���ร��าร"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
+#: ../plugins/project-wizard/templates/translatable-strings.h:49
 msgid "Generic"
 msgstr "�ั�ว��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
+#: ../plugins/project-wizard/templates/translatable-strings.h:50
 msgid "Generic (Minimal)"
 msgstr "�ั�ว�� (�ล���ี�สุ�)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
+#: ../plugins/project-wizard/templates/translatable-strings.h:51
 msgid "Generic C++"
 msgstr "C++ �ั�ว��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
+#: ../plugins/project-wizard/templates/translatable-strings.h:52
 msgid "Generic JavaScript"
 msgstr "�าวาส�ริ����ั�ว��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
-msgid "Generic gcj compiled Java"
+#: ../plugins/project-wizard/templates/translatable-strings.h:53
+msgid "Generic gcj compiled java"
 msgstr "�าวา�ั�ว���ี��อม��ล���วย gcj"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
-msgid "Generic Java (automake)"
+#: ../plugins/project-wizard/templates/translatable-strings.h:54
+msgid "Generic java (automake)"
 msgstr "�าวา�ั�ว�� (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
-msgid "Generic Python (automake)"
+#: ../plugins/project-wizard/templates/translatable-strings.h:55
+msgid "Generic python (automake)"
 msgstr "���อ��ั�ว�� (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
+#: ../plugins/project-wizard/templates/translatable-strings.h:56
 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 "
@@ -7607,235 +7603,235 @@ msgstr ""
 "��อ��ื�อ�������ี���ร��าร�ุ���อ���� �ุ�อา�ระ�ุรุ���อ��������ี���อ��าร��วย����� �ัวอย�า����� "
 "'libgnomeui-2.0' หรือ 'libgnomeui-2.0 >= 2.2.0'"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
+#: ../plugins/project-wizard/templates/translatable-strings.h:57
 msgid "Icon File:"
 msgstr "���ม�อ�อ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
+#: ../plugins/project-wizard/templates/translatable-strings.h:58
 msgid "Icon file for the plugin"
 msgstr "���ม�อ�อ�สำหรั��ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:60
+#: ../plugins/project-wizard/templates/translatable-strings.h:59
 msgid "Implement plugin interfaces"
 msgstr "�ำอิ���อร����สำหรั��ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
+#: ../plugins/project-wizard/templates/translatable-strings.h:60
 msgid "Interface implemented by the plugin"
 msgstr "อิ���อร�����ี��ลั��อิ��ำ"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
+#: ../plugins/project-wizard/templates/translatable-strings.h:61
 msgid "Interface:"
 msgstr "ส�ว��ิ���อ:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
+#: ../plugins/project-wizard/templates/translatable-strings.h:63
 msgid "Library"
 msgstr "�ล�รารี"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
+#: ../plugins/project-wizard/templates/translatable-strings.h:64
 msgid "License"
 msgstr "สั��าอ�ุ�า�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
+#: ../plugins/project-wizard/templates/translatable-strings.h:65
 msgid "Main Class:"
 msgstr "�ลาสหลั�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
+#: ../plugins/project-wizard/templates/translatable-strings.h:66
 msgid "Main class"
 msgstr "�ลาสหลั�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
+#: ../plugins/project-wizard/templates/translatable-strings.h:67
 msgid "Makefile project"
 msgstr "��ร��าร Makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
+#: ../plugins/project-wizard/templates/translatable-strings.h:68
 msgid "Makefile-based project"
 msgstr "��ร��าร�ี���� Makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
+#: ../plugins/project-wizard/templates/translatable-strings.h:69
 msgid "Mininum SDL version required"
 msgstr "SDL รุ���ี���ำ�ี�สุ��ี���อ��าร"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
+#: ../plugins/project-wizard/templates/translatable-strings.h:70
 msgid "Name of the value to watch"
 msgstr "�ื�อ�อ���า�ี����า�ู"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
+#: ../plugins/project-wizard/templates/translatable-strings.h:71
 msgid "No license"
 msgstr "�ม�มีสั��าอ�ุ�า�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
+#: ../plugins/project-wizard/templates/translatable-strings.h:72
 msgid "Only Shared"
 msgstr "���ร�วม���า�ั��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
+#: ../plugins/project-wizard/templates/translatable-strings.h:73
 msgid "Only Static"
 msgstr "ส���ิ����า�ั��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
+#: ../plugins/project-wizard/templates/translatable-strings.h:74
 msgid "Options for project build system"
 msgstr "�ัว�ลือ�สำหรั�ระ���ระ�อ�สร�า���ร��าร"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
+#: ../plugins/project-wizard/templates/translatable-strings.h:75
 msgid "Plugin Class Name:"
 msgstr "�ื�อ�ลาส�อ��ลั��อิ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
+#: ../plugins/project-wizard/templates/translatable-strings.h:76
 msgid "Plugin Dependencies:"
 msgstr "สิ���ี��ลั��อิ���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
+#: ../plugins/project-wizard/templates/translatable-strings.h:77
 msgid "Plugin Description:"
 msgstr "�ำ�รรยาย�ลั��อิ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
+#: ../plugins/project-wizard/templates/translatable-strings.h:78
 msgid "Plugin Title:"
 msgstr "�ื�อ�ลั��อิ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
+#: ../plugins/project-wizard/templates/translatable-strings.h:79
 msgid "Plugin class name"
 msgstr "�ื�อ�ลาส�อ��ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
-msgid "Plugin has menus and/or toolbars"
+#: ../plugins/project-wizard/templates/translatable-strings.h:80
+msgid "Plugin has menus or/and toolbars"
 msgstr "�ลั��อิ�มี�ม�ู�ละ/หรือ�����รื�อ�มือ"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
+#: ../plugins/project-wizard/templates/translatable-strings.h:81
 msgid "Plugin interfaces to implement"
 msgstr "อิ���อร����สำหรั��ลั��อิ��ี��ะ�ำ"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
+#: ../plugins/project-wizard/templates/translatable-strings.h:82
 msgid "Project Name:"
 msgstr "�ื�อ��ร��าร:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
-msgid "Project directory, output file, etc."
+#: ../plugins/project-wizard/templates/translatable-strings.h:83
+msgid "Project directory, output file etc."
 msgstr "���ร��อรี��ร��าร ���ม�ลลั��� ฯลฯ"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
+#: ../plugins/project-wizard/templates/translatable-strings.h:84
 msgid "Project directory:"
 msgstr "���ร��อรี��ร��าร:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
+#: ../plugins/project-wizard/templates/translatable-strings.h:85
 msgid ""
 "Project name must not contain spaces, because it will be the name of the "
-"project build target (executable, library, etc.)"
+"project build target (executable, library etc.)"
 msgstr ""
 "�ื�อ��ร��าร�ะ��อ��ม�มี��อ�ว�า� ��ราะ�ะ��������ื�อ�อ����าหมาย�าร�ระ�อ�สร�า�����ร��าร (���� "
 "���ม��ร��รม, �ล�รารี ฯลฯ)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
+#: ../plugins/project-wizard/templates/translatable-strings.h:86
 msgid "Project name:"
 msgstr "�ื�อ��ร��าร:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
+#: ../plugins/project-wizard/templates/translatable-strings.h:87
 msgid "Project options"
 msgstr "�ัว�ลือ�สำหรั���ร��าร"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
-msgid "Python web project using Django Web Framework"
+#: ../plugins/project-wizard/templates/translatable-strings.h:88
+msgid "Python webproject using Django Web Framework"
 msgstr "��ร��าร�ว����วย���อ� ��ย����รอ��า��ว�� Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
+#: ../plugins/project-wizard/templates/translatable-strings.h:89
 msgid "Require Package:"
 msgstr "�������ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
+#: ../plugins/project-wizard/templates/translatable-strings.h:90
 msgid "Require SDL version:"
 msgstr "รุ�� SDL �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
+#: ../plugins/project-wizard/templates/translatable-strings.h:91
 msgid "Require SDL_gfx library"
 msgstr "SDL_gfx library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
+#: ../plugins/project-wizard/templates/translatable-strings.h:92
 msgid "Require SDL_gfx:"
 msgstr "SDL_gfx �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
+#: ../plugins/project-wizard/templates/translatable-strings.h:93
 msgid "Require SDL_image library"
 msgstr "SDL_image library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
+#: ../plugins/project-wizard/templates/translatable-strings.h:94
 msgid "Require SDL_image:"
 msgstr "SDL_image �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
+#: ../plugins/project-wizard/templates/translatable-strings.h:95
 msgid "Require SDL_mixer library"
 msgstr "SDL_mixer library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
+#: ../plugins/project-wizard/templates/translatable-strings.h:96
 msgid "Require SDL_mixer:"
 msgstr "SDL_mixer �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
+#: ../plugins/project-wizard/templates/translatable-strings.h:97
 msgid "Require SDL_net library"
 msgstr "SDL_net library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
+#: ../plugins/project-wizard/templates/translatable-strings.h:98
 msgid "Require SDL_net:"
 msgstr "SDL_net �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
+#: ../plugins/project-wizard/templates/translatable-strings.h:99
 msgid "Require SDL_ttf library"
 msgstr "SDL_ttf library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
+#: ../plugins/project-wizard/templates/translatable-strings.h:100
 msgid "Require SDL_ttf:"
 msgstr "SDL_ttf �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:102
+#: ../plugins/project-wizard/templates/translatable-strings.h:101
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:102
 msgid "Select code license"
 msgstr "�ลือ�สั��าอ�ุ�า��อ�����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:104
+#: ../plugins/project-wizard/templates/translatable-strings.h:103
 msgid "Select library type to build"
 msgstr "�ลือ���ิ��อ��ล�รารี�ี��ะ�ระ�อ�สร�า�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:105
+#: ../plugins/project-wizard/templates/translatable-strings.h:104
 msgid "Shared and Static library"
 msgstr "�ล�รารี���ร�วม�ละส���ิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
+#: ../plugins/project-wizard/templates/translatable-strings.h:105
 msgid "Shell values to watch"
 msgstr "��า�อ���ลล��ี��ะ���า�ู"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:107
+#: ../plugins/project-wizard/templates/translatable-strings.h:106
 msgid "Use pkg-config to add library support from other packages"
 msgstr "��� pkg-config ��ิ�ม�ารรอ�รั��ล�รารี�า�������อื��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:108
+#: ../plugins/project-wizard/templates/translatable-strings.h:107
 msgid "Value Name:"
 msgstr "�ื�อ��า:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:109
+#: ../plugins/project-wizard/templates/translatable-strings.h:108
 msgid "Values to watch"
 msgstr "��า�ี��ะ���า�ู"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:111
+#: ../plugins/project-wizard/templates/translatable-strings.h:110
 msgid "Whether the plugin has menus or toolbars"
 msgstr "�ำห��ว�า�ลั��อิ�มี�ม�ูหรือ�����รื�อ�มือหรือ�ม�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:112
-msgid "wxWidgets"
-msgstr "wxWidgets"
+#: ../plugins/project-wizard/templates/translatable-strings.h:111
+msgid "Wx Widgets"
+msgstr "Wx Widgets"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:113
+#: ../plugins/project-wizard/templates/translatable-strings.h:112
 msgid "Xlib"
 msgstr "Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:114
+#: ../plugins/project-wizard/templates/translatable-strings.h:113
 msgid "Xlib dock"
 msgstr "Xlib dock"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:115
-msgid "gtk-doc is used to compile API documentation for GObject-based classes"
+#: ../plugins/project-wizard/templates/translatable-strings.h:114
+msgid "gtk-doc is used to compile API documentations for GObject based classes"
 msgstr "��� gtk-doc ���าร�อม��ล��อ�สาร API สำหรั��ลาส�ี�อิ� GObject"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:116
+#: ../plugins/project-wizard/templates/translatable-strings.h:115
 msgid "project name"
 msgstr "�ื�อ��ร��าร"
 
@@ -8213,7 +8209,7 @@ msgstr[0] "����ี��� %d �ห��"
 msgid "Unable to build user interface for Search and Replace"
 msgstr "�ม�สามาร�สร�า�ส�ว��ิ���อ�ู����สำหรั��ล�อ�����อ� \"���หา�ละ����ี�\""
 
-#: ../plugins/sourceview/sourceview.c:366
+#: ../plugins/sourceview/sourceview.c:374
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8222,7 +8218,7 @@ msgstr ""
 "���ม \"%s\" ���ิส���หม��ว�า�ั���อร��ั��ุ�ั�\n"
 "�ุ���อ��าร�รีย�อ�า��หม�หรือ�ม�?"
 
-#: ../plugins/sourceview/sourceview.c:403
+#: ../plugins/sourceview/sourceview.c:411
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8232,18 +8228,18 @@ msgstr ""
 "�ุ���อ��าร�ิ����มหรือ�ม�?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:440
+#: ../plugins/sourceview/sourceview.c:448
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "�ม�สามาร���ิ� %s: %s"
 
-#: ../plugins/sourceview/sourceview.c:494
+#: ../plugins/sourceview/sourceview.c:502
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "���ม \"%s\" อ�า�อย�า������ียว! ยื�ยั��ี��ะ�����หรือ�ม�?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:553
+#: ../plugins/sourceview/sourceview.c:561
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "�ม�สามาร��ั��ึ� %s: %s"
@@ -8271,8 +8267,8 @@ msgid "Create backup files"
 msgstr "สร�า����มสำรอ�"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
-msgid "Enable autocompletion"
-msgstr "��ิ�����า��าร��ิม���มอั���มั�ิ"
+msgid "Enable autocompletion for document words"
+msgstr "��ิ�����า��าร��ิม���มอั���มั�ิสำหรั��ำ���อ�สาร"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
 msgid "Font"
@@ -8355,32 +8351,32 @@ msgstr "มุมมอ�"
 msgid "Wrap long lines to fit on paper"
 msgstr "�ั��รร�ั�ยาว�ห��อ�ีห��า�ระ�าษ"
 
-#: ../plugins/starter/plugin.c:50 ../plugins/starter/starter.c:349
+#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:362
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "��รื�อ�มือ�รีย��ำ�า�"
 
-#: ../plugins/starter/starter.c:390
+#: ../plugins/starter/starter.c:403
 msgid "Create File/Project"
 msgstr "สร�า����ม/��ร��าร"
 
-#: ../plugins/starter/starter.c:424
+#: ../plugins/starter/starter.c:437
 msgid "Recent Projects"
 msgstr "��ร��ารล�าสุ�"
 
-#: ../plugins/starter/starter.c:455
+#: ../plugins/starter/starter.c:468
 msgid "Links"
 msgstr "ลิ���"
 
-#: ../plugins/starter/starter.c:474
+#: ../plugins/starter/starter.c:487
 msgid "Anjuta Home Page"
 msgstr "�ว�������อ��อ��ู�า"
 
-#: ../plugins/starter/starter.c:480
+#: ../plugins/starter/starter.c:493
 msgid "Anjuta Manual"
 msgstr "�ู�มือ�อ��ู�า"
 
-#: ../plugins/starter/starter.c:486
+#: ../plugins/starter/starter.c:499
 msgid "GNOME Online API Documentation"
 msgstr "�อ�สาร API ออ��ล���อ� GNOME"
 
@@ -8894,64 +8890,64 @@ msgstr "สู�หาย: %s"
 msgid "Obstructed: %s"
 msgstr "�ู��ี��วา�: %s"
 
-#: ../plugins/symbol-db/plugin.c:317
+#: ../plugins/symbol-db/plugin.c:318
 msgid "Tag De_claration"
 msgstr "�าร�ระ�าศ�_���"
 
-#: ../plugins/symbol-db/plugin.c:319
+#: ../plugins/symbol-db/plugin.c:320
 msgid "Go to symbol declaration"
 msgstr "��ยั��าร�ระ�าศสั�ลั�ษ��"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:326
+#: ../plugins/symbol-db/plugin.c:327
 msgid "Tag _Implementation"
 msgstr "�_�ื�อหา����"
 
-#: ../plugins/symbol-db/plugin.c:328
+#: ../plugins/symbol-db/plugin.c:329
 msgid "Go to symbol definition"
 msgstr "��ยั��ัว��ื�อหา�อ�สั�ลั�ษ��"
 
-#: ../plugins/symbol-db/plugin.c:335
+#: ../plugins/symbol-db/plugin.c:336
 msgid "_Find Symbolâ?¦"
 msgstr "_หาสั�ลั�ษ���"
 
-#: ../plugins/symbol-db/plugin.c:336
+#: ../plugins/symbol-db/plugin.c:337
 msgid "Find Symbol"
 msgstr "หาสั�ลั�ษ��"
 
-#: ../plugins/symbol-db/plugin.c:1175
+#: ../plugins/symbol-db/plugin.c:1174
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%s: �ำลั�สร�า���ร�สร�า��ารสื��อ��ุ�สม�ั�ิ�"
 
-#: ../plugins/symbol-db/plugin.c:1180
+#: ../plugins/symbol-db/plugin.c:1179
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%s: ส����ล�ว %d �า� %d ���ม"
 
-#: ../plugins/symbol-db/plugin.c:1211
+#: ../plugins/symbol-db/plugin.c:1210
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "�ำลั�สร�า���ร�สร�า��ารสื��อ��ุ�สม�ั�ิ�"
 
-#: ../plugins/symbol-db/plugin.c:1213
+#: ../plugins/symbol-db/plugin.c:1212
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "ส����ล�ว %d �า� %d ���ม"
 
-#: ../plugins/symbol-db/plugin.c:1981
+#: ../plugins/symbol-db/plugin.c:1982
 msgid "Populating symbol databaseâ?¦"
 msgstr "�ำลั���ิม��อมูล�า���อมูลสั�ลั�ษ���"
 
-#: ../plugins/symbol-db/plugin.c:2345 ../plugins/symbol-db/plugin.c:2473
+#: ../plugins/symbol-db/plugin.c:2321 ../plugins/symbol-db/plugin.c:2460
 msgid "Symbols"
 msgstr "สั�ลั�ษ��"
 
-#: ../plugins/symbol-db/plugin.c:2482
+#: ../plugins/symbol-db/plugin.c:2469
 msgid "SymbolDb popup actions"
 msgstr "�าร�ระ�ำ���ม�ู�ุ��ึ���อ��า���อมูลสั�ลั�ษ��"
 
-#: ../plugins/symbol-db/plugin.c:2490
+#: ../plugins/symbol-db/plugin.c:2477
 msgid "SymbolDb menu actions"
 msgstr "�าร�ระ�ำ���ม�ู�อ��า���อมูลสั�ลั�ษ��"
 
@@ -8974,11 +8970,11 @@ msgid "Resuming glb scan."
 msgstr "�าร�ลั���ส��� glb �หม�"
 
 #: ../plugins/symbol-db/symbol-db-view-locals.c:326
-#: ../plugins/symbol-db/symbol-db-view.c:1413
+#: ../plugins/symbol-db/symbol-db-view.c:1412
 msgid "Symbol"
 msgstr "สั�ลั�ษ��"
 
-#: ../plugins/symbol-db/symbol-db-view.c:799
+#: ../plugins/symbol-db/symbol-db-view.c:798
 msgid "Loadingâ?¦"
 msgstr "�ำลั��หล��"
 
@@ -9529,54 +9525,54 @@ msgstr "��ี�ยว�ั��ลั��อิ� third party �อ
 msgid "Edit"
 msgstr "�����"
 
-#: ../src/anjuta-app.c:734
+#: ../src/anjuta-app.c:771
 msgid "Installed plugins"
 msgstr "�ลั��อิ��ี��ิ��ั���ว�"
 
-#: ../src/anjuta-app.c:738
+#: ../src/anjuta-app.c:775
 msgid "Shortcuts"
 msgstr "�ุ�มลั�"
 
-#: ../src/anjuta-app.c:810
+#: ../src/anjuta-app.c:847
 #, c-format
 msgid "Value doesn't exist"
 msgstr "��า�ี��ม�มีอยู�"
 
-#: ../src/main.c:62
+#: ../src/main.c:74
 msgid "Specify the size and location of the main window"
 msgstr "ระ�ุ��า��ละ�ำ�ห����อ�ห��า��า�หลั�"
 
 #. This is the format you can specify the size andposition
 #. * of the window on command line
-#: ../src/main.c:65
+#: ../src/main.c:77
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
-#: ../src/main.c:70
+#: ../src/main.c:82
 msgid "Do not show the splash screen"
 msgstr "�ม��ส��รู�����ิล"
 
-#: ../src/main.c:76
+#: ../src/main.c:88
 msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "��ิ�ห��า��า��หม� �ละ�ม���ิ����ม��ห��า��า���ิม�ี�มีอยู�"
 
-#: ../src/main.c:82
+#: ../src/main.c:94
 msgid "Do not open last session on startup"
 msgstr "�ม���อ���ิ�วาระล�าสุ����าร�ริ�ม�ำ�า�"
 
-#: ../src/main.c:88
+#: ../src/main.c:100
 msgid "Do not open last project and files on startup"
 msgstr "�ม���อ���ิ���ร��าร�ละ���มล�าสุ���ะ�ริ�ม�ำ�า�"
 
-#: ../src/main.c:94
+#: ../src/main.c:106
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr "�ิ��อ��ู�า�ห��รีย�ร�อย �ร�อม�ล�อย�ื��รั�ยา�ร�ั��หม� (สำหรั��าร�ี�ั��)"
 
-#: ../src/main.c:156
+#: ../src/main.c:174
 msgid "- Integrated Development Environment"
 msgstr "- �ุ���รื�อ�มือ�ั��า�����สร��"
 
-#: ../src/main.c:232
+#: ../src/main.c:250
 msgid "Anjuta"
 msgstr "�อ��ู�า"
 
@@ -9679,84 +9675,80 @@ msgid "Autocompletion (C/C++/Java only)"
 msgstr "�าร��ิม���ม�ำอั���มั�ิ (C/C++/�าวา ���า�ั��)"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
-msgid "Autocompletion pop up choices"
-msgstr "�ัว�ลือ��ี��ุ��ึ���อ��าร��ิม���ม�ำอั���มั�ิ"
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Brace indentation size in spaces:"
 msgstr "��า��ารร��ย�อห��า�ี��า��ห��วย�ำ�ว���อ�ว�า�:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Calltips"
 msgstr "�ำ��ะ�ำ�าร�รีย�"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
 msgid "Enable code completion"
 msgstr "��ิ�����า��าร��ิม���ม����"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
 msgid "Enable smart brace completion"
 msgstr "��ิ�����า��าร��ิมว��ล���ิ�อั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable smart indentation"
 msgstr "��ิ�����า��ารร��ย�อห��า����ลา�"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Indent:"
 msgstr "ร��ย�อห��า:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 msgid "Indentation parameters"
 msgstr "�ารามิ��อร��ารร��ย�อห��า"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Line up parentheses"
 msgstr "�ั�ว��ล���ห��ร��ั�"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
 msgid "Parenthesis indentation"
 msgstr "�ารร��ย�อห��าว��ล��"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "�ส���ำ��ะ�ำ�าร�รีย�"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Smart Indentation"
 msgstr "�ารร��ย�อห��า����ลา�"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "��า��ารร��ย�อห��า��อย��ล���ห��วย�ำ�ว���อ�ว�า�:"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1884
+#: ../plugins/language-support-cpp-java/plugin.c:1888
 msgid "Auto-Indent"
 msgstr "ร��ย�อห��าอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1885
+#: ../plugins/language-support-cpp-java/plugin.c:1889
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "ร���รร�ั��ั��ุ�ั�หรือ��อ�วาม�ี��ลือ�อยู���ยอั���มั�ิ �ึ��อยู��ั���า�ั���ารร��ย�อห��า"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1890
+#: ../plugins/language-support-cpp-java/plugin.c:1894
 msgid "Swap .h/.c"
 msgstr "สลั� .h/.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1891
+#: ../plugins/language-support-cpp-java/plugin.c:1895
 msgid "Swap C header and source files"
 msgstr "สลั����มส�ว�หัว�ั��อร�สภาษา C"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1932
+#: ../plugins/language-support-cpp-java/plugin.c:1936
 msgid "C++/Java Assistance"
 msgstr "��รื�อ�มือ��วย C++/Java"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2025
-#: ../plugins/language-support-cpp-java/plugin.c:2034
+#: ../plugins/language-support-cpp-java/plugin.c:2048
+#: ../plugins/language-support-cpp-java/plugin.c:2061
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
-#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1044
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1368
 msgid "C/C++"
 msgstr "C/C++"
 
@@ -10035,6 +10027,18 @@ msgstr "����อั�ภา� (semicolon) �ี�หาย��"
 msgid "Min character for completion "
 msgstr "�ำ�ว�อั��ระ��ำสุ��ี��ะ�ริ�ม��ิม���ม����"
 
+#~ msgid "Online"
+#~ msgstr "ออ��ล��"
+
+#~ msgid "Edit&#x2026;"
+#~ msgstr "�����&#x2026;"
+
+#~ msgid "wxWidgets"
+#~ msgstr "wxWidgets"
+
+#~ msgid "Autocompletion pop up choices"
+#~ msgstr "�ัว�ลือ��ี��ุ��ึ���อ��าร��ิม���ม�ำอั���มั�ิ"
+
 #~ msgid "Gdb plugin."
 #~ msgstr "�ลั��อิ� Gdb"
 
@@ -10203,9 +10207,6 @@ msgstr "�ำ�ว�อั��ระ��ำสุ��ี��ะ�ร
 #~ msgid "Create a template gtk builder interface file"
 #~ msgstr "สร�า����ม�ม����ส�ว��ิ���อ�ู�����อ� gtk builder"
 
-#~ msgid "Wx Widgets"
-#~ msgstr "Wx Widgets"
-
 #~ msgid "Run In Terminal"
 #~ msgstr "�รีย�����อร�มิ�ัล"
 
diff --git a/po/uk.po b/po/uk.po
index b91d53f..aa1d678 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: anjuta IDE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 15:03+0300\n"
-"PO-Revision-Date: 2009-09-16 15:38+0300\n"
+"POT-Creation-Date: 2010-03-31 13:32+0300\n"
+"PO-Revision-Date: 2010-03-31 15:38+0300\n"
 "Last-Translator: Maxim Dziumanenko <dziumanenko gmail com>\n"
-"Language-Team: ukrainian <Ukrainian <uk li org>>\n"
+"Language-Team: Ukrainian <trans-uk lists fedoraproject org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,10 +69,10 @@ msgstr ""
 #: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
 #, c-format
 msgid ""
-"anjuta was not able to automatically determine the encoding of the file you "
+"Anjuta was not able to automatically determine the encoding of the file you "
 "want to open."
 msgstr ""
-"не вдаÑ?Ñ?Ñ?Ñ?Ñ? авÑ?омаÑ?иÑ?но визнаÑ?иÑ?и кодÑ?ваннÑ? Ñ?айлÑ?, Ñ?кий ви Ñ?оÑ?еÑ?е вÑ?дкÑ?иÑ?и."
+"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? авÑ?омаÑ?иÑ?но визнаÑ?иÑ?и кодÑ?ваннÑ? Ñ?айлÑ?, Ñ?кий ви Ñ?оÑ?еÑ?е вÑ?дкÑ?иÑ?и."
 
 #: ../libanjuta/anjuta-encodings.c:137 ../libanjuta/anjuta-encodings.c:182
 #: ../libanjuta/anjuta-encodings.c:184 ../libanjuta/anjuta-encodings.c:186
@@ -186,12 +186,15 @@ msgstr "Ð?'еÑ?намÑ?Ñ?ка"
 msgid "Thai"
 msgstr "ТайÑ?Ñ?ка"
 
-#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:3204
+#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:193
+#: ../plugins/gbf-am/gbf-am-project.c:3372
 #: ../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-am/gbf-am-properties.c:176
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:191
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3267
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:104
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:148
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:151
+#: ../plugins/dir-project/dir-project.c:802
 msgid "Unknown"
 msgstr "Ð?евÑ?дома"
 
@@ -205,11 +208,11 @@ msgstr "Ð?е вдалоÑ?Ñ? виконаÑ?и командÑ?: \"%s\""
 msgid "execvp failed"
 msgstr "Ð?омилка пÑ?и execvp"
 
-#: ../libanjuta/anjuta-plugin.c:327 ../libanjuta/anjuta-plugin-manager.c:2310
+#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2312
 msgid "Anjuta Shell"
 msgstr "Ð?болонка Anjuta"
 
-#: ../libanjuta/anjuta-plugin.c:328
+#: ../libanjuta/anjuta-plugin.c:327
 msgid "Anjuta shell that will contain the plugin"
 msgstr "Ð?болонка Anjuta Ñ?ка мÑ?Ñ?Ñ?иÑ?име модÑ?лÑ?"
 
@@ -236,11 +239,11 @@ msgid "Load"
 msgstr "Ð?аванÑ?ажиÑ?и"
 
 #: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1941
+#: ../libanjuta/anjuta-plugin-manager.c:1943
 msgid "Available Plugins"
 msgstr "Ð?оÑ?Ñ?Ñ?пнÑ? доповненнÑ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:736
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:773
 msgid "Preferred plugins"
 msgstr "УлÑ?бленÑ? доповненнÑ?"
 
@@ -264,13 +267,13 @@ msgstr "Ð?е вважаÑ?и Ñ?лÑ?бленими"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1357
 #: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
-#: ../plugins/debug-manager/queue.c:556
+#: ../plugins/debug-manager/queue.c:537
 msgid "Select a plugin"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? модÑ?лÑ?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#: ../plugins/debug-manager/queue.c:557
+#: ../plugins/debug-manager/queue.c:538
 msgid "Please select a plugin to activate"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? модÑ?лÑ?, Ñ?кий Ñ?Ñ?еба акÑ?ивÑ?ваÑ?и"
 
@@ -279,50 +282,50 @@ msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? модÑ?лÑ?, Ñ?кий Ñ?Ñ?еба акÑ?ивÑ?ваÑ?и"
 msgid "No plugin is able to load other plugins in %s"
 msgstr "Ð?емаÑ? доповненнÑ?, здаÑ?ного заванÑ?ажиÑ?и Ñ?нÑ?е доповненнÑ? Ñ? %s"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1960
+#: ../libanjuta/anjuta-plugin-manager.c:1962
 msgid "Remember this selection"
 msgstr "Ð?апам'Ñ?Ñ?аÑ?и вибÑ?Ñ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2291
+#: ../libanjuta/anjuta-plugin-manager.c:2293
 msgid "Profiles"
 msgstr "Ð?Ñ?оÑ?Ñ?лÑ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2292
+#: ../libanjuta/anjuta-plugin-manager.c:2294
 msgid "Current stack of profiles"
 msgstr "Ð?оÑ?оÑ?ний Ñ?Ñ?ек пÑ?оÑ?Ñ?лÑ?в"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2297
+#: ../libanjuta/anjuta-plugin-manager.c:2299
 msgid "Available plugins"
 msgstr "Ð?оÑ?Ñ?Ñ?пнÑ? доповненнÑ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2298
+#: ../libanjuta/anjuta-plugin-manager.c:2300
 msgid "Currently available plugins found in plugin paths"
 msgstr "Ð?оÑ?Ñ?Ñ?пнÑ? модÑ?лÑ?, знайденÑ? Ñ? Ñ?екаÑ? длÑ? доповненÑ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2304
+#: ../libanjuta/anjuta-plugin-manager.c:2306
 msgid "Activated plugins"
 msgstr "Ð?кÑ?ивованÑ? доповненнÑ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2305
+#: ../libanjuta/anjuta-plugin-manager.c:2307
 msgid "Currently activated plugins"
 msgstr "Ð?аÑ?азÑ? акÑ?ивованÑ? доповненнÑ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2311
+#: ../libanjuta/anjuta-plugin-manager.c:2313
 msgid "Anjuta shell for which the plugins are made"
 msgstr "Ð?болонка Anjuta длÑ? Ñ?коÑ? Ñ? доповненнÑ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2319
+#: ../libanjuta/anjuta-plugin-manager.c:2321
 msgid "Anjuta Status"
 msgstr "СÑ?аÑ?Ñ?Ñ? Anjuta"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2320
+#: ../libanjuta/anjuta-plugin-manager.c:2322
 msgid "Anjuta status to use in loading and unloading of plugins"
 msgstr ""
 "СÑ?аÑ?Ñ?Ñ? Anjuta длÑ? викоÑ?иÑ?Ñ?аннÑ? пÑ?и заванÑ?аженнÑ? Ñ?а виванÑ?аженнÑ? доповненÑ?"
 
 #. DEBUG_PRINT ("Icon: %s", icon_path);
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-plugin-manager.c:2480
+#: ../libanjuta/anjuta-plugin-manager.c:2482
 msgid "Loaded:"
 msgstr "Ð?аванÑ?ажено:"
 
@@ -355,8 +358,8 @@ msgid "Synchronization file"
 msgstr "Файл длÑ? Ñ?инÑ?Ñ?онÑ?заÑ?Ñ?Ñ?"
 
 #: ../libanjuta/anjuta-profile.c:281
-msgid "File to sync the profile xml"
-msgstr "Файл длÑ? Ñ?инÑ?Ñ?онÑ?заÑ?Ñ?Ñ? пÑ?оÑ?Ñ?лÑ? xml"
+msgid "File to syncronize the profile XML"
+msgstr "Файл длÑ? Ñ?инÑ?Ñ?онÑ?заÑ?Ñ?Ñ? пÑ?оÑ?Ñ?лÑ? XML"
 
 #: ../libanjuta/anjuta-profile.c:508
 msgid "Please select a plugin from the list"
@@ -365,7 +368,7 @@ msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? модÑ?лÑ? зÑ? Ñ?пиÑ?кÑ?"
 #: ../libanjuta/anjuta-profile.c:672
 #, c-format
 msgid ""
-"Failed to read '%s': XML parse error. Invalid or corrupted anjuta plugins "
+"Failed to read '%s': XML parse error. Invalid or corrupted Anjuta plugins "
 "profile."
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?оÑ?иÑ?аÑ?и '%s': помилка Ñ?озбоÑ?Ñ? XML. Ð?епÑ?авилÑ?ний або зÑ?пÑ?ований "
@@ -408,8 +411,8 @@ msgstr "Ð?аÑ?егоÑ?Ñ?Ñ?"
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4 ../src/anjuta-app.c:723
-#: ../src/preferences.ui.h:10
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:760
+#: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "Ð?агалÑ?нÑ?"
 
@@ -417,24 +420,24 @@ msgstr "Ð?агалÑ?нÑ?"
 msgid "Anjuta Preferences"
 msgstr "Ð?аÑ?амеÑ?Ñ?и Anjuta"
 
-#: ../libanjuta/anjuta-save-prompt.c:158
+#: ../libanjuta/anjuta-save-prompt.c:157
 msgid "Select the items to save:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? елеменÑ?и длÑ? збеÑ?еженнÑ?:"
 
-#: ../libanjuta/anjuta-save-prompt.c:183
+#: ../libanjuta/anjuta-save-prompt.c:182
 msgid "If you do not save, all your changes will be lost."
 msgstr "ЯкÑ?о ви не збеÑ?ежеÑ?е змÑ?ни, вони бÑ?дÑ?Ñ?Ñ? вÑ?Ñ?аÑ?енÑ?"
 
-#: ../libanjuta/anjuta-save-prompt.c:190
-#: ../plugins/document-manager/plugin.c:596
+#: ../libanjuta/anjuta-save-prompt.c:189
+#: ../plugins/document-manager/plugin.c:603
 msgid "Save"
 msgstr "Ð?беÑ?егÑ?и"
 
-#: ../libanjuta/anjuta-save-prompt.c:197
+#: ../libanjuta/anjuta-save-prompt.c:196
 msgid "Item"
 msgstr "Ð?леменÑ?"
 
-#: ../libanjuta/anjuta-save-prompt.c:203
+#: ../libanjuta/anjuta-save-prompt.c:202
 msgid "_Discard changes"
 msgstr "_Ð?Ñ?дÑ?илиÑ?и змÑ?ни"
 
@@ -474,11 +477,35 @@ msgid "Shortcut"
 msgstr "Ð?омбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:355
+#: ../libanjuta/anjuta-utils.c:359
 msgid "System:"
 msgstr "СиÑ?Ñ?ема: "
 
-#: ../libanjuta/anjuta-utils.c:493
+#: ../libanjuta/anjuta-utils.c:505
+msgid ""
+"You do not seem to have PackageKit installed. PackageKit is required for "
+"installing missing packages. Please install \"packagekit-gnome\" package "
+"from your distribution, or install the missing packages manually."
+msgstr ""
+"Ð?мовÑ?Ñ?но, PackageKit не вÑ?Ñ?ановлено. Ð?лÑ? вÑ?Ñ?ановленнÑ? вÑ?дÑ?Ñ?Ñ?нÑ?Ñ? пакеÑ?Ñ?в "
+"поÑ?Ñ?Ñ?бен PackageKit. вÑ?дÑ?Ñ?Ñ?нÑ?Ñ? пакеÑ?Ñ?в. Ð?Ñ?Ñ?ановÑ?Ñ?Ñ? пакеÑ? «packagekit-gnome» з "
+"диÑ?Ñ?Ñ?ибÑ?Ñ?ивÑ? Ñ?и вÑ?дÑ?Ñ?Ñ?нÑ? пакеÑ?и вÑ?Ñ?Ñ?нÑ?."
+
+#: ../libanjuta/anjuta-utils.c:515
+#, c-format
+msgid "Installation failed: %s"
+msgstr "Ð?омилка пÑ?и вÑ?Ñ?ановленнÑ?: %s"
+
+#: ../libanjuta/anjuta-utils.c:575
+#, c-format
+msgid ""
+"The \"%s\" package is not installed.\n"
+"Please install it."
+msgstr ""
+"Ð?Ñ?огÑ?амÑ? «%s» не вÑ?Ñ?ановлено.\n"
+"Ð?Ñ?Ñ?ановÑ?Ñ?Ñ? Ñ?Ñ?."
+
+#: ../libanjuta/anjuta-utils.c:593
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -488,72 +515,73 @@ msgstr ""
 "Ð?Ñ?Ñ?ановÑ?Ñ?Ñ? Ñ?Ñ?."
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:986
-msgid "Cannot find a terminal, using xterm, even if it may not work"
+#: ../libanjuta/anjuta-utils.c:1086
+msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и Ñ?еÑ?мÑ?нал, викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? xterm, навÑ?Ñ?Ñ? Ñ?кÑ?о вÑ?н не "
 "пÑ?аÑ?Ñ?Ñ?"
 
-#: ../libanjuta/anjuta-utils.c:1022 ../libanjuta/anjuta-utils.c:1026
-#: ../libanjuta/anjuta-utils.c:1054 ../libanjuta/anjuta-utils.c:1058
+#: ../libanjuta/anjuta-utils.c:1122 ../libanjuta/anjuta-utils.c:1126
+#: ../libanjuta/anjuta-utils.c:1154 ../libanjuta/anjuta-utils.c:1158
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? запÑ?Ñ?Ñ?иÑ?и командÑ?: %s (викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?и оболонкÑ? %s)\n"
 
-#: ../libanjuta/anjuta-utils.c:1690
+#: ../libanjuta/anjuta-utils.c:1790
 msgid ""
-"Unable to display help. Please make sure Anjuta documentation package is "
-"install. It can be downloaded from http://anjuta.org";
+"Unable to display help. Please make sure the Anjuta documentation package is "
+"installed. It can be downloaded from http://anjuta.org.";
 msgstr ""
-"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? показаÑ?и довÑ?дкÑ?. Ð?еÑ?евÑ?Ñ?Ñ?е, Ñ?о пакеÑ? докÑ?менÑ?аÑ?Ñ?Ñ? длÑ? Anjuta "
-"вÑ?Ñ?ановлено. Ð?Ñ?н може бÑ?Ñ?и заванÑ?ажений з http://anjuta.org";
+"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? показаÑ?и довÑ?дкÑ?. Ð?еÑ?евÑ?Ñ?Ñ?е, Ñ?о вÑ?Ñ?ановлено пакеÑ? докÑ?менÑ?аÑ?Ñ?Ñ? "
+"длÑ? Anjuta. Ð?Ñ?н може бÑ?Ñ?и заванÑ?ажений з http://anjuta.org";
 
-#: ../libanjuta/anjuta-utils.c:2129
+#: ../libanjuta/anjuta-utils.c:2229
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и Ñ?айл Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а: %s"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:92
-#: ../plugins/file-manager/file-view.c:65
+#: ../plugins/file-manager/file-view.c:75
 msgid "Modified"
 msgstr "Ð?мÑ?нено"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:95
-#: ../plugins/file-manager/file-view.c:69
+#: ../plugins/file-manager/file-view.c:79
 msgid "Added"
 msgstr "Ð?одано"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:98
-#: ../plugins/file-manager/file-view.c:67
+#: ../plugins/file-manager/file-view.c:77
 msgid "Deleted"
 msgstr "Ð?идалено"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:101
-#: ../plugins/file-manager/file-view.c:71
+#: ../plugins/file-manager/file-view.c:81
 msgid "Conflicted"
 msgstr "Ð?Ñ?оÑ?иÑ?Ñ?Ñ?Ñ?Ñ?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-msgid "Up to date"
-msgstr "Ð?новлено"
+#: ../plugins/file-manager/file-view.c:83
+msgid "Up-to-date"
+msgstr "Ð?е поÑ?Ñ?ебÑ?Ñ? Ñ?Ñ?кÑ?аÑ?Ñ?Ñ?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
-#: ../plugins/file-manager/file-view.c:75
+#: ../plugins/file-manager/file-view.c:85
 msgid "Locked"
 msgstr "Ð?аÑ?оплено"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:112
-#: ../plugins/file-manager/file-view.c:77
+#: ../plugins/file-manager/file-view.c:87
 msgid "Missing"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ?й"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:115
-#: ../plugins/file-manager/file-view.c:79
+#: ../plugins/file-manager/file-view.c:89
 msgid "Unversioned"
 msgstr "Ð?е пÑ?д конÑ?Ñ?олем Ñ?иÑ?Ñ?еми веÑ?Ñ?Ñ?й"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:119
-#: ../plugins/file-manager/file-view.c:81
+#: ../plugins/file-manager/file-view.c:91
 msgid "Ignored"
 msgstr "Ð?е вÑ?аÑ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
 
@@ -573,8 +601,8 @@ msgstr "Ð?б'Ñ?кÑ? Pixbuf"
 msgid "The pixbuf to render."
 msgstr "Ð?б'Ñ?кÑ? Рixbuf длÑ? виведеннÑ?"
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3041
-#: ../plugins/glade/plugin.c:3076
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3029
+#: ../plugins/glade/plugin.c:3064
 #, c-format
 msgid "Widget not found: %s"
 msgstr "Ð?Ñ?джеÑ?Ñ? не знайдено: %s"
@@ -585,67 +613,67 @@ msgid "Could not find application pixmap file: %s"
 msgstr "Ð?е вдалоÑ?Ñ? знайÑ?и Ñ?айл зобÑ?аженнÑ?: %s"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
-msgid "<b>Build</b>"
-msgstr "<b>Ð?бÑ?Ñ?ка</b>"
+#: ../plugins/run-program/anjuta-run-program.ui.h:1
+msgid "Arguments:"
+msgstr "Ð?Ñ?гÑ?менÑ?и:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:2
-msgid "<b>Configuration:</b>"
-msgstr "<b>Ð?онÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?:</b>"
+msgid "Build"
+msgstr "Ð?биÑ?аннÑ?"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:3
-msgid "<b>Install</b>"
-msgstr "<b>Ð?Ñ?Ñ?ановленнÑ?</b>"
+msgid "Build Directory:"
+msgstr "Ð?аÑ?алог длÑ? збиÑ?аннÑ?:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:4
-msgid "<b>Regenerate project</b>"
-msgstr "<b>Ð?еÑ?егенеÑ?Ñ?ваÑ?и пÑ?оекÑ?</b>"
+msgid "Configuration:"
+msgstr "Ð?онÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:5
-msgid "<b>Select Program to run:</b>"
-msgstr "<b>Ð?ибеÑ?Ñ?Ñ?Ñ? пÑ?огÑ?амÑ? длÑ? запÑ?Ñ?кÑ?:</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
-#: ../plugins/run-program/anjuta-run-program.ui.h:1
-msgid "Arguments:"
-msgstr "Ð?Ñ?гÑ?менÑ?и:"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
-msgid "Build Directory:"
-msgstr "Ð?аÑ?алог длÑ? збиÑ?аннÑ?:"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Configure Options:"
 msgstr "Ð?аÑ?амеÑ?Ñ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
 msgid "Configure Project"
 msgstr "Ð?алаÑ?Ñ?Ñ?ваÑ?и пÑ?оекÑ?"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
 msgid "Continue on errors"
 msgstr "Ð?Ñ?одовжÑ?ваÑ?и пÑ?и виÑ?вленнÑ? помилок"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Highlight message locations in editor"
 msgstr "Ð?идÑ?лÑ?Ñ?и колÑ?оÑ?ом повÑ?домленнÑ? збÑ?Ñ?ки Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+msgid "Install"
+msgstr "Ð?Ñ?Ñ?ановиÑ?и"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
 msgid "Install as root:"
 msgstr "Ð?Ñ?Ñ?ановиÑ?и Ñ?к Ñ?Ñ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
-#: ../plugins/tools/anjuta-tools.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+msgid "Regenerate project"
+msgstr "Ð?еÑ?егенеÑ?Ñ?ваÑ?и пÑ?оекÑ?"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/tools/anjuta-tools.ui.h:8
 msgid "Run in terminal"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?Ñ? Ñ? Ñ?еÑ?мÑ?налÑ?"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
 msgid "Run several commands at a time:"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и декÑ?лÑ?ка команд одноÑ?аÑ?но:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
 msgid "Select Program"
 msgstr "Ð?иконаÑ?и пÑ?огÑ?амÑ?"
 
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+msgid "Select Program to run:"
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? пÑ?огÑ?амÑ? длÑ? запÑ?Ñ?кÑ?:"
+
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:16
 msgid "Select a build directory"
 msgstr "Ð?ибÑ?аÑ?и каÑ?алог длÑ? збиÑ?аннÑ?"
@@ -654,23 +682,23 @@ msgstr "Ð?ибÑ?аÑ?и каÑ?алог длÑ? збиÑ?аннÑ?"
 msgid "Translate messages"
 msgstr "Ð?еÑ?екладаÑ?и повÑ?домленнÑ? збиÑ?аннÑ?"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:62
+#: ../plugins/build-basic-autotools/configuration-list.c:68
 #: ../plugins/class-gen/window.c:525
 #: ../plugins/search/search_preferences.c:523
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2 ../src/preferences.ui.h:2
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "Типово"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:63
+#: ../plugins/build-basic-autotools/configuration-list.c:69
 #: ../plugins/gdb/utilities.c:297
 msgid "Debug"
 msgstr "Ð?алагодженнÑ?"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:64
+#: ../plugins/build-basic-autotools/configuration-list.c:70
 msgid "Profiling"
 msgstr "Ð?Ñ?оÑ?Ñ?лÑ?ваннÑ?"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:65
+#: ../plugins/build-basic-autotools/configuration-list.c:71
 msgid "Optimized"
 msgstr "Ð?пÑ?имÑ?заÑ?Ñ?Ñ?"
 
@@ -678,39 +706,42 @@ msgstr "Ð?пÑ?имÑ?заÑ?Ñ?Ñ?"
 msgid "No executables in this project!"
 msgstr "У пÑ?оекÑ?Ñ? немаÑ? виконÑ?ваниÑ? Ñ?айлÑ?в"
 
-#: ../plugins/build-basic-autotools/executer.c:154
-#: ../plugins/gbf-am/gbf-am-project.c:3194
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3086
+#: ../plugins/build-basic-autotools/executer.c:157
+#: ../plugins/gbf-am/gbf-am-project.c:196
+#: ../plugins/gbf-am/gbf-am-project.c:3362
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:194
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3261
 msgid "Program"
 msgstr "Ð?Ñ?огÑ?ама"
 
-#: ../plugins/build-basic-autotools/executer.c:255
+#: ../plugins/build-basic-autotools/executer.c:258
 msgid "No file or project currently opened."
 msgstr "Ð?емаÑ? вÑ?дкÑ?иÑ?ого Ñ?айлÑ? або пÑ?оекÑ?Ñ?."
 
 #. Only local program are supported
-#: ../plugins/build-basic-autotools/executer.c:295
+#: ../plugins/build-basic-autotools/executer.c:298
 #: ../plugins/run-program/execute.c:70
 #, c-format
 msgid "Program '%s' is not a local file"
 msgstr "Ð?Ñ?огÑ?ама «%s» не Ñ? локалÑ?ним Ñ?айлом"
 
-#: ../plugins/build-basic-autotools/executer.c:310
+#: ../plugins/build-basic-autotools/executer.c:313
+#: ../plugins/run-program/execute.c:76
 #, c-format
-msgid "Program '%s' does not exists"
-msgstr "Ð?Ñ?огÑ?ама «%s» не Ñ?Ñ?нÑ?Ñ?"
+msgid "Program '%s' does not exist"
+msgstr "Ð?Ñ?огÑ?ама '%s' не Ñ?Ñ?нÑ?Ñ?"
 
-#: ../plugins/build-basic-autotools/executer.c:318
+#: ../plugins/build-basic-autotools/executer.c:321
 #: ../plugins/run-program/execute.c:80
 #, c-format
 msgid "Program '%s' does not have execution permission"
 msgstr "Ð?Ñ?огÑ?ама «%s» не маÑ? аÑ?Ñ?ибÑ?Ñ?Ñ? дозволÑ? на виконаннÑ?"
 
-#: ../plugins/build-basic-autotools/executer.c:350
+#: ../plugins/build-basic-autotools/executer.c:353
 msgid "No executable for this file."
 msgstr "Ð?лÑ? Ñ?Ñ?ого Ñ?айлÑ? немаÑ? виконÑ?ваного Ñ?айлÑ?."
 
-#: ../plugins/build-basic-autotools/executer.c:356
+#: ../plugins/build-basic-autotools/executer.c:359
 #, c-format
 msgid "Executable '%s' is not up-to-date."
 msgstr "Ð?иконÑ?ваний Ñ?айл %s заÑ?Ñ?аÑ?Ñ?в."
@@ -720,11 +751,11 @@ msgstr "Ð?иконÑ?ваний Ñ?айл %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:167
+#: ../plugins/build-basic-autotools/plugin.c:168
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Ð?биÑ?аннÑ? Ñ?\\s+каÑ?алозÑ?\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:168
+#: ../plugins/build-basic-autotools/plugin.c:169
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Ð?биÑ?аннÑ? Ñ?\\s+каÑ?алозÑ?\\s+'(.+)'"
 
@@ -733,364 +764,365 @@ msgstr "make(\\[\\d+\\])?:\\s+Ð?биÑ?аннÑ? Ñ?\\s+каÑ?алозÑ?\\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:176
+#: ../plugins/build-basic-autotools/plugin.c:177
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Ð?иÑ?Ñ?д з\\s+каÑ?алогÑ?\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:177
+#: ../plugins/build-basic-autotools/plugin.c:178
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Ð?иÑ?Ñ?д з\\s+каÑ?алогÑ?\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:827
+#: ../plugins/build-basic-autotools/plugin.c:846
 #, c-format
 msgid "Entering: %s"
 msgstr "Ð?Ñ?дкÑ?иваннÑ?: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:863
+#: ../plugins/build-basic-autotools/plugin.c:882
 #, c-format
 msgid "Leaving: %s"
 msgstr "Ð?акÑ?иÑ?Ñ?Ñ?: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:896
+#: ../plugins/build-basic-autotools/plugin.c:915
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "Ð?опеÑ?едженнÑ?:"
 
-#: ../plugins/build-basic-autotools/plugin.c:902
+#: ../plugins/build-basic-autotools/plugin.c:921
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "помилка: "
 
-#: ../plugins/build-basic-autotools/plugin.c:1019
+#: ../plugins/build-basic-autotools/plugin.c:1038
 #, c-format
 msgid "Command exited with status %d"
 msgstr "Ð?оманда завеÑ?Ñ?илаÑ?Ñ? з Ñ?езÑ?лÑ?Ñ?аÑ?ом %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1029
-#: ../plugins/build-basic-autotools/plugin.c:1505
+#: ../plugins/build-basic-autotools/plugin.c:1048
+#: ../plugins/build-basic-autotools/plugin.c:1524
 #, c-format
 msgid "Command canceled by user"
 msgstr "Ð?оманда Ñ?каÑ?ована коÑ?иÑ?Ñ?Ñ?ваÑ?ем"
 
-#: ../plugins/build-basic-autotools/plugin.c:1034
+#: ../plugins/build-basic-autotools/plugin.c:1053
 #, c-format
 msgid "Command aborted by user"
 msgstr "Ð?оманда пеÑ?еÑ?вана коÑ?иÑ?Ñ?Ñ?ваÑ?ем"
 
-#: ../plugins/build-basic-autotools/plugin.c:1039
+#: ../plugins/build-basic-autotools/plugin.c:1058
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "Ð?иконаннÑ? пÑ?огÑ?ами пÑ?ипинено з Ñ?игналом %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1047
+#: ../plugins/build-basic-autotools/plugin.c:1066
 msgid "Command terminated for an unknown reason"
 msgstr "Ð?иконаннÑ? команди пеÑ?еÑ?вано з невÑ?домоÑ? пÑ?иÑ?ини"
 
-#: ../plugins/build-basic-autotools/plugin.c:1065
+#: ../plugins/build-basic-autotools/plugin.c:1084
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "Ð?Ñ?Ñ?ого зайнÑ?ло Ñ?аÑ?Ñ?: %lu Ñ?екÑ?нд\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1072
+#: ../plugins/build-basic-autotools/plugin.c:1091
 msgid "Completed unsuccessfully\n"
 msgstr "Ð?авеÑ?Ñ?ено з помилкоÑ?\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1080
+#: ../plugins/build-basic-autotools/plugin.c:1099
 #: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "Ð?авеÑ?Ñ?ено Ñ?Ñ?пÑ?Ñ?но\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:1168
+#: ../plugins/build-basic-autotools/plugin.c:1187
 #, c-format
 msgid "Build %d: %s"
 msgstr "Ð?бÑ?Ñ?ка %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1499
+#: ../plugins/build-basic-autotools/plugin.c:1518
 msgid ""
 "Before using this new configuration, the default one needs to be removed. Do "
 "you want to do that ?"
 msgstr ""
-"Ð?еÑ?ед викоÑ?иÑ?Ñ?аннÑ?м новоÑ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? Ñ?Ñ?еба видалиÑ?и Ñ?иповÑ?. Ð?Ñ?обиÑ?и Ñ?е заÑ?аз ?"
+"Ð?еÑ?ед викоÑ?иÑ?Ñ?аннÑ?м новоÑ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? Ñ?Ñ?еба видалиÑ?и Ñ?иповÑ?. Ð?Ñ?обиÑ?и Ñ?е "
+"заÑ?аз ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1802
+#: ../plugins/build-basic-autotools/plugin.c:1822
 #, c-format
-msgid "Can not compile \"%s\": No compile rule defined for this file type."
+msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr ""
-"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?компÑ?лÑ?ваÑ?и «%s»: не визнаÑ?енÑ? пÑ?авила збÑ?Ñ?ки длÑ? Ñ?Ñ?ого Ñ?ипÑ? "
+"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?компÑ?лÑ?ваÑ?и «%s»: не визнаÑ?енÑ? пÑ?авила збиÑ?аннÑ? длÑ? Ñ?Ñ?ого Ñ?ипÑ? "
 "Ñ?айлÑ?в."
 
-#: ../plugins/build-basic-autotools/plugin.c:1928
+#: ../plugins/build-basic-autotools/plugin.c:1957
 #, c-format
-msgid "Can not configure project: Missing configure script in %s."
+msgid "Cannot configure project: Missing configure script in %s."
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? налаÑ?Ñ?Ñ?ваÑ?и пÑ?оекÑ?: Ñ? %s вÑ?дÑ?Ñ?Ñ?нÑ?й конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?Ñ?енаÑ?Ñ?й."
 
-#: ../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
+#: ../plugins/build-basic-autotools/plugin.c:2438
+#: ../plugins/build-basic-autotools/plugin.c:2512
+#: ../plugins/build-basic-autotools/plugin.c:2522
+#: ../plugins/build-basic-autotools/plugin.c:2540
+#: ../plugins/build-basic-autotools/plugin.c:2550
+#: ../plugins/build-basic-autotools/plugin.c:2607
 #, c-format
 msgid "_Build"
 msgstr "Ð?_бÑ?Ñ?ка"
 
-#: ../plugins/build-basic-autotools/plugin.c:2398
+#: ../plugins/build-basic-autotools/plugin.c:2442
 msgid "_Build Project"
 msgstr "Ð?Ñ?бÑ?аÑ?и _пÑ?оекÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2399
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "Build whole project"
 msgstr "Ð?бÑ?Ñ?ка Ñ?Ñ?Ñ?ого пÑ?оекÑ?Ñ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2404
+#: ../plugins/build-basic-autotools/plugin.c:2448
 msgid "_Install Project"
 msgstr "Ð?Ñ?Ñ?ановиÑ?и п_Ñ?оекÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2405
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "Install whole project"
 msgstr "Ð?Ñ?Ñ?ановленнÑ? вÑ?Ñ?ого пÑ?оекÑ?Ñ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2410
+#: ../plugins/build-basic-autotools/plugin.c:2454
 msgid "_Clean Project"
 msgstr "_Ð?Ñ?иÑ?Ñ?иÑ?и пÑ?оекÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2411
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "Clean whole project"
 msgstr "Ð?Ñ?иÑ?еннÑ? вÑ?Ñ?ого пÑ?оекÑ?Ñ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2416
-msgid "C_onfigure Project..."
-msgstr "_Ð?алаÑ?Ñ?Ñ?ваÑ?и пÑ?оекÑ?..."
+#: ../plugins/build-basic-autotools/plugin.c:2460
+msgid "C_onfigure Projectâ?¦"
+msgstr "_Ð?алаÑ?Ñ?Ñ?ваÑ?и пÑ?оекÑ?â?¦"
 
-#: ../plugins/build-basic-autotools/plugin.c:2417
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "Configure project"
 msgstr "Ð?алаÑ?Ñ?Ñ?ваÑ?и пÑ?оекÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2422
+#: ../plugins/build-basic-autotools/plugin.c:2466
 msgid "Build _Tarball"
 msgstr "Ð?Ñ?бÑ?аÑ?и _аÑ?Ñ?Ñ?в з пÑ?оекÑ?ом"
 
-#: ../plugins/build-basic-autotools/plugin.c:2423
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build project tarball distribution"
 msgstr "Ð?бÑ?Ñ?ка диÑ?Ñ?Ñ?ибÑ?Ñ?ивного пакеÑ?Ñ? пÑ?оекÑ?Ñ?: "
 
-#: ../plugins/build-basic-autotools/plugin.c:2428
+#: ../plugins/build-basic-autotools/plugin.c:2472
 msgid "_Build Module"
 msgstr "Ð?_Ñ?бÑ?аÑ?и модÑ?лÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2429
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "Build module associated with current file"
 msgstr "Ð?Ñ?бÑ?аÑ?и модÑ?лÑ?, аÑ?оÑ?Ñ?йований з даним Ñ?айлом"
 
-#: ../plugins/build-basic-autotools/plugin.c:2434
+#: ../plugins/build-basic-autotools/plugin.c:2478
 msgid "_Install Module"
 msgstr "Ð?Ñ?Ñ?ановиÑ?и м_одÑ?лÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2435
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "Install module associated with current file"
 msgstr "Ð?Ñ?Ñ?ановиÑ?и модÑ?лÑ?, аÑ?оÑ?Ñ?йований з Ñ?им Ñ?айлом"
 
-#: ../plugins/build-basic-autotools/plugin.c:2440
+#: ../plugins/build-basic-autotools/plugin.c:2484
 msgid "_Clean Module"
 msgstr "Ð?Ñ?иÑ?Ñ?иÑ?и _модÑ?лÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2441
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "Clean module associated with current file"
 msgstr "Ð?идалиÑ?и модÑ?лÑ?, аÑ?оÑ?Ñ?йований з Ñ?им Ñ?айлом"
 
-#: ../plugins/build-basic-autotools/plugin.c:2446
+#: ../plugins/build-basic-autotools/plugin.c:2490
 msgid "Co_mpile File"
 msgstr "_Ð?омпÑ?лÑ?ваÑ?и Ñ?айл"
 
-#: ../plugins/build-basic-autotools/plugin.c:2447
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Compile current editor file"
 msgstr "Ð?омпÑ?лÑ?ваÑ?и поÑ?оÑ?ний Ñ?едагований Ñ?айл"
 
-#: ../plugins/build-basic-autotools/plugin.c:2452
+#: ../plugins/build-basic-autotools/plugin.c:2496
 msgid "Select Configuration"
 msgstr "Ð?ибÑ?аÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2453
+#: ../plugins/build-basic-autotools/plugin.c:2497
 msgid "Select current configuration"
 msgstr "Ð?ибÑ?Ñ? поÑ?оÑ?ноÑ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2458
+#: ../plugins/build-basic-autotools/plugin.c:2502
 msgid "Remove Configuration"
 msgstr "Ð?идалиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2459
+#: ../plugins/build-basic-autotools/plugin.c:2503
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr ""
 "Ð?Ñ?иÑ?Ñ?иÑ?и пÑ?оекÑ?(distclean) Ñ?а видалиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний каÑ?алог пÑ?и можливоÑ?Ñ?Ñ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2472
-#: ../plugins/build-basic-autotools/plugin.c:2500
+#: ../plugins/build-basic-autotools/plugin.c:2516
+#: ../plugins/build-basic-autotools/plugin.c:2544
 msgid "_Compile"
 msgstr "С_компÑ?лÑ?ваÑ?и"
 
-#: ../plugins/build-basic-autotools/plugin.c:2473
-#: ../plugins/build-basic-autotools/plugin.c:2501
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "Compile file"
 msgstr "Ð?омпÑ?лÑ?Ñ?Ñ?Ñ? Ñ?айлÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2479
-#: ../plugins/build-basic-autotools/plugin.c:2507
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2551
 msgid "Build module"
 msgstr "Ð?биÑ?аннÑ? модÑ?лÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2484
-#: ../plugins/build-basic-autotools/plugin.c:2512
-#: ../plugins/build-basic-autotools/plugin.c:2570
+#: ../plugins/build-basic-autotools/plugin.c:2528
+#: ../plugins/build-basic-autotools/plugin.c:2556
+#: ../plugins/build-basic-autotools/plugin.c:2614
 #, c-format
 msgid "_Install"
 msgstr "_Ð?Ñ?Ñ?ановиÑ?и"
 
-#: ../plugins/build-basic-autotools/plugin.c:2485
-#: ../plugins/build-basic-autotools/plugin.c:2513
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
 msgid "Install module"
 msgstr "Ð?Ñ?Ñ?ановленнÑ? модÑ?лÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2490
-#: ../plugins/build-basic-autotools/plugin.c:2518
-#: ../plugins/build-basic-autotools/plugin.c:2577
+#: ../plugins/build-basic-autotools/plugin.c:2534
+#: ../plugins/build-basic-autotools/plugin.c:2562
+#: ../plugins/build-basic-autotools/plugin.c:2621
 #, c-format
 msgid "_Clean"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?и"
 
-#: ../plugins/build-basic-autotools/plugin.c:2491
-#: ../plugins/build-basic-autotools/plugin.c:2519
+#: ../plugins/build-basic-autotools/plugin.c:2535
+#: ../plugins/build-basic-autotools/plugin.c:2563
 msgid "Clean module"
 msgstr "Ð?Ñ?иÑ?еннÑ? модÑ?лÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2524
+#: ../plugins/build-basic-autotools/plugin.c:2568
 msgid "_Cancel command"
 msgstr "_Ð?Ñ?пиниÑ?и виконаннÑ? команди"
 
-#: ../plugins/build-basic-autotools/plugin.c:2525
+#: ../plugins/build-basic-autotools/plugin.c:2569
 msgid "Cancel build command"
 msgstr "Ð?Ñ?пиниÑ?и командÑ? збиÑ?аннÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2563
+#: ../plugins/build-basic-autotools/plugin.c:2607
 #, c-format
 msgid "_Build (%s)"
 msgstr "_Ð?Ñ?бÑ?аÑ?и (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2570
+#: ../plugins/build-basic-autotools/plugin.c:2614
 #, c-format
 msgid "_Install (%s)"
 msgstr "_Ð?Ñ?Ñ?ановиÑ?и (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2577
+#: ../plugins/build-basic-autotools/plugin.c:2621
 #, c-format
 msgid "_Clean (%s)"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?и (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2585
+#: ../plugins/build-basic-autotools/plugin.c:2629
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "_Ð?омпÑ?лÑ?Ñ?Ñ?Ñ? (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2585
+#: ../plugins/build-basic-autotools/plugin.c:2629
 #, c-format
 msgid "Co_mpile"
 msgstr "_Ð?омпÑ?лÑ?ваÑ?и"
 
-#: ../plugins/build-basic-autotools/plugin.c:3121
+#: ../plugins/build-basic-autotools/plugin.c:3165
 msgid "Build commands"
 msgstr "Ð?оманди длÑ? збиÑ?аннÑ?"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3130
+#: ../plugins/build-basic-autotools/plugin.c:3174
 msgid "Build popup commands"
 msgstr "Ð?онÑ?екÑ?Ñ?нÑ? команди длÑ? збиÑ?аннÑ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:3512
-#: ../plugins/build-basic-autotools/plugin.c:3520
+#: ../plugins/build-basic-autotools/plugin.c:3556
+#: ../plugins/build-basic-autotools/plugin.c:3564
 msgid "Build Autotools"
 msgstr "Ð?бÑ?Ñ?ка з Autotools"
 
-#: ../plugins/build-basic-autotools/program.c:323
+#: ../plugins/build-basic-autotools/program.c:326
 msgid "Command aborted"
 msgstr "Ð?омандÑ? пеÑ?еÑ?вано"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
-msgid "<b>Class Elements</b>"
-msgstr "<b>Ð?леменÑ?и клаÑ?Ñ?</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
-msgid "<b>General Class Properties</b>"
-msgstr "<b>Ð?агалÑ?нÑ? вÑ?домоÑ?Ñ?Ñ? пÑ?о клаÑ?</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Project"
 msgstr "Ð?одаÑ?и до пÑ?оекÑ?Ñ?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Repository"
 msgstr "Ð?одаÑ?и до Ñ?епозиÑ?оÑ?Ñ?Ñ?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
-msgid "Author Email:"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+msgid "Author Email Address:"
 msgstr "Ð?л. поÑ?Ñ?а авÑ?оÑ?а:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Name:"
 msgstr "Ð?вÑ?оÑ?:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author/Date-Time"
 msgstr "Ð?вÑ?оÑ?/Ð?аÑ?а-ЧаÑ?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date/Time"
 msgstr "Ð?вÑ?оÑ?/Ð?аÑ?а/ЧаÑ?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Base Class Inheritance:"
 msgstr "Тип Ñ?падкÑ?ваннÑ? базового клаÑ?Ñ?:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class:"
 msgstr "Ð?азовий клаÑ?:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+msgid "Class Elements"
+msgstr "Ð?леменÑ?и клаÑ?Ñ?"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Function Prefix:"
 msgstr "Ð?Ñ?еÑ?Ñ?кÑ? Ñ?Ñ?нкÑ?Ñ?й клаÑ?Ñ?:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
 msgid "Class Generator"
 msgstr "Ð?енеÑ?аÑ?оÑ? клаÑ?Ñ?в"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 msgid "Class Name:"
 msgstr "Ð?азва клаÑ?Ñ?:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
 msgid "Class Options:"
 msgstr "Ð?аÑ?амеÑ?Ñ?и клаÑ?Ñ?:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Create"
 msgstr "СÑ?воÑ?иÑ?и"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "GObject Class\t"
 msgstr "Ð?лаÑ? GObject\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
 msgid "GObject Prefix and Type:"
 msgstr "Ð?Ñ?еÑ?Ñ?кÑ? Ñ?а Ñ?ип GObject:"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+msgid "General Class Properties"
+msgstr "Ð?агалÑ?нÑ? вÑ?домоÑ?Ñ?Ñ? пÑ?о клаÑ?"
+
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
-#: ../plugins/file-wizard/file.c:102
-#: ../plugins/project-wizard/templates/translatable-strings.h:47
+#: ../plugins/file-wizard/file.c:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:48
 msgid "General Public License (GPL)"
 msgstr "УнÑ?веÑ?Ñ?алÑ?на Ñ?Ñ?Ñ?пÑ?лÑ?на лÑ?Ñ?ензÑ?Ñ? (GPL)"
 
@@ -1107,13 +1139,13 @@ msgid "Inline the declaration and implementation"
 msgstr "СпÑ?лÑ?не визнаÑ?еннÑ? Ñ?а опиÑ?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
-#: ../plugins/file-wizard/file.c:103
-#: ../plugins/project-wizard/templates/translatable-strings.h:60
+#: ../plugins/file-wizard/file.c:104
+#: ../plugins/project-wizard/templates/translatable-strings.h:62
 msgid "Lesser General Public License (LGPL)"
 msgstr "Ð?бмежена Ñ?нÑ?веÑ?Ñ?алÑ?на Ñ?Ñ?Ñ?пÑ?лÑ?на лÑ?Ñ?ензÑ?Ñ? (LGPL)"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "Ð?Ñ?Ñ?ензÑ?Ñ?:"
 
@@ -1126,7 +1158,7 @@ msgid "No License"
 msgstr "Ð?Ñ?Ñ?ензÑ?Ñ? вÑ?дÑ?Ñ?Ñ?нÑ?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
-#: ../plugins/glade/plugin.c:4446
+#: ../plugins/glade/plugin.c:4433
 msgid "Properties"
 msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ?"
 
@@ -1142,18 +1174,6 @@ msgstr "Файл пеÑ?винного кодÑ?:"
 msgid "Source/Header Headings:"
 msgstr "Ð?аголовки Ñ?айлÑ? заголовкÑ?в/пеÑ?винного кодÑ?:"
 
-#: ../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"
@@ -1176,15 +1196,15 @@ msgstr "Файл длÑ? запиÑ?Ñ? Ñ?аблонÑ?, Ñ?о обÑ?облÑ?Ñ?Ñ?Ñ?Ñ?
 msgid "Failed to write autogen definition file"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? запиÑ?аÑ?и Ñ?айл визнаÑ?еннÑ? autogen"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1040
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1127
 msgid ""
-"Could not find autogen version 5, please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net";
+"Could not find autogen version 5; please install the autogen package. You "
+"can get it from http://autogen.sourceforge.net.";
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и autogen веÑ?Ñ?Ñ?Ñ? 5, вÑ?Ñ?ановÑ?Ñ?Ñ? пакеÑ? autogen. Ð?и можеÑ?е "
 "знайÑ?и його Ñ?Ñ?Ñ?: http://autogen.sourceforge.net";
 
-#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:412
+#: ../plugins/class-gen/plugin.c:242 ../plugins/class-gen/plugin.c:410
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и autogen: %s"
@@ -1194,6 +1214,7 @@ msgid "Guess from type"
 msgstr "Ð?изнаÑ?иÑ?и за Ñ?ипом"
 
 #: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+#: ../plugins/search/anjuta-search.ui.h:29
 msgid "Scope"
 msgstr "Ð?блаÑ?Ñ?Ñ?"
 
@@ -1203,14 +1224,14 @@ msgstr "РеалÑ?заÑ?Ñ?Ñ?"
 
 #: ../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/breakpoints.c:1914
 #: ../plugins/debug-manager/debug_tree.c:126
 msgid "Type"
 msgstr "Тип"
 
 #: ../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/run-program/parameters.c:754
 #: ../plugins/search/search_preferences.c:534
 msgid "Name"
 msgstr "Ð?азва"
@@ -1251,201 +1272,206 @@ msgid "XML description of the user interface"
 msgstr "XML-опиÑ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
-msgid "<b>CVS Options</b>"
-msgstr "<b>Ð?аÑ?амеÑ?Ñ?и CVS</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:2
-msgid "<b>Module Details:</b>"
-msgstr "<b>Ð?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о модÑ?лÑ?:</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:3
-msgid "<b>Options:</b>"
-msgstr "<b>Ð?аÑ?амеÑ?Ñ?и:</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
-#: ../plugins/git/anjuta-git.ui.h:1 ../plugins/search/anjuta-search.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>Ð?аÑ?амеÑ?Ñ?и</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
 msgid ""
 "<b>Please note: </b>\n"
 "\n"
-"Pressing OK will delete the file from disk and from CVS. Of course the file "
+"Pressing OK will delete the file from disk and from CVS. Of course, the file "
 "won't be removed from CVS before you use CVS Commit. <b>You have been warned!"
 "</b>"
 msgstr ""
 "<b>Увага: </b>\n"
 "\n"
 "Ð?Ñ?Ñ?лÑ? наÑ?иÑ?каннÑ? OK Ñ?айл бÑ?де видалено з диÑ?кÑ? Ñ?а з CVS. Ð?виÑ?айно, Ñ?айл не "
-"бÑ?де видалено з CVS до викликÑ? пÑ?блÑ?каÑ?Ñ?Ñ? змÑ?н CVS. <b>Ð?и попеÑ?едженÑ?!</b>"
+"бÑ?де видалено з CVS до Ñ?Ñ?кÑ?аÑ?Ñ?Ñ? змÑ?н CVS. <b>Ð?и попеÑ?едженÑ?!</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
-msgid "<b>Repository: </b>"
-msgstr "<b>РепозиÑ?оÑ?Ñ?й: </b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
 msgid "Be verbose"
-msgstr "Ð?окладний вÑ?вÑ?д"
+msgstr "Ð?окладний вивÑ?д"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
+#: ../plugins/git/anjuta-git.ui.h:22
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
-#: ../plugins/tools/anjuta-tools.ui.h:2
-msgid "Browse..."
-msgstr "Ð?глÑ?д..."
+#: ../plugins/tools/anjuta-tools.ui.h:1
+msgid "Browseâ?¦"
+msgstr "Ð?глÑ?дâ?¦"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:6
+msgid "CVS Options"
+msgstr "Ð?пÑ?Ñ?Ñ? CVS"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:7
 msgid "CVS Preferences"
 msgstr "Ð?аÑ?амеÑ?Ñ?и CVS"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
 msgid "CVS: Add file/directory"
 msgstr "CVS: Ð?одаÑ?и Ñ?айл/каÑ?алог"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
 msgid "CVS: Commit file/directory"
 msgstr "CVS: Ð?аÑ?Ñ?кÑ?Ñ?ваÑ?и Ñ?айл/каÑ?алог"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
 msgid "CVS: Diff file/directory"
 msgstr "CVS: Ð?Ñ?дмÑ?нноÑ?Ñ?Ñ? Ñ?айлÑ?/каÑ?алогÑ?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
 msgid "CVS: Import"
 msgstr "CVS: Ð?мпоÑ?Ñ?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
 msgid "CVS: Log file/directory"
 msgstr "CVS: Ð?Ñ?Ñ?нал Ñ?айлÑ?/каÑ?алогÑ?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
 msgid "CVS: Remove file/directory"
 msgstr "CVS: Ð?идалиÑ?и Ñ?айл/каÑ?алог"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
 msgid "CVS: Status"
 msgstr "CVS: СÑ?аÑ?Ñ?Ñ?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
 msgid "CVS: Status from file/directory"
 msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?айлÑ?/каÑ?алогÑ?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
 msgid "CVS: Update file/directory"
 msgstr "CVS: Ð?новиÑ?и Ñ?айл/каÑ?алог"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
 msgid "CVSROOT:"
 msgstr "CVSROOT:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
 #: ../plugins/subversion/anjuta-subversion.ui.h:5
 msgid "Choose file or directory to add:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл/каÑ?алог длÑ? додаваннÑ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
 msgid "Choose file or directory to commit:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл/каÑ?алог длÑ? опеÑ?аÑ?Ñ?Ñ? Ñ?Ñ?кÑ?аÑ?Ñ?Ñ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
 msgid "Choose file or directory to diff:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл/каÑ?алог длÑ? поÑ?Ñ?кÑ? вÑ?дмÑ?нноÑ?Ñ?ей:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
-msgid "Choose file or directory to get log:"
-msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл/каÑ?алог длÑ? команди log:"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+msgid "Choose file or directory to get log for:"
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл/каÑ?алог длÑ? оÑ?Ñ?иманнÑ? жÑ?Ñ?налÑ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
 msgid "Choose file or directory to get the status from:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл/каÑ?алог длÑ? оÑ?Ñ?иманнÑ? Ñ?Ñ?аÑ?Ñ?Ñ?Ñ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
 msgid "Choose file or directory to remove:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл/каÑ?алог длÑ? видаленнÑ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
 #: ../plugins/subversion/anjuta-subversion.ui.h:6
 msgid "Choose file or directory to update:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл/каÑ?алог длÑ? оновленнÑ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
 msgid "Compression Level (0=off, 10=max):"
 msgstr "СÑ?Ñ?пÑ?нÑ? Ñ?Ñ?иÑ?неннÑ? (0=без Ñ?Ñ?иÑ?неннÑ?, 10=макÑ?. Ñ?Ñ?иÑ?неннÑ?)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
 msgid "Create new directories"
 msgstr "СÑ?воÑ?иÑ?и новÑ? каÑ?алоги"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
 msgid "Delete empty directories"
 msgstr "Ð?идалиÑ?и поÑ?ожнÑ? каÑ?алоги"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
 #: ../plugins/subversion/anjuta-subversion.ui.h:13
 msgid "Do not act recursively"
 msgstr "Ð?е заÑ?Ñ?оÑ?овÑ?ваÑ?и Ñ?екÑ?Ñ?Ñ?ивно"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
 msgid "Extern (rsh)"
 msgstr "Ð?овнÑ?Ñ?нÑ?й (rsh)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "File is binary"
 msgstr "Ð?Ñ?наÑ?ний Ñ?айл"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
 msgid "Ignore .cvsrc file (recommended)"
 msgstr "Ð?гноÑ?Ñ?ваÑ?и Ñ?айл .cvsrc (Ñ?екомендÑ?Ñ?Ñ?Ñ?Ñ?Ñ?)"
 
-#: ../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
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2120
+#: ../plugins/symbol-db/plugin.c:2189
 msgid "Local"
 msgstr "Ð?окалÑ?нÑ?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "Ð?овÑ?домленнÑ? жÑ?Ñ?налÑ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+msgid "Module Details:"
+msgstr "Ð?одÑ?обиÑ?Ñ? пÑ?о модÑ?лÑ?:"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
 msgid "Module name:"
 msgstr "Ð?азва модÑ?лÑ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/glade/plugin.c:3085
+#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
+#: ../plugins/subversion/anjuta-subversion.ui.h:23
+msgid "Options"
+msgstr "Ð?аÑ?амеÑ?Ñ?и"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/subversion/anjuta-subversion.ui.h:24
+msgid "Options:"
+msgstr "Ð?аÑ?амеÑ?Ñ?и:"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
 msgid "Password server (pserver)"
 msgstr "СеÑ?веÑ? з паÑ?олем (pserver)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
 #: ../plugins/subversion/anjuta-subversion.ui.h:26
 msgid "Password:"
 msgstr "Ð?аÑ?олÑ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
 msgid "Patch-Style diff"
 msgstr "Ð?Ñ?дмÑ?нноÑ?Ñ?Ñ? Ñ? Ñ?Ñ?илÑ? Patch"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
 msgid "Path to \"cvs\" command"
 msgstr "ШлÑ?Ñ? до команди \"cvs\""
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
 msgid "Project root directory:"
 msgstr "Ð?оÑ?еневий каÑ?алог пÑ?оекÑ?Ñ?:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
 msgid "Release tag:"
 msgstr "Ð?ознаÑ?ка випÑ?Ñ?кÑ?:"
 
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+msgid "Repository:"
+msgstr "РепозиÑ?оÑ?Ñ?й:"
+
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:45
 msgid "Reset sticky tags"
 msgstr "СкинÑ?Ñ?и липкÑ? познаÑ?ки"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
-#: ../plugins/git/anjuta-git.ui.h:91
-#: ../plugins/subversion/anjuta-subversion.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "Ð?Ñ?авка:"
 
@@ -1458,7 +1484,7 @@ msgid "Unified format instead of context format"
 msgstr "УнÑ?Ñ?Ñ?кований Ñ?оÑ?маÑ? замÑ?Ñ?Ñ?Ñ? конÑ?екÑ?Ñ?ного"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:49
-#: ../plugins/subversion/anjuta-subversion.ui.h:54
+#: ../plugins/subversion/anjuta-subversion.ui.h:55
 msgid "Use revision/tag:"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и пÑ?авкÑ?/мÑ?Ñ?кÑ?:"
 
@@ -1467,7 +1493,7 @@ msgid "Use revision:"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и пÑ?авкÑ?:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:51
-#: ../plugins/subversion/anjuta-subversion.ui.h:55
+#: ../plugins/subversion/anjuta-subversion.ui.h:56
 msgid "Username:"
 msgstr "Ð?м'Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а:"
 
@@ -1476,8 +1502,8 @@ msgid "Vendor tag:"
 msgstr "Ð?ознаÑ?ка поÑ?Ñ?аÑ?алÑ?ника:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
-#: ../plugins/git/anjuta-git.ui.h:125
-#: ../plugins/subversion/anjuta-subversion.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "Ð?еÑ?Ñ? пÑ?оекÑ?"
 
@@ -1511,7 +1537,7 @@ msgid "CVSROOT"
 msgstr "CVSROOT"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:438
-#: ../plugins/gbf-am/gbf-am-properties.c:1234
+#: ../plugins/gbf-am/gbf-am-properties.c:1237
 msgid "Module"
 msgstr "Ð?одÑ?лÑ?"
 
@@ -1528,19 +1554,19 @@ msgid "Are you sure that you do not want a log message?"
 msgstr "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е напиÑ?аÑ?и повÑ?домленнÑ? длÑ? жÑ?Ñ?налÑ??"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:125
-msgid "CVS command failed - See above for details"
-msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и командÑ? CVS - подÑ?обиÑ?Ñ? дивÑ?Ñ?Ñ?Ñ?Ñ? нижÑ?е"
+msgid "CVS command failed. See above for details"
+msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и командÑ? CVS. Ð?одÑ?обиÑ?Ñ? дивÑ?Ñ?Ñ?Ñ?Ñ? нижÑ?е"
 
 #: ../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 виконано Ñ?Ñ?пÑ?Ñ?но. Ð?иÑ?Ñ?аÑ?ено %ld Ñ?екÑ?ндÑ?."
+msgid "CVS command successful! Time taken: %ld second"
+msgid_plural "CVS command successful! Time taken: %ld seconds"
+msgstr[0] "Ð?омандÑ? CVS виконано Ñ?Ñ?пÑ?Ñ?но. Ð?иÑ?Ñ?аÑ?ено %ld Ñ?екÑ?ндÑ?"
 msgstr[1] "Ð?омандÑ? CVS виконано Ñ?Ñ?пÑ?Ñ?но. Ð?иÑ?Ñ?аÑ?ено %ld Ñ?екÑ?нди"
 msgstr[2] "Ð?омандÑ? CVS виконано Ñ?Ñ?пÑ?Ñ?но. Ð?иÑ?Ñ?аÑ?ено %ld Ñ?екÑ?нд"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:221
-msgid "CVS command is running - please wait until it finishes!"
+msgid "CVS command is running â?? please wait until it finishes!"
 msgstr "Ð?оманда CVS виконÑ?Ñ?Ñ?Ñ?Ñ?Ñ?. Ð?оÑ?екайÑ?еÑ?Ñ? Ñ?Ñ? завеÑ?Ñ?еннÑ?!"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
@@ -1601,7 +1627,7 @@ msgstr "_Ð?новиÑ?и"
 #. Display label
 #. short-cut
 #: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
-msgid "Sync your local copy with the CVS tree"
+msgid "Syncronize your local copy with the CVS tree"
 msgstr "СинÑ?Ñ?онÑ?зÑ?ваÑ?и локалÑ?нÑ? копÑ?Ñ? з деÑ?евом CVS"
 
 #. Action name
@@ -1661,137 +1687,139 @@ msgid "CVS popup operations"
 msgstr "Ð?онÑ?екÑ?Ñ?нÑ? команди CVS"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
-msgid "<b>Debugger:</b>"
-msgstr "<b>Ð?алагодженнÑ?:</b>"
-
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:2
-msgid "<b>Remote debugging</b>"
-msgstr "<b>Ð?Ñ?ддалене налагодженнÑ?</b>"
-
-#: ../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"
+"program not using the Debug configuration?</span>\n"
 "\n"
 "When optimizations are enabled, the debugger cannot always identify the "
-"source code corresponding to the instructions, some commands can perform in "
-"a strange way, especially steps."
+"source code corresponding to the instructions, so some commands can perform "
+"in a strange way, especially steps."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е налагоджÑ?ваÑ?и пÑ?огÑ?амÑ? без налагоджÑ?валÑ?ноÑ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? ?</span>\n"
+"<span weight=\"bold\" size=\"larger\">Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е запÑ?Ñ?Ñ?иÑ?и налагодженнÑ? "
+"пÑ?огÑ?ами без налагоджÑ?валÑ?ноÑ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? ?</span>\n"
 "\n"
-"Ð?Ñ?и вмиканнÑ? опÑ?имÑ?заÑ?Ñ?Ñ?, пÑ?огÑ?ама налагодженнÑ? не завжди може визнаÑ?иÑ?и Ñ?Ñ?агменÑ? кодÑ? "
-"Ñ?о вÑ?дповÑ?даÑ? Ñ?нÑ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?м, деÑ?кÑ? команди можÑ?Ñ?Ñ? дивно поводиÑ?иÑ?Ñ?, оÑ?обливо покÑ?оковий пÑ?оÑ?Ñ?д."
+"Ð?Ñ?и вмиканнÑ? опÑ?имÑ?заÑ?Ñ?Ñ?, пÑ?огÑ?ама налагодженнÑ? не завжди може визнаÑ?иÑ?и "
+"Ñ?Ñ?агменÑ? кодÑ? Ñ?о вÑ?дповÑ?даÑ? Ñ?нÑ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?м, деÑ?кÑ? команди можÑ?Ñ?Ñ? дивно "
+"поводиÑ?иÑ?Ñ?, оÑ?обливо покÑ?оковий пÑ?оÑ?Ñ?д."
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
 msgstr "Ð?обавиÑ?Ñ? Ñ? вÑ?кно Ñ?поÑ?Ñ?еÑ?еженнÑ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:5
 msgid "Address:"
 msgstr "Ð?дÑ?еÑ?а:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Attach to process"
 msgstr "Ð?Ñ?д'Ñ?днаÑ?иÑ?Ñ? до пÑ?оÑ?еÑ?Ñ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
 msgid "Breakpoint properties"
 msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? Ñ?оÑ?ки зÑ?пинки"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
-#: ../plugins/debug-manager/breakpoints.c:1980
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/breakpoints.c:1987
 msgid "Breakpoints"
 msgstr "ТоÑ?ки зÑ?пинки"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
 msgid "CPU Registers"
 msgstr "РегÑ?Ñ?Ñ?Ñ?и CPU"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
 msgid "Change Watch"
 msgstr "Ð?мÑ?ниÑ?и доÑ?лÑ?джÑ?ваний об'Ñ?кÑ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
 msgid "Connect to remote target"
 msgstr "Ð?Ñ?д'Ñ?днаÑ?иÑ? до вÑ?ддаленоÑ? Ñ?Ñ?лÑ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Debugger command"
 msgstr "Ð?оманда налагодженнÑ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Debugger command:"
 msgstr "Ð?оманда налагодженнÑ?:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
-#: ../plugins/project-wizard/templates/translatable-strings.h:33
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+msgid "Debugger:"
+msgstr "Ð?алагодженнÑ?:"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
+#: ../plugins/project-wizard/templates/translatable-strings.h:34
 msgid "Description:"
 msgstr "Ð?пиÑ?:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
 msgid "Disable"
 msgstr "Ð?имкнÑ?Ñ?и"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Display process _tree"
 msgstr "Ð?оказаÑ?и _деÑ?ево пÑ?оÑ?еÑ?Ñ?в"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
 msgid "Do not show again"
 msgstr "_Ð?е показÑ?ваÑ?и наÑ?Ñ?Ñ?пного Ñ?азÑ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 msgid "Enable _all"
 msgstr "УвÑ?мкнÑ?Ñ?и _вÑ?е"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
 msgid "Enter an address in hexadecimal or select one in the data"
 msgstr "Ð?ведÑ?Ñ?Ñ? адÑ?еÑ?Ñ? Ñ? Ñ?Ñ?Ñ?Ñ?надÑ?Ñ?Ñ?ковомÑ? виглÑ?дÑ? або вибеÑ?Ñ?Ñ?Ñ? Ñ?Ñ? Ñ? даниÑ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Hide process para_meters"
 msgstr "Ð?Ñ?иÑ?оваÑ?и п_аÑ?амеÑ?Ñ?и пÑ?оÑ?еÑ?Ñ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
 msgid "Inspect"
 msgstr "Ð?еÑ?еглÑ?нÑ?Ñ?и"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
 msgid "Inspect/Evaluate"
 msgstr "Ð?еÑ?еглÑ?нÑ?Ñ?и/обÑ?иÑ?лиÑ?и"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
 #: ../plugins/debug-manager/plugin.c:945
 #: ../plugins/debug-manager/plugin.c:1045
 msgid "Kernel Signals"
 msgstr "Сигнали Ñ?дÑ?а"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/breakpoints.c:1914
 msgid "Location"
 msgstr "РозÑ?аÑ?Ñ?ваннÑ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
 #: ../plugins/debug-manager/memory.c:180
 msgid "Memory"
 msgstr "Ð?ам'Ñ?Ñ?Ñ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
 msgid "Pass:"
 msgstr "Ð?Ñ?опÑ?Ñ?к:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
 msgid "Port:"
 msgstr "Ð?оÑ?Ñ?:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Print:"
 msgstr "Ð?Ñ?Ñ?к:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
 msgid "Program Interrupt"
 msgstr "Ð?еÑ?еÑ?иваннÑ? пÑ?огÑ?ами"
 
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+msgid "Remote debugging"
+msgstr "Ð?Ñ?ддалене налагодженнÑ?"
+
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:32
 msgid "SIGINT"
 msgstr "SIGINT"
@@ -1834,7 +1862,7 @@ msgid "TCP/IP Connection"
 msgstr "Ð?Ñ?дклÑ?Ñ?еннÑ? до TCP/IP"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/project-wizard/property.c:286
+#: ../plugins/project-wizard/property.c:309
 msgid "Yes"
 msgstr "Так"
 
@@ -1883,165 +1911,165 @@ msgstr "_Ð?идалиÑ?и вÑ?е"
 msgid "_Value:"
 msgstr "Ð?_наÑ?еннÑ?:"
 
-#: ../plugins/debug-manager/breakpoints.c:1673
+#: ../plugins/debug-manager/breakpoints.c:1680
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и вÑ?Ñ? Ñ?оÑ?ки зÑ?пинки?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1770
+#: ../plugins/debug-manager/breakpoints.c:1777
 msgid "_Breakpoints"
 msgstr "_ТоÑ?ки зÑ?пинки"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1778
+#: ../plugins/debug-manager/breakpoints.c:1785
 msgid "Toggle Breakpoint"
 msgstr "Ð?еÑ?емикнÑ?Ñ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1780
+#: ../plugins/debug-manager/breakpoints.c:1787
 msgid "Toggle breakpoint at the current location"
 msgstr "Ð?еÑ?емикнÑ?Ñ?и Ñ?оÑ?кÑ? зÑ?пинки Ñ? поÑ?оÑ?нÑ?й позиÑ?Ñ?Ñ?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1786
-msgid "Add Breakpoint..."
-msgstr "Ð?Ñ?Ñ?ановиÑ?и Ñ?оÑ?кÑ? зÑ?пинки..."
+#: ../plugins/debug-manager/breakpoints.c:1793
+msgid "Add Breakpointâ?¦"
+msgstr "Ð?Ñ?Ñ?ановиÑ?и Ñ?оÑ?кÑ? зÑ?пинкиâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1788
+#: ../plugins/debug-manager/breakpoints.c:1795
 msgid "Add a breakpoint"
 msgstr "Ð?Ñ?Ñ?ановиÑ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1794
+#: ../plugins/debug-manager/breakpoints.c:1801
 msgid "Remove Breakpoint"
 msgstr "Ð?идалиÑ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1796
+#: ../plugins/debug-manager/breakpoints.c:1803
 msgid "Remove a breakpoint"
 msgstr "Ð?идалиÑ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1802
+#: ../plugins/debug-manager/breakpoints.c:1809
 msgid "Edit Breakpoint"
 msgstr "РедагÑ?ваÑ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1804
+#: ../plugins/debug-manager/breakpoints.c:1811
 msgid "Edit breakpoint properties"
 msgstr "РедагÑ?ваÑ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1810
-#: ../plugins/debug-manager/breakpoints.c:1881
+#: ../plugins/debug-manager/breakpoints.c:1817
+#: ../plugins/debug-manager/breakpoints.c:1888
 msgid "Enable Breakpoint"
 msgstr "УвÑ?мкнÑ?Ñ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1812
-#: ../plugins/debug-manager/breakpoints.c:1882
+#: ../plugins/debug-manager/breakpoints.c:1819
+#: ../plugins/debug-manager/breakpoints.c:1889
 msgid "Enable a breakpoint"
 msgstr "УвÑ?мкнÑ?Ñ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1818
+#: ../plugins/debug-manager/breakpoints.c:1825
 msgid "Disable All Breakpoints"
 msgstr "Ð?имкнÑ?Ñ?и вÑ?Ñ? Ñ?оÑ?ки зÑ?пинки"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1820
+#: ../plugins/debug-manager/breakpoints.c:1827
 msgid "Deactivate all breakpoints"
 msgstr "Ð?имкнÑ?Ñ?и вÑ?Ñ? Ñ?оÑ?ки зÑ?пинки"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1826
+#: ../plugins/debug-manager/breakpoints.c:1833
 msgid "R_emove All Breakpoints"
 msgstr "Ð?_идалиÑ?и вÑ?Ñ? Ñ?оÑ?ки зÑ?пинки"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1828
+#: ../plugins/debug-manager/breakpoints.c:1835
 msgid "Remove all breakpoints"
 msgstr "Ð?идалиÑ?и вÑ?Ñ? Ñ?оÑ?ки зÑ?пинки"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1837
+#: ../plugins/debug-manager/breakpoints.c:1844
 msgid "Jump to Breakpoint"
 msgstr "Ð?еÑ?ейÑ?и до Ñ?оÑ?ки зÑ?пинки"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1839
+#: ../plugins/debug-manager/breakpoints.c:1846
 msgid "Jump to breakpoint location"
 msgstr "Ð?еÑ?ейÑ?и до Ñ?оÑ?ки зÑ?пинки"
 
-#: ../plugins/debug-manager/breakpoints.c:1876
+#: ../plugins/debug-manager/breakpoints.c:1883
 msgid "Disable Breakpoint"
 msgstr "Ð?имкнÑ?Ñ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
-#: ../plugins/debug-manager/breakpoints.c:1877
+#: ../plugins/debug-manager/breakpoints.c:1884
 msgid "Disable a breakpoint"
 msgstr "Ð?имкнÑ?Ñ?и Ñ?оÑ?кÑ? зÑ?пинки"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/tools/anjuta-tools.ui.h:6
+#: ../plugins/debug-manager/breakpoints.c:1914
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "УвÑ?мкнено"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/breakpoints.c:1914
 #: ../plugins/debug-manager/stack_trace.c:667
 #: ../plugins/debug-manager/threads.c:481
 msgid "Address"
 msgstr "Ð?дÑ?еÑ?а"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Condition"
 msgstr "Умова"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Pass count"
 msgstr "Ð?Ñ?оÑ?Ñ?д"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "State"
 msgstr "СÑ?ан"
 
-#: ../plugins/debug-manager/breakpoints.c:1957
-#: ../plugins/debug-manager/breakpoints.c:1963
+#: ../plugins/debug-manager/breakpoints.c:1964
+#: ../plugins/debug-manager/breakpoints.c:1970
 msgid "Breakpoint operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? з Ñ?оÑ?ками зÑ?пинки"
 
 #. create goto menu_item.
-#: ../plugins/debug-manager/data_view.c:390
-#: ../plugins/debug-manager/sparse_view.c:498
-msgid "_Goto address"
+#: ../plugins/debug-manager/data_view.c:386
+#: ../plugins/debug-manager/sparse_view.c:491
+msgid "_Go to address"
 msgstr "_Ð?еÑ?ейÑ?и до адÑ?еÑ?и"
 
 #: ../plugins/debug-manager/debug_tree.c:126
-#: ../plugins/gbf-am/gbf-am-properties.c:971 ../plugins/tools/editor.c:468
+#: ../plugins/gbf-am/gbf-am-properties.c:974 ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "Ð?мÑ?нна"
 
 #: ../plugins/debug-manager/debug_tree.c:126
 #: ../plugins/debug-manager/registers.c:469
-#: ../plugins/gbf-am/gbf-am-properties.c:981
-#: ../plugins/run-program/parameters.c:758 ../plugins/tools/editor.c:474
+#: ../plugins/gbf-am/gbf-am-properties.c:984
+#: ../plugins/run-program/parameters.c:763 ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "Ð?наÑ?еннÑ?"
 
@@ -2050,7 +2078,7 @@ msgid "Disassembly"
 msgstr "Ð?изаÑ?Ñ?емблеÑ?"
 
 #: ../plugins/debug-manager/info.c:52 ../plugins/debug-manager/info.c:101
-#: ../plugins/project-wizard/druid.c:135
+#: ../plugins/project-wizard/druid.c:138
 msgid "Information"
 msgstr "Ð?нÑ?оÑ?маÑ?Ñ?Ñ?"
 
@@ -2083,8 +2111,8 @@ msgid "Loaded"
 msgstr "Ð?аванÑ?ажено"
 
 #: ../plugins/debug-manager/plugin.c:429
-msgid "Running..."
-msgstr "Ð?апÑ?Ñ?ено..."
+msgid "Runningâ?¦"
+msgstr "Ð?апÑ?Ñ?еноâ?¦"
 
 #: ../plugins/debug-manager/plugin.c:451
 msgid "Stopped"
@@ -2123,16 +2151,16 @@ msgid "Start debugger and load the program"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и налагодженнÑ? Ñ?а заванÑ?ажиÑ?и пÑ?огÑ?амÑ?"
 
 #: ../plugins/debug-manager/plugin.c:853
-msgid "_Debug Process..."
-msgstr "_Ð?Ñ?д'Ñ?днаÑ?иÑ?Ñ? до пÑ?оÑ?еÑ?Ñ?..."
+msgid "_Debug Processâ?¦"
+msgstr "_Ð?Ñ?д'Ñ?днаÑ?иÑ?Ñ? до пÑ?оÑ?еÑ?Ñ?â?¦"
 
 #: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и налагодженнÑ? Ñ?а пÑ?д'Ñ?днаÑ?иÑ?Ñ? до запÑ?Ñ?еноÑ? пÑ?огÑ?ами"
 
 #: ../plugins/debug-manager/plugin.c:861
-msgid "Debug _Remote Target..."
-msgstr "Ð?алагодиÑ?и _вÑ?ддаленÑ? Ñ?Ñ?лÑ?..."
+msgid "Debug _Remote Targetâ?¦"
+msgstr "Ð?алагодиÑ?и _вÑ?ддаленÑ? Ñ?Ñ?лÑ?â?¦"
 
 #: ../plugins/debug-manager/plugin.c:863
 msgid "Connect to a remote debugging target"
@@ -2147,8 +2175,8 @@ msgid "Say goodbye to the debugger"
 msgstr "Ð?опÑ?оÑ?аÑ?иÑ?Ñ? з налагодженнÑ?м"
 
 #: ../plugins/debug-manager/plugin.c:877
-msgid "Add source paths..."
-msgstr "Ð?одаÑ?и каÑ?алог пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в"
+msgid "Add source pathsâ?¦"
+msgstr "Ð?одаÑ?и каÑ?алог пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?вâ?¦"
 
 #: ../plugins/debug-manager/plugin.c:879
 msgid "Add additional source paths"
@@ -2157,8 +2185,8 @@ msgstr "Ð?обавиÑ?Ñ? додаÑ?ковÑ? Ñ?лÑ?Ñ?и до пеÑ?винниÑ? 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/plugin.c:889 ../plugins/debug-manager/plugin.c:997
-msgid "Debugger Command..."
-msgstr "Ð?оманда налагодженнÑ?..."
+msgid "Debugger Commandâ?¦"
+msgstr "Ð?оманда налагодженнÑ?â?¦"
 
 #. Display label
 #. short-cut
@@ -2202,7 +2230,7 @@ msgstr "СпÑ?лÑ?нÑ? бÑ?блÑ?оÑ?еки"
 
 #: ../plugins/debug-manager/plugin.c:939
 #: ../plugins/debug-manager/plugin.c:1039
-msgid "Show shared libraries mappings"
+msgid "Show shared library mappings"
 msgstr "Ð?оказаÑ?и каÑ?Ñ?и Ñ?пÑ?лÑ?ниÑ? бÑ?блÑ?оÑ?ек"
 
 #: ../plugins/debug-manager/plugin.c:947
@@ -2243,7 +2271,7 @@ msgid "Step _Out"
 msgstr "Ð?Ñ?ок _з"
 
 #: ../plugins/debug-manager/plugin.c:983
-msgid "Single step out of the function"
+msgid "Single step out of function"
 msgstr "Ð?дин кÑ?ок з Ñ?Ñ?нкÑ?Ñ?Ñ?"
 
 #: ../plugins/debug-manager/plugin.c:989
@@ -2297,12 +2325,11 @@ msgstr "Ð?Ñ?изÑ?пиниÑ?и виконаннÑ? пÑ?огÑ?ами"
 msgid "Debugger operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? налагоджÑ?ваÑ?а"
 
-#: ../plugins/debug-manager/queue.c:543
+#: ../plugins/debug-manager/queue.c:524
 #, c-format
-msgid ""
-"Unable to find one debugger plugin supporting a target with %s mime type"
+msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
 msgstr ""
-"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и модÑ?лÑ? налагоджÑ?ваÑ?а, Ñ?о пÑ?дÑ?Ñ?имÑ?Ñ? Ñ?Ñ?лÑ? з Ñ?ипом mime %s"
+"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и модÑ?лÑ? налагоджÑ?ваÑ?а, Ñ?о пÑ?дÑ?Ñ?имÑ?Ñ? Ñ?Ñ?лÑ? з Ñ?ипом MIME %s"
 
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
@@ -2321,11 +2348,11 @@ msgstr "Ð?новиÑ?и"
 msgid "Shared Object"
 msgstr " СпÑ?лÑ?ний об'Ñ?кÑ?"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
 msgid "From"
 msgstr "Ð?"
 
-#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:116
+#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "Ð?о"
 
@@ -2333,7 +2360,7 @@ msgstr "Ð?о"
 msgid "Symbols read"
 msgstr "СимволÑ?нÑ? Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?оÑ?иÑ?ано"
 
-#: ../plugins/debug-manager/sharedlib.c:338
+#: ../plugins/debug-manager/sharedlib.c:341
 msgid "Shared library operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? Ñ?пÑ?лÑ?ноÑ? бÑ?блÑ?оÑ?еки"
 
@@ -2367,24 +2394,24 @@ msgstr "Ð?Ñ?дÑ?Ñ?лаÑ?и пÑ?оÑ?еÑ?Ñ?"
 msgid "Kernel signals"
 msgstr "Сигнали Ñ?дÑ?а"
 
-#: ../plugins/debug-manager/signals.c:474
-#: ../plugins/debug-manager/signals.c:480
+#: ../plugins/debug-manager/signals.c:477
+#: ../plugins/debug-manager/signals.c:483
 msgid "Signal operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? Ñ?игналÑ?"
 
-#: ../plugins/debug-manager/sparse_view.c:1202
+#: ../plugins/debug-manager/sparse_view.c:1200
 msgid "Show Line Numbers"
 msgstr "Ð?оказаÑ?и номеÑ?и Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/debug-manager/sparse_view.c:1203
+#: ../plugins/debug-manager/sparse_view.c:1201
 msgid "Whether to display line numbers"
 msgstr "Чи показÑ?ваÑ?и номеÑ?и Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/debug-manager/sparse_view.c:1210
+#: ../plugins/debug-manager/sparse_view.c:1208
 msgid "Show Line Markers"
 msgstr "Ð?оказаÑ?и маÑ?кеÑ?и Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/debug-manager/sparse_view.c:1211
+#: ../plugins/debug-manager/sparse_view.c:1209
 msgid "Whether to display line marker pixbufs"
 msgstr "Ð?оказÑ?ваÑ?и знаÑ?ки маÑ?кеÑ?Ñ?в Ñ?Ñ?дкÑ?в"
 
@@ -2418,7 +2445,7 @@ msgstr "Файл"
 
 #: ../plugins/debug-manager/stack_trace.c:642
 #: ../plugins/debug-manager/threads.c:460
-#: ../plugins/document-manager/plugin.c:921
+#: ../plugins/document-manager/plugin.c:943
 msgid "Line"
 msgstr "РÑ?док"
 
@@ -2435,48 +2462,47 @@ msgstr "СÑ?ек"
 msgid "Stack frame operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? з кадÑ?ом Ñ?Ñ?екÑ?"
 
-#: ../plugins/debug-manager/start.c:98
-msgid "Pid"
-msgstr "PID"
+#: ../plugins/debug-manager/start.c:99
+msgid "PID"
+msgstr "Ð?денÑ?иÑ?Ñ?каÑ?оÑ? пÑ?оÑ?еÑ?Ñ?"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "User"
 msgstr "Ð?оÑ?иÑ?Ñ?Ñ?ваÑ?"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "Time"
 msgstr "ЧаÑ?"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "Command"
 msgstr "Ð?оманда"
 
-#: ../plugins/debug-manager/start.c:627
+#: ../plugins/debug-manager/start.c:630
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "Ð?еможливо виконаÑ?и: %s."
 
-#: ../plugins/debug-manager/start.c:641
+#: ../plugins/debug-manager/start.c:644
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "Ð?еможливо вÑ?дкÑ?иÑ?и Ñ?айл: %s\n"
 
-#: ../plugins/debug-manager/start.c:965
+#: ../plugins/debug-manager/start.c:968
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "Ð?еможливо вÑ?дкÑ?иÑ?и Ñ?айл: %s. Ð?еможливо запÑ?Ñ?Ñ?иÑ?и налагодженнÑ?"
 
-#: ../plugins/debug-manager/start.c:975
+#: ../plugins/debug-manager/start.c:978
 #, c-format
-msgid "Unable to detect mime-type of %s. Debugger cannot start."
-msgstr ""
-"Ð?еможливо визнаÑ?иÑ?и Ñ?ип MIME длÑ? %s. Ð?алагодженнÑ? не може бÑ?Ñ?и запÑ?Ñ?ено."
+msgid "Unable to detect MIME type of %s. Debugger cannot start."
+msgstr "Ð?еможливо визнаÑ?иÑ?и Ñ?ип MIME длÑ? %s. Ð?еможливо запÑ?Ñ?Ñ?иÑ?и налагодженнÑ?."
 
-#: ../plugins/debug-manager/start.c:1336
+#: ../plugins/debug-manager/start.c:1339
 msgid "Path"
 msgstr "ШлÑ?Ñ?"
 
-#: ../plugins/debug-manager/start.c:1385 ../plugins/gdb/debugger.c:1699
+#: ../plugins/debug-manager/start.c:1388 ../plugins/gdb/debugger.c:1738
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2491,8 +2517,8 @@ msgid "Set current thread"
 msgstr "Ð?Ñ?Ñ?ановиÑ?и поÑ?оÑ?ний поÑ?Ñ?к"
 
 #: ../plugins/debug-manager/threads.c:436
-msgid "Id"
-msgstr "Ð?денÑ?иÑ?Ñ?каÑ?Ñ?йний номеÑ?"
+msgid "ID"
+msgstr "Ð?денÑ?иÑ?икаÑ?оÑ?"
 
 #: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
@@ -2505,8 +2531,8 @@ msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? з поÑ?оками"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/watch.c:372
-msgid "Ins_pect/Evaluate..."
-msgstr "Ð?еÑ?еглÑ?нÑ?Ñ?и/_обÑ?иÑ?лиÑ?и..."
+msgid "Ins_pect/Evaluateâ?¦"
+msgstr "Ð?еÑ?еглÑ?нÑ?Ñ?и Ñ?а _обÑ?иÑ?лиÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -2515,8 +2541,8 @@ msgid "Inspect or evaluate an expression or variable"
 msgstr "Ð?еÑ?еглÑ?нÑ?Ñ?и змÑ?ннÑ? або обÑ?иÑ?лиÑ?и виÑ?аз"
 
 #: ../plugins/debug-manager/watch.c:380
-msgid "Add Watch..."
-msgstr "Ð?одаÑ?и до вÑ?кна Ñ?поÑ?Ñ?еÑ?еженнÑ?..."
+msgid "Add Watchâ?¦"
+msgstr "Ð?обавиÑ?Ñ? Ñ? вÑ?кно Ñ?поÑ?Ñ?еÑ?еженнÑ?â?¦"
 
 #: ../plugins/debug-manager/watch.c:388
 msgid "Remove Watch"
@@ -2556,9 +2582,9 @@ msgstr "Ð?б'Ñ?кÑ?и Ñ?поÑ?Ñ?еÑ?еженнÑ?"
 msgid "Search Help:"
 msgstr "Ð?найÑ?и Ñ? довÑ?дÑ?Ñ?:"
 
-#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:236
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:309
-msgid "_Goto"
+#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:239
+#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:312
+msgid "_Go to"
 msgstr "Ð?еÑ?е_йÑ?и"
 
 #: ../plugins/devhelp/plugin.c:231
@@ -2597,8 +2623,8 @@ msgstr "Ð?мÑ?Ñ?Ñ?"
 #: ../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
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2124
+#: ../plugins/symbol-db/plugin.c:2206
 msgid "Search"
 msgstr "Ð?оÑ?Ñ?к"
 
@@ -2615,7 +2641,7 @@ msgstr "Ð?онÑ?екÑ?Ñ?на довÑ?дка"
 msgid "Online"
 msgstr "ШÑ?каÑ?и в меÑ?ежÑ?"
 
-#: ../plugins/document-manager/action-callbacks.c:276
+#: ../plugins/document-manager/action-callbacks.c:277
 #, c-format
 msgid ""
 "Are you sure you want to reload '%s'?\n"
@@ -2624,44 +2650,53 @@ msgstr ""
 "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е пеÑ?езапÑ?Ñ?Ñ?иÑ?и «%s»?\n"
 "Ð?Ñ?Ñ? незбеÑ?еженÑ? змÑ?ни бÑ?дÑ?Ñ?Ñ? Ñ?Ñ?аÑ?енÑ?."
 
-#: ../plugins/document-manager/action-callbacks.c:285
+#: ../plugins/document-manager/action-callbacks.c:286
 msgid "_Reload"
 msgstr "_Ð?еÑ?езаванÑ?ажиÑ?и"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:235
+#: ../plugins/document-manager/anjuta-bookmarks.c:311
 msgid "Add bookmark"
 msgstr "Ð?одаÑ?и закладкÑ?"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:241
+#: ../plugins/document-manager/anjuta-bookmarks.c:317
 msgid "Remove bookmark"
 msgstr "Ð?идалиÑ?и закладкÑ?"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:255
-#: ../plugins/document-manager/anjuta-bookmarks.c:300
-#: ../plugins/document-manager/plugin.c:411
+#: ../plugins/document-manager/anjuta-bookmarks.c:331
+#: ../plugins/document-manager/anjuta-bookmarks.c:393
+#: ../plugins/document-manager/plugin.c:418
 msgid "Bookmarks"
 msgstr "Ð?акладки"
 
-#: ../plugins/document-manager/anjuta-docman.c:400
+#: ../plugins/document-manager/anjuta-bookmarks.c:339
+msgid "Rename"
+msgstr "Ð?еÑ?ейменÑ?ваÑ?и"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
+#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+msgid "Remove"
+msgstr "Ð?идалиÑ?и"
+
+#: ../plugins/document-manager/anjuta-docman.c:435
 msgid "Close file"
 msgstr "Ð?акÑ?иÑ?и Ñ?айл"
 
-#: ../plugins/document-manager/anjuta-docman.c:448
+#: ../plugins/document-manager/anjuta-docman.c:483
 msgid "Path:"
 msgstr "ШлÑ?Ñ?:"
 
-#: ../plugins/document-manager/anjuta-docman.c:565
+#: ../plugins/document-manager/anjuta-docman.c:600
 #: ../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 "Ð?Ñ?дкÑ?иÑ?и Ñ?айл"
 
-#: ../plugins/document-manager/anjuta-docman.c:584
+#: ../plugins/document-manager/anjuta-docman.c:619
 #: ../plugins/message-view/message-view.c:94
 msgid "Save file as"
 msgstr "Ð?беÑ?егÑ?и Ñ?айл Ñ?к"
 
-#: ../plugins/document-manager/anjuta-docman.c:665
+#: ../plugins/document-manager/anjuta-docman.c:700
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -2670,37 +2705,37 @@ msgstr ""
 "Файл «%s» вже Ñ?Ñ?нÑ?Ñ?.\n"
 "Ð?амÑ?ниÑ?и його новим Ñ?айлом?"
 
-#: ../plugins/document-manager/anjuta-docman.c:674
+#: ../plugins/document-manager/anjuta-docman.c:709
 msgid "_Replace"
 msgstr "_Ð?амÑ?ниÑ?и"
 
-#: ../plugins/document-manager/anjuta-docman.c:1392
+#: ../plugins/document-manager/anjuta-docman.c:1426
 msgid "[read-only]"
 msgstr "[лиÑ?е длÑ? Ñ?иÑ?аннÑ?]"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:1
-msgid "<b>Autosave</b>"
-msgstr "<b>Ð?вÑ?озбеÑ?еженнÑ?</b>"
+msgid "Autosave"
+msgstr "Ð?вÑ?озбеÑ?еженнÑ?"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:2
-msgid "<b>Editor tabs</b>"
-msgstr "<b>Ð?акладки Ñ?едакÑ?оÑ?а</b>"
-
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
 msgid "Bottom"
 msgstr "Ð?низÑ?"
 
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
 msgid "Do not show tabs"
 msgstr "Ð?е показÑ?ваÑ?и закладки"
 
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+msgid "Editor tabs"
+msgstr "Ð?акладки Ñ?едакÑ?оÑ?а"
+
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:5
 msgid "Enable files autosave"
 msgstr "УвÑ?мкнÑ?Ñ?и авÑ?озбеÑ?еженнÑ? Ñ?айлÑ?в"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:6
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
 msgid "Left"
 msgstr "Ð?Ñ?воÑ?Ñ?Ñ?"
 
@@ -2709,7 +2744,7 @@ msgid "Position:"
 msgstr "Ð?озиÑ?Ñ?Ñ?:"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:8
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
 msgid "Right"
 msgstr "Ð?Ñ?авоÑ?Ñ?Ñ?"
 
@@ -2734,176 +2769,176 @@ msgid "Sorted in opening order"
 msgstr "Ð?поÑ?Ñ?дкÑ?ваÑ?и за поÑ?Ñ?дком вÑ?дкÑ?иÑ?Ñ?Ñ?"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:14
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 msgid "Top"
 msgstr "Ð?гоÑ?и"
 
-#: ../plugins/document-manager/plugin.c:147
+#: ../plugins/document-manager/plugin.c:150
 msgid "_Save"
 msgstr "Ð?_беÑ?егÑ?и"
 
-#: ../plugins/document-manager/plugin.c:148
+#: ../plugins/document-manager/plugin.c:151
 msgid "Save current file"
 msgstr "Ð?беÑ?егÑ?и поÑ?оÑ?ний Ñ?айл"
 
-#: ../plugins/document-manager/plugin.c:149
-msgid "Save _As..."
-msgstr "Ð?беÑ?егÑ?и _Ñ?к..."
+#: ../plugins/document-manager/plugin.c:152
+msgid "Save _Asâ?¦"
+msgstr "Ð?беÑ?егÑ?и _Ñ?кâ?¦"
 
-#: ../plugins/document-manager/plugin.c:150
+#: ../plugins/document-manager/plugin.c:153
 msgid "Save the current file with a different name"
 msgstr "Ð?беÑ?егÑ?и поÑ?оÑ?ний Ñ?айл пÑ?д Ñ?нÑ?оÑ? назвоÑ?"
 
-#: ../plugins/document-manager/plugin.c:152
+#: ../plugins/document-manager/plugin.c:155
 msgid "Save A_ll"
 msgstr "Ð?беÑ?егÑ?и вÑ?_е"
 
-#: ../plugins/document-manager/plugin.c:153
+#: ../plugins/document-manager/plugin.c:156
 msgid "Save all currently open files, except new files"
 msgstr "Ð?беÑ?егÑ?и вÑ?Ñ? вÑ?дкÑ?иÑ?Ñ? Ñ?айли, кÑ?Ñ?м новиÑ?"
 
-#: ../plugins/document-manager/plugin.c:155
+#: ../plugins/document-manager/plugin.c:158
 msgid "_Close File"
 msgstr "_Ð?акÑ?иÑ?и Ñ?айл"
 
-#: ../plugins/document-manager/plugin.c:156
+#: ../plugins/document-manager/plugin.c:159
 msgid "Close current file"
 msgstr "Ð?акÑ?иÑ?и поÑ?оÑ?ний Ñ?айл"
 
-#: ../plugins/document-manager/plugin.c:158
+#: ../plugins/document-manager/plugin.c:161
 msgid "Close All"
 msgstr "Ð?акÑ?иÑ?и вÑ?е"
 
-#: ../plugins/document-manager/plugin.c:159
+#: ../plugins/document-manager/plugin.c:162
 msgid "Close all files"
 msgstr "Ð?акÑ?иÑ?и вÑ?Ñ? Ñ?айли"
 
-#: ../plugins/document-manager/plugin.c:161
+#: ../plugins/document-manager/plugin.c:164
 msgid "Reload F_ile"
 msgstr "Ð?еÑ?езаванÑ?ажиÑ?и Ñ?_айл"
 
-#: ../plugins/document-manager/plugin.c:162
+#: ../plugins/document-manager/plugin.c:165
 msgid "Reload current file"
 msgstr "Ð?еÑ?езаванÑ?ажиÑ?и поÑ?оÑ?ний Ñ?айл"
 
-#: ../plugins/document-manager/plugin.c:164
+#: ../plugins/document-manager/plugin.c:167
 msgid "Recent _Files"
 msgstr "_Ð?Ñ?Ñ?аннÑ? Ñ?айли"
 
-#: ../plugins/document-manager/plugin.c:168
-msgid "_Print..."
-msgstr "Ð?_Ñ?Ñ?к..."
+#: ../plugins/document-manager/plugin.c:171
+msgid "_Printâ?¦"
+msgstr "Ð?_Ñ?Ñ?кâ?¦"
 
-#: ../plugins/document-manager/plugin.c:169
+#: ../plugins/document-manager/plugin.c:172
 msgid "Print the current file"
 msgstr "Ð?Ñ?Ñ?кÑ?ваÑ?и поÑ?оÑ?ний Ñ?айл"
 
-#: ../plugins/document-manager/plugin.c:176
+#: ../plugins/document-manager/plugin.c:179
 msgid "_Print Preview"
 msgstr "_Ð?опеÑ?еднÑ?й пеÑ?еглÑ?д"
 
-#: ../plugins/document-manager/plugin.c:177
-msgid "Preview the current file in print-format"
+#: ../plugins/document-manager/plugin.c:180
+msgid "Preview the current file in print format"
 msgstr "Ð?еÑ?еглÑ?д поÑ?оÑ?ного Ñ?айлÑ? Ñ? Ñ?оÑ?маÑ?Ñ? длÑ? дÑ?Ñ?кÑ?"
 
-#: ../plugins/document-manager/plugin.c:182
+#: ../plugins/document-manager/plugin.c:185
 msgid "_Transform"
 msgstr "Ð?е_Ñ?еÑ?воÑ?иÑ?и"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:183
+#: ../plugins/document-manager/plugin.c:186
 msgid "_Make Selection Uppercase"
 msgstr "Ð?а _великÑ? лÑ?Ñ?еÑ?и"
 
-#: ../plugins/document-manager/plugin.c:184
+#: ../plugins/document-manager/plugin.c:187
 msgid "Make the selected text uppercase"
 msgstr "Ð?еÑ?еÑ?воÑ?иÑ?и лÑ?Ñ?еÑ?и видÑ?леного Ñ?екÑ?Ñ?Ñ? на великÑ?"
 
-#: ../plugins/document-manager/plugin.c:186
+#: ../plugins/document-manager/plugin.c:189
 msgid "Make Selection Lowercase"
 msgstr "Ð?а _маленÑ?кÑ? лÑ?Ñ?еÑ?и"
 
-#: ../plugins/document-manager/plugin.c:187
+#: ../plugins/document-manager/plugin.c:190
 msgid "Make the selected text lowercase"
 msgstr "Ð?еÑ?еÑ?воÑ?иÑ?и лÑ?Ñ?еÑ?и видÑ?леного Ñ?екÑ?Ñ?Ñ? на маленÑ?кÑ?"
 
-#: ../plugins/document-manager/plugin.c:189
+#: ../plugins/document-manager/plugin.c:192
 msgid "Convert EOL to CRLF"
 msgstr "Ð?еÑ?еÑ?воÑ?иÑ?и Ñ?имволи EOL на CRLF"
 
-#: ../plugins/document-manager/plugin.c:190
+#: ../plugins/document-manager/plugin.c:193
 msgid "Convert End Of Line characters to DOS EOL (CRLF)"
 msgstr "Ð?еÑ?еÑ?воÑ?иÑ?и Ñ?имволи кÑ?нÑ?Ñ? Ñ?Ñ?дка на Ñ?имволи пеÑ?еводÑ? Ñ?Ñ?дка DOS (CRLF)"
 
-#: ../plugins/document-manager/plugin.c:192
+#: ../plugins/document-manager/plugin.c:195
 msgid "Convert EOL to LF"
 msgstr "Ð?еÑ?еÑ?воÑ?иÑ?и Ñ?имволи EOL на LF"
 
-#: ../plugins/document-manager/plugin.c:193
+#: ../plugins/document-manager/plugin.c:196
 msgid "Convert End Of Line characters to Unix EOL (LF)"
 msgstr ""
 "Ð?еÑ?еÑ?воÑ?иÑ?и Ñ?имволи кÑ?нÑ?Ñ? Ñ?Ñ?дка (EOL) на Ñ?имволи пеÑ?еводÑ? Ñ?Ñ?дка UNIX (LF)"
 
-#: ../plugins/document-manager/plugin.c:195
+#: ../plugins/document-manager/plugin.c:198
 msgid "Convert EOL to CR"
 msgstr "Ð?еÑ?еÑ?воÑ?иÑ?и Ñ?имволи EOL на CR"
 
-#: ../plugins/document-manager/plugin.c:196
+#: ../plugins/document-manager/plugin.c:199
 msgid "Convert End Of Line characters to Mac OS EOL (CR)"
 msgstr ""
 "Ð?еÑ?еÑ?воÑ?иÑ?и Ñ?имволи кÑ?нÑ?Ñ? Ñ?Ñ?дка (EOL) на Ñ?имволи пеÑ?еводÑ? Ñ?Ñ?дка Mac OS (CR)"
 
-#: ../plugins/document-manager/plugin.c:198
+#: ../plugins/document-manager/plugin.c:201
 msgid "Convert EOL to Majority EOL"
 msgstr "Ð?еÑ?еÑ?воÑ?Ñ?ваÑ?и Ñ?имволи EOL на домÑ?нÑ?Ñ?Ñ?Ñ? Ñ?имволи пеÑ?еводÑ? Ñ?Ñ?дка"
 
-#: ../plugins/document-manager/plugin.c:199
-msgid "Convert End Of Line characters to majority of the EOL found in the file"
+#: ../plugins/document-manager/plugin.c:202
+msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr ""
 "Ð?еÑ?еÑ?воÑ?иÑ?и Ñ?имволи кÑ?нÑ?Ñ? Ñ?Ñ?дка (EOL) на Ñ?имволи пеÑ?еводÑ? Ñ?Ñ?дка, Ñ?о "
 "домÑ?нÑ?Ñ?Ñ?Ñ? Ñ? Ñ?Ñ?омÑ? Ñ?айлÑ?"
 
-#: ../plugins/document-manager/plugin.c:204
+#: ../plugins/document-manager/plugin.c:207
 msgid "_Select"
 msgstr "Ð?идÑ?_лиÑ?и"
 
-#: ../plugins/document-manager/plugin.c:206
+#: ../plugins/document-manager/plugin.c:209
 msgid "Select _All"
 msgstr "Ð?идÑ?лиÑ?и вÑ?_е"
 
-#: ../plugins/document-manager/plugin.c:207
+#: ../plugins/document-manager/plugin.c:210
 msgid "Select all text in the editor"
 msgstr "Ð?идÑ?лиÑ?и веÑ?Ñ? Ñ?екÑ?Ñ? в Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:209
+#: ../plugins/document-manager/plugin.c:212
 msgid "Select _Code Block"
 msgstr "Ð?идÑ?лиÑ?и _блок кодÑ?"
 
-#: ../plugins/document-manager/plugin.c:210
+#: ../plugins/document-manager/plugin.c:213
 msgid "Select the current code block"
 msgstr "Ð?идÑ?лиÑ?и поÑ?оÑ?ний блок кодÑ?"
 
-#: ../plugins/document-manager/plugin.c:215
+#: ../plugins/document-manager/plugin.c:218
 msgid "Co_mment"
 msgstr "_Ð?оменÑ?Ñ?ваÑ?и"
 
 #. Block comment: Uses line-comment (comment that affects only single line
 #. such as '//' or '#') and comments a block of lines.
-#: ../plugins/document-manager/plugin.c:218
+#: ../plugins/document-manager/plugin.c:221
 msgid "_Block Comment/Uncomment"
 msgstr "_Ð?оменÑ?Ñ?ваÑ?и/Ñ?озкоменÑ?Ñ?ваÑ?и по Ñ?Ñ?дкаÑ?"
 
-#: ../plugins/document-manager/plugin.c:219
+#: ../plugins/document-manager/plugin.c:222
 msgid "Block comment the selected text"
 msgstr "Ð?оменÑ?Ñ?ваннÑ? видÑ?леного Ñ?екÑ?Ñ?Ñ? по Ñ?Ñ?дкаÑ?"
 
 #. Box comment: Uses stream-comment to comment a block of lines, usually with
 #. some decorations, to give an appearance of box.
-#: ../plugins/document-manager/plugin.c:223
+#: ../plugins/document-manager/plugin.c:226
 msgid "Bo_x Comment/Uncomment"
 msgstr "Ð?_оменÑ?Ñ?ваÑ?и/Ñ?озкоменÑ?Ñ?ваÑ?и блок"
 
-#: ../plugins/document-manager/plugin.c:224
+#: ../plugins/document-manager/plugin.c:227
 msgid "Box comment the selected text"
 msgstr "Ð?оменÑ?Ñ?ваннÑ? видÑ?леного Ñ?екÑ?Ñ?Ñ? Ñ? виглÑ?дÑ? блокÑ?"
 
@@ -2911,432 +2946,440 @@ msgstr "Ð?оменÑ?Ñ?ваннÑ? видÑ?леного Ñ?екÑ?Ñ?Ñ? Ñ? виглÑ?
 #. characters -- has start and end comment code) and comments any code from
 #. arbitrary start position to arbitrary end position (can be in middle of
 #. lines).
-#: ../plugins/document-manager/plugin.c:230
+#: ../plugins/document-manager/plugin.c:233
 msgid "_Stream Comment/Uncomment"
 msgstr "Ð?о_менÑ?Ñ?ваÑ?и/Ñ?озкоменÑ?Ñ?ваÑ?и поÑ?оком"
 
-#: ../plugins/document-manager/plugin.c:231
+#: ../plugins/document-manager/plugin.c:234
 msgid "Stream comment the selected text"
 msgstr "Ð?оменÑ?Ñ?ваннÑ? видÑ?леного Ñ?екÑ?Ñ?Ñ? Ñ? виглÑ?дÑ? безпеÑ?еÑ?вного Ñ?Ñ?дка"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:237
-msgid "_Line Number..."
-msgstr "Ð?еÑ?ейÑ?и на _Ñ?Ñ?док..."
+#: ../plugins/document-manager/plugin.c:240
+msgid "_Line Numberâ?¦"
+msgstr "Ð?еÑ?ейÑ?и на _Ñ?Ñ?докâ?¦"
 
-#: ../plugins/document-manager/plugin.c:238
+#: ../plugins/document-manager/plugin.c:241
 msgid "Go to a particular line in the editor"
 msgstr "Ð?еÑ?ейÑ?и до вказаного Ñ?Ñ?дка Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:240
+#: ../plugins/document-manager/plugin.c:243
 msgid "Matching _Brace"
 msgstr "Ð?аÑ?на _дÑ?жка"
 
-#: ../plugins/document-manager/plugin.c:241
+#: ../plugins/document-manager/plugin.c:244
 msgid "Go to the matching brace in the editor"
 msgstr "Ð?еÑ?ейÑ?и до паÑ?ноÑ? дÑ?жки в Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/document-manager/plugin.c:246
 msgid "_Start of Block"
 msgstr "Ð?о_Ñ?аÑ?ок блокÑ?"
 
-#: ../plugins/document-manager/plugin.c:244
+#: ../plugins/document-manager/plugin.c:247
 msgid "Go to the start of the current block"
 msgstr "Ð?еÑ?ейÑ?и на поÑ?аÑ?ок поÑ?оÑ?ного блокÑ?"
 
-#: ../plugins/document-manager/plugin.c:246
+#: ../plugins/document-manager/plugin.c:249
 msgid "_End of Block"
 msgstr "_Ð?Ñ?неÑ?Ñ? блокÑ?"
 
-#: ../plugins/document-manager/plugin.c:247
+#: ../plugins/document-manager/plugin.c:250
 msgid "Go to the end of the current block"
 msgstr "Ð?еÑ?ейÑ?и на кÑ?неÑ?Ñ? поÑ?оÑ?ного блокÑ?"
 
-#: ../plugins/document-manager/plugin.c:249
+#: ../plugins/document-manager/plugin.c:252
 msgid "Previous _History"
 msgstr "_Ð?опеÑ?еднÑ? Ñ?Ñ?Ñ?оÑ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:250
-msgid "Goto previous history"
+#: ../plugins/document-manager/plugin.c:253
+msgid "Go to previous history"
 msgstr "Ð?еÑ?ейÑ?и до попеÑ?еднÑ?оÑ? Ñ?Ñ?Ñ?оÑ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:252
+#: ../plugins/document-manager/plugin.c:255
 msgid "Next Histor_y"
 msgstr "_Ð?аÑ?Ñ?Ñ?пна Ñ?Ñ?Ñ?оÑ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:253
-msgid "Goto next history"
+#: ../plugins/document-manager/plugin.c:256
+msgid "Go to next history"
 msgstr "Ð?еÑ?ейÑ?и до наÑ?Ñ?Ñ?пноÑ? Ñ?Ñ?Ñ?оÑ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:258 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:261 ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "Ð?_найÑ?и"
 
-#: ../plugins/document-manager/plugin.c:259
+#: ../plugins/document-manager/plugin.c:262
 msgid "_Quick Search"
 msgstr "_Швидкий поÑ?Ñ?к"
 
-#: ../plugins/document-manager/plugin.c:260
+#: ../plugins/document-manager/plugin.c:263
 msgid "Quick editor embedded search"
 msgstr "Швидкий поÑ?Ñ?к, вбÑ?дований Ñ? Ñ?едакÑ?оÑ?"
 
-#: ../plugins/document-manager/plugin.c:262
+#: ../plugins/document-manager/plugin.c:265
 msgid "Quick _ReSearch"
 msgstr "Швидкий пов_Ñ?оÑ?ний поÑ?Ñ?к"
 
-#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/document-manager/plugin.c:266
 msgid "Repeat quick search"
 msgstr "Ð?овÑ?оÑ?иÑ?и Ñ?видкий поÑ?Ñ?к"
 
-#: ../plugins/document-manager/plugin.c:268 ../plugins/gtodo/interface.c:168
+#: ../plugins/document-manager/plugin.c:271 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1915
+#: ../plugins/language-support-cpp-java/plugin.c:1882
 msgid "_Edit"
 msgstr "_Ð?Ñ?авка"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:269
+#: ../plugins/document-manager/plugin.c:272
 msgid "_Editor"
 msgstr "_РедакÑ?оÑ?"
 
-#: ../plugins/document-manager/plugin.c:276
+#: ../plugins/document-manager/plugin.c:279
 msgid "_Add Editor View"
 msgstr "_Ð?одаÑ?и виглÑ?д Ñ?едакÑ?оÑ?а"
 
-#: ../plugins/document-manager/plugin.c:277
+#: ../plugins/document-manager/plugin.c:280
 msgid "Add one more view of current document"
 msgstr "Ð?одаÑ?и один Ñ?и бÑ?лÑ?Ñ?е видÑ?в поÑ?оÑ?ного докÑ?менÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:279
+#: ../plugins/document-manager/plugin.c:282
 msgid "_Remove Editor View"
 msgstr "Ð?_идалиÑ?и вид Ñ?едакÑ?оÑ?а"
 
-#: ../plugins/document-manager/plugin.c:280
+#: ../plugins/document-manager/plugin.c:283
 msgid "Remove current view of the document"
 msgstr "Ð?идалиÑ?и поÑ?оÑ?ний вид докÑ?менÑ?а"
 
-#: ../plugins/document-manager/plugin.c:282
+#: ../plugins/document-manager/plugin.c:285
 msgid "U_ndo"
 msgstr "Ð?_еÑ?нÑ?Ñ?и"
 
-#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4089
+#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4076
 msgid "Undo the last action"
 msgstr "Ð?еÑ?нÑ?Ñ?и оÑ?Ñ?аннÑ? дÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:288
 msgid "_Redo"
 msgstr "Ð?ов_Ñ?оÑ?иÑ?и"
 
-#: ../plugins/document-manager/plugin.c:286
+#: ../plugins/document-manager/plugin.c:289
 msgid "Redo the last undone action"
 msgstr "Ð?овÑ?оÑ?иÑ?и оÑ?Ñ?аннÑ? повеÑ?нÑ?Ñ?Ñ? дÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:288
+#: ../plugins/document-manager/plugin.c:291
 msgid "C_ut"
 msgstr "_Ð?иÑ?Ñ?заÑ?и"
 
-#: ../plugins/document-manager/plugin.c:289
+#: ../plugins/document-manager/plugin.c:292
 msgid "Cut the selected text from the editor to the clipboard"
 msgstr "Ð?иÑ?Ñ?заÑ?и видÑ?лений Ñ?екÑ?Ñ? з Ñ?едакÑ?оÑ?а до бÑ?Ñ?еÑ?Ñ? обмÑ?нÑ?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:592
+#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:609
 msgid "_Copy"
 msgstr "_Ð?опÑ?Ñ?ваÑ?и"
 
-#: ../plugins/document-manager/plugin.c:292
+#: ../plugins/document-manager/plugin.c:295
 msgid "Copy the selected text to the clipboard"
 msgstr "СкопÑ?Ñ?ваÑ?и вибÑ?аний Ñ?екÑ?Ñ? в бÑ?Ñ?еÑ? обмÑ?нÑ?"
 
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:600
+#: ../plugins/document-manager/plugin.c:297 ../plugins/terminal/terminal.c:617
 msgid "_Paste"
 msgstr "Ð?Ñ?Ñ?_авиÑ?и"
 
-#: ../plugins/document-manager/plugin.c:295
+#: ../plugins/document-manager/plugin.c:298
 msgid "Paste the content of clipboard at the current position"
 msgstr "Ð?Ñ?Ñ?авиÑ?и вмÑ?Ñ?Ñ? бÑ?Ñ?еÑ?Ñ? обмÑ?нÑ? в поÑ?оÑ?нÑ?й позиÑ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:303
+#: ../plugins/document-manager/plugin.c:306
 msgid "_Clear"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?и"
 
-#: ../plugins/document-manager/plugin.c:304
+#: ../plugins/document-manager/plugin.c:307
 msgid "Delete the selected text from the editor"
 msgstr "Ð?идалиÑ?и видÑ?лений Ñ?екÑ?Ñ? з Ñ?едакÑ?оÑ?а"
 
-#: ../plugins/document-manager/plugin.c:309
+#: ../plugins/document-manager/plugin.c:310
+msgid "_Auto-Complete"
+msgstr "Ð?в_Ñ?одоповненнÑ?"
+
+#: ../plugins/document-manager/plugin.c:311
+msgid "Auto-complete the current word"
+msgstr "Ð?вÑ?одоповненнÑ? поÑ?оÑ?ного Ñ?лова"
+
+#: ../plugins/document-manager/plugin.c:316
 msgid "_Line Number Margin"
 msgstr "_Ð?омеÑ?и Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/document-manager/plugin.c:310
+#: ../plugins/document-manager/plugin.c:317
 msgid "Show/Hide line numbers"
 msgstr "Ð?оказаÑ?и/пÑ?ибÑ?аÑ?и номеÑ?и Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/document-manager/plugin.c:312
+#: ../plugins/document-manager/plugin.c:319
 msgid "_Marker Margin"
 msgstr "Ð?оле длÑ? _маÑ?кеÑ?а"
 
-#: ../plugins/document-manager/plugin.c:313
+#: ../plugins/document-manager/plugin.c:320
 msgid "Show/Hide marker margin"
 msgstr "Ð?оказаÑ?и/пÑ?ибÑ?аÑ?и поле длÑ? маÑ?кеÑ?Ñ?в"
 
-#: ../plugins/document-manager/plugin.c:315
+#: ../plugins/document-manager/plugin.c:322
 msgid "_Code Fold Margin"
 msgstr "Ð?_Ñ?дÑ?Ñ?Ñ?п длÑ? згоÑ?Ñ?аннÑ? кодÑ?"
 
-#: ../plugins/document-manager/plugin.c:316
+#: ../plugins/document-manager/plugin.c:323
 msgid "Show/Hide code fold margin"
 msgstr "Ð?оказаÑ?и/Ñ?Ñ?оваÑ?и поле згоÑ?Ñ?аннÑ? кодÑ?"
 
-#: ../plugins/document-manager/plugin.c:318
+#: ../plugins/document-manager/plugin.c:325
 msgid "_Indentation Guides"
 msgstr "_РÑ?внÑ? вÑ?дÑ?Ñ?Ñ?пÑ?в"
 
-#: ../plugins/document-manager/plugin.c:319
+#: ../plugins/document-manager/plugin.c:326
 msgid "Show/Hide indentation guides"
 msgstr "Ð?оказаÑ?и/пÑ?ибÑ?аÑ?и Ñ?Ñ?внÑ? вÑ?дÑ?Ñ?Ñ?пÑ?в"
 
-#: ../plugins/document-manager/plugin.c:321
+#: ../plugins/document-manager/plugin.c:328
 msgid "_White Space"
 msgstr "_Ð?Ñ?обÑ?ли Ñ?а Ñ?имволи Ñ?абÑ?лÑ?Ñ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:322
+#: ../plugins/document-manager/plugin.c:329
 msgid "Show/Hide white spaces"
 msgstr "Ð?оказаÑ?и/Ñ?Ñ?оваÑ?и пÑ?обÑ?ли Ñ?а Ñ?имволи Ñ?абÑ?лÑ?Ñ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:324
+#: ../plugins/document-manager/plugin.c:331
 msgid "_Line End Characters"
 msgstr "Символи _кÑ?нÑ?Ñ? Ñ?Ñ?дка"
 
-#: ../plugins/document-manager/plugin.c:325
+#: ../plugins/document-manager/plugin.c:332
 msgid "Show/Hide line end characters"
 msgstr "Ð?оказаÑ?и/пÑ?ибÑ?аÑ?и Ñ?имволи кÑ?нÑ?Ñ? Ñ?Ñ?дка"
 
-#: ../plugins/document-manager/plugin.c:327
+#: ../plugins/document-manager/plugin.c:334
 msgid "Line _Wrapping"
 msgstr "Ð?еÑ?еноÑ? _Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/document-manager/plugin.c:328
+#: ../plugins/document-manager/plugin.c:335
 msgid "Enable/disable line wrapping"
 msgstr "УвÑ?мкнÑ?Ñ?и/вимкнÑ?Ñ?и пеÑ?еноÑ? Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/document-manager/plugin.c:333
+#: ../plugins/document-manager/plugin.c:340
 msgid "Zoom In"
 msgstr "Ð?бÑ?лÑ?Ñ?иÑ?и"
 
-#: ../plugins/document-manager/plugin.c:334
+#: ../plugins/document-manager/plugin.c:341
 msgid "Zoom in: Increase font size"
 msgstr "Ð?бÑ?лÑ?Ñ?иÑ?и Ñ?озмÑ?Ñ? Ñ?Ñ?иÑ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:336
+#: ../plugins/document-manager/plugin.c:343
 msgid "Zoom Out"
 msgstr "Ð?менÑ?иÑ?и"
 
-#: ../plugins/document-manager/plugin.c:337
+#: ../plugins/document-manager/plugin.c:344
 msgid "Zoom out: Decrease font size"
 msgstr "Ð?менÑ?иÑ?и Ñ?озмÑ?Ñ? Ñ?Ñ?иÑ?Ñ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:342
+#: ../plugins/document-manager/plugin.c:349
 msgid "_Highlight Mode"
 msgstr "Р_ежим видаленнÑ? колÑ?оÑ?ом"
 
-#: ../plugins/document-manager/plugin.c:346
+#: ../plugins/document-manager/plugin.c:353
 msgid "_Close All Folds"
 msgstr "Ð?гоÑ?нÑ?Ñ?и _веÑ?Ñ? код"
 
-#: ../plugins/document-manager/plugin.c:347
+#: ../plugins/document-manager/plugin.c:354
 msgid "Close all code folds in the editor"
 msgstr "Ð?гоÑ?нÑ?Ñ?и веÑ?Ñ? код Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:349
+#: ../plugins/document-manager/plugin.c:356
 msgid "_Open All Folds"
 msgstr "_РозгоÑ?нÑ?Ñ?и веÑ?Ñ? код"
 
-#: ../plugins/document-manager/plugin.c:350
+#: ../plugins/document-manager/plugin.c:357
 msgid "Open all code folds in the editor"
 msgstr "РозгоÑ?нÑ?Ñ?и веÑ?Ñ? код Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:352
+#: ../plugins/document-manager/plugin.c:359
 msgid "_Toggle Current Fold"
 msgstr "Ð?_гоÑ?нÑ?Ñ?и/Ñ?озгоÑ?нÑ?Ñ?и код"
 
-#: ../plugins/document-manager/plugin.c:353
+#: ../plugins/document-manager/plugin.c:360
 msgid "Toggle current code fold in the editor"
 msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? на поÑ?оÑ?ний код Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:358
+#: ../plugins/document-manager/plugin.c:365
 msgid "_Documents"
 msgstr "Ð?_окÑ?менÑ?и"
 
-#: ../plugins/document-manager/plugin.c:359
+#: ../plugins/document-manager/plugin.c:366
 msgid "Previous Document"
 msgstr "Ð?опеÑ?еднÑ?й докÑ?менÑ?"
 
-#: ../plugins/document-manager/plugin.c:360
+#: ../plugins/document-manager/plugin.c:367
 msgid "Switch to previous document"
 msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? на попеÑ?еднÑ?й докÑ?менÑ?"
 
-#: ../plugins/document-manager/plugin.c:362
+#: ../plugins/document-manager/plugin.c:369
 msgid "Next Document"
 msgstr "Ð?аÑ?Ñ?Ñ?пний докÑ?менÑ?"
 
-#: ../plugins/document-manager/plugin.c:363
+#: ../plugins/document-manager/plugin.c:370
 msgid "Switch to next document"
 msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? на наÑ?Ñ?Ñ?пний докÑ?менÑ?"
 
-#: ../plugins/document-manager/plugin.c:368
+#: ../plugins/document-manager/plugin.c:375
 msgid "Bookmar_k"
 msgstr "_Ð?акладка"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:376
 msgid "_Add Bookmark"
 msgstr "_Ð?одаÑ?и закладкÑ?"
 
-#: ../plugins/document-manager/plugin.c:370
+#: ../plugins/document-manager/plugin.c:377
 msgid "Add a bookmark at the current line position"
 msgstr "Ð?одаÑ?и закладкÑ? на поÑ?оÑ?нÑ? позиÑ?Ñ?Ñ? Ñ?Ñ?дка"
 
-#: ../plugins/document-manager/plugin.c:372
+#: ../plugins/document-manager/plugin.c:379
 msgid "_Previous Bookmark"
 msgstr "Ð?_опеÑ?еднÑ? закладка"
 
-#: ../plugins/document-manager/plugin.c:373
+#: ../plugins/document-manager/plugin.c:380
 msgid "Jump to the previous bookmark in the file"
 msgstr "Ð?еÑ?ейÑ?и до попеÑ?еднÑ?оÑ? закладки в Ñ?Ñ?омÑ? докÑ?менÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:375
+#: ../plugins/document-manager/plugin.c:382
 msgid "_Next Bookmark"
 msgstr "_Ð?аÑ?Ñ?Ñ?пна закладка"
 
-#: ../plugins/document-manager/plugin.c:376
+#: ../plugins/document-manager/plugin.c:383
 msgid "Jump to the next bookmark in the file"
 msgstr "Ð?еÑ?ейÑ?и до наÑ?Ñ?Ñ?пноÑ? закладки в Ñ?Ñ?омÑ? докÑ?менÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:378
+#: ../plugins/document-manager/plugin.c:385
 msgid "_Clear All Bookmarks"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?и вÑ?Ñ? закладки"
 
-#: ../plugins/document-manager/plugin.c:379
+#: ../plugins/document-manager/plugin.c:386
 msgid "Clear bookmarks"
 msgstr "Ð?Ñ?иÑ?Ñ?иÑ?и вÑ?Ñ? закладки"
 
-#: ../plugins/document-manager/plugin.c:398
+#: ../plugins/document-manager/plugin.c:405
 msgid "Editor file operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? Ñ?едагÑ?ваннÑ? Ñ?айлÑ?в"
 
-#: ../plugins/document-manager/plugin.c:399
+#: ../plugins/document-manager/plugin.c:406
 msgid "Editor print operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? дÑ?Ñ?кÑ? Ñ?айлÑ?в"
 
-#: ../plugins/document-manager/plugin.c:400
+#: ../plugins/document-manager/plugin.c:407
 msgid "Editor text transformation"
 msgstr "Ð?еÑ?еÑ?воÑ?еннÑ? Ñ?екÑ?Ñ?Ñ? Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:401
+#: ../plugins/document-manager/plugin.c:408
 msgid "Editor text selection"
 msgstr "Ð?идÑ?леннÑ? Ñ?екÑ?Ñ?Ñ? Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
 #. { actions_insert, G_N_ELEMENTS (actions_insert), "ActionGroupEditorInsert", N_("Editor text insertions") },
-#: ../plugins/document-manager/plugin.c:403
+#: ../plugins/document-manager/plugin.c:410
 msgid "Editor code commenting"
 msgstr "Ð?оменÑ?Ñ?ваннÑ? кодÑ? Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:404
+#: ../plugins/document-manager/plugin.c:411
 msgid "Editor navigations"
 msgstr "Ð?авÑ?гаÑ?Ñ?Ñ? Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:405
+#: ../plugins/document-manager/plugin.c:412
 msgid "Editor edit operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? Ñ?едагÑ?ваннÑ? Ñ?едакÑ?оÑ?а"
 
-#: ../plugins/document-manager/plugin.c:406
+#: ../plugins/document-manager/plugin.c:413
 msgid "Editor zoom operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? маÑ?Ñ?Ñ?абÑ?ваннÑ? Ñ? Ñ?едакÑ?оÑ?Ñ? "
 
-#: ../plugins/document-manager/plugin.c:407
+#: ../plugins/document-manager/plugin.c:414
 msgid "Editor syntax highlighting styles"
 msgstr "Ð?идÑ?леннÑ? Ñ?инÑ?акÑ?иÑ?Ñ? колÑ?оÑ?ом Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:408
+#: ../plugins/document-manager/plugin.c:415
 msgid "Editor text formating"
 msgstr "ФоÑ?маÑ?Ñ?ваннÑ? Ñ?екÑ?Ñ?Ñ? Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/document-manager/plugin.c:409
+#: ../plugins/document-manager/plugin.c:416
 msgid "Simple searching"
 msgstr "Ð?Ñ?оÑ?Ñ?ий поÑ?Ñ?к"
 
-#: ../plugins/document-manager/plugin.c:410
-#: ../plugins/document-manager/plugin.c:1713
-#: ../plugins/document-manager/plugin.c:2130
-#: ../plugins/document-manager/plugin.c:2140
+#: ../plugins/document-manager/plugin.c:417
+#: ../plugins/document-manager/plugin.c:1734
+#: ../plugins/document-manager/plugin.c:2151
+#: ../plugins/document-manager/plugin.c:2161
 msgid "Documents"
 msgstr "Ð?окÑ?менÑ?и"
 
-#: ../plugins/document-manager/plugin.c:415
+#: ../plugins/document-manager/plugin.c:422
 msgid "Editor view settings"
 msgstr "Ð?аÑ?амеÑ?Ñ?и виглÑ?дÑ? Ñ?едакÑ?оÑ?а"
 
-#: ../plugins/document-manager/plugin.c:600
+#: ../plugins/document-manager/plugin.c:607
 msgid "Reload"
 msgstr "Ð?еÑ?езаванÑ?ажиÑ?и"
 
-#: ../plugins/document-manager/plugin.c:606
-msgid "Goto"
+#: ../plugins/document-manager/plugin.c:613
+msgid "Go to"
 msgstr "Ð?еÑ?ейÑ?и"
 
-#: ../plugins/document-manager/plugin.c:909
+#: ../plugins/document-manager/plugin.c:928
 msgid "OVR"
 msgstr "Ð?Ð?Ð?"
 
-#: ../plugins/document-manager/plugin.c:913
+#: ../plugins/document-manager/plugin.c:932
 msgid "INS"
 msgstr "Ð?СТ"
 
-#: ../plugins/document-manager/plugin.c:917
-#: ../plugins/document-manager/plugin.c:919
+#: ../plugins/document-manager/plugin.c:938
+#: ../plugins/document-manager/plugin.c:941
 msgid "Zoom"
 msgstr "Ð?аÑ?Ñ?Ñ?аб"
 
-#: ../plugins/document-manager/plugin.c:922
+#: ../plugins/document-manager/plugin.c:944
 msgid "Col"
 msgstr "СÑ?овп"
 
-#: ../plugins/document-manager/plugin.c:923
+#: ../plugins/document-manager/plugin.c:945
 msgid "Mode"
 msgstr "Режим"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1003
+#: ../plugins/document-manager/plugin.c:1025
 msgid "Automatic"
 msgstr "Ð?вÑ?омаÑ?иÑ?но"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1537
+#: ../plugins/document-manager/plugin.c:1558
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и Ñ?айл %s."
 
-#: ../plugins/document-manager/plugin.c:1551
+#: ../plugins/document-manager/plugin.c:1572
 msgid "Autosave completed"
 msgstr "Ð?вÑ?озбеÑ?еженнÑ? завеÑ?Ñ?ено"
 
 #: ../plugins/document-manager/search-box.c:383
 #, c-format
-msgid "Search for \"%s\" reached end and was continued on top."
-msgstr "Ð?оÑ?Ñ?к «%s» доÑ?Ñ?г кÑ?нÑ?Ñ? Ñ?а бÑ?де пÑ?одовжений Ñ?поÑ?аÑ?кÑ?"
+msgid "Search for \"%s\" reached the end and was continued at the top."
+msgstr "Ð?оÑ?Ñ?к «%s» доÑ?Ñ?г кÑ?нÑ?Ñ? Ñ?а бÑ?де пÑ?одовжений Ñ?поÑ?аÑ?кÑ?."
 
 #: ../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."
+"Search for \"%s\" reached the end and was continued at the top but no new "
+"match was found."
 msgstr ""
 "Ð?оÑ?Ñ?к «%s» доÑ?Ñ?г кÑ?нÑ?Ñ? Ñ?а Ñ?озпоÑ?аÑ?ий Ñ?поÑ?аÑ?кÑ?, але новÑ? збÑ?ги не бÑ?ло "
 "виÑ?влено."
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.ui.h:22
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Match case"
 msgstr "Ð?Ñ?аÑ?овÑ?ваÑ?и Ñ?егÑ?Ñ?Ñ?Ñ?"
 
@@ -3357,7 +3400,7 @@ msgstr "Ð?емаÑ? елеменÑ?Ñ?в"
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:670
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:726
 #, c-format
-msgid "No recently used resource found with URI `%s'"
+msgid "No recently used resource found with URI \"%s\""
 msgstr "Ð?е знайдено недавно викоÑ?иÑ?Ñ?аниÑ? Ñ?еÑ?Ñ?Ñ?Ñ?Ñ?в з URI «%s»"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:750
@@ -3367,6 +3410,7 @@ msgid "This function is not implemented for widgets of class '%s'"
 msgstr "ЦÑ? Ñ?Ñ?нкÑ?Ñ?Ñ? Ñ?е не Ñ?еалÑ?зована длÑ? вÑ?джеÑ?Ñ?в клаÑ?Ñ? «%s»"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:937
+#: ../plugins/starter/starter.c:111
 #, c-format
 msgid "Open '%s'"
 msgstr "Ð?Ñ?дкÑ?иÑ?и %s"
@@ -3379,28 +3423,26 @@ msgstr "Ð?евÑ?домий елеменÑ?"
 #. * in a recent files menu. The %d is the number of the item,
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:980
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:978
 #, c-format
-msgid "recent menu label|_%d. %s"
+msgctxt "recent menu label"
+msgid "_%d. %s"
 msgstr "_%d. %s"
 
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:987
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:983
 #, c-format
-msgid "recent menu label|%d. %s"
+msgctxt "recent menu label"
+msgid "%d. %s"
 msgstr "%d. %s"
 
 #: ../plugins/file-loader/plugin.c:116
 #, c-format
 msgid ""
-"Can not open \"%s\".\n"
+"Cannot open \"%s\".\n"
 "\n"
 "%s"
 msgstr ""
@@ -3416,7 +3458,7 @@ msgid ""
 "There is no plugin, default action, or application configured to handle this "
 "file type.\n"
 "\n"
-"Mime type: %s\n"
+"MIME type: %s\n"
 "\n"
 "You may choose to try opening it with the following plugins or applications."
 msgstr ""
@@ -3424,7 +3466,7 @@ msgstr ""
 "\n"
 "Ð?е знайдено доповненнÑ?, дÑ?Ñ? Ñ?и пÑ?огÑ?ами длÑ? Ñ?обоÑ?и з Ñ?им Ñ?ипом Ñ?айлÑ?.\n"
 "\n"
-"Тип Mime: %s.\n"
+"Тип MIME: %s.\n"
 "\n"
 "Ð?ожна Ñ?пÑ?обÑ?ваÑ?и вÑ?дкÑ?иÑ?и за допомогоÑ? наÑ?Ñ?Ñ?пниÑ? доповненÑ? або пÑ?огÑ?ам."
 
@@ -3476,11 +3518,11 @@ msgid "Python source files"
 msgstr "Файл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в Python"
 
 #: ../plugins/file-loader/plugin.c:555
-msgid "Hyper text markup files"
-msgstr "Файли з гÑ?пеÑ?Ñ?екÑ?Ñ?ом"
+msgid "Hypertext markup files"
+msgstr "Файли з гÑ?пеÑ?Ñ?екÑ?Ñ?овоÑ? Ñ?озмÑ?Ñ?коÑ?"
 
 #: ../plugins/file-loader/plugin.c:564
-msgid "Shell scripts files"
+msgid "Shell script files"
 msgstr "Файли Ñ?Ñ?енаÑ?Ñ?Ñ?в оболонки"
 
 #: ../plugins/file-loader/plugin.c:569
@@ -3509,8 +3551,8 @@ msgid "New empty file"
 msgstr "СÑ?воÑ?иÑ?и поÑ?ожнÑ?й Ñ?айл"
 
 #: ../plugins/file-loader/plugin.c:892
-msgid "_Open..."
-msgstr "_Ð?Ñ?дкÑ?иÑ?и..."
+msgid "_Openâ?¦"
+msgstr "_Ð?Ñ?дкÑ?иÑ?иâ?¦"
 
 #: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
@@ -3524,51 +3566,51 @@ msgstr "Ð?Ñ?дкÑ?иÑ?и Ñ? _Ñ?нÑ?Ñ?й пÑ?огÑ?амÑ?"
 msgid "Open with"
 msgstr "Ð?Ñ?дкÑ?иÑ?и Ñ? Ñ?нÑ?Ñ?й пÑ?огÑ?амÑ?"
 
-#: ../plugins/file-loader/plugin.c:1245 ../plugins/file-loader/plugin.c:1251
+#: ../plugins/file-loader/plugin.c:1243 ../plugins/file-loader/plugin.c:1249
 #: ../plugins/file-loader/anjuta-loader.plugin.in.h:1
 msgid "File Loader"
 msgstr "Ð?аванÑ?ажÑ?ваÑ? Ñ?айлÑ?в"
 
-#: ../plugins/file-loader/plugin.c:1255
+#: ../plugins/file-loader/plugin.c:1253
 msgid "New"
 msgstr "Ð?овий"
 
-#: ../plugins/file-loader/plugin.c:1256
+#: ../plugins/file-loader/plugin.c:1254
 msgid "New file, project and project components."
 msgstr "СÑ?воÑ?иÑ?и Ñ?айл, пÑ?оекÑ? Ñ?а компоненÑ?и пÑ?оекÑ?Ñ?."
 
-#: ../plugins/file-loader/plugin.c:1263 ../plugins/file-loader/plugin.c:1303
+#: ../plugins/file-loader/plugin.c:1261 ../plugins/file-loader/plugin.c:1301
 msgid "Open"
 msgstr "Ð?Ñ?дкÑ?иÑ?и"
 
-#: ../plugins/file-loader/plugin.c:1267
+#: ../plugins/file-loader/plugin.c:1265
 msgid "Open _Recent"
 msgstr "Ð?Ñ?дкÑ?иÑ?и _недавнÑ?й"
 
-#: ../plugins/file-loader/plugin.c:1268 ../plugins/file-loader/plugin.c:1305
+#: ../plugins/file-loader/plugin.c:1266 ../plugins/file-loader/plugin.c:1303
 msgid "Open recent file"
 msgstr "Ð?Ñ?дкÑ?иÑ?и оÑ?Ñ?аннÑ?й Ñ?айл"
 
-#: ../plugins/file-loader/plugin.c:1274
+#: ../plugins/file-loader/plugin.c:1272
 msgid "Open recent files"
 msgstr "Ð?Ñ?дкÑ?иÑ?и оÑ?Ñ?аннÑ? Ñ?айли"
 
-#: ../plugins/file-loader/plugin.c:1304
+#: ../plugins/file-loader/plugin.c:1302
 msgid "Open a file"
 msgstr "Ð?Ñ?дкÑ?иÑ?и Ñ?айл"
 
-#: ../plugins/file-loader/plugin.c:1420 ../plugins/file-loader/plugin.c:1422
+#: ../plugins/file-loader/plugin.c:1416 ../plugins/file-loader/plugin.c:1418
 #, c-format
 msgid "File not found"
 msgstr "Файл не знайдено"
 
 #. %s is name of file that will be opened
-#: ../plugins/file-loader/plugin.c:1441
+#: ../plugins/file-loader/plugin.c:1437
 #, c-format
 msgid "Please select a plugin to open <b>%s</b>."
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? модÑ?лÑ?, Ñ?об вÑ?дкÑ?иÑ?и <b>%s</b>."
 
-#: ../plugins/file-loader/plugin.c:1445
+#: ../plugins/file-loader/plugin.c:1441 ../plugins/project-import/plugin.c:205
 msgid "Open With"
 msgstr "Ð?Ñ?дкÑ?иÑ?и Ñ? Ñ?нÑ?Ñ?й пÑ?огÑ?амÑ?"
 
@@ -3597,7 +3639,8 @@ msgid "Filter"
 msgstr "ФÑ?лÑ?Ñ?Ñ?"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2334 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2122 ../plugins/symbol-db/plugin.c:2201
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "Ð?лобалÑ?нÑ?"
 
@@ -3605,25 +3648,20 @@ msgstr "Ð?лобалÑ?нÑ?"
 msgid "Root directory if no project is open:"
 msgstr "Ð?оÑ?еневий каÑ?алог, Ñ?кÑ?о немаÑ? вÑ?дкÑ?иÑ?иÑ? пÑ?оекÑ?Ñ?в:"
 
-#: ../plugins/file-manager/file-model.c:119
-#: ../plugins/symbol-db/symbol-db-view.c:799
+#: ../plugins/file-manager/file-model.c:120
 msgid "Loading..."
 msgstr "Ð?аванÑ?аженнÑ?..."
 
-#: ../plugins/file-manager/file-view.c:73
-msgid "Up-to-date"
-msgstr "Ð?е поÑ?Ñ?ебÑ?Ñ? Ñ?Ñ?кÑ?аÑ?Ñ?Ñ?"
-
-#: ../plugins/file-manager/file-view.c:510
+#: ../plugins/file-manager/file-view.c:569
 msgid "Filename"
 msgstr "Ð?азва Ñ?айлÑ?"
 
-#: ../plugins/file-manager/file-view.c:590
-msgid "Base uri"
+#: ../plugins/file-manager/file-view.c:656
+msgid "Base URI"
 msgstr "Ð?азовий URI"
 
-#: ../plugins/file-manager/file-view.c:591
-msgid "Uri of the top-most path displayed"
+#: ../plugins/file-manager/file-view.c:657
+msgid "URI of the top-most path displayed"
 msgstr "URI поÑ?аÑ?кового елеменÑ?Ñ?"
 
 #: ../plugins/file-manager/plugin.c:74
@@ -3634,40 +3672,36 @@ msgstr "Ð?еÑ?ей_менÑ?ваÑ?и"
 msgid "Rename file or directory"
 msgstr "Ð?еÑ?ейменÑ?ваÑ?и Ñ?айл/каÑ?алог"
 
-#: ../plugins/file-manager/plugin.c:294
+#: ../plugins/file-manager/plugin.c:298
 msgid "File manager popup actions"
 msgstr "Ð?онÑ?екÑ?Ñ?нÑ? команди Ñ?обоÑ?и з Ñ?айлами"
 
-#: ../plugins/file-manager/plugin.c:327
+#: ../plugins/file-manager/plugin.c:331
 msgid "Files"
 msgstr "Файли"
 
-#: ../plugins/file-manager/plugin.c:456 ../plugins/file-manager/plugin.c:465
+#: ../plugins/file-manager/plugin.c:460 ../plugins/file-manager/plugin.c:469
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "Ð?еÑ?Ñ?ваннÑ? Ñ?айлами"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:1
-msgid "<b>File Information</b>"
-msgstr "<b>Ð?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о Ñ?айл</b>"
-
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add License Information"
 msgstr "Ð?одаÑ?и вÑ?домоÑ?Ñ?Ñ? пÑ?о лÑ?Ñ?ензÑ?Ñ?"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
 msgid "Add to project"
 msgstr "Ð?одаÑ?и до пÑ?оекÑ?Ñ?"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add to repository"
 msgstr "Ð?одаÑ?и до Ñ?епозиÑ?оÑ?Ñ?Ñ?"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
 msgid "Create corresponding header file"
 msgstr "СÑ?воÑ?иÑ?и вÑ?дповÑ?дний Ñ?айл заголовкÑ?в"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
 msgid ""
 "Enter the File name.\n"
 "The extension will be added according to the type."
@@ -3675,20 +3709,24 @@ msgstr ""
 "Ð?ведÑ?Ñ?Ñ? назвÑ? Ñ?айла.\n"
 "РозÑ?иÑ?еннÑ? бÑ?де додано вÑ?дповÑ?дно до Ñ?ипÑ? Ñ?айлÑ?."
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:69 ../plugins/macro/anjuta-macro.ui.h:6
-#: ../plugins/tools/anjuta-tools.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+msgid "File Information"
+msgstr "Ð?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о Ñ?айл"
+
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/git/anjuta-git.ui.h:64 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "Ð?азва:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/starter/starter.c:404
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
+#: ../plugins/starter/starter.c:422
 msgid "New File"
 msgstr "СÑ?воÑ?иÑ?и Ñ?айл"
 
 #: ../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
+#: ../plugins/gbf-am/gbf-am-properties.c:1527
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:353
 msgid "Type:"
 msgstr "Тип:"
 
@@ -3696,47 +3734,47 @@ msgstr "Тип:"
 msgid "Use Template for the Header file"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?аблон Ñ?айлÑ? заголовкÑ?в"
 
-#: ../plugins/file-wizard/file.c:83
+#: ../plugins/file-wizard/file.c:84
 msgid "C Source File"
 msgstr "Файл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в на С"
 
-#: ../plugins/file-wizard/file.c:84
+#: ../plugins/file-wizard/file.c:85
 msgid "C/C++ Header File"
 msgstr "Файл заголовкÑ?в C/C++"
 
-#: ../plugins/file-wizard/file.c:85
+#: ../plugins/file-wizard/file.c:86
 msgid "C++ Source File"
 msgstr "Файл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в C++"
 
-#: ../plugins/file-wizard/file.c:86
+#: ../plugins/file-wizard/file.c:87
 msgid "C# Source File"
 msgstr "Файл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в C#"
 
-#: ../plugins/file-wizard/file.c:87
+#: ../plugins/file-wizard/file.c:88
 msgid "Java Source File"
 msgstr "Файл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в Java"
 
-#: ../plugins/file-wizard/file.c:88
+#: ../plugins/file-wizard/file.c:89
 msgid "Perl Source File"
 msgstr "Файл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в Perl"
 
-#: ../plugins/file-wizard/file.c:89
+#: ../plugins/file-wizard/file.c:90
 msgid "Python Source File"
 msgstr "Файл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в Python"
 
-#: ../plugins/file-wizard/file.c:90
+#: ../plugins/file-wizard/file.c:91
 msgid "Shell Script File"
 msgstr "Файл Ñ?Ñ?енаÑ?Ñ?Ñ? оболонки"
 
-#: ../plugins/file-wizard/file.c:91
+#: ../plugins/file-wizard/file.c:92
 msgid "Other"
 msgstr "Ð?нÑ?е"
 
-#: ../plugins/file-wizard/file.c:104
+#: ../plugins/file-wizard/file.c:105
 msgid "BSD Public License"
 msgstr "СÑ?Ñ?пÑ?лÑ?на лÑ?Ñ?ензÑ?Ñ? BSD"
 
-#: ../plugins/file-wizard/file.c:182
+#: ../plugins/file-wizard/file.c:183
 msgid "Unable to build user interface for New File"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? побÑ?дÑ?ваÑ?и Ñ?нÑ?еÑ?Ñ?ейÑ? коÑ?иÑ?Ñ?Ñ?ваÑ?а длÑ? нового Ñ?айла"
 
@@ -3745,21 +3783,21 @@ msgid "Invalid GbfAmConfigValue type"
 msgstr "Ð?епÑ?авилÑ?ний Ñ?ип GbfAmConfigValue"
 
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
-msgid "<b>Select Package to add:</b>"
-msgstr "<b>Ð?ибеÑ?Ñ?Ñ?Ñ? пакеÑ? длÑ? додаваннÑ?:</b>"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _Package"
 msgstr "Ð?одаÑ?и _пакеÑ?"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _module"
 msgstr "Ð?одаÑ?и _модÑ?лÑ?"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4
 msgid "Packages"
 msgstr "Ð?акеÑ?и"
 
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+msgid "Select Package to add:"
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? пакеÑ? длÑ? додаваннÑ?:"
+
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
 msgid "Select package"
 msgstr "Ð?ибÑ?аÑ?и пакеÑ?"
@@ -3768,422 +3806,480 @@ msgstr "Ð?ибÑ?аÑ?и пакеÑ?"
 msgid "Variables"
 msgstr "Ð?мÑ?ннÑ?"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:199
+#: ../plugins/gbf-am/gbf-am-project.c:3352
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:197
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3253
+msgid "Static Library"
+msgstr "СÑ?аÑ?иÑ?на бÑ?блÑ?оÑ?ека"
+
+#: ../plugins/gbf-am/gbf-am-project.c:202
+#: ../plugins/gbf-am/gbf-am-project.c:3354
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:200
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3255
+msgid "Shared Library"
+msgstr "СпÑ?лÑ?на бÑ?блÑ?оÑ?ека"
+
+#: ../plugins/gbf-am/gbf-am-project.c:205
+#: ../plugins/gbf-am/gbf-am-project.c:3358
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:203
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3257
+msgid "Man Documentation"
+msgstr "Ð?окÑ?менÑ?аÑ?Ñ?Ñ? man"
+
+#: ../plugins/gbf-am/gbf-am-project.c:208
+#: ../plugins/gbf-am/gbf-am-project.c:3360
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:206
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3259
+msgid "Miscellaneous Data"
+msgstr "РÑ?знÑ? даннÑ?"
+
+#: ../plugins/gbf-am/gbf-am-project.c:211
+#: ../plugins/gbf-am/gbf-am-project.c:3364
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:209
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3263
+msgid "Script"
+msgstr "СÑ?енаÑ?Ñ?й"
+
+#: ../plugins/gbf-am/gbf-am-project.c:214
+#: ../plugins/gbf-am/gbf-am-project.c:3366
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:212
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3265
+msgid "Info Documentation"
+msgstr "Ð?окÑ?менÑ?аÑ?Ñ?Ñ? info"
+
+#: ../plugins/gbf-am/gbf-am-project.c:217
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:215
+msgid "Lisp Module"
+msgstr "Ð?одÑ?лÑ? Lisp"
+
+#: ../plugins/gbf-am/gbf-am-project.c:220
+#: ../plugins/gbf-am/gbf-am-project.c:3356
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:218
+msgid "Header Files"
+msgstr "Файли заголовкÑ?в"
+
+#: ../plugins/gbf-am/gbf-am-project.c:223
+#: ../plugins/gbf-am/gbf-am-project.c:3368
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:221
+msgid "Java Module"
+msgstr "Ð?одÑ?лÑ? Java"
+
+#: ../plugins/gbf-am/gbf-am-project.c:226
+#: ../plugins/gbf-am/gbf-am-project.c:3370
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:224
+msgid "Python Module"
+msgstr "Ð?одÑ?лÑ? Python"
+
+#: ../plugins/gbf-am/gbf-am-project.c:229
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:227
+msgid "Generic rule"
+msgstr "Ð?агалÑ?не пÑ?авило"
+
+#: ../plugins/gbf-am/gbf-am-project.c:232
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:230
+msgid "Extra target"
+msgstr "Ð?одаÑ?кова Ñ?Ñ?лÑ?"
+
+#: ../plugins/gbf-am/gbf-am-project.c:235
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:233
+msgid "Configure file"
+msgstr "Ð?алаÑ?Ñ?Ñ?ваÑ?и Ñ?айл"
+
+#: ../plugins/gbf-am/gbf-am-project.c:238
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:236
+msgid "Interface file"
+msgstr "Файл Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ?"
+
+#: ../plugins/gbf-am/gbf-am-project.c:241
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:239
+msgid "GLib mkenums"
+msgstr "СÑ?енаÑ?Ñ?й GLib mkenums"
+
+#: ../plugins/gbf-am/gbf-am-project.c:244
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:242
+msgid "GLib genmarshal"
+msgstr "Ð?Ñ?огÑ?ама GLib genmarshal"
+
+#: ../plugins/gbf-am/gbf-am-project.c:247
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:245
+msgid "Intl rule"
+msgstr "Ð?Ñ?авило intl"
+
+#: ../plugins/gbf-am/gbf-am-project.c:2559
+#: ../plugins/gbf-am/gbf-am-project.c:2637
+#: ../plugins/gbf-am/gbf-am-project.c:2846
+#: ../plugins/gbf-am/gbf-am-project.c:3055
+#: ../plugins/gbf-am/gbf-am-project.c:3205
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2506
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2584
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2812
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2998
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3146
 msgid "Group doesn't exist"
 msgstr "Ð?Ñ?Ñ?па не Ñ?Ñ?нÑ?Ñ?"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:2579
+#: ../plugins/gbf-am/gbf-am-project.c:2682
+#: ../plugins/gbf-am/gbf-am-project.c:3098
+#: ../plugins/gbf-am/gbf-am-project.c:3320
+#: ../plugins/gbf-am/gbf-am-project.c:3541
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2526
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2629
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3041
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3221
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3407
 msgid "Target doesn't exist"
 msgstr "ЦÑ?лÑ? не Ñ?Ñ?нÑ?Ñ?"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:2613
+#: ../plugins/gbf-am/gbf-am-project.c:2657
+#: ../plugins/gbf-am/gbf-am-project.c:2700
+#: ../plugins/gbf-am/gbf-am-project.c:3016
+#: ../plugins/gbf-am/gbf-am-project.c:3076
+#: ../plugins/gbf-am/gbf-am-project.c:3280
+#: ../plugins/gbf-am/gbf-am-project.c:3341
+#: ../plugins/gbf-am/gbf-am-project.c:3649
+#: ../plugins/gbf-am/gbf-am-project.c:3710
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2560
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2604
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2647
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2959
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3019
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3182
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3242
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3474
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3535
 msgid "Unable to update project"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оновиÑ?и пÑ?оекÑ?"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2575
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2517
+#: ../plugins/gbf-am/gbf-am-project.c:2743
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2692
 msgid "Invalid or remote path (only local paths supported)"
 msgstr "Ð?епÑ?авилÑ?ний або видалений Ñ?лÑ?Ñ? (пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ? лиÑ?е локалÑ?нÑ? Ñ?лÑ?Ñ?и)"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2583
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2538
+#: ../plugins/gbf-am/gbf-am-project.c:2751
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2713
+#: ../plugins/dir-project/dir-project.c:693
+#: ../plugins/dir-project/dir-project.c:765
+#, c-format
 msgid "Project doesn't exist or invalid path"
 msgstr "Ð?Ñ?оекÑ? не Ñ?Ñ?нÑ?Ñ? або Ñ?лÑ?Ñ? непÑ?авилÑ?ний"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2594
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2552
+#: ../plugins/gbf-am/gbf-am-project.c:2762
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2727
 msgid "Malformed project"
 msgstr "Ð?екоÑ?екÑ?ний пÑ?оекÑ?"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2791
+#: ../plugins/gbf-am/gbf-am-project.c:2959
 msgid "Please specify group name"
 msgstr "Ð?ведÑ?Ñ?Ñ? назвÑ? гÑ?Ñ?пи"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2805
+#: ../plugins/gbf-am/gbf-am-project.c:2973
 msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr "Ð?азва гÑ?Ñ?пи може Ñ?кладаÑ?иÑ?Ñ? лиÑ?е з лÑ?Ñ?еÑ?, Ñ?иÑ?Ñ?, Ñ?имволÑ?в «_», «-» або «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2814
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2750
+#: ../plugins/gbf-am/gbf-am-project.c:2982
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2925
 msgid "Parent group doesn't exist"
 msgstr "Ð?аÑ?Ñ?кÑ?вÑ?Ñ?ка гÑ?Ñ?па не Ñ?Ñ?нÑ?Ñ?"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2825
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2761
+#: ../plugins/gbf-am/gbf-am-project.c:2993
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2936
 msgid "Group already exists"
 msgstr "Ð?Ñ?Ñ?па вже Ñ?Ñ?нÑ?Ñ?"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:3003
+#: ../plugins/gbf-am/gbf-am-project.c:3030
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2946
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2973
 msgid "Group couldn't be created"
-msgstr "Ð?Ñ?Ñ?пÑ? неможеиво Ñ?Ñ?воÑ?ии"
+msgstr "Ð?Ñ?Ñ?пÑ? неможливо Ñ?Ñ?воÑ?иÑ?и"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2895
+#: ../plugins/gbf-am/gbf-am-project.c:3063
 msgid "Group couldn't be removed"
 msgstr "Ð?Ñ?Ñ?пÑ? неможливо видалиÑ?и"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3045
+#: ../plugins/gbf-am/gbf-am-project.c:3213
 msgid "Please specify target name"
 msgstr "Ð?ведÑ?Ñ?Ñ? назвÑ? Ñ?Ñ?лÑ?."
 
-#: ../plugins/gbf-am/gbf-am-project.c:3059
+#: ../plugins/gbf-am/gbf-am-project.c:3227
 msgid "Target name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr "Ð?азва Ñ?Ñ?лÑ? може Ñ?кладаÑ?иÑ?Ñ? лиÑ?е з лÑ?Ñ?еÑ?, Ñ?иÑ?Ñ?, Ñ?имволÑ?в «_», «-» Ñ?и «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3068
+#: ../plugins/gbf-am/gbf-am-project.c:3236
 msgid "Shared library target name must be of the form 'libxxx.la'"
 msgstr "Ð?азва Ñ?пÑ?лÑ?ноÑ? бÑ?блÑ?оÑ?еки повинна маÑ?и виглÑ?д «libxxx.la»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3077
+#: ../plugins/gbf-am/gbf-am-project.c:3245
 msgid "Static library target name must be of the form 'libxxx.a'"
 msgstr "Ð?азва Ñ?Ñ?аÑ?иÑ?ноÑ? бÑ?блÑ?оÑ?еки повинна маÑ?и виглÑ?д «libxxx.a»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3089
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2984
+#: ../plugins/gbf-am/gbf-am-project.c:3257
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3159
 msgid "Target already exists"
 msgstr "ЦÑ?лÑ? вже Ñ?Ñ?нÑ?Ñ?"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3099
+#: ../plugins/gbf-am/gbf-am-project.c:3267
 msgid "General failure in target creation"
 msgstr "Ð?агалÑ?на помилка пÑ?и Ñ?Ñ?воÑ?еннÑ? Ñ?Ñ?лÑ?"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3127
+#: ../plugins/gbf-am/gbf-am-project.c:3295
 msgid "Newly created target could not be identified"
 msgstr "СÑ?воÑ?ена Ñ?Ñ?лÑ? не може бÑ?Ñ?и визнаÑ?ена"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3160
+#: ../plugins/gbf-am/gbf-am-project.c:3328
 msgid "Target couldn't be removed"
 msgstr "ЦÑ?лÑ? не може бÑ?Ñ?и видалена"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3184
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3078
-msgid "Static Library"
-msgstr "СÑ?аÑ?иÑ?на бÑ?блÑ?оÑ?ека"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3186
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3080
-msgid "Shared Library"
-msgstr "СпÑ?лÑ?на бÑ?блÑ?оÑ?ека"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3188
-msgid "Header Files"
-msgstr "Файли заголовкÑ?в"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3190
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3082
-msgid "Man Documentation"
-msgstr "Ð?окÑ?менÑ?аÑ?Ñ?Ñ? man"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3192
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3084
-msgid "Miscellaneous Data"
-msgstr "РÑ?знÑ? даннÑ?"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3196
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3088
-msgid "Script"
-msgstr "СÑ?енаÑ?Ñ?й"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3198
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3090
-msgid "Info Documentation"
-msgstr "Ð?окÑ?менÑ?аÑ?Ñ?Ñ? info"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3200
-msgid "Java Module"
-msgstr "Ð?одÑ?лÑ? Java"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3202
-msgid "Python Module"
-msgstr "Ð?одÑ?лÑ? Python"
-
-#: ../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
+#: ../plugins/gbf-am/gbf-am-project.c:3428
+#: ../plugins/gbf-am/gbf-am-project.c:3687
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3317
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3512
 msgid "Source doesn't exist"
 msgstr "Файл пеÑ?винного кодÑ? не Ñ?Ñ?нÑ?Ñ?"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3363
+#: ../plugins/gbf-am/gbf-am-project.c:3532
 msgid ""
 "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr ""
 "Ð?азва Ñ?айлÑ? пеÑ?винного кодÑ? може Ñ?кладаÑ?иÑ?Ñ? лиÑ?е з лÑ?Ñ?еÑ?, Ñ?иÑ?Ñ?, Ñ?имволÑ?в «_», "
 "«-» Ñ?и «.»"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3440
+#: ../plugins/gbf-am/gbf-am-project.c:3612
 msgid "Source file is already in given target"
 msgstr "Файл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в вже Ñ? Ñ?Ñ?й Ñ?Ñ?лÑ?"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3457
+#: ../plugins/gbf-am/gbf-am-project.c:3630
 msgid "General failure in adding source file"
 msgstr "Ð?агалÑ?на помилка пÑ?и додаваннÑ? Ñ?айлÑ? пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3490
+#: ../plugins/gbf-am/gbf-am-project.c:3664
 msgid "Newly added source file could not be identified"
 msgstr "Ð?оданий Ñ?айл пеÑ?винного кодÑ? не може бÑ?Ñ?и визнаÑ?ений"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3521
+#: ../plugins/gbf-am/gbf-am-project.c:3695
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3520
 msgid "Source couldn't be removed"
 msgstr "Файл пеÑ?винного кодÑ? не може бÑ?Ñ?и видалений"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3707
-#: ../plugins/gbf-am/gbf-am-project.c:3708
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3449
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3450
+#: ../plugins/gbf-am/gbf-am-project.c:4111
+#: ../plugins/gbf-am/gbf-am-project.c:4112
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3830
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3831
 msgid "Project directory"
 msgstr "Ð?аÑ?алог пÑ?оекÑ?Ñ?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:341
-#: ../plugins/gbf-am/gbf-am-properties.c:393
+#: ../plugins/gbf-am/gbf-am-properties.c:344
+#: ../plugins/gbf-am/gbf-am-properties.c:396
 msgid "Enter new module"
 msgstr "Ð?кажÑ?Ñ?Ñ? новий модÑ?лÑ?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:434
-#: ../plugins/gbf-am/gbf-am-properties.c:930
+#: ../plugins/gbf-am/gbf-am-properties.c:437
+#: ../plugins/gbf-am/gbf-am-properties.c:933
 msgid "Module/Packages"
 msgstr "Ð?одÑ?лÑ?/Ð?акеÑ?и"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:441
-#: ../plugins/gbf-am/gbf-am-properties.c:939
+#: ../plugins/gbf-am/gbf-am-properties.c:444
+#: ../plugins/gbf-am/gbf-am-properties.c:942
 msgid "Version"
 msgstr "Ð?еÑ?Ñ?Ñ?Ñ?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:527
+#: ../plugins/gbf-am/gbf-am-properties.c:530
 #, c-format
 msgid ""
 "Are you sure you want to remove module \"%s\" and all its associated "
 "packages?"
 msgstr "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и модÑ?лÑ? «%s» Ñ?а вÑ?Ñ? пов'Ñ?занÑ? пакеÑ?и?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:529
+#: ../plugins/gbf-am/gbf-am-properties.c:532
 #, c-format
 msgid "Are you sure you want to remove package \"%s\"?"
 msgstr "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и пакеÑ? «%s»?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:587
-#: ../plugins/gbf-am/gbf-am-properties.c:669
+#: ../plugins/gbf-am/gbf-am-properties.c:590
+#: ../plugins/gbf-am/gbf-am-properties.c:672
 msgid "Enter new variable"
 msgstr "Ð?ведÑ?Ñ?Ñ? новÑ? змÑ?ннÑ?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:700
+#: ../plugins/gbf-am/gbf-am-properties.c:703
 #, c-format
 msgid "Are you sure you want to remove variable \"%s\"?"
 msgstr "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и змÑ?ннÑ? «%s»?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:854
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:177
+#: ../plugins/gbf-am/gbf-am-properties.c:857
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:180
 msgid "Project:"
 msgstr "Ð?Ñ?оекÑ?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:857
+#: ../plugins/gbf-am/gbf-am-properties.c:860
 msgid "Package name:"
 msgstr "Ð?азва пакеÑ?Ñ?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:860
-#: ../plugins/project-wizard/templates/translatable-strings.h:102
+#: ../plugins/gbf-am/gbf-am-properties.c:863
+#: ../plugins/project-wizard/templates/translatable-strings.h:109
 msgid "Version:"
 msgstr "Ð?еÑ?Ñ?Ñ?Ñ?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:863
-msgid "Url:"
+#: ../plugins/gbf-am/gbf-am-properties.c:866
+msgid "URI:"
 msgstr "URL:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1229
+#: ../plugins/gbf-am/gbf-am-properties.c:1232
 msgid "Use"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1321
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:244
+#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
 msgid "Group name:"
 msgstr "Ð?азва гÑ?Ñ?пи:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-am/gbf-am-properties.c:1327
 msgid "Advanced"
 msgstr "Ð?одаÑ?ково"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1329
-#: ../plugins/gbf-am/gbf-am-properties.c:1419
+#: ../plugins/gbf-am/gbf-am-properties.c:1332
+#: ../plugins/gbf-am/gbf-am-properties.c:1422
 msgid "C compiler flags:"
 msgstr "Ð?лÑ?Ñ?Ñ? компÑ?лÑ?Ñ?оÑ?а C:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1331
+#: ../plugins/gbf-am/gbf-am-properties.c:1334
 msgid "C preprocessor flags:"
 msgstr "Ð?лÑ?Ñ?Ñ? пÑ?епÑ?оÑ?еÑ?оÑ?а C:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1333
+#: ../plugins/gbf-am/gbf-am-properties.c:1336
 msgid "C++ compiler flags:"
 msgstr "Ð?лÑ?Ñ?Ñ? компÑ?лÑ?Ñ?оÑ?а C++:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1335
+#: ../plugins/gbf-am/gbf-am-properties.c:1338
 msgid "gcj compiler flags (ahead-of-time):"
 msgstr "Ð?лÑ?Ñ?Ñ? компÑ?лÑ?Ñ?оÑ?а gcj (ahead-of-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1337
+#: ../plugins/gbf-am/gbf-am-properties.c:1340
 msgid "Java compiler flags (just-in-time):"
 msgstr "Ð?лÑ?Ñ?Ñ? компÑ?лÑ?Ñ?оÑ?а Java (just-in-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1339
-#: ../plugins/gbf-am/gbf-am-properties.c:1427
+#: ../plugins/gbf-am/gbf-am-properties.c:1342
+#: ../plugins/gbf-am/gbf-am-properties.c:1430
 msgid "Fortran compiler flags:"
 msgstr "Ð?лÑ?Ñ?Ñ? компÑ?лÑ?Ñ?оÑ?а Fortran:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1342
+#: ../plugins/gbf-am/gbf-am-properties.c:1345
 msgid "Includes (deprecated):"
 msgstr "ШлÑ?Ñ?и вклÑ?Ñ?еннÑ? (заÑ?Ñ?аÑ?Ñ?ло):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1353
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:258
+#: ../plugins/gbf-am/gbf-am-properties.c:1356
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:261
 msgid "Install directories:"
 msgstr "Ð?аÑ?алоги вÑ?Ñ?ановленнÑ?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1421
+#: ../plugins/gbf-am/gbf-am-properties.c:1424
 msgid "C preprocessor flags"
 msgstr "Ð?лÑ?Ñ?Ñ? пÑ?епÑ?оÑ?еÑ?оÑ?а C"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1423
+#: ../plugins/gbf-am/gbf-am-properties.c:1426
 msgid "C++ compiler flags"
 msgstr "Ð?лÑ?Ñ?Ñ? компÑ?лÑ?Ñ?оÑ?а C++"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1425
+#: ../plugins/gbf-am/gbf-am-properties.c:1428
 msgid "gcj compiler flags (ahead-of-time)"
 msgstr "Ð?лÑ?Ñ?Ñ? компÑ?лÑ?Ñ?оÑ?а gcj (ahead-of-time)"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1431
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:410
+#: ../plugins/gbf-am/gbf-am-properties.c:1434
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:413
 msgid "Linker flags:"
 msgstr "Ð?лÑ?Ñ?Ñ? компонÑ?валÑ?ника:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1437
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:416
+#: ../plugins/gbf-am/gbf-am-properties.c:1440
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:419
 msgid "Libraries:"
 msgstr "Ð?Ñ?блÑ?оÑ?еки:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1443
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:422
+#: ../plugins/gbf-am/gbf-am-properties.c:1446
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:425
 msgid "Dependencies:"
 msgstr "Ð?алежноÑ?Ñ?Ñ?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1446
+#: ../plugins/gbf-am/gbf-am-properties.c:1449
 msgid "Advanced options"
 msgstr "РозÑ?иÑ?енÑ? паÑ?амеÑ?Ñ?и"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1521
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:347
+#: ../plugins/gbf-am/gbf-am-properties.c:1524
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:350
 msgid "Target name:"
 msgstr "Ð?азва Ñ?Ñ?лÑ?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1530
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:356
+#: ../plugins/gbf-am/gbf-am-properties.c:1533
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:359
 msgid "Group:"
 msgstr "Ð?Ñ?Ñ?па:"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-properties.c:1551
+#: ../plugins/gbf-am/gbf-am-properties.c:1567
+#: ../plugins/gbf-am/gbf-am-properties.c:1574
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:377
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:394
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:401
 msgid "Install directory:"
 msgstr "Ð?аÑ?алог длÑ? вÑ?Ñ?ановленнÑ?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1583
-msgid "Advanced..."
-msgstr "Ð?одаÑ?ково..."
+#: ../plugins/gbf-am/gbf-am-properties.c:1586
+msgid "Advancedâ?¦"
+msgstr "Ð?одаÑ?ковоâ?¦"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
 msgid "Invalid GbfMkfileConfigValue type"
 msgstr "Ð?епÑ?авилÑ?ний Ñ?ип GbfMkfileConfigValue"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2524
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2699
 msgid "Project doesn't exist"
 msgstr "Ð?Ñ?оекÑ? не Ñ?Ñ?нÑ?Ñ?"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2831
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3006
 msgid "Group coudn't be removed"
 msgstr "Ð?Ñ?Ñ?па не може бÑ?Ñ?и Ñ?Ñ?воÑ?ена"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2994
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3021
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3169
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3196
 msgid "Target couldn't be created"
 msgstr "ЦÑ?лÑ? не може бÑ?Ñ?и Ñ?Ñ?воÑ?ена"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3054
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3229
 msgid "Target coudn't be removed"
 msgstr "ЦÑ?лÑ? не може бÑ?Ñ?и видалена"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3252
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3427
 msgid "Source file must be inside the project directory"
 msgstr "Файл пеÑ?винного кодÑ? маÑ? знаÑ?одиÑ?иÑ?Ñ? вÑ?еÑ?единÑ? каÑ?алогÑ? пÑ?оекÑ?Ñ?"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3264
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3439
 msgid "Source is already in target"
 msgstr "Файл пеÑ?винного кодÑ? вже знаÑ?одиÑ?Ñ?Ñ?Ñ? Ñ? Ñ?Ñ?лÑ?"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3281
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3313
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3456
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3488
 msgid "Source couldn't be added"
 msgstr "Файл пеÑ?винного кодÑ? не може бÑ?Ñ?и доданий"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
-msgid "Source coudn't be removed"
-msgstr "Файл пеÑ?винного кодÑ? не може бÑ?Ñ?и видалений"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:250
 msgid "Includes:"
 msgstr "Ð?клÑ?Ñ?аÑ?:"
 
 #. The %s argument is a program name, anjuta by example
-#: ../plugins/gdb/debugger.c:691
+#: ../plugins/gdb/debugger.c:712
 #, c-format
 msgid "Loading Executable: %s\n"
 msgstr "Ð?аванÑ?аженнÑ? виконÑ?ваного Ñ?айлÑ?: %s\n"
 
 #. The %s argument is a file name
-#: ../plugins/gdb/debugger.c:722
+#: ../plugins/gdb/debugger.c:743
 #, c-format
 msgid "Loading Core: %s\n"
 msgstr "Ð?аванÑ?аженнÑ? обÑ?азÑ? пам'Ñ?Ñ?Ñ?: %s\n"
 
-#: ../plugins/gdb/debugger.c:804
+#: ../plugins/gdb/debugger.c:828
 #, c-format
 msgid ""
 "Unable to find: %s.\n"
@@ -4194,60 +4290,60 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?нÑ?Ñ?Ñ?алÑ?зÑ?ваÑ?и налагодженнÑ?.\n"
 "Ð?еÑ?евÑ?Ñ?Ñ?е, Ñ?о Anjuta Ñ?Ñ?Ñ?ановлено пÑ?авилÑ?но."
 
-#: ../plugins/gdb/debugger.c:933
-msgid "Getting ready to start debugging session...\n"
-msgstr "Ð?Ñ?дгоÑ?овка до поÑ?аÑ?кÑ? Ñ?еанÑ?Ñ? налагодженнÑ?...\n"
+#: ../plugins/gdb/debugger.c:973
+msgid "Getting ready to start debugging sessionâ?¦\n"
+msgstr "Ð?Ñ?дгоÑ?овка до поÑ?аÑ?кÑ? Ñ?еанÑ?Ñ? налагодженнÑ?â?¦\n"
 
-#: ../plugins/gdb/debugger.c:939
+#: ../plugins/gdb/debugger.c:979
 msgid "Loading Executable: "
 msgstr "Ð?аванÑ?аженнÑ? виконÑ?ваного Ñ?айлÑ?:"
 
-#: ../plugins/gdb/debugger.c:948
+#: ../plugins/gdb/debugger.c:988
 msgid "No executable specified.\n"
 msgstr "Ð?е вказаний виконÑ?ваний Ñ?айл.\n"
 
-#: ../plugins/gdb/debugger.c:951
+#: ../plugins/gdb/debugger.c:991
 msgid "Open an executable or attach to a process to start debugging.\n"
 msgstr ""
 "СпоÑ?аÑ?кÑ? налагодженнÑ? Ñ?Ñ?еба вÑ?дкÑ?иÑ?и виконÑ?ваний або пÑ?иÑ?днаÑ?иÑ?Ñ? до "
 "пÑ?оÑ?еÑ?Ñ?.\n"
 
-#: ../plugins/gdb/debugger.c:960
+#: ../plugins/gdb/debugger.c:1000
 msgid "There was an error whilst launching the debugger.\n"
 msgstr "Ð?Ñ?и виконаннÑ? налагоджÑ?ваÑ?а виникла помилка.\n"
 
-#: ../plugins/gdb/debugger.c:964
+#: ../plugins/gdb/debugger.c:1004
 msgid "Make sure 'gdb' is installed on the system.\n"
 msgstr "Ð?еÑ?еконайÑ?еÑ?Ñ?, Ñ?о Ñ? ваÑ? вÑ?Ñ?ановлено \"gdb\".\n"
 
-#: ../plugins/gdb/debugger.c:1255
+#: ../plugins/gdb/debugger.c:1294
 msgid "Program exited normally\n"
 msgstr "Ð?Ñ?огÑ?ама завеÑ?Ñ?илаÑ?Ñ? коÑ?екÑ?но\n"
 
-#: ../plugins/gdb/debugger.c:1266
+#: ../plugins/gdb/debugger.c:1305
 #, c-format
 msgid "Program exited with error code %s\n"
 msgstr "Ð?Ñ?огÑ?ама завеÑ?Ñ?илаÑ?Ñ? з кодом помилки %s\n"
 
 #. The program has reached one breakpoint and will stop
-#: ../plugins/gdb/debugger.c:1281
+#: ../plugins/gdb/debugger.c:1320
 #, c-format
 msgid "Breakpoint number %s hit\n"
 msgstr "ТоÑ?ка зÑ?пинки %s доÑ?Ñ?гнÑ?Ñ?а\n"
 
-#: ../plugins/gdb/debugger.c:1290
+#: ../plugins/gdb/debugger.c:1329
 msgid "Function finished\n"
 msgstr "Ð?иконаннÑ? Ñ?Ñ?нкÑ?Ñ?Ñ? завеÑ?Ñ?ено\n"
 
-#: ../plugins/gdb/debugger.c:1296
+#: ../plugins/gdb/debugger.c:1335
 msgid "Stepping finished\n"
 msgstr "Ð?Ñ?ок завеÑ?Ñ?Ñ?но\n"
 
-#: ../plugins/gdb/debugger.c:1302
+#: ../plugins/gdb/debugger.c:1341
 msgid "Location reached\n"
 msgstr "РозÑ?аÑ?Ñ?ваннÑ? доÑ?Ñ?гнÑ?Ñ?о\n"
 
-#: ../plugins/gdb/debugger.c:1696
+#: ../plugins/gdb/debugger.c:1735
 msgid ""
 "The program is attached.\n"
 "Do you still want to stop the debugger?"
@@ -4257,7 +4353,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:1857
+#: ../plugins/gdb/debugger.c:1896
 #, c-format
 msgid ""
 "Unable to connect to remote target, %s\n"
@@ -4266,20 +4362,20 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?иÑ?днаÑ?иÑ?Ñ? до вÑ?ддаленоÑ? Ñ?Ñ?лÑ?, %s\n"
 "ХоÑ?еÑ?е Ñ?пÑ?обÑ?ваÑ?и зновÑ??"
 
-#: ../plugins/gdb/debugger.c:1875
+#: ../plugins/gdb/debugger.c:1914
 msgid "Debugger connected\n"
 msgstr "Ð?алагоджÑ?ваÑ? пÑ?иÑ?днано\n"
 
-#: ../plugins/gdb/debugger.c:1949
+#: ../plugins/gdb/debugger.c:1988
 msgid "Program attached\n"
 msgstr "Ð?Ñ?огÑ?амÑ? пÑ?иÑ?днано\n"
 
-#: ../plugins/gdb/debugger.c:1970
+#: ../plugins/gdb/debugger.c:2009
 #, c-format
-msgid "Attaching to process: %d...\n"
-msgstr "Ð?Ñ?д'Ñ?днаннÑ? до пÑ?оÑ?еÑ?Ñ?: %d...\n"
+msgid "Attaching to process: %dâ?¦\n"
+msgstr "Ð?Ñ?д'Ñ?днаннÑ? до пÑ?оÑ?еÑ?Ñ?: %dâ?¦\n"
 
-#: ../plugins/gdb/debugger.c:1996
+#: ../plugins/gdb/debugger.c:2035
 msgid ""
 "A process is already running.\n"
 "Would you like to terminate it and attach the new process?"
@@ -4287,40 +4383,40 @@ msgstr ""
 "Ð?Ñ?оÑ?еÑ? вже виконÑ?Ñ?Ñ?Ñ?Ñ?Ñ?.\n"
 "ХоÑ?еÑ?е завеÑ?Ñ?иÑ?и його Ñ?а пÑ?иÑ?днаÑ?иÑ?Ñ? до Ñ?нÑ?ого пÑ?оÑ?еÑ?Ñ??"
 
-#: ../plugins/gdb/debugger.c:2013
+#: ../plugins/gdb/debugger.c:2052
 msgid "Anjuta is unable to attach to itself."
 msgstr "Ð?е ваÑ?Ñ?о пÑ?иÑ?днÑ?ваÑ?и Anjuta до Ñ?амоÑ? Ñ?ебе!"
 
-#: ../plugins/gdb/debugger.c:2063
+#: ../plugins/gdb/debugger.c:2102
 msgid "Program terminated\n"
 msgstr "Ð?иконаннÑ? пÑ?огÑ?ами пеÑ?еÑ?вано\n"
 
-#: ../plugins/gdb/debugger.c:2078
+#: ../plugins/gdb/debugger.c:2117
 msgid "Program detached\n"
 msgstr "Ð?Ñ?огÑ?амÑ? вÑ?д'Ñ?днано\n"
 
-#: ../plugins/gdb/debugger.c:2098
+#: ../plugins/gdb/debugger.c:2137
 #, c-format
-msgid "Detaching the process...\n"
-msgstr "Ð?Ñ?д'Ñ?днаннÑ? вÑ?д пÑ?оÑ?еÑ?Ñ?...\n"
+msgid "Detaching the processâ?¦\n"
+msgstr "Ð?Ñ?д'Ñ?днаннÑ? вÑ?д пÑ?оÑ?еÑ?Ñ?â?¦\n"
 
-#: ../plugins/gdb/debugger.c:2119
+#: ../plugins/gdb/debugger.c:2158
 msgid "Interrupting the process\n"
 msgstr "Ð?еÑ?еÑ?иваннÑ? пÑ?оÑ?еÑ?Ñ?\n"
 
-#: ../plugins/gdb/debugger.c:3910
+#: ../plugins/gdb/debugger.c:3949
 #, c-format
 msgid "Sending signal %s to the process: %d"
 msgstr "Ð?адÑ?иланнÑ? Ñ?игналÑ? %s пÑ?оÑ?еÑ?Ñ?: %d"
 
-#: ../plugins/gdb/debugger.c:3936
+#: ../plugins/gdb/debugger.c:3975
 msgid "Error whilst signaling the process."
 msgstr "Ð?Ñ?и надÑ?иланнÑ? Ñ?игналÑ? пÑ?оÑ?еÑ?Ñ? виникла помилка."
 
 #: ../plugins/gdb/plugin.c:112
 #, c-format
 msgid ""
-"Failed to create fifo file named %s. The program will run without a terminal."
+"Failed to create FIFO file named %s. The program will run without a terminal."
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?айл FIFO %s. Ð?Ñ?огÑ?амÑ? бÑ?де запÑ?Ñ?ено без Ñ?еÑ?мÑ?налÑ?."
 
@@ -4328,486 +4424,473 @@ msgstr ""
 msgid "Cannot start terminal for debugging."
 msgstr "Ð?еможливо запÑ?Ñ?Ñ?иÑ?и Ñ?еÑ?мÑ?нал длÑ? налагодженнÑ?."
 
-#: ../plugins/git/anjuta-git.ui.h:2
-msgid "<b>Stash Message (Optional)</b>"
-msgstr "<b>Ð?аÑ?амеÑ?Ñ?и Ñ?Ñ?ованки (необов'Ñ?зково)</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:3
-msgid "<b>Stash to Apply</b>"
-msgstr "<b>СÑ?ованки, Ñ?к заÑ?Ñ?оÑ?Ñ?ваÑ?и</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:4
-msgid "<b>Tags</b>"
-msgstr "<b>Теги:</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:5
+#: ../plugins/git/anjuta-git.ui.h:1
 msgid "Add File"
 msgstr "Ð?одаÑ?и Ñ?айл"
 
-#: ../plugins/git/anjuta-git.ui.h:6
+#: ../plugins/git/anjuta-git.ui.h:2
 msgid "Add Remote Branch"
 msgstr "Ð?одаÑ?и вÑ?ддаленÑ? гÑ?лкÑ?"
 
 #. A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.
-#: ../plugins/git/anjuta-git.ui.h:8
-msgid "Add signed off by line"
+#: ../plugins/git/anjuta-git.ui.h:4
+msgid "Add signed-off-by line"
 msgstr "Ð?одаÑ?и пÑ?дпиÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:9
-msgid "Add signed-off by line"
-msgstr "Ð?одаÑ?и Ñ?Ñ?док пÑ?дпиÑ?Ñ?"
-
-#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:5
 msgid "Amend the previous commit"
 msgstr "Ð?неÑ?Ñ?и змÑ?ни до попеÑ?еднÑ?оÑ? пÑ?блÑ?каÑ?Ñ?Ñ?"
 
-#: ../plugins/git/anjuta-git.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:6
 msgid "Annotate this tag"
 msgstr "Ð?ознаÑ?иÑ?и"
 
 #. Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.
-#: ../plugins/git/anjuta-git.ui.h:13
+#: ../plugins/git/anjuta-git.ui.h:8
 msgid "Append fetch data"
 msgstr "Ð?одаÑ?и оÑ?Ñ?иманÑ? данÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/git/anjuta-git.ui.h:9
 msgid "Apply Stash"
 msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и Ñ?Ñ?ованкÑ?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:15 ../plugins/git/plugin.c:239
+#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и Ñ?айли mailbox"
 
-#: ../plugins/git/anjuta-git.ui.h:16
+#: ../plugins/git/anjuta-git.ui.h:11
 msgid "Apply the selected stash"
 msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и вибÑ?анÑ? Ñ?Ñ?ованки"
 
 #. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
-#: ../plugins/git/anjuta-git.ui.h:18
+#: ../plugins/git/anjuta-git.ui.h:13
 msgid "Author/Grep"
 msgstr "Ð?вÑ?оÑ?/Шаблон"
 
-#: ../plugins/git/anjuta-git.ui.h:19
-#: ../plugins/project-wizard/templates/translatable-strings.h:24
+#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/project-wizard/templates/translatable-strings.h:25
 msgid "Author:"
 msgstr "Ð?вÑ?оÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:20
+#: ../plugins/git/anjuta-git.ui.h:15
 msgid "Bad revision:"
 msgstr "Ð?епÑ?авилÑ?на пÑ?авка:"
 
-#: ../plugins/git/anjuta-git.ui.h:21
+#: ../plugins/git/anjuta-git.ui.h:16
 msgid "Branch name:"
 msgstr "Ð?азва гÑ?лки:"
 
-#: ../plugins/git/anjuta-git.ui.h:22
+#: ../plugins/git/anjuta-git.ui.h:17
 msgid "Branch to switch to:"
 msgstr "Ð?алка длÑ? пеÑ?емиканнÑ? на неÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:23
+#: ../plugins/git/anjuta-git.ui.h:18
 msgid "Branch:"
 msgstr "Ð?Ñ?лка:"
 
-#: ../plugins/git/anjuta-git.ui.h:24
+#: ../plugins/git/anjuta-git.ui.h:19
 msgid "Branches"
 msgstr "Ð?Ñ?лки"
 
-#: ../plugins/git/anjuta-git.ui.h:25
+#: ../plugins/git/anjuta-git.ui.h:20
 msgid "Branches must be fully merged"
 msgstr "Ð?Ñ?лка маÑ? бÑ?Ñ?и повнÑ?Ñ?Ñ?Ñ? об'Ñ?днана"
 
-#: ../plugins/git/anjuta-git.ui.h:26
+#: ../plugins/git/anjuta-git.ui.h:21
 msgid "Branches to delete:"
 msgstr "Ð?Ñ?лки длÑ? видаленнÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:28
+#: ../plugins/git/anjuta-git.ui.h:23
 #: ../plugins/subversion/anjuta-subversion.ui.h:4
 msgid "Changes:"
 msgstr "Ð?мÑ?ни:"
 
-#: ../plugins/git/anjuta-git.ui.h:29
+#: ../plugins/git/anjuta-git.ui.h:24
 msgid "Check Out Files"
 msgstr "Ð?Ñ?Ñ?имаÑ?и Ñ?айли"
 
-#: ../plugins/git/anjuta-git.ui.h:30
+#: ../plugins/git/anjuta-git.ui.h:25
 msgid "Check out all local changes"
 msgstr "Ð?Ñ?Ñ?имаÑ?и Ñ?Ñ?Ñ? локалÑ?нÑ? змÑ?ни"
 
-#: ../plugins/git/anjuta-git.ui.h:31
+#: ../plugins/git/anjuta-git.ui.h:26
 msgid "Check out the branch after it is created"
 msgstr "Ð?Ñ?Ñ?имаÑ?и гÑ?лкÑ? пÑ?Ñ?лÑ? Ñ?Ñ?воÑ?еннÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:27
 msgid "Cherry Pick"
 msgstr "Cherry Pick"
 
-#: ../plugins/git/anjuta-git.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:28
 msgid "Clear all stashes"
 msgstr "Ð?ознаÑ?иÑ?и вÑ?Ñ? Ñ?Ñ?ованки"
 
-#: ../plugins/git/anjuta-git.ui.h:34
+#: ../plugins/git/anjuta-git.ui.h:29
 msgid "Column 1"
 msgstr "СÑ?овпÑ?ик 1"
 
-#: ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/git/anjuta-git.ui.h:30
 #: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "Ð?аÑ?Ñ?кÑ?Ñ?ваÑ?и змÑ?ни"
 
-#: ../plugins/git/anjuta-git.ui.h:36
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Commit on fast-forward merges"
 msgstr "Ð?аÑ?Ñ?кÑ?Ñ?ваÑ?и пÑ?Ñ?лÑ? Ñ?видкого об'Ñ?днаннÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:32
 msgid "Commit to Cherry Pick:"
 msgstr "Ð?адÑ?Ñ?лаÑ?и до Cherry Pick:"
 
-#: ../plugins/git/anjuta-git.ui.h:38
+#: ../plugins/git/anjuta-git.ui.h:33
 msgid "Commit to revert:"
 msgstr "Ð?аÑ?Ñ?кÑ?Ñ?ваÑ?и Ñ? вÑ?дкаÑ?Ñ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:39
+#: ../plugins/git/anjuta-git.ui.h:34
 msgid "Create Branch"
 msgstr "СÑ?воÑ?иÑ?и гÑ?лкÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:40
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Create Tag"
 msgstr "СÑ?воÑ?иÑ?и познаÑ?кÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Create patch series"
 msgstr "СÑ?воÑ?иÑ?и Ñ?еÑ?Ñ?Ñ? лаÑ?ок"
 
-#: ../plugins/git/anjuta-git.ui.h:42 ../plugins/git/git-log-dialog.c:189
+#: ../plugins/git/anjuta-git.ui.h:37 ../plugins/git/git-log-dialog.c:189
 #: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "Ð?аÑ?а"
 
-#: ../plugins/git/anjuta-git.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Delete Branch"
 msgstr "Ð?идалиÑ?и гÑ?лкÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:44
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Delete Remote Branch"
 msgstr "Ð?идалиÑ?и гÑ?лкÑ? Ñ? меÑ?ежÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:40
 msgid "Delete Tags"
 msgstr "Ð?идалиÑ?и Ñ?еги"
 
-#: ../plugins/git/anjuta-git.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "Ð?е пÑ?блÑ?кÑ?ваÑ?и"
 
-#: ../plugins/git/anjuta-git.ui.h:47
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "Do not follow tags"
 msgstr "Ð?е Ñ?лÑ?дÑ?ваÑ?и познаÑ?кам"
 
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Drop the selected stash"
 msgstr "Ð?Ñ?дкинÑ?Ñ?и вибÑ?анÑ? Ñ?Ñ?ованкÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "E-mail:"
 msgstr "Ð?л. поÑ?Ñ?а:"
 
-#: ../plugins/git/anjuta-git.ui.h:50
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Fetch remote branches after creation"
 msgstr "Ð?Ñ?Ñ?имÑ?ваÑ?и вÑ?ддаленÑ? гÑ?лки пÑ?Ñ?лÑ? Ñ?Ñ?воÑ?еннÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:51
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Filters"
 msgstr "ФÑ?лÑ?Ñ?Ñ?и"
 
-#: ../plugins/git/anjuta-git.ui.h:52
+#: ../plugins/git/anjuta-git.ui.h:47
 msgid "Folder to create patches in:"
 msgstr "Ð?аÑ?алог длÑ? Ñ?Ñ?воÑ?еннÑ? лаÑ?ок Ñ? нÑ?омÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/git/anjuta-git.ui.h:48
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "Ð?Ñ?имÑ?Ñ?ово"
 
-#: ../plugins/git/anjuta-git.ui.h:55
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "From:"
 msgstr "Ð?"
 
-#: ../plugins/git/anjuta-git.ui.h:56
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Generate patches relative to:"
 msgstr "СÑ?воÑ?иÑ?и лаÑ?ки вÑ?дноÑ?но:"
 
-#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Good revision:"
 msgstr "Ð?обÑ?а пÑ?авка:"
 
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:53
 msgid "Grep:"
 msgstr "Шаблон:"
 
-#: ../plugins/git/anjuta-git.ui.h:59
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Hard"
 msgstr "Ð?оÑ?Ñ?Ñ?кий"
 
-#: ../plugins/git/anjuta-git.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Head"
 msgstr "Ð?Ñ?Ñ?аннÑ? веÑ?Ñ?Ñ?Ñ?"
 
-#: ../plugins/git/anjuta-git.ui.h:61
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Ignore Files"
 msgstr "Ð?гноÑ?Ñ?ваÑ?и Ñ?айли"
 
-#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/git/anjuta-git.ui.h:58
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "Ð?овÑ?домленнÑ? жÑ?Ñ?налÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Mailbox file containing patches:"
 msgstr "Файл поÑ?Ñ?овоÑ? Ñ?кÑ?инÑ?ки, Ñ?о мÑ?Ñ?Ñ?иÑ?Ñ? лаÑ?ки:"
 
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Merge"
 msgstr "Ð? об'Ñ?днаннÑ?м"
 
-#: ../plugins/git/anjuta-git.ui.h:67
+#: ../plugins/git/anjuta-git.ui.h:62
 msgid "Mixed"
 msgstr "Ð?мÑ?Ñ?аний"
 
-#: ../plugins/git/anjuta-git.ui.h:68
+#: ../plugins/git/anjuta-git.ui.h:63
 msgid "Mode:"
 msgstr "Ð?одÑ?лÑ?:"
 
-#: ../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 "Ð?аÑ?амеÑ?Ñ?и"
-
-#: ../plugins/git/anjuta-git.ui.h:71
-#: ../plugins/subversion/anjuta-subversion.ui.h:24
-msgid "Options:"
-msgstr "Ð?аÑ?амеÑ?Ñ?и:"
-
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Previous commit"
 msgstr "Ð?опеÑ?еднÑ? пÑ?блÑ?каÑ?Ñ?Ñ?"
 
-#: ../plugins/git/anjuta-git.ui.h:73
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Pull"
 msgstr "Ð?Ñ?Ñ?иманнÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:74
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Push"
 msgstr "Ð?адÑ?Ñ?лаÑ?и"
 
-#: ../plugins/git/anjuta-git.ui.h:75
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "Push all branches and tags"
 msgstr "Ð?адÑ?Ñ?лаÑ?и Ñ?Ñ?Ñ? гÑ?лки Ñ?а Ñ?еги"
 
-#: ../plugins/git/anjuta-git.ui.h:76
+#: ../plugins/git/anjuta-git.ui.h:71
 msgid "Push all tags"
 msgstr "Ð?адÑ?Ñ?лаÑ?и Ñ?Ñ?Ñ? Ñ?еги"
 
-#: ../plugins/git/anjuta-git.ui.h:77
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Rebase"
 msgstr "Ð?еÑ?емÑ?Ñ?еннÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:78
+#: ../plugins/git/anjuta-git.ui.h:73
 msgid "Remote"
 msgstr "Ð?идалиÑ?и"
 
-#: ../plugins/git/anjuta-git.ui.h:79
+#: ../plugins/git/anjuta-git.ui.h:74
 msgid "Remote branch to rebase from:"
 msgstr "Ð?Ñ?ддалена гÑ?лка длÑ? пеÑ?еноÑ?Ñ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:80
+#: ../plugins/git/anjuta-git.ui.h:75
 msgid "Remote to delete:"
 msgstr "Ð?Ñ?ддалений длÑ? видаленнÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:81
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Remove File"
 msgstr "Ð?идалиÑ?и Ñ?айл"
 
-#: ../plugins/git/anjuta-git.ui.h:82
+#: ../plugins/git/anjuta-git.ui.h:77
 msgid "Repository origin"
 msgstr "Ð?жеÑ?ело Ñ?епозиÑ?оÑ?Ñ?Ñ?"
 
-#: ../plugins/git/anjuta-git.ui.h:83
+#: ../plugins/git/anjuta-git.ui.h:78
 msgid "Repository to pull from:"
 msgstr "РепозиÑ?оÑ?Ñ?й длÑ? заванÑ?аженнÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:84
+#: ../plugins/git/anjuta-git.ui.h:79
 msgid "Repository to push to:"
 msgstr "РепозиÑ?оÑ?Ñ?й длÑ? надÑ?иланнÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:85
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Reset Tree"
 msgstr "СкинÑ?Ñ?и деÑ?ево"
 
-#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Reset to:"
 msgstr "СкинÑ?Ñ?и на:"
 
-#: ../plugins/git/anjuta-git.ui.h:87
+#: ../plugins/git/anjuta-git.ui.h:82
 msgid "Restore index"
 msgstr "Ð?Ñ?дновиÑ?и покажÑ?ик"
 
-#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/git/anjuta-git.ui.h:83
 #: ../plugins/subversion/anjuta-subversion.ui.h:35
-msgid "Retrieving status..."
-msgstr "Ð?Ñ?Ñ?иманнÑ? Ñ?Ñ?аÑ?Ñ?Ñ?Ñ?..."
+msgid "Retrieving statusâ?¦"
+msgstr "Ð?Ñ?Ñ?иманнÑ? Ñ?Ñ?аÑ?Ñ?Ñ?Ñ?â?¦"
 
-#: ../plugins/git/anjuta-git.ui.h:89
+#: ../plugins/git/anjuta-git.ui.h:84
 msgid "Revert Commit"
 msgstr "СкаÑ?Ñ?ваÑ?и Ñ?Ñ?кÑ?аÑ?Ñ?Ñ?"
 
-#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revision/Tag:"
 msgstr "Ð?Ñ?авка/познаÑ?ка:"
 
-#: ../plugins/git/anjuta-git.ui.h:92
-msgid "Select A Folder"
-msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? каÑ?алог"
-
-#: ../plugins/git/anjuta-git.ui.h:93
+#: ../plugins/git/anjuta-git.ui.h:87
 msgid "Select Files to Check Out:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айли длÑ? виÑ?Ñ?гÑ?ваннÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:94
-#: ../plugins/subversion/anjuta-subversion.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
 msgid "Select Files to Commit:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айли длÑ? Ñ?Ñ?кÑ?аÑ?Ñ?Ñ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:95
+#: ../plugins/git/anjuta-git.ui.h:89
 msgid "Select Files to Ignore:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айли длÑ? Ñ?гноÑ?Ñ?ваннÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:96
-#: ../plugins/subversion/anjuta-subversion.ui.h:42
+#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
 msgid "Select Files to Mark as Resolved:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айли, длÑ? Ñ?киÑ? конÑ?лÑ?кÑ? Ñ?озв'Ñ?зано:"
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../plugins/git/anjuta-git.ui.h:91
 msgid "Select Files to Unstage:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айли длÑ? видаленнÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:98
+#: ../plugins/git/anjuta-git.ui.h:92
 msgid "Select Mailbox File"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл Mailbox"
 
-#: ../plugins/git/anjuta-git.ui.h:99
+#: ../plugins/git/anjuta-git.ui.h:93
+msgid "Select a Folder"
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? каÑ?алог"
+
+#: ../plugins/git/anjuta-git.ui.h:94
 msgid "Select file to add:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл длÑ? додаваннÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:100
+#: ../plugins/git/anjuta-git.ui.h:95
 msgid "Select file to remove:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айли длÑ? видаленнÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:101
-#: ../plugins/subversion/anjuta-subversion.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
 msgid "Set Conflicts as Resolved"
 msgstr "Ð?ознаÑ?иÑ?и конÑ?лÑ?кÑ?и Ñ?к Ñ?озв'Ñ?занÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/anjuta-git.ui.h:97
 msgid "Show source revision in log message"
 msgstr "Ð?оказаÑ?и пеÑ?виннÑ? пÑ?авкÑ? Ñ? повÑ?домленнÑ? жÑ?Ñ?налÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:103
+#: ../plugins/git/anjuta-git.ui.h:98
 msgid "Show the contents of the selected stash in an editor"
 msgstr "Ð?оказÑ?ваÑ?и змÑ?Ñ?Ñ? вибÑ?аноÑ? Ñ?Ñ?ованки Ñ? Ñ?едакÑ?оÑ?Ñ?"
 
-#: ../plugins/git/anjuta-git.ui.h:104
+#: ../plugins/git/anjuta-git.ui.h:99
 msgid "Sign this tag"
 msgstr "Ð?Ñ?дпиÑ?аÑ?и Ñ?Ñ? Ñ?Ñ?лÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:105
+#: ../plugins/git/anjuta-git.ui.h:100
 msgid "Soft"
 msgstr "Ð?'Ñ?кий"
 
-#: ../plugins/git/anjuta-git.ui.h:106
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Squash"
 msgstr "Ð?Ñ?Ñ?Ñ?овÑ?Ñ?Ñ?Ñ?ий"
 
-#: ../plugins/git/anjuta-git.ui.h:107 ../plugins/git/plugin.c:811
+#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
 msgid "Stash"
 msgstr "СÑ?ованка"
 
-#: ../plugins/git/anjuta-git.ui.h:108
+#: ../plugins/git/anjuta-git.ui.h:103
+msgid "Stash Message (Optional)"
+msgstr "Ð?аÑ?амеÑ?Ñ?и пÑ?о пÑ?иÑ?овÑ?ваннÑ? (необов'Ñ?зково)"
+
+#: ../plugins/git/anjuta-git.ui.h:104
 msgid "Stash Uncommitted Changes"
 msgstr "Ð?еопÑ?блÑ?кованÑ? змÑ?ни Ñ? Ñ?Ñ?ованÑ?Ñ?"
 
-#: ../plugins/git/anjuta-git.ui.h:109
+#: ../plugins/git/anjuta-git.ui.h:105
 msgid "Stash indexed changes"
 msgstr "Ð?ндекÑ?ованÑ? змÑ?ни Ñ? Ñ?Ñ?ованÑ?Ñ?"
 
-#: ../plugins/git/anjuta-git.ui.h:110
+#: ../plugins/git/anjuta-git.ui.h:106
 msgid "Stash the working tree's uncommitted changes"
 msgstr "СÑ?оваÑ?и Ñ? Ñ?Ñ?ованкÑ? не заÑ?веÑ?дженÑ? змÑ?ни Ñ?обоÑ?ого деÑ?ева"
 
-#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/anjuta-git.ui.h:107
+msgid "Stash to Apply"
+msgstr "СÑ?ованÑ? змÑ?ни длÑ? заÑ?Ñ?оÑ?Ñ?ваннÑ?"
+
+#: ../plugins/git/anjuta-git.ui.h:108
 msgid "Switch to Another Branch"
 msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? на Ñ?нÑ?Ñ? гÑ?лкÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:112
+#: ../plugins/git/anjuta-git.ui.h:109
 msgid "Tag name:"
 msgstr "Ð?азва Ñ?Ñ?лÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:113
+#: ../plugins/git/anjuta-git.ui.h:110
 msgid "Tag/Commit"
 msgstr "Ð?ознаÑ?иÑ?и/Ð?аÑ?Ñ?кÑ?Ñ?ваÑ?и"
 
-#: ../plugins/git/anjuta-git.ui.h:114
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+msgid "Tags"
+msgstr "Теги"
+
+#: ../plugins/git/anjuta-git.ui.h:112
 msgid "Tags to delete:"
 msgstr "ЦÑ?лÑ? длÑ? видаленнÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:115
+#: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "ЦÑ? Ñ?Ñ?кÑ?аÑ?Ñ?Ñ? мÑ?Ñ?Ñ?иÑ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ? невдалого об'Ñ?днаннÑ? (викоÑ?иÑ?Ñ?овÑ?йÑ?е -i)"
 
-#: ../plugins/git/anjuta-git.ui.h:117
+#: ../plugins/git/anjuta-git.ui.h:115
 msgid "To:"
 msgstr "Ð?о:"
 
-#: ../plugins/git/anjuta-git.ui.h:118
+#: ../plugins/git/anjuta-git.ui.h:116
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/git/anjuta-git.ui.h:119
+#: ../plugins/git/anjuta-git.ui.h:117
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/git/anjuta-git.ui.h:120
+#: ../plugins/git/anjuta-git.ui.h:118
 msgid "Unstage Files"
 msgstr "Ð?Ñ?ибÑ?аÑ?и Ñ?айли"
 
-#: ../plugins/git/anjuta-git.ui.h:121
+#: ../plugins/git/anjuta-git.ui.h:119
 msgid "Use a custom log message"
 msgstr "Ð?одаÑ?и повÑ?домленнÑ? до жÑ?Ñ?налÑ?"
 
-#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/git/anjuta-git.ui.h:120
 msgid "Use custom author information:"
 msgstr "Ð?лаÑ?на Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о авÑ?оÑ?а:"
 
-#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/git/anjuta-git.ui.h:121
 msgid "View log"
 msgstr "Ð?оказаÑ?и жÑ?Ñ?нал"
 
-#: ../plugins/git/anjuta-git.ui.h:124
-#: ../plugins/subversion/anjuta-subversion.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "Ð?еÑ?еглÑ?д жÑ?Ñ?налÑ? длÑ? Ñ?айлÑ?/каÑ?алогÑ?:"
 
-#: ../plugins/git/anjuta-git.ui.h:126
+#: ../plugins/git/anjuta-git.ui.h:124
 msgid "page 1"
 msgstr "Ñ?Ñ?оÑ?Ñ?нка 1"
 
-#: ../plugins/git/anjuta-git.ui.h:127
+#: ../plugins/git/anjuta-git.ui.h:125
 msgid "page 2"
 msgstr "Ñ?Ñ?оÑ?Ñ?нка 2"
 
-#: ../plugins/git/anjuta-git.ui.h:128
+#: ../plugins/git/anjuta-git.ui.h:126
 msgid "page 3"
 msgstr "Ñ?Ñ?оÑ?Ñ?нка 3"
 
@@ -4835,8 +4918,8 @@ msgstr "Ð?ведÑ?Ñ?Ñ? URL."
 
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetching..."
-msgstr "Git: оÑ?Ñ?иманнÑ?..."
+msgid "Git: Fetchingâ?¦"
+msgstr "Git: оÑ?Ñ?иманнÑ?â?¦"
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
 msgid "Please select a mailbox file."
@@ -4916,8 +4999,8 @@ msgid "Author"
 msgstr "Ð?вÑ?оÑ?"
 
 #: ../plugins/git/git-log-dialog.c:317
-msgid "Git: Retrieving log..."
-msgstr "Git: оÑ?Ñ?иманнÑ? жÑ?Ñ?налÑ?..."
+msgid "Git: Retrieving logâ?¦"
+msgstr "Git: оÑ?Ñ?иманнÑ? жÑ?Ñ?налÑ?â?¦"
 
 #: ../plugins/git/git-log-dialog.c:360
 #: ../plugins/subversion/subversion-add-dialog.c:65
@@ -4975,17 +5058,17 @@ msgstr "Git: вÑ?дванÑ?аженнÑ? завеÑ?Ñ?ено."
 
 #. 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
+#: ../plugins/git/git-push-dialog.c:144
 msgid "Please select a remote to push to."
 msgstr "Ð?ведÑ?Ñ?Ñ? вÑ?ддалений вÑ?зол до Ñ?кого заÑ?Ñ?овÑ?Ñ?ваÑ?и змÑ?ни."
 
-#: ../plugins/git/git-push-dialog.c:159
+#: ../plugins/git/git-push-dialog.c:162
 msgid "Please enter the URL of the repository to push to."
 msgstr "Ð?ведÑ?Ñ?Ñ? URL Ñ?епозиÑ?оÑ?Ñ?Ñ? длÑ? вÑ?дванÑ?аженнÑ?."
 
-#: ../plugins/git/git-push-dialog.c:193
-msgid "Git: Pushing..."
-msgstr "Git: вÑ?дванÑ?аженнÑ?..."
+#: ../plugins/git/git-push-dialog.c:197
+msgid "Git: Pushingâ?¦"
+msgstr "Git: занеÑ?еннÑ? змÑ?нâ?¦"
 
 #: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
@@ -5060,8 +5143,8 @@ msgstr "Ð?_мÑ?ни"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
-msgid "_Commit..."
-msgstr "Ð?а_Ñ?Ñ?кÑ?Ñ?ваÑ?и..."
+msgid "_Commitâ?¦"
+msgstr "_ФÑ?кÑ?Ñ?ваÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5090,8 +5173,8 @@ msgstr "_СÑ?ованка"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:111
-msgid "_Stash uncommitted changes..."
-msgstr "С_Ñ?оваÑ?и неопÑ?блÑ?кованÑ? змÑ?ни"
+msgid "_Stash uncommitted changesâ?¦"
+msgstr "С_Ñ?оваÑ?и неопÑ?блÑ?кованÑ? змÑ?ниâ?¦"
 
 #. Display label
 #. short-cut
@@ -5102,8 +5185,8 @@ msgstr "Ð?беÑ?егÑ?и неопÑ?блÑ?кованÑ? змÑ?ни Ñ?а заÑ?Ñ?о
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:119
-msgid "_Apply stashed changes..."
-msgstr "_Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и змÑ?ни Ñ? Ñ?Ñ?ованÑ?Ñ?..."
+msgid "_Apply stashed changesâ?¦"
+msgstr "_Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и Ñ?Ñ?ованÑ? змÑ?ниâ?¦"
 
 #. Display label
 #. short-cut
@@ -5114,8 +5197,8 @@ msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и змÑ?ни Ñ? Ñ?Ñ?ованÑ?Ñ? до Ñ?обоÑ?о
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
-msgid "_View log..."
-msgstr "Ð?еÑ?еглÑ?нÑ?Ñ?и _жÑ?Ñ?нал..."
+msgid "_View logâ?¦"
+msgstr "_Ð?оказаÑ?и жÑ?Ñ?налâ?¦"
 
 #. Display label
 #. short-cut
@@ -5132,8 +5215,8 @@ msgstr "Ð?_идалиÑ?и Ñ?епозиÑ?оÑ?Ñ?й"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:143
-msgid "_Push..."
-msgstr "_Ð?адÑ?Ñ?лаÑ?и..."
+msgid "_Pushâ?¦"
+msgstr "_Ð?неÑ?Ñ?и змÑ?ниâ?¦"
 
 #. Display label
 #. short-cut
@@ -5144,8 +5227,8 @@ msgstr "Ð?пÑ?блÑ?кÑ?ваÑ?и змÑ?ни Ñ? вÑ?ддаленомÑ? Ñ?епоз
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:151
-msgid "_Pull..."
-msgstr "_Ð?аванÑ?ажиÑ?и..."
+msgid "_Pullâ?¦"
+msgstr "_Ð?Ñ?Ñ?имаÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5176,8 +5259,8 @@ msgstr "_Файли"
 #: ../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 "_Ð?одаÑ?и..."
+msgid "_Addâ?¦"
+msgstr "_Ð?одаÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5189,8 +5272,8 @@ msgstr "Ð?одаÑ?и Ñ?айли до Ñ?епозиÑ?оÑ?Ñ?Ñ?"
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
 #: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "Ð?_идалиÑ?и..."
+msgid "_Removeâ?¦"
+msgstr "Ð?_идалиÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5201,8 +5284,8 @@ msgstr "Ð?идалиÑ?и Ñ?айли з Ñ?епозиÑ?оÑ?Ñ?Ñ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:191
-msgid "_Ignore..."
-msgstr "_Ð?гноÑ?Ñ?ваÑ?и..."
+msgid "_Ignoreâ?¦"
+msgstr "_Ð?гноÑ?Ñ?ваÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5213,8 +5296,8 @@ msgstr "Ð?гноÑ?Ñ?ваÑ?и Ñ?айли"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:199
-msgid "_Check out files..."
-msgstr "_Ð?Ñ?Ñ?имаÑ?и Ñ?айли..."
+msgid "_Check out filesâ?¦"
+msgstr "_Ð?иÑ?Ñ?гнÑ?Ñ?и Ñ?айлиâ?¦"
 
 #. Display label
 #. short-cut
@@ -5225,8 +5308,8 @@ msgstr "Ð?овеÑ?нÑ?Ñ?и назад неопÑ?блÑ?кованÑ? змÑ?ни Ñ?
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:207
-msgid "_Unstage files..."
-msgstr "_Ð?Ñ?ибÑ?аÑ?и Ñ?айли..."
+msgid "_Unstage filesâ?¦"
+msgstr "_Ð?Ñ?ибÑ?аÑ?и Ñ?айлиâ?¦"
 
 #. Display label
 #. short-cut
@@ -5237,8 +5320,8 @@ msgstr "Ð?идалиÑ?и Ñ?айли з Ñ?ндекÑ?Ñ? пÑ?блÑ?каÑ?Ñ?Ñ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:215
-msgid "_Resolve conflicts..."
-msgstr "Розв'Ñ?заÑ?и _конÑ?лÑ?кÑ?и..."
+msgid "_Resolve conflictsâ?¦"
+msgstr "Розв'Ñ?заÑ?и _конÑ?лÑ?кÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5255,8 +5338,8 @@ msgstr "Ð?аÑ?ки"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:231
-msgid "Create patch series..."
-msgstr "СÑ?воÑ?иÑ?и Ñ?еÑ?Ñ?Ñ? лаÑ?ок..."
+msgid "Create patch seriesâ?¦"
+msgstr "СÑ?воÑ?иÑ?и Ñ?еÑ?Ñ?Ñ? лаÑ?окâ?¦"
 
 #. Display label
 #. short-cut
@@ -5267,8 +5350,8 @@ msgstr "СÑ?воÑ?иÑ?и Ñ?айли лаÑ?ок длÑ? надÑ?иланнÑ? Ñ?о
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:247
-msgid "_Apply..."
-msgstr "_Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и..."
+msgid "_Applyâ?¦"
+msgstr "_Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5323,8 +5406,8 @@ msgstr "_Ð?Ñ?лки"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
-msgid "_Create branch..."
-msgstr "С_Ñ?воÑ?иÑ?и гÑ?лкÑ?..."
+msgid "_Create branchâ?¦"
+msgstr "С_Ñ?воÑ?иÑ?и гÑ?лкÑ?â?¦"
 
 #. Display label
 #. short-cut
@@ -5335,8 +5418,8 @@ msgstr "СÑ?воÑ?иÑ?и гÑ?лкÑ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:295
-msgid "_Delete branch..."
-msgstr "Ð?ида_лиÑ?и гÑ?лкÑ?"
+msgid "_Delete branchâ?¦"
+msgstr "Ð?ида_лиÑ?и гÑ?лкÑ?â?¦"
 
 #. Display label
 #. short-cut
@@ -5347,8 +5430,8 @@ msgstr "Ð?идалиÑ?и гÑ?лки"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:303
-msgid "_Switch to another branch..."
-msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? _на гÑ?лкÑ?..."
+msgid "_Switch to another branchâ?¦"
+msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? на _Ñ?нÑ?Ñ? гÑ?лкÑ?â?¦"
 
 #. Display label
 #. short-cut
@@ -5359,8 +5442,8 @@ msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? на Ñ?нÑ?Ñ? гÑ?лкÑ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:311
-msgid "_Merge..."
-msgstr "_Ð?б'Ñ?днаÑ?и..."
+msgid "_Mergeâ?¦"
+msgstr "_Ð?б'Ñ?днаÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5383,8 +5466,8 @@ msgstr "Ð?б'Ñ?днаÑ?и змÑ?ни з головноÑ? вÑ?ддаленоÑ? г
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
-msgid "_Start..."
-msgstr "_Ð?оÑ?аÑ?и..."
+msgid "_Startâ?¦"
+msgstr "_Ð?оÑ?аÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5425,8 +5508,8 @@ msgstr "Ð?еÑ?еÑ?ваÑ?и rebase Ñ?а повеÑ?нÑ?Ñ?и Ñ?епозиÑ?оÑ?Ñ?й
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
-msgid "_Cherry pick..."
-msgstr "_Cherry pick..."
+msgid "_Cherry pickâ?¦"
+msgstr "_Ð?ибÑ?Ñ?кове змÑ?наâ?¦"
 
 #. Display label
 #. short-cut
@@ -5450,8 +5533,8 @@ msgstr "Ð?одаÑ?и вÑ?ддаленÑ? гÑ?лкÑ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:383
-msgid "_Delete..."
-msgstr "Ð?_идалиÑ?и..."
+msgid "_Deleteâ?¦"
+msgstr "Ð?_идалиÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -5461,15 +5544,9 @@ msgstr "Ð?идалиÑ?и гÑ?лкÑ? Ñ? меÑ?ежÑ?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:391
-msgid "Tags"
-msgstr "Теги"
-
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
-msgid "_Create tag..."
-msgstr "СÑ?во_Ñ?иÑ?и Ñ?ег..."
+msgid "_Create tagâ?¦"
+msgstr "СÑ?во_Ñ?иÑ?и Ñ?егâ?¦"
 
 #. Display label
 #. short-cut
@@ -5480,8 +5557,8 @@ msgstr "СÑ?воÑ?иÑ?и Ñ?ег"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:407
-msgid "_Delete tag..."
-msgstr "Ð?_идалиÑ?и Ñ?ег..."
+msgid "_Delete tagâ?¦"
+msgstr "Ð?_идалиÑ?и Ñ?егâ?¦"
 
 #. Display label
 #. short-cut
@@ -5498,8 +5575,8 @@ msgstr "_СкинÑ?Ñ?и/веÑ?нÑ?Ñ?и"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
-msgid "_Reset tree..."
-msgstr "Скин_Ñ?Ñ?и деÑ?ево..."
+msgid "_Reset treeâ?¦"
+msgstr "_СкинÑ?Ñ?и деÑ?евоâ?¦"
 
 #. Display label
 #. short-cut
@@ -5510,8 +5587,8 @@ msgstr "Ð?овеÑ?нÑ?Ñ?и Ñ?епозиÑ?оÑ?Ñ?й до бÑ?дÑ?-Ñ?кого по
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
-msgid "_Revert commit..."
-msgstr "_СкаÑ?Ñ?ваÑ?и Ñ?Ñ?кÑ?аÑ?Ñ?Ñ?..."
+msgid "_Revert commitâ?¦"
+msgstr "_СкаÑ?Ñ?ваÑ?и Ñ?Ñ?кÑ?аÑ?Ñ?Ñ?â?¦"
 
 #. Display label
 #. short-cut
@@ -5716,12 +5793,12 @@ msgstr "Ð?в'Ñ?заÑ?и"
 msgid "Automatically add resources"
 msgstr "Ð?вÑ?омаÑ?иÑ?но додаваÑ?и Ñ?еÑ?Ñ?Ñ?Ñ?и"
 
-#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:763
-#: ../plugins/glade/plugin.c:3094
+#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:762
+#: ../plugins/glade/plugin.c:3082
 msgid "Designer"
 msgstr "Ð?изайнеÑ?"
 
-#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3096
+#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3084
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "РедакÑ?оÑ?"
@@ -5776,230 +5853,231 @@ msgstr "Ð?епÑ?авилÑ?не знаÑ?еннÑ? влаÑ?Ñ?ивоÑ?Ñ?Ñ? %s"
 msgid "Association item filename has no path"
 msgstr "Ð?в'Ñ?зана назва Ñ?айлÑ? не мÑ?Ñ?Ñ?иÑ?Ñ? Ñ?лÑ?Ñ?Ñ?"
 
-#: ../plugins/glade/plugin.c:855
+#: ../plugins/glade/plugin.c:856
 #, c-format
-msgid "No associations initialized, nothing to save"
+msgid "No associations initialized: nothing to save"
 msgstr "Ð?в'Ñ?зки не Ñ?Ñ?воÑ?ено, немаÑ? даниÑ? длÑ? збеÑ?еженнÑ?"
 
-#: ../plugins/glade/plugin.c:862
+#: ../plugins/glade/plugin.c:863
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и зв'Ñ?зки, оÑ?кÑ?лÑ?ки не вÑ?Ñ?ановлено коÑ?Ñ?нÑ? пÑ?оекÑ?Ñ?"
 
-#: ../plugins/glade/plugin.c:884
+#: ../plugins/glade/plugin.c:885
 #, c-format
 msgid "Failed to save associations"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и зв'Ñ?зки"
 
 #. iptCurrent:
-#: ../plugins/glade/plugin.c:1196
+#: ../plugins/glade/plugin.c:1184
 msgid "Current"
 msgstr "Ð?оÑ?оÑ?ний"
 
 #. iptBeforeEnd:
-#: ../plugins/glade/plugin.c:1197
+#: ../plugins/glade/plugin.c:1185
 msgid "Before end"
 msgstr "Ð?апÑ?икÑ?нÑ?Ñ?"
 
 #. iptAfterBegin:
-#: ../plugins/glade/plugin.c:1198
+#: ../plugins/glade/plugin.c:1186
 msgid "After begin"
 msgstr "Ð?еÑ?ед поÑ?аÑ?ком"
 
 #. ipEOF:
-#: ../plugins/glade/plugin.c:1199
+#: ../plugins/glade/plugin.c:1187
 msgid "End of file"
 msgstr "У кÑ?нÑ?Ñ? Ñ?айлÑ?"
 
-#: ../plugins/glade/plugin.c:1368
+#: ../plugins/glade/plugin.c:1356
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? авÑ?омаÑ?иÑ?но оÑ?Ñ?имаÑ?и Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о Ñ?игнал"
 
-#: ../plugins/glade/plugin.c:1390
+#: ../plugins/glade/plugin.c:1378
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "Ð?ова Python Ñ?е не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
 
-#: ../plugins/glade/plugin.c:1403
+#: ../plugins/glade/plugin.c:1391
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "Ð?ова Vala Ñ?е не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
 
-#: ../plugins/glade/plugin.c:1962
+#: ../plugins/glade/plugin.c:1950
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "Ð?емаÑ? Ñ?едакÑ?оÑ?а Ñ?екÑ?Ñ?Ñ?, пов'Ñ?заного з Ñ?им Ñ?едакÑ?оÑ?ом Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ?"
 
-#: ../plugins/glade/plugin.c:1980
+#: ../plugins/glade/plugin.c:1968
 #, c-format
-msgid "Unknown language of the editor \"%s\""
-msgstr "Ð?евÑ?дома мова длÑ? Ñ?едакÑ?оÑ?а «%s»"
+msgid "Unknown editor language \"%s\""
+msgstr "Ð?евÑ?дома помилка Ñ?едакÑ?оÑ?а «%s»"
 
-#: ../plugins/glade/plugin.c:2047 ../plugins/glade/plugin.c:2124
-#: ../plugins/glade/plugin.c:2249
+#: ../plugins/glade/plugin.c:2035 ../plugins/glade/plugin.c:2112
+#: ../plugins/glade/plugin.c:2237
 #, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "Ð?омилка пÑ?и Ñ?иÑ?аннÑ? Ñ?аблонÑ? обÑ?обника: %s"
 
-#: ../plugins/glade/plugin.c:2054 ../plugins/glade/plugin.c:2138
-msgid "Couldn't find a signal information"
+#: ../plugins/glade/plugin.c:2042 ../plugins/glade/plugin.c:2126
+msgid "Couldn't find signal information"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о Ñ?игнал"
 
-#: ../plugins/glade/plugin.c:2081
+#: ../plugins/glade/plugin.c:2069
 msgid "Error while adding a new handler stub: No current editor"
 msgstr "Ð?омилка пÑ?и додаваннÑ? обÑ?обника: Ð?е знайдено Ñ?едакÑ?оÑ? Ñ?екÑ?Ñ?Ñ?"
 
-#: ../plugins/glade/plugin.c:2254
+#: ../plugins/glade/plugin.c:2242
 #, c-format
 msgid ""
 "To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
 msgstr ""
-"Щоб Ñ?никнÑ?Ñ?и Ñ?Ñ?ого повÑ?домленнÑ? вимнÑ?Ñ?Ñ? ознакÑ? « %s» Ñ? менÑ? Ð?аÑ?амеÑ?Ñ?и пÑ?дменÑ? Ð?изайнеÑ? Glade"
+"Щоб Ñ?никнÑ?Ñ?и Ñ?Ñ?ого повÑ?домленнÑ? вимнÑ?Ñ?Ñ? ознакÑ? « %s» Ñ? менÑ? Ð?аÑ?амеÑ?Ñ?и пÑ?дменÑ? "
+"Ð?изайнеÑ? Glade"
 
-#: ../plugins/glade/plugin.c:2324
+#: ../plugins/glade/plugin.c:2312
 msgid "Couldn't find an associated document"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и поÑ?в'Ñ?заний докÑ?менÑ?"
 
-#: ../plugins/glade/plugin.c:2390
+#: ../plugins/glade/plugin.c:2378
 msgid "Those documents are already associated"
 msgstr "ЦÑ? докÑ?менÑ?и вже зв'Ñ?занÑ?"
 
-#: ../plugins/glade/plugin.c:2428
+#: ../plugins/glade/plugin.c:2416
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "Ð?еможливо пÑ?оÑ?иÑ?аÑ?и Ñ?айл: %s."
 
-#: ../plugins/glade/plugin.c:3095
+#: ../plugins/glade/plugin.c:3083
 msgid "Top level widget"
 msgstr "Ð?Ñ?джеÑ? веÑ?Ñ?нÑ?ого Ñ?Ñ?внÑ?"
 
-#: ../plugins/glade/plugin.c:3686
+#: ../plugins/glade/plugin.c:3674
 msgid "Couldn't find a default signal name"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и Ñ?иповÑ? назвÑ? Ñ?игналÑ?"
 
-#: ../plugins/glade/plugin.c:3896
+#: ../plugins/glade/plugin.c:3883
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "Ð?Ñ?оекÑ? %s не мÑ?Ñ?Ñ?иÑ?Ñ? заÑ?Ñ?аÑ?Ñ?лиÑ? вÑ?джеÑ?Ñ?в Ñ?а невÑ?дповÑ?днÑ?Ñ?Ñ?Ñ? веÑ?Ñ?Ñ?й."
 
-#: ../plugins/glade/plugin.c:3913
+#: ../plugins/glade/plugin.c:3900
 msgid "There is no Glade project"
 msgstr "Ð?Ñ?оекÑ? Glade вÑ?дÑ?Ñ?Ñ?нÑ?й"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3999
+#: ../plugins/glade/plugin.c:3986
 msgid "_Glade"
 msgstr "Ð?нÑ?еÑ?_Ñ?ейÑ?"
 
-#: ../plugins/glade/plugin.c:4007 ../plugins/glade/plugin.c:4009
+#: ../plugins/glade/plugin.c:3994 ../plugins/glade/plugin.c:3996
 msgid "Switch between designer/code"
 msgstr "Ð?еÑ?емикнÑ?Ñ?и Ñ?едакÑ?оÑ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ?/кодÑ?"
 
-#: ../plugins/glade/plugin.c:4015 ../plugins/glade/plugin.c:4017
+#: ../plugins/glade/plugin.c:4002 ../plugins/glade/plugin.c:4004
 msgid "Insert handler stub"
 msgstr "Ð?Ñ?Ñ?авлÑ?Ñ?и заглÑ?Ñ?кÑ? обÑ?обника"
 
-#: ../plugins/glade/plugin.c:4023 ../plugins/glade/plugin.c:4025
+#: ../plugins/glade/plugin.c:4010 ../plugins/glade/plugin.c:4012
 msgid "Insert handler stub, autoposition"
 msgstr "Ð?Ñ?Ñ?авлÑ?Ñ?и заглÑ?Ñ?кÑ? обÑ?обника, авÑ?омаÑ?иÑ?но Ñ?озмÑ?Ñ?Ñ?Ñ?Ñ?и Ñ?Ñ? Ñ? кодÑ?"
 
-#: ../plugins/glade/plugin.c:4031
+#: ../plugins/glade/plugin.c:4018
 msgid "Associate last designer and last editor"
 msgstr "Ð?в'Ñ?заÑ?и оÑ?Ñ?аннÑ? Ñ?едакÑ?оÑ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? Ñ?а Ñ?едакÑ?оÑ? Ñ?екÑ?Ñ?Ñ?"
 
-#: ../plugins/glade/plugin.c:4033
+#: ../plugins/glade/plugin.c:4020
 msgid "Associate last designer and editor"
 msgstr "Ð?в'Ñ?заÑ?и оÑ?Ñ?аннÑ?й Ñ?едакÑ?оÑ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? Ñ?а Ñ?екÑ?Ñ?Ñ?"
 
-#: ../plugins/glade/plugin.c:4039 ../plugins/glade/plugin.c:4041
-msgid "Associations dialog..."
-msgstr "РедакÑ?оÑ? зв'Ñ?зкÑ?в..."
+#: ../plugins/glade/plugin.c:4026 ../plugins/glade/plugin.c:4028
+msgid "Associations dialogâ?¦"
+msgstr "РедакÑ?оÑ? зв'Ñ?зкÑ?вâ?¦"
 
-#: ../plugins/glade/plugin.c:4047
-msgid "Versioning..."
-msgstr "Ð?еÑ?Ñ?Ñ?Ñ?..."
+#: ../plugins/glade/plugin.c:4034
+msgid "Versioningâ?¦"
+msgstr "Ð?еÑ?Ñ?Ñ?Ñ?â?¦"
 
-#: ../plugins/glade/plugin.c:4049
+#: ../plugins/glade/plugin.c:4036
 msgid "Switch between library versions and check deprecations"
 msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? мÑ?ж веÑ?Ñ?Ñ?Ñ?ми бÑ?блÑ?оÑ?ек Ñ?а пеÑ?евÑ?Ñ?иÑ?и залежноÑ?Ñ?Ñ?"
 
-#: ../plugins/glade/plugin.c:4055 ../plugins/glade/plugin.c:4057
+#: ../plugins/glade/plugin.c:4042 ../plugins/glade/plugin.c:4044
 msgid "Set as default resource target"
 msgstr "Ð?Ñ?Ñ?ановиÑ?и Ñ?к Ñ?иповÑ? Ñ?Ñ?лÑ?"
 
-#: ../plugins/glade/plugin.c:4065
+#: ../plugins/glade/plugin.c:4052
 msgid "Current default target"
 msgstr "Типова поÑ?оÑ?на Ñ?Ñ?лÑ?"
 
-#: ../plugins/glade/plugin.c:4073
+#: ../plugins/glade/plugin.c:4060
 msgid "Close the current file"
 msgstr "Ð?акÑ?иÑ?и поÑ?оÑ?ний Ñ?айл"
 
-#: ../plugins/glade/plugin.c:4081
+#: ../plugins/glade/plugin.c:4068
 msgid "Save the current file"
 msgstr "Ð?беÑ?егÑ?и поÑ?оÑ?ний Ñ?айл"
 
-#: ../plugins/glade/plugin.c:4097
+#: ../plugins/glade/plugin.c:4084
 msgid "Redo the last action"
 msgstr "Ð?еÑ?нÑ?Ñ?и оÑ?Ñ?аннÑ? дÑ?Ñ?"
 
-#: ../plugins/glade/plugin.c:4105
+#: ../plugins/glade/plugin.c:4092
 msgid "Cut the selection"
 msgstr "Ð?иÑ?Ñ?заÑ?и видÑ?лене"
 
-#: ../plugins/glade/plugin.c:4113
+#: ../plugins/glade/plugin.c:4100
 msgid "Copy the selection"
 msgstr "Ð?опÑ?Ñ?ваÑ?и видÑ?лене"
 
-#: ../plugins/glade/plugin.c:4121
+#: ../plugins/glade/plugin.c:4108
 msgid "Paste the clipboard"
 msgstr "Ð?Ñ?Ñ?авиÑ?и видÑ?лене"
 
-#: ../plugins/glade/plugin.c:4129
+#: ../plugins/glade/plugin.c:4116
 msgid "Delete the selection"
 msgstr "Ð?идалиÑ?и видÑ?лене"
 
-#: ../plugins/glade/plugin.c:4307
+#: ../plugins/glade/plugin.c:4294
 msgid "Glade designer operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? дизайнеÑ?а Glade"
 
-#: ../plugins/glade/plugin.c:4407
+#: ../plugins/glade/plugin.c:4394
 msgid "Go back in undo history"
 msgstr "Ð?еÑ?ейÑ?и назад Ñ? Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? Ñ?едагÑ?ваннÑ?"
 
-#: ../plugins/glade/plugin.c:4409
+#: ../plugins/glade/plugin.c:4396
 msgid "Go forward in undo history"
 msgstr "Ð?еÑ?ейÑ?и впеÑ?ед Ñ? Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? Ñ?едагÑ?ваннÑ?"
 
-#: ../plugins/glade/plugin.c:4431
+#: ../plugins/glade/plugin.c:4418
 msgid "Glade Clipboard"
 msgstr "Ð?Ñ?Ñ?еÑ? обмÑ?нÑ? Glade"
 
-#: ../plugins/glade/plugin.c:4436
+#: ../plugins/glade/plugin.c:4423
 msgid "Widgets"
 msgstr "Ð?Ñ?джеÑ?и"
 
-#: ../plugins/glade/plugin.c:4441
+#: ../plugins/glade/plugin.c:4428
 msgid "Palette"
 msgstr "Ð?алÑ?Ñ?Ñ?а"
 
-#: ../plugins/glade/plugin.c:4695
+#: ../plugins/glade/plugin.c:4682
 #, c-format
 msgid "Not local file: %s"
 msgstr "Ð?е локалÑ?ний Ñ?айл: %s"
 
-#: ../plugins/glade/plugin.c:4716
+#: ../plugins/glade/plugin.c:4703
 #, c-format
 msgid "Could not open %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дкÑ?иÑ?и: %s"
 
-#: ../plugins/glade/plugin.c:4767
+#: ../plugins/glade/plugin.c:4754
 msgid "Could not create a new glade project."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и новий пÑ?оекÑ? glade."
 
-#: ../plugins/glade/plugin.c:5029 ../plugins/glade/plugin.c:5054
+#: ../plugins/glade/plugin.c:5025 ../plugins/glade/plugin.c:5050
 msgid "Glade GUI Designer"
 msgstr "РедакÑ?оÑ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? Glade"
 
@@ -6011,7 +6089,7 @@ msgstr "Ð?Ñ?оекÑ? Glade '%s' збеÑ?ежено"
 
 #: ../plugins/glade/anjuta-design-document.c:379
 #: ../plugins/glade/anjuta-design-document.c:406
-msgid "Invalid glade file name"
+msgid "Invalid Glade file name"
 msgstr "Ð?екоÑ?екÑ?на назва Ñ?айлÑ? Glade"
 
 #: ../plugins/gtodo/add_edit_item.c:99
@@ -6032,7 +6110,7 @@ msgid "Summary:"
 msgstr "Ð?веденнÑ?:"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:4
+#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
 msgid "Category:"
 msgstr "Ð?аÑ?егоÑ?Ñ?Ñ?:"
 
@@ -6073,8 +6151,8 @@ msgstr "поÑ?аÑ?о:"
 #: ../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"
+msgid "N/A"
+msgstr "Ð?/Ð?"
 
 #: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
@@ -6082,27 +6160,23 @@ msgid "stopped:"
 msgstr "закÑ?нÑ?ено:"
 
 #: ../plugins/gtodo/callback.c:17
-msgid "You need to select a todo item before you can remove it"
-msgstr "ТÑ?еба обÑ?аÑ?и запиÑ? длÑ? видаленнÑ?"
+msgid "You need to select a to-do item before you can remove it"
+msgstr "ТÑ?еба обÑ?аÑ?и задаÑ?Ñ? длÑ? видаленнÑ?"
 
 #: ../plugins/gtodo/callback.c:20
-msgid "Are you sure you want to remove the selected todo item?"
+msgid "Are you sure you want to remove the selected to-do item?"
 msgstr "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и видÑ?ленÑ? задаÑ?Ñ??"
 
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
-msgid "Remove"
-msgstr "Ð?идалиÑ?и"
-
 #: ../plugins/gtodo/callback.c:98
 #, c-format
-msgid "Are you sure you want to remove all the completed todo items?"
+msgid "Are you sure you want to remove all the completed to-do items?"
 msgstr "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и вÑ?Ñ? завеÑ?Ñ?енÑ? задаÑ?Ñ??"
 
 #: ../plugins/gtodo/callback.c:99
 #, c-format
 msgid ""
-"Are you sure you want to remove all the completed todo items in the category "
-"\"%s\"?"
+"Are you sure you want to remove all the completed to-do items in the "
+"category \"%s\"?"
 msgstr "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и вÑ?Ñ? завеÑ?Ñ?енÑ? запиÑ?и Ñ? каÑ?егоÑ?Ñ?Ñ? «%s»?"
 
 #: ../plugins/gtodo/export.c:47
@@ -6174,7 +6248,7 @@ msgstr "Ð?еможливо пÑ?оÑ?иÑ?аÑ?и Ñ?айл"
 
 #: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
 #, c-format
-msgid "Failed to parse xml structure"
+msgid "Failed to parse XML structure"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?оаналÑ?зÑ?ваÑ?и Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?Ñ? XML"
 
 #: ../plugins/gtodo/libgtodo.c:646
@@ -6231,7 +6305,7 @@ msgstr "Ð?идалиÑ?и"
 msgid "<New category (%d)>"
 msgstr "<Ð?ова каÑ?егоÑ?Ñ?Ñ? (%d)>"
 
-#: ../plugins/gtodo/notification.c:67
+#: ../plugins/gtodo/notification.c:68
 #, c-format
 msgid "The following item is due in %i minute:"
 msgid_plural "The following item is due in %i minutes:"
@@ -6239,12 +6313,12 @@ msgstr[0] "Ð?аÑ?Ñ?Ñ?пнÑ? подÑ?Ñ? наÑ?Ñ?Ñ?пиÑ?Ñ? пÑ?оÑ?Ñ?гом %i Ñ?
 msgstr[1] "Ð?аÑ?Ñ?Ñ?пнÑ? подÑ?Ñ? наÑ?Ñ?Ñ?пиÑ?Ñ? пÑ?оÑ?Ñ?гом %i Ñ?вилин:"
 msgstr[2] "Ð?аÑ?Ñ?Ñ?пнÑ? подÑ?Ñ? наÑ?Ñ?Ñ?пиÑ?Ñ? пÑ?оÑ?Ñ?гом %i Ñ?вилин:"
 
-#: ../plugins/gtodo/notification.c:76
+#: ../plugins/gtodo/notification.c:77
 msgid "The following item is due:"
 msgstr "ЦÑ? подÑ?Ñ? вÑ?дбÑ?лоÑ?Ñ?:"
 
 #. gtk_container_set_border_width(GTK_CONTAINER(hbox), 9);
-#: ../plugins/gtodo/notification.c:116
+#: ../plugins/gtodo/notification.c:118
 msgid "_Do not show again"
 msgstr "_Ð?е показÑ?ваÑ?и наÑ?Ñ?Ñ?пного Ñ?азÑ?"
 
@@ -6257,7 +6331,7 @@ msgid "Hide _Completed Items"
 msgstr "СÑ?оваÑ?и _завеÑ?Ñ?енÑ? задаÑ?Ñ?"
 
 #: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed todo items"
+msgid "Hide completed to-do items"
 msgstr "СÑ?оваÑ?и завеÑ?Ñ?енÑ? задаÑ?Ñ?"
 
 #: ../plugins/gtodo/plugin.c:83
@@ -6277,11 +6351,11 @@ msgid "Hide items without an end date"
 msgstr "СÑ?оваÑ?и задаÑ?Ñ? без Ñ?Ñ?Ñ?окÑ? завеÑ?Ñ?еннÑ?"
 
 #: ../plugins/gtodo/plugin.c:122
-msgid "Tasks manager"
+msgid "Task manager"
 msgstr "Ð?енеджеÑ? задаÑ?"
 
 #: ../plugins/gtodo/plugin.c:128
-msgid "Tasks manager view"
+msgid "Task manager view"
 msgstr "Ð?иглÑ?д менеджеÑ?а задаÑ?"
 
 #: ../plugins/gtodo/plugin.c:134
@@ -6289,11 +6363,11 @@ msgid "Tasks"
 msgstr "Ð?адаÑ?Ñ?"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "Todo Manager"
+msgid "To-do Manager"
 msgstr "Ð?енеджеÑ? Ñ?пиÑ?кÑ? задаÑ?"
 
 #: ../plugins/gtodo/preferences.c:21
-msgid "Todo List Preferences"
+msgid "To-do List Preferences"
 msgstr "Ð?аÑ?амеÑ?Ñ?и Ñ?пиÑ?кÑ? задаÑ?"
 
 #: ../plugins/gtodo/preferences.c:84
@@ -6344,11 +6418,11 @@ msgstr[1] "Ð?адаÑ?Ñ?, Ñ?Ñ?Ñ?ок Ñ?киÑ? виÑ?одиÑ?Ñ? пÑ?оÑ?Ñ?гом %
 msgstr[2] "Ð?адаÑ?Ñ?, Ñ?Ñ?Ñ?ок Ñ?киÑ? виÑ?одиÑ?Ñ? пÑ?оÑ?Ñ?гом %i днÑ?в:"
 
 #: ../plugins/gtodo/preferences.c:168
-msgid "Misc"
-msgstr "Ð?нÑ?е"
+msgid "Miscellaneous"
+msgstr "РÑ?зне"
 
 #: ../plugins/gtodo/preferences.c:171
-msgid "Auto purge completed items"
+msgid "Auto-purge completed items"
 msgstr "Ð?вÑ?омаÑ?иÑ?но оÑ?иÑ?аÑ?и завеÑ?Ñ?енÑ? задаÑ?Ñ?"
 
 #. Translators: First part of the sentence "Purge items after %d days"
@@ -6362,8 +6436,8 @@ msgid "days."
 msgstr "днÑ?в."
 
 #: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
-msgid "Auto Purge"
-msgstr "Ð?вÑ?омаÑ?иÑ?на оÑ?иÑ?еннÑ?"
+msgid "Auto-Purge"
+msgstr "Ð?вÑ?омаÑ?иÑ?не оÑ?иÑ?еннÑ?"
 
 #: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
 msgid "Notification"
@@ -6371,11 +6445,11 @@ msgstr "СповÑ?Ñ?еннÑ?"
 
 #: ../plugins/gtodo/preferences.c:218
 #, c-format
-msgid "Allow todo items to notifiy me when they are due in %i minute"
-msgid_plural "Allow todo items to notifiy me when they are due in %i minutes"
-msgstr[0] "СповÑ?Ñ?аÑ?и, коли до завеÑ?Ñ?еннÑ? Ñ?Ñ?Ñ?окÑ? завданнÑ? залиÑ?илаÑ?Ñ? %i Ñ?вилина"
-msgstr[1] "СповÑ?Ñ?аÑ?и, коли до завеÑ?Ñ?еннÑ? Ñ?Ñ?Ñ?окÑ? завданнÑ? залиÑ?илоÑ?Ñ? %i Ñ?вилини"
-msgstr[2] "СповÑ?Ñ?аÑ?и, коли до завеÑ?Ñ?еннÑ? Ñ?Ñ?Ñ?окÑ? завданнÑ? залиÑ?илоÑ?Ñ? %i Ñ?вилин"
+msgid "Allow to-do items to notify me when they are due in %i minute"
+msgid_plural "Allow to-do items to notify me when they are due in %i minutes"
+msgstr[0] "СповÑ?Ñ?аÑ?и, коли до закÑ?нÑ?еннÑ? Ñ?аÑ?Ñ? завданнÑ? залиÑ?илаÑ?Ñ? %i Ñ?вилина"
+msgstr[1] "СповÑ?Ñ?аÑ?и, коли до закÑ?нÑ?еннÑ? Ñ?аÑ?Ñ? завданнÑ? залиÑ?илоÑ?Ñ? %i Ñ?вилини"
+msgstr[2] "СповÑ?Ñ?аÑ?и, коли до закÑ?нÑ?еннÑ? Ñ?аÑ?Ñ? завданнÑ? залиÑ?илоÑ?Ñ? %i Ñ?вилин"
 
 #: ../plugins/gtodo/tasklists.c:10
 msgid "Open a Task List"
@@ -6389,29 +6463,29 @@ msgstr "СÑ?воÑ?иÑ?и Ñ?пиÑ?ок задаÑ?"
 msgid "No Date"
 msgstr "Ð?ез даÑ?и"
 
-#: ../plugins/macro/anjuta-macro.ui.h:1
-msgid "<b>Macro details:</b>"
-msgstr "<b>Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? макÑ?оÑ?Ñ?:</b>"
-
 #: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "<b>Macro text:</b>"
-msgstr "<b>ТекÑ?Ñ? макÑ?оÑ?Ñ?:</b>"
+msgid "Editâ?¦"
+msgstr "Ð?Ñ?авкаâ?¦"
 
 #: ../plugins/macro/anjuta-macro.ui.h:3
-msgid "<b>Macros:</b>"
-msgstr "<b>Ð?акÑ?оÑ?:</b>"
+msgid "Macro details:"
+msgstr "Ð?одÑ?обиÑ?Ñ? пÑ?о макÑ?оÑ?:"
+
+#: ../plugins/macro/anjuta-macro.ui.h:4
+msgid "Macro text:"
+msgstr "ТекÑ?Ñ? макÑ?оÑ?Ñ?:"
 
 #: ../plugins/macro/anjuta-macro.ui.h:5
-msgid "Edit..."
-msgstr "Ð?мÑ?ниÑ?и..."
+msgid "Macros:"
+msgstr "Ð?акÑ?оÑ?и:"
 
 #: ../plugins/macro/anjuta-macro.ui.h:7
 msgid "Shortcut:"
 msgstr "Ð?омбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?:"
 
 #: ../plugins/macro/macro-actions.c:127
-msgid "Press macro shortcut..."
-msgstr "Ð?аÑ?иÑ?нÑ?Ñ?Ñ? комбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ? длÑ? вÑ?Ñ?авки макÑ?оÑ?Ñ?"
+msgid "Press macro shortcutâ?¦"
+msgstr "Ð?аÑ?иÑ?нÑ?Ñ?Ñ? комбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ? макÑ?оÑ?Ñ?â?¦"
 
 #: ../plugins/macro/macro-actions.c:134
 msgid "Press shortcut"
@@ -6436,15 +6510,15 @@ msgstr ""
 "Ð?аÑ?егоÑ?Ñ?Ñ?:\t %s\n"
 "Ð?омбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?:\t %c\n"
 
-#: ../plugins/macro/macro-dialog.c:276
+#: ../plugins/macro/macro-dialog.c:277
 msgid "Insert"
 msgstr "Ð?Ñ?Ñ?авиÑ?и"
 
-#: ../plugins/macro/macro-dialog.c:279
+#: ../plugins/macro/macro-dialog.c:280
 msgid "Insert macro"
 msgstr "Ð?Ñ?Ñ?авиÑ?и макÑ?оÑ?..."
 
-#: ../plugins/macro/macro-edit.c:211
+#: ../plugins/macro/macro-edit.c:207
 msgid "Add/Edit macro"
 msgstr "Ð?одаÑ?и/змÑ?ниÑ?и макÑ?оÑ?"
 
@@ -6463,24 +6537,24 @@ msgid "Macros"
 msgstr "Ð?акÑ?оÑ?и"
 
 #: ../plugins/macro/plugin.c:42
-msgid "_Insert Macro..."
-msgstr "Ð?_Ñ?Ñ?авиÑ?и макÑ?оÑ?..."
+msgid "_Insert Macroâ?¦"
+msgstr "Ð?_Ñ?Ñ?авиÑ?и макÑ?оÑ?â?¦"
 
 #: ../plugins/macro/plugin.c:44
 msgid "Insert a macro using a shortcut"
 msgstr "Ð?Ñ?Ñ?авиÑ?и макÑ?оÑ? за допомогоÑ? комбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?"
 
 #: ../plugins/macro/plugin.c:49
-msgid "_Add Macro..."
-msgstr "_Ð?одаÑ?и макÑ?оÑ? ..."
+msgid "_Add Macroâ?¦"
+msgstr "_Ð?одаÑ?и макÑ?оÑ?â?¦"
 
 #: ../plugins/macro/plugin.c:51
 msgid "Add a macro"
 msgstr "Ð?одаÑ?и макÑ?оÑ?"
 
 #: ../plugins/macro/plugin.c:56
-msgid "Macros..."
-msgstr "Ð?акÑ?оÑ? ..."
+msgid "Macrosâ?¦"
+msgstr "Ð?акÑ?оÑ?иâ?¦"
 
 #: ../plugins/macro/plugin.c:58
 msgid "Add/Edit/Remove macros"
@@ -6490,71 +6564,76 @@ msgstr "Ð?одаÑ?и/Ð?мÑ?ниÑ?и/Ð?идалиÑ?и макÑ?оÑ?"
 msgid "Macro operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? з макÑ?оÑ?ами"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
-msgid "<b>Indicators</b>"
-msgstr "<b>Ð?ндикаÑ?оÑ?и</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:2
-msgid "<b>Message colors</b>"
-msgstr "<b>Ð?олÑ?оÑ?и повÑ?домленÑ?</b>"
-
+#. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
-msgid "<b>Messages options</b>"
-msgstr "<b>Ð?аÑ?амеÑ?Ñ?и повÑ?домленÑ?</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Diagonal"
 msgstr "Ð?Ñ?агоналÑ?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
 msgid "Error message indicator style:"
 msgstr "СÑ?илÑ? Ñ?ндикаÑ?оÑ?а повÑ?домленÑ?:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Errors:"
 msgstr "Ð?омилка:"
 
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+msgid "Indicators"
+msgstr "Ð?ндикаÑ?оÑ?и"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+msgid "Message colors"
+msgstr "Ð?олÑ?оÑ?и повÑ?домленÑ?"
+
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:9
+msgid "Messages options"
+msgstr "Ð?аÑ?амеÑ?Ñ?и повÑ?домленÑ?"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Normal message indicator style:"
 msgstr "СÑ?илÑ? Ñ?ндикаÑ?оÑ?а ноÑ?малÑ?ного повÑ?домленнÑ?:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
 msgid "Number of first characters to show:"
 msgstr "Ð?Ñ?лÑ?кÑ?Ñ?Ñ?Ñ? поÑ?аÑ?ковиÑ? Ñ?имволÑ?в, Ñ?о показÑ?Ñ?Ñ?Ñ?Ñ?Ñ?:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
 msgid "Number of last characters to show:"
 msgstr "Ð?Ñ?лÑ?кÑ?Ñ?Ñ?Ñ? кÑ?нÑ?евиÑ? Ñ?имволÑ?в, Ñ?о показÑ?Ñ?Ñ?Ñ?Ñ?Ñ?:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 msgid "Strike-Out"
 msgstr "Ð?еÑ?екÑ?еÑ?лений"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
-msgid "Tabs position:"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+msgid "Tab position:"
 msgstr "Ð?озиÑ?Ñ?Ñ? вкладок:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
 msgid "Truncate long messages"
 msgstr "Ð?бÑ?Ñ?заÑ?и довгÑ? повÑ?домленнÑ?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Underline-Plain"
 msgstr "Ð?Ñ?дкÑ?еÑ?лений"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:22
 msgid "Underline-Squiggle"
 msgstr "Ð?Ñ?дкÑ?еÑ?лений Ñ?вилÑ?Ñ?Ñ?оÑ?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
+#. text style in editor, TT is for typewriter text
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:24
 msgid "Underline-TT"
 msgstr "Ð?Ñ?дкÑ?еÑ?лений-TT"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:25
 msgid "Warning message indicator style:"
 msgstr "СÑ?илÑ? Ñ?ндикаÑ?оÑ?а попеÑ?едженÑ?:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:26
 msgid "Warnings:"
 msgstr "Ð?опеÑ?едженнÑ?:"
 
@@ -6562,38 +6641,38 @@ msgstr "Ð?опеÑ?едженнÑ?:"
 msgid "Close all message tabs"
 msgstr "Ð?акÑ?иÑ?и вÑ?Ñ? вкладки повÑ?домленÑ?"
 
-#: ../plugins/message-view/message-view.c:490
+#: ../plugins/message-view/message-view.c:491
 msgid "No Messages"
 msgstr "Ð?овÑ?домленÑ? немаÑ?"
 
-#: ../plugins/message-view/message-view.c:499
+#: ../plugins/message-view/message-view.c:500
 msgid "No Infos"
 msgstr "Ð?нÑ?оÑ?маÑ?Ñ?Ñ? немаÑ?"
 
-#: ../plugins/message-view/message-view.c:511
+#: ../plugins/message-view/message-view.c:512
 msgid "No Warnings"
 msgstr "Ð?опеÑ?едженÑ? немаÑ?"
 
-#: ../plugins/message-view/message-view.c:524
+#: ../plugins/message-view/message-view.c:525
 msgid "No Errors"
 msgstr "Ð?омилок немаÑ?"
 
-#: ../plugins/message-view/message-view.c:569
+#: ../plugins/message-view/message-view.c:570
 msgid "Icon"
 msgstr "Ð?наÑ?ок"
 
-#: ../plugins/message-view/message-view.c:583
+#: ../plugins/message-view/message-view.c:584
 #: ../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 "Ð?овÑ?домленнÑ?"
 
-#: ../plugins/message-view/message-view.c:942
+#: ../plugins/message-view/message-view.c:943
 #, c-format
 msgid "Error writing %s"
 msgstr "Ð?омилка запиÑ?Ñ? %s"
 
-#: ../plugins/message-view/message-view.c:1099
+#: ../plugins/message-view/message-view.c:1100
 #, c-format
 msgid "%d Message"
 msgid_plural "%d Messages"
@@ -6601,7 +6680,7 @@ msgstr[0] "%d повÑ?домленнÑ?"
 msgstr[1] "%d повÑ?домленнÑ?"
 msgstr[2] "%d повÑ?домленÑ?"
 
-#: ../plugins/message-view/message-view.c:1105
+#: ../plugins/message-view/message-view.c:1106
 #, c-format
 msgid "%d Info"
 msgid_plural "%d Infos"
@@ -6609,7 +6688,7 @@ msgstr[0] "%d Ñ?повÑ?Ñ?еннÑ?"
 msgstr[1] "%d Ñ?повÑ?Ñ?еннÑ?"
 msgstr[2] "%d Ñ?повÑ?Ñ?енÑ?"
 
-#: ../plugins/message-view/message-view.c:1110
+#: ../plugins/message-view/message-view.c:1111
 #, c-format
 msgid "%d Warning"
 msgid_plural "%d Warnings"
@@ -6617,7 +6696,7 @@ msgstr[0] "%d попеÑ?едженнÑ?"
 msgstr[1] "%d попеÑ?едженнÑ?"
 msgstr[2] "%d попеÑ?едженÑ?"
 
-#: ../plugins/message-view/message-view.c:1115
+#: ../plugins/message-view/message-view.c:1116
 #, c-format
 msgid "%d Error"
 msgid_plural "%d Errors"
@@ -6683,16 +6762,16 @@ msgid "Patching %s using %s\n"
 msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваннÑ? лаÑ?ки до %s з викоÑ?иÑ?Ñ?аннÑ?м %s\n"
 
 #: ../plugins/patch/patch-plugin.c:209
-msgid "Patching...\n"
-msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваннÑ? лаÑ?ки...\n"
+msgid "Patchingâ?¦\n"
+msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваннÑ? лаÑ?киâ?¦\n"
 
 #: ../plugins/patch/patch-plugin.c:219
-msgid "Patching..."
-msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваннÑ? лаÑ?ки..."
+msgid "Patchingâ?¦"
+msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваннÑ? лаÑ?киâ?¦"
 
 #: ../plugins/patch/patch-plugin.c:224
-msgid "There are unfinished jobs, please wait until they are finished."
-msgstr "Ð?е вÑ?Ñ? опеÑ?аÑ?Ñ?Ñ? збеÑ?еженÑ?, заÑ?екайÑ?е, коли вони закÑ?нÑ?аÑ?Ñ?Ñ?Ñ?."
+msgid "There are unfinished jobs: please wait until they are finished."
+msgstr "Ð?е вÑ?Ñ? опеÑ?аÑ?Ñ?Ñ? збеÑ?еженÑ?, доÑ?екайÑ?еÑ?Ñ? Ñ?Ñ? завеÑ?Ñ?еннÑ?."
 
 #: ../plugins/patch/patch-plugin.c:266
 msgid ""
@@ -6734,77 +6813,82 @@ msgstr "_Ð?нÑ?Ñ?Ñ?Ñ?менÑ?и"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
-msgid "_Patch..."
-msgstr "_Ð?аÑ?ка..."
+msgid "_Patchâ?¦"
+msgstr "_Ð?аÑ?каâ?¦"
 
 #: ../plugins/patch/plugin.c:92
 msgid "Patch files/directories"
 msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и лаÑ?кÑ? до Ñ?айлÑ?в/каÑ?алогÑ?в"
 
-#: ../plugins/project-import/plugin.c:66
+#: ../plugins/project-import/plugin.c:68
 msgid ""
 "Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up to date."
+"template to use. Please make sure your version of Anjuta is up-to-date."
 msgstr ""
-"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?мпоÑ?Ñ?Ñ?ваÑ?и пÑ?оекÑ?. Ð?е знайдено вÑ?дповÑ?дний Ñ?аблон пÑ?оекÑ?Ñ?. "
-"Ð?еÑ?евÑ?Ñ?Ñ?е, Ñ?о ваÑ?Ñ? веÑ?Ñ?Ñ?Ñ? Anjuta не вÑ?Ñ?ановлено."
+"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и пÑ?оекÑ?. Ð?е знайдено вÑ?дповÑ?дний Ñ?аблон пÑ?оекÑ?Ñ?. "
+"Ð?еÑ?евÑ?Ñ?Ñ?е, Ñ?о ваÑ?а веÑ?Ñ?Ñ?Ñ? Anjuta не заÑ?Ñ?аÑ?Ñ?ла."
 
-#: ../plugins/project-import/plugin.c:86
+#: ../plugins/project-import/plugin.c:88
 #, c-format
 msgid "A file named \"%s\" already exists. Do you want to replace it?"
 msgstr "Файл «%s» вже Ñ?Ñ?нÑ?Ñ?. ХоÑ?еÑ?е пеÑ?епиÑ?аÑ?и його?"
 
-#: ../plugins/project-import/plugin.c:134
+#: ../plugins/project-import/plugin.c:136
 #, c-format
 msgid ""
-"A file named \"%s\" cannot be written: %s.  Check if you have write access "
-"to the project directory."
+"A file named \"%s\" cannot be written: %s. Check if you have write access to "
+"the project directory."
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? запиÑ?аÑ?и Ñ? Ñ?айл «%s»: %s. Ð?еÑ?евÑ?Ñ?Ñ?е, Ñ?о Ñ? ваÑ? Ñ? пÑ?ава на запиÑ? до "
 "каÑ?алогÑ? пÑ?оекÑ?Ñ?."
 
-#: ../plugins/project-import/plugin.c:204
+#: ../plugins/project-import/plugin.c:200
+#, c-format
+msgid "Please select a project backend to open %s."
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? модÑ?лÑ?, Ñ?об вÑ?дкÑ?иÑ?и %s."
+
+#: ../plugins/project-import/plugin.c:220
 #, c-format
 msgid ""
-"Could not find a valid project backend for the directory given (%s). Please "
+"Could not find a valid project backend for the given directory (%s). Please "
 "select a different directory, or try upgrading to a newer version of Anjuta."
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и внÑ?Ñ?Ñ?Ñ?Ñ?нÑ?й компоненÑ? длÑ? Ñ?Ñ?ого пÑ?оекÑ?Ñ? (%s). Ð?беÑ?Ñ?Ñ?Ñ? "
 "Ñ?нÑ?ий каÑ?алог або оновÑ?Ñ?Ñ? веÑ?Ñ?Ñ?Ñ? Anjuta."
 
-#: ../plugins/project-import/plugin.c:274
-#: ../plugins/project-import/plugin.c:330
+#: ../plugins/project-import/plugin.c:290
+#: ../plugins/project-import/plugin.c:346
 #, c-format
 msgid ""
-"Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
-msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и вказаний uri \"%s\", помилка: \"%s\""
+"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
+msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и вказаний URI «%s». Ð?од помилки: «%s»"
 
 #: ../plugins/project-import/project-import.ui.h:1
-msgid "<b>Import options</b>"
-msgstr "<b>Ð?адливÑ? паÑ?амеÑ?Ñ?и</b>"
-
-#: ../plugins/project-import/project-import.ui.h:2
-msgid "<b>Project name</b>"
-msgstr "<b>Ð?азва пÑ?оекÑ?Ñ?</b>"
-
-#: ../plugins/project-import/project-import.ui.h:3
-#: ../plugins/project-wizard/templates/translatable-strings.h:34
+#: ../plugins/project-wizard/templates/translatable-strings.h:35
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "Ð?пиÑ?:"
 
-#: ../plugins/project-import/project-import.ui.h:4
+#: ../plugins/project-import/project-import.ui.h:2
 msgid "Import from folder"
 msgstr "Ð?мпоÑ?Ñ?Ñ?ваÑ?и з Ñ?еки"
 
-#: ../plugins/project-import/project-import.ui.h:5
+#: ../plugins/project-import/project-import.ui.h:3
 msgid "Import from version control system"
 msgstr "Ð?мпоÑ?Ñ?Ñ?ваÑ?и з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
-#: ../plugins/project-import/project-import.ui.h:6
+#: ../plugins/project-import/project-import.ui.h:4
+msgid "Import options"
+msgstr "Ð?аÑ?амеÑ?Ñ?и Ñ?мпоÑ?Ñ?Ñ?"
+
+#: ../plugins/project-import/project-import.ui.h:5
 msgid "Location:"
 msgstr "РозÑ?аÑ?Ñ?ваннÑ?:"
 
+#: ../plugins/project-import/project-import.ui.h:6
+msgid "Project name"
+msgstr "Ð?азва пÑ?оекÑ?Ñ?"
+
 #: ../plugins/project-import/project-import-dialog.c:292
 msgid "Import project"
 msgstr "Ð?мпоÑ?Ñ?Ñ?ваÑ?и пÑ?оекÑ?"
@@ -6858,130 +6942,151 @@ msgid "_Group name:"
 msgstr "_Ð?азва гÑ?Ñ?пи:"
 
 #: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to add..."
-msgstr "_Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл длÑ? додаваннÑ?..."
+msgid "_Select file to addâ?¦"
+msgstr "_Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл длÑ? додаваннÑ?â?¦"
 
-#: ../plugins/project-manager/gbf-project-model.c:233
-#: ../plugins/project-manager/plugin.c:1301
-#: ../plugins/project-manager/plugin.c:1384
-#: ../plugins/project-manager/plugin.c:1557
+#: ../plugins/project-manager/gbf-project-model.c:231
+#: ../plugins/project-manager/plugin.c:1430
+#: ../plugins/project-manager/plugin.c:1513
+#: ../plugins/project-manager/plugin.c:1689
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "Ð?Ñ?оекÑ?"
 
-#: ../plugins/project-manager/gbf-project-model.c:234
+#: ../plugins/project-manager/gbf-project-model.c:232
 msgid "GbfProject Object"
 msgstr "Ð?б'Ñ?кÑ? GbfProject"
 
-#: ../plugins/project-manager/gbf-project-model.c:251
+#: ../plugins/project-manager/gbf-project-model.c:677
 msgid "No project loaded"
 msgstr "Ð?емаÑ? заванÑ?аженого пÑ?оекÑ?Ñ?"
 
+#: ../plugins/project-manager/gbf-project-util.c:229
 #: ../plugins/project-manager/gbf-project-util.c:236
-#: ../plugins/project-manager/gbf-project-util.c:244
-msgid "Can not add group"
+msgid "Cannot add group"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? додаÑ?и гÑ?Ñ?пÑ?"
 
-#: ../plugins/project-manager/gbf-project-util.c:245
+#: ../plugins/project-manager/gbf-project-util.c:237
 msgid "No parent group selected"
 msgstr "Ð?аÑ?Ñ?кÑ?вÑ?Ñ?кÑ? гÑ?Ñ?пÑ? не обÑ?ано"
 
-#: ../plugins/project-manager/gbf-project-util.c:417
-#: ../plugins/project-manager/gbf-project-util.c:426
-msgid "Can not add target"
+#: ../plugins/project-manager/gbf-project-util.c:407
+#: ../plugins/project-manager/gbf-project-util.c:414
+msgid "Cannot add target"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? додаÑ?и Ñ?Ñ?лÑ?"
 
-#: ../plugins/project-manager/gbf-project-util.c:427
+#: ../plugins/project-manager/gbf-project-util.c:415
 msgid "No group selected"
 msgstr "Ð?Ñ?Ñ?пÑ? не обÑ?ано"
 
-#: ../plugins/project-manager/gbf-project-util.c:532
-msgid "Select sources..."
-msgstr "Ð?бÑ?аÑ?и Ñ?айли пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в..."
+#: ../plugins/project-manager/gbf-project-util.c:510
+msgid "Select sourcesâ?¦"
+msgstr "Ð?бÑ?аÑ?и Ñ?айли пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?вâ?¦"
 
-#: ../plugins/project-manager/gbf-project-util.c:772
-#: ../plugins/project-manager/gbf-project-util.c:779
-msgid "Can not add source files"
+#: ../plugins/project-manager/gbf-project-util.c:744
+#: ../plugins/project-manager/gbf-project-util.c:751
+msgid "Cannot add source files"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? додаÑ?и Ñ?айл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в"
 
-#: ../plugins/project-manager/gbf-project-util.c:780
+#: ../plugins/project-manager/gbf-project-util.c:752
 msgid "No target has been selected"
 msgstr "Ð?е обÑ?ано Ñ?Ñ?лÑ?"
 
-#: ../plugins/project-manager/plugin.c:425
-#: ../plugins/project-manager/plugin.c:826
-msgid "Project properties"
-msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? пÑ?оекÑ?Ñ?"
+#: ../plugins/project-manager/plugin.c:437
+msgid "Group properties"
+msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? гÑ?Ñ?пи"
 
-#: ../plugins/project-manager/plugin.c:430
+#: ../plugins/project-manager/plugin.c:446
+msgid "No properties available for this group"
+msgstr "Ð?емаÑ? влаÑ?Ñ?ивоÑ?Ñ?ей, доÑ?Ñ?Ñ?пниÑ? длÑ? Ñ?Ñ?Ñ?Ñ? гÑ?Ñ?пи"
+
+#: ../plugins/project-manager/plugin.c:451
 msgid "Target properties"
 msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? Ñ?Ñ?лÑ?"
 
-#: ../plugins/project-manager/plugin.c:435
-msgid "Group properties"
-msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? гÑ?Ñ?пи"
-
-#: ../plugins/project-manager/plugin.c:459
+#: ../plugins/project-manager/plugin.c:460
 msgid "No properties available for this target"
 msgstr "Ð?емаÑ? влаÑ?Ñ?ивоÑ?Ñ?ей доÑ?Ñ?Ñ?пниÑ? длÑ? Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?лÑ?"
 
-#: ../plugins/project-manager/plugin.c:485
+#: ../plugins/project-manager/plugin.c:492
+#: ../plugins/project-manager/plugin.c:907
+msgid "Project properties"
+msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? пÑ?оекÑ?Ñ?"
+
+#: ../plugins/project-manager/plugin.c:511
+msgid "Refreshing symbol treeâ?¦"
+msgstr "Ð?новленнÑ? деÑ?ева Ñ?имволÑ?вâ?¦"
+
+#: ../plugins/project-manager/plugin.c:518
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оновиÑ?и пÑ?оекÑ?: %s"
 
-#: ../plugins/project-manager/plugin.c:663
+#: ../plugins/project-manager/plugin.c:696
 msgid ""
-"Are you sure you want to remove the following group from project?\n"
+"Are you sure you want to remove the following group from the project?\n"
 "\n"
 msgstr ""
 "Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и гÑ?Ñ?пÑ? з пÑ?оекÑ?Ñ??\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:664
-#, c-format
+#: ../plugins/project-manager/plugin.c:699
 msgid ""
-"Group: %s\n"
+"Are you sure you want to remove the following target from the project?\n"
 "\n"
-"The group will not be deleted from file system."
 msgstr ""
-"Ð?Ñ?Ñ?па: %s\n"
+"Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и Ñ?Ñ?лÑ? з пÑ?оекÑ?Ñ??\n"
 "\n"
-"Ð?Ñ?Ñ?пÑ? не бÑ?де видалено з Ñ?айловоÑ? Ñ?иÑ?Ñ?еми."
 
-#: ../plugins/project-manager/plugin.c:667
+#: ../plugins/project-manager/plugin.c:702
 msgid ""
-"Are you sure you want to remove the following target from project?\n"
+"Are you sure you want to remove the following source file from the project?\n"
 "\n"
 msgstr ""
-"Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и елеменÑ? з пÑ?оекÑ?Ñ??\n"
+"Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и Ñ?айл пеÑ?винного кодÑ? з пÑ?оекÑ?Ñ??\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:668
-#, c-format
-msgid "Target: %s"
-msgstr "ЦÑ?лÑ?: %s"
-
-#: ../plugins/project-manager/plugin.c:671
+#: ../plugins/project-manager/plugin.c:705
 msgid ""
-"Are you sure you want to remove the following source file from project?\n"
+"Are you sure you want to remove the following elements from the project?\n"
 "\n"
 msgstr ""
-"Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и Ñ?айл з пÑ?оекÑ?Ñ??\n"
+"Ð?Ñ?йÑ?но Ñ?оÑ?еÑ?е видалиÑ?и наÑ?Ñ?Ñ?пÑ? елеменÑ?и з пÑ?оекÑ?Ñ??\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:672
+#: ../plugins/project-manager/plugin.c:722
 #, c-format
-msgid ""
-"Source: %s\n"
-"\n"
-"The source file will not be deleted from file system."
-msgstr ""
-"Файл пеÑ?винного кодÑ?: %s\n"
-"\n"
-"Файл пеÑ?винного  кодÑ? не бÑ?де видалено з Ñ?айловоÑ? Ñ?иÑ?Ñ?еми."
+msgid "Group: %s\n"
+msgstr "Ð?Ñ?Ñ?па: %s\n"
+
+#: ../plugins/project-manager/plugin.c:725
+#, c-format
+msgid "Target: %s\n"
+msgstr "ЦÑ?лÑ?: %s\n"
+
+#: ../plugins/project-manager/plugin.c:728
+#, c-format
+msgid "Source: %s\n"
+msgstr "Ð?жеÑ?ело: %s\n"
 
-#: ../plugins/project-manager/plugin.c:727
+#: ../plugins/project-manager/plugin.c:731
+#, c-format
+msgid "Shortcut: %s\n"
+msgstr "Ð?омбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?: %s\n"
+
+#: ../plugins/project-manager/plugin.c:743
+msgid "The group will not be deleted from the file system."
+msgstr "Ð?Ñ?Ñ?пÑ? не бÑ?де видалено з Ñ?айловоÑ? Ñ?иÑ?Ñ?еми."
+
+#: ../plugins/project-manager/plugin.c:745
+msgid "The source file will not be deleted from the file system."
+msgstr "Файл пеÑ?винного  кодÑ? не бÑ?де видалено з Ñ?айловоÑ? Ñ?иÑ?Ñ?еми."
+
+#: ../plugins/project-manager/plugin.c:750
+msgid "Confirm remove"
+msgstr "Ð?Ñ?дÑ?веÑ?диÑ?и видаленнÑ?"
+
+#: ../plugins/project-manager/plugin.c:795
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -6990,102 +7095,102 @@ msgstr ""
 "Ð?е даÑ?Ñ?Ñ?Ñ?Ñ? видалиÑ?и '%s':\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:784
+#: ../plugins/project-manager/plugin.c:865
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о Ñ?еÑ?Ñ?Ñ?Ñ? %s: %s"
 
-#: ../plugins/project-manager/plugin.c:822
+#: ../plugins/project-manager/plugin.c:903
 msgid "_Project"
 msgstr "Ð?_Ñ?оекÑ?"
 
-#: ../plugins/project-manager/plugin.c:826
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:907
+#: ../plugins/project-manager/plugin.c:941
 msgid "_Properties"
 msgstr "Ð?_лаÑ?Ñ?ивоÑ?Ñ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:912
 msgid "_Refresh"
 msgstr "_Ð?новиÑ?и"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:912
 msgid "Refresh project manager tree"
 msgstr "Ð?новиÑ?и деÑ?ево менеджеÑ?а пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:836
-msgid "Add _Group..."
-msgstr "Ð?одаÑ?и _гÑ?Ñ?пÑ?..."
+#: ../plugins/project-manager/plugin.c:917
+msgid "Add _Groupâ?¦"
+msgstr "Ð?одаÑ?и_ гÑ?Ñ?пÑ?â?¦"
 
-#: ../plugins/project-manager/plugin.c:836
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:917
+#: ../plugins/project-manager/plugin.c:951
 msgid "Add a group to project"
 msgstr "Ð?одаÑ?и гÑ?Ñ?пÑ? до пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:841
-msgid "Add _Target..."
-msgstr "Ð?одаÑ?и _Ñ?Ñ?лÑ?"
+#: ../plugins/project-manager/plugin.c:922
+msgid "Add _Targetâ?¦"
+msgstr "Ð?одаÑ?и _Ñ?Ñ?лÑ?â?¦"
 
-#: ../plugins/project-manager/plugin.c:841
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:922
+#: ../plugins/project-manager/plugin.c:956
 msgid "Add a target to project"
 msgstr "Ð?обавиÑ?Ñ? Ñ?Ñ?лÑ? до пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:846
-msgid "Add _Source File..."
-msgstr "Ð?одаÑ?и _Ñ?айл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в..."
+#: ../plugins/project-manager/plugin.c:927
+msgid "Add _Source Fileâ?¦"
+msgstr "Ð?одаÑ?и _Ñ?айл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?вâ?¦"
 
-#: ../plugins/project-manager/plugin.c:846
-#: ../plugins/project-manager/plugin.c:865
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:927
+#: ../plugins/project-manager/plugin.c:946
+#: ../plugins/project-manager/plugin.c:961
 msgid "Add a source file to project"
 msgstr "Ð?одаÑ?и _Ñ?айл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в до пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:932
 msgid "Close Pro_ject"
 msgstr "_Ð?акÑ?иÑ?и пÑ?оекÑ?"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:932
 msgid "Close project"
 msgstr "Ð?акÑ?иÑ?и пÑ?оекÑ?"
 
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:941
 msgid "Properties of group/target/source"
 msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? гÑ?Ñ?пи/Ñ?Ñ?лÑ?/джеÑ?ела"
 
-#: ../plugins/project-manager/plugin.c:865
-msgid "_Add To Project"
+#: ../plugins/project-manager/plugin.c:946
+msgid "_Add to Project"
 msgstr "_Ð?одаÑ?и до пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:951
 msgid "Add _Group"
 msgstr "Ð?одаÑ?и_ гÑ?Ñ?пÑ?"
 
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:956
 msgid "Add _Target"
 msgstr "Ð?одаÑ?и _Ñ?Ñ?лÑ?..."
 
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:961
 msgid "Add _Source File"
 msgstr "Ð?одаÑ?и _Ñ?айл пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:966
 msgid "Re_move"
 msgstr "Ð?_идалиÑ?и"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:966
 msgid "Remove from project"
 msgstr "Ð?идалиÑ?и з пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:1259
+#: ../plugins/project-manager/plugin.c:1387
 #, c-format
 msgid "Loading project: %s"
 msgstr "Ð?аванÑ?аженнÑ? пÑ?оекÑ?Ñ?: %s"
 
-#: ../plugins/project-manager/plugin.c:1267
-msgid "Created project view..."
-msgstr "СÑ?воÑ?ено пÑ?едÑ?Ñ?авленнÑ? пÑ?оекÑ?Ñ?..."
+#: ../plugins/project-manager/plugin.c:1395
+msgid "Created project viewâ?¦"
+msgstr "СÑ?воÑ?ено пÑ?едÑ?Ñ?авленнÑ? пÑ?оекÑ?Ñ?â?¦"
 
-#: ../plugins/project-manager/plugin.c:1280
+#: ../plugins/project-manager/plugin.c:1408
 #, c-format
 msgid ""
 "Failed to parse project (the project is opened, but there will be no project "
@@ -7094,49 +7199,45 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? обÑ?обиÑ?и пÑ?оекÑ? (пÑ?оекÑ? вÑ?дкÑ?иÑ?о, але вÑ?н не бÑ?де показаний) %s: "
 "%s\n"
 
-#: ../plugins/project-manager/plugin.c:1472
+#: ../plugins/project-manager/plugin.c:1601
 #, c-format
 msgid "Error closing project: %s"
 msgstr "Ð?омилка пÑ?д Ñ?аÑ? закÑ?иÑ?Ñ?Ñ? пÑ?оекÑ?Ñ?: %s"
 
-#: ../plugins/project-manager/plugin.c:1536
+#: ../plugins/project-manager/plugin.c:1668
 msgid "Project manager actions"
 msgstr "Ð?Ñ?Ñ? менеджеÑ?а пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:1544
+#: ../plugins/project-manager/plugin.c:1676
 msgid "Project manager popup actions"
 msgstr "Ð?онÑ?екÑ?Ñ?нÑ? команди менеджеÑ?а пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-manager/plugin.c:2641
-msgid "Initializing Project..."
-msgstr "Ð?нÑ?Ñ?Ñ?алÑ?заÑ?Ñ?Ñ? пÑ?оекÑ?Ñ?..."
+#: ../plugins/project-manager/plugin.c:2471
+msgid "Initializing Projectâ?¦"
+msgstr "Ð?нÑ?Ñ?Ñ?алÑ?заÑ?Ñ?Ñ? пÑ?оекÑ?Ñ?â?¦"
 
-#: ../plugins/project-manager/plugin.c:2644
+#: ../plugins/project-manager/plugin.c:2474
 msgid "Project Loaded"
 msgstr "Ð?Ñ?оекÑ? заванÑ?ажено"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Ð?одÑ?обиÑ?Ñ?</b>"
+msgid "Details"
+msgstr "Ð?одÑ?обиÑ?Ñ?"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:2
-#: ../plugins/project-wizard/druid.c:147
+#: ../plugins/project-wizard/druid.c:150
 msgid "Error"
 msgstr "Ð?омилка"
 
-#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:3
-msgid "Select project type"
-msgstr "Ð?беÑ?Ñ?Ñ?Ñ? Ñ?ип пÑ?оекÑ?Ñ?"
-
-#: ../plugins/project-wizard/druid.c:139 ../plugins/project-wizard/druid.c:143
+#: ../plugins/project-wizard/druid.c:142 ../plugins/project-wizard/druid.c:146
 msgid "Warning"
 msgstr "Ð?опеÑ?едженнÑ?"
 
-#: ../plugins/project-wizard/druid.c:150
+#: ../plugins/project-wizard/druid.c:153
 msgid "Message"
 msgstr "Ð?овÑ?домленнÑ?"
 
-#: ../plugins/project-wizard/druid.c:216
+#: ../plugins/project-wizard/druid.c:232
 msgid ""
 "<b>Confirm the following information:</b>\n"
 "\n"
@@ -7146,17 +7247,17 @@ msgstr ""
 
 #. The project type is translated too, it is something like
 #. * generic, GNOME applet, Makefile project...
-#: ../plugins/project-wizard/druid.c:220
+#: ../plugins/project-wizard/druid.c:236
 #, c-format
 msgid "Project Type: %s\n"
 msgstr "Тип пÑ?оекÑ?Ñ?: %s\n"
 
-#: ../plugins/project-wizard/druid.c:374
+#: ../plugins/project-wizard/druid.c:393
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "Ð?е вдалоÑ?Ñ? знайÑ?и Ñ?аблони пÑ?оекÑ?Ñ?в Ñ? %s"
 
-#: ../plugins/project-wizard/druid.c:575
+#: ../plugins/project-wizard/druid.c:594
 #, c-format
 msgid ""
 "\n"
@@ -7165,21 +7266,32 @@ msgstr ""
 "\n"
 "Ð?оле «%s» Ñ? обов'Ñ?зковим длÑ? заповненнÑ?."
 
-#: ../plugins/project-wizard/druid.c:590
+#: ../plugins/project-wizard/druid.c:609
 #, c-format
 msgid ""
-"Field \"%s\" must start with a letter, a digit or an underscore and contains "
+"Field \"%s\" must start with a letter, a digit or an underscore and contain "
 "only letters, digits, underscore, minus and dot. Please fix it."
 msgstr ""
 "Ð?оле «%s» маÑ? поÑ?инаÑ?иÑ?Ñ? з бÑ?кви, Ñ?иÑ?Ñ?и Ñ?а Ñ?имволÑ? нижнÑ?ого пÑ?дкÑ?еÑ?леннÑ? Ñ?а "
-"мÑ?Ñ?Ñ?иÑ?и лиÑ?е лÑ?Ñ?еÑ?и, Ñ?иÑ?Ñ?и, Ñ?имволи нижнÑ?ого пÑ?дкÑ?еÑ?леннÑ? Ñ?а Ñ?оÑ?кÑ?."
+"мÑ?Ñ?Ñ?иÑ?и лиÑ?е лÑ?Ñ?еÑ?и, Ñ?иÑ?Ñ?и, Ñ?имволи нижнÑ?ого пÑ?дкÑ?еÑ?леннÑ?, деÑ?Ñ?Ñ? Ñ?а Ñ?оÑ?кÑ?."
 
-#: ../plugins/project-wizard/druid.c:595
+#: ../plugins/project-wizard/druid.c:614
+#, c-format
+msgid ""
+"Field \"%s\" must start with a letter, a digit, an underscore or a directory "
+"separator and contain only letters, digits, underscore, directory separator, "
+"minus and dot. Please fix it."
+msgstr ""
+"Ð?оле «%s» маÑ? поÑ?инаÑ?иÑ?Ñ? з бÑ?кви, Ñ?иÑ?Ñ?и Ñ?а Ñ?имволÑ? нижнÑ?ого пÑ?дкÑ?еÑ?леннÑ? або "
+"Ñ?оздÑ?лÑ?ваÑ?а каÑ?алогÑ?в Ñ?а мÑ?Ñ?Ñ?иÑ?и лиÑ?е лÑ?Ñ?еÑ?и, Ñ?иÑ?Ñ?и, Ñ?имволи нижнÑ?ого "
+"пÑ?дкÑ?еÑ?леннÑ?, деÑ?Ñ?Ñ? Ñ?а Ñ?оÑ?кÑ?."
+
+#: ../plugins/project-wizard/druid.c:619
 #, c-format
 msgid "Unknown error."
 msgstr "Ð?евÑ?дома помилка."
 
-#: ../plugins/project-wizard/druid.c:622
+#: ../plugins/project-wizard/druid.c:646
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
@@ -7188,20 +7300,20 @@ msgstr ""
 "Ð?апка «%s» не поÑ?ожнÑ?. Ð?Ñ?оекÑ? може не бÑ?Ñ?и Ñ?Ñ?воÑ?ений, Ñ?кÑ?о бÑ?де неможливо "
 "запиÑ?аÑ?и деÑ?кÑ? Ñ?айли. Ð?Ñ?одовжиÑ?и?"
 
-#: ../plugins/project-wizard/druid.c:624
+#: ../plugins/project-wizard/druid.c:648
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "Файл «%s» вже Ñ?Ñ?нÑ?Ñ?. ХоÑ?еÑ?е пеÑ?епиÑ?аÑ?и його?"
 
-#: ../plugins/project-wizard/druid.c:655
+#: ../plugins/project-wizard/druid.c:679
 msgid "Invalid entry"
 msgstr "Ð?екоÑ?екÑ?ний елеменÑ?"
 
-#: ../plugins/project-wizard/druid.c:666
+#: ../plugins/project-wizard/druid.c:690
 msgid "Dubious entry"
 msgstr "Ð?омилковÑ? данÑ?"
 
-#: ../plugins/project-wizard/druid.c:776
+#: ../plugins/project-wizard/druid.c:851
 #, c-format
 msgid ""
 "\n"
@@ -7210,7 +7322,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?дÑ?Ñ?Ñ?нÑ? пÑ?огÑ?ами: %s."
 
-#: ../plugins/project-wizard/druid.c:787
+#: ../plugins/project-wizard/druid.c:862
 #, c-format
 msgid ""
 "\n"
@@ -7219,7 +7331,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?дÑ?Ñ?Ñ?нÑ? пакеÑ?и: %s."
 
-#: ../plugins/project-wizard/druid.c:795
+#: ../plugins/project-wizard/druid.c:871
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
@@ -7229,27 +7341,31 @@ msgstr ""
 "пÑ?оекÑ?Ñ?, вÑ?дÑ?Ñ?Ñ?нÑ?. Ð?еÑ?ед Ñ?Ñ?воÑ?еннÑ?м пÑ?оекÑ?Ñ? пеÑ?евÑ?Ñ?Ñ?е, Ñ?о вони вÑ?Ñ?ановленÑ? "
 "коÑ?екÑ?но.\n"
 
-#: ../plugins/project-wizard/druid.c:801
+#: ../plugins/project-wizard/druid.c:879
+msgid "Install missing packages"
+msgstr "Ð?Ñ?Ñ?ановиÑ?и вÑ?дÑ?Ñ?Ñ?нÑ? пакеÑ?и"
+
+#: ../plugins/project-wizard/druid.c:887
 msgid ""
 "The missing programs are usually part of some distrubution packages and can "
-"be searched in your Application Manager. Similarly, the development packages "
-"are contained in special packages that your distribution provide to allow "
-"development of projects based on them. They usually end with -dev or -devel "
-"suffix in package names and can be found by searching in your Application "
-"Manager."
+"be searched for in your Application Manager. Similarly, the development "
+"packages are contained in special packages that your distribution provides "
+"to allow development of projects based on them. They usually end with a \"-"
+"dev\" or \"-devel\" suffix in package names and can be found by searching in "
+"your Application Manager."
 msgstr ""
 "Ð?Ñ?дÑ?Ñ?Ñ?нÑ? пакеÑ?и Ñ?аÑ?Ñ?о вÑ?одÑ?Ñ?Ñ? до Ñ?кладÑ? пакеÑ?Ñ?в Ñ? диÑ?Ñ?Ñ?ибÑ?Ñ?ивÑ? Ñ?а можÑ?Ñ?Ñ? "
 "бÑ?Ñ?и вÑ?Ñ?ановленÑ?, Ñ?к бÑ?дÑ?-Ñ?кÑ? Ñ?нÑ?Ñ?, за допомогоÑ? менеджеÑ?а пакеÑ?Ñ?в. У "
 "пакеÑ?аÑ? диÑ?Ñ?Ñ?ибÑ?Ñ?ивÑ? пÑ?иÑ?Ñ?Ñ?нÑ? пакеÑ?и длÑ? Ñ?озÑ?обникÑ?в, Ñ?о дозволÑ?Ñ?Ñ?Ñ? "
-"Ñ?Ñ?воÑ?Ñ?ваÑ?и пÑ?огÑ?ами з викоÑ?иÑ?Ñ?аннÑ?м бÑ?блÑ?оÑ?ек диÑ?Ñ?Ñ?ибÑ?Ñ?ивÑ?. Ð?они Ñ?аÑ?Ñ?о маÑ?Ñ?Ñ? "
-"Ñ?Ñ?Ñ?Ñ?кÑ? -dev або -devel Ñ? назвÑ? пакеÑ?Ñ? Ñ?а Ñ?акож можÑ?Ñ?Ñ? бÑ?Ñ?и знайденÑ? Ñ? "
-"менеджеÑ?Ñ? пакеÑ?Ñ?в."
+"Ñ?Ñ?воÑ?Ñ?ваÑ?и пÑ?огÑ?ами з викоÑ?иÑ?Ñ?аннÑ?м бÑ?блÑ?оÑ?ек диÑ?Ñ?Ñ?ибÑ?Ñ?ивÑ?. У назвÑ? пакеÑ?Ñ? "
+"вони Ñ?аÑ?Ñ?о маÑ?Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?кÑ? -dev або -devel, Ñ?Ñ? Ñ?акож можна знайÑ?и Ñ? менеджеÑ?Ñ? "
+"пакеÑ?Ñ?в."
 
-#: ../plugins/project-wizard/druid.c:809
+#: ../plugins/project-wizard/druid.c:895
 msgid "Missing components"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ? компоненÑ?и"
 
-#: ../plugins/project-wizard/druid.c:941
+#: ../plugins/project-wizard/druid.c:1027
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?оÑ?иÑ?аÑ?и Ñ?нÑ?еÑ?Ñ?ейÑ? помÑ?Ñ?ника Ñ?Ñ?воÑ?еннÑ? пÑ?оекÑ?Ñ?в з %s."
@@ -7269,18 +7385,18 @@ msgstr "Ð?Ñ?опÑ?Ñ?к %s: Ñ?айл вже Ñ?Ñ?нÑ?Ñ?"
 
 #: ../plugins/project-wizard/install.c:503
 #, c-format
-msgid "Creating %s ... Fail to create directory"
-msgstr "СÑ?воÑ?еннÑ? %s ... Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и папкÑ?"
+msgid "Creating %s â?¦ Failed to create directory"
+msgstr "СÑ?воÑ?еннÑ? %s â?¦ Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог"
 
 #: ../plugins/project-wizard/install.c:519
 #, c-format
-msgid "Creating %s (using AutoGen)... %s"
-msgstr "СÑ?воÑ?еннÑ? %s (викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?и AutoGen)... %s"
+msgid "Creating %s (using AutoGen)â?¦ %s"
+msgstr "СÑ?воÑ?еннÑ? %s (викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?и AutoGen)â?¦ %s"
 
 #: ../plugins/project-wizard/install.c:524
 #, c-format
-msgid "Creating %s ... %s"
-msgstr "СÑ?воÑ?еннÑ? %s ... %s"
+msgid "Creating %s â?¦ %s"
+msgstr "СÑ?воÑ?еннÑ? %s â?¦ %s"
 
 #. The %s is a name of a unix command line, by example
 #. * cp foobar.c project
@@ -7293,34 +7409,34 @@ msgstr "Ð?иконаннÑ?: %s"
 msgid "New Project Assistant"
 msgstr "Ð?омÑ?Ñ?ник нового пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-wizard/property.c:288
-#: ../plugins/project-wizard/property.c:401
+#: ../plugins/project-wizard/property.c:311
+#: ../plugins/project-wizard/property.c:424
 msgid "No"
 msgstr "Ð?Ñ?"
 
-#: ../plugins/project-wizard/property.c:299
+#: ../plugins/project-wizard/property.c:322
 msgid "Select directory"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? каÑ?алог"
 
-#: ../plugins/project-wizard/property.c:307
+#: ../plugins/project-wizard/property.c:330
 msgid "Select file"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл"
 
-#: ../plugins/project-wizard/property.c:359 ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:382 ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айл зобÑ?аженнÑ?"
 
-#: ../plugins/project-wizard/property.c:384
-#: ../plugins/project-wizard/property.c:474 ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:407
+#: ../plugins/project-wizard/property.c:497 ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? знаÑ?ок"
 
-#: ../plugins/project-wizard/property.c:444
+#: ../plugins/project-wizard/property.c:467
 msgid "Choose directory"
 msgstr "Ð?ибÑ?аÑ?и каÑ?алог"
 
-#: ../plugins/project-wizard/property.c:448
+#: ../plugins/project-wizard/property.c:471
 msgid "Choose file"
 msgstr "Ð?ибÑ?аÑ?и Ñ?айл"
 
@@ -7380,59 +7496,67 @@ msgid "A sample SDL project"
 msgstr "Ð?Ñ?оÑ?Ñ?ий пÑ?оекÑ? SDL"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:14
+msgid "A shared or a static library project"
+msgstr "Ð?Ñ?оекÑ? Ñ?пÑ?лÑ?ноÑ? Ñ?и Ñ?Ñ?аÑ?иÑ?ноÑ? бÑ?блÑ?оÑ?еки"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:15
 msgid "Add C++ support:"
 msgstr "Ð?Ñ?дÑ?Ñ?имка C++:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:15
+#: ../plugins/project-wizard/templates/translatable-strings.h:16
 msgid "Add gtk-doc system:"
 msgstr "Ð?Ñ?дÑ?Ñ?имка gtk-doc:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:16
+#: ../plugins/project-wizard/templates/translatable-strings.h:17
 msgid "Add internationalization:"
 msgstr "Ð?Ñ?дÑ?Ñ?имка локалÑ?заÑ?Ñ?Ñ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:17
+#: ../plugins/project-wizard/templates/translatable-strings.h:18
 msgid "Add shared library support:"
 msgstr "Ð?Ñ?дÑ?Ñ?имка Ñ?пÑ?лÑ?ниÑ? бÑ?блÑ?оÑ?ек:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:18
+#: ../plugins/project-wizard/templates/translatable-strings.h:19
 msgid "Adds C++ support to the project so that C++ source files can be built"
 msgstr ""
 "Ð?одаÑ?и пÑ?дÑ?Ñ?имкÑ? C++ до пÑ?оекÑ?Ñ?. Ð? неÑ? ви зможеÑ?е збиÑ?аÑ?и пÑ?оекÑ? з Ñ?айлами С+"
 "+."
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:19
+#: ../plugins/project-wizard/templates/translatable-strings.h:20
 msgid "Adds support for building shared libraries in your project"
 msgstr "Ð?одаÑ?и можливÑ?Ñ?Ñ?Ñ? збиÑ?аннÑ? Ñ?пÑ?лÑ?ниÑ? бÑ?блÑ?оÑ?ек"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:20
+#: ../plugins/project-wizard/templates/translatable-strings.h:21
 msgid ""
 "Adds support for internationalization so that your project can have "
 "translations in different languages"
 msgstr ""
 "Ð?одаÑ?и пÑ?дÑ?Ñ?имкÑ? локалÑ?заÑ?Ñ?Ñ?, Ñ?об пÑ?оекÑ? можна бÑ?де пеÑ?еклаÑ?Ñ?и Ñ?Ñ?зними мовами"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:21
+#: ../plugins/project-wizard/templates/translatable-strings.h:22
 msgid "Anjuta Plugin"
 msgstr "Ð?одÑ?лÑ? Anjuta"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:22
+#: ../plugins/project-wizard/templates/translatable-strings.h:23
 msgid "Anjuta plugin project that uses libanjuta framework"
 msgstr "Ð?Ñ?оекÑ? модÑ?лÑ? Anjuta, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ? Ñ?Ñ?еймвоÑ?к libanjuta"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:23
+#: ../plugins/project-wizard/templates/translatable-strings.h:24
 msgid "Applet Title:"
 msgstr "Ð?азва аплеÑ?Ñ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:25
+#: ../plugins/project-wizard/templates/translatable-strings.h:26
 msgid "Basic information"
 msgstr "Ð?Ñ?новна Ñ?нÑ?оÑ?маÑ?Ñ?Ñ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:26
+#: ../plugins/project-wizard/templates/translatable-strings.h:27
 msgid "Berkeley Software Distribution License (BSD)"
 msgstr "Ð?Ñ?огÑ?амна лÑ?Ñ?ензÑ?Ñ? Ð?еÑ?клÑ? (BSD)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:27
+#: ../plugins/project-wizard/templates/translatable-strings.h:28
+msgid "Build library as"
+msgstr "Ð?Ñ?бÑ?аÑ?и бÑ?блÑ?оÑ?екÑ? Ñ?к"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:29
 msgid ""
 "Comma separated, other plugins that this plugin depends on. It could be "
 "either primary interface name or plugin location (library:class)"
@@ -7440,99 +7564,99 @@ msgstr ""
 "РоздÑ?ленÑ? комоÑ? доповненнÑ?, вÑ?д Ñ?киÑ? залежиÑ?Ñ? Ñ?ей модÑ?лÑ?. Це може бÑ?Ñ?и назва "
 "оÑ?новного Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? або Ñ?озÑ?аÑ?Ñ?ваннÑ? модÑ?лÑ? (бÑ?блÑ?оÑ?ека.клаÑ?)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:28
+#: ../plugins/project-wizard/templates/translatable-strings.h:30
 msgid "Configure external packages"
 msgstr "Ð?алаÑ?Ñ?Ñ?ваÑ?и зовнÑ?Ñ?нÑ? пакеÑ?и"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:29
+#: ../plugins/project-wizard/templates/translatable-strings.h:31
 msgid "Configure external packages:"
 msgstr "Ð?алаÑ?Ñ?Ñ?ваÑ?и зовнÑ?Ñ?нÑ? пакеÑ?и:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:30
+#: ../plugins/project-wizard/templates/translatable-strings.h:32
 msgid "Create Gtk Builder interface file"
 msgstr "СÑ?воÑ?иÑ?и Ñ?айл Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? Gtk Builder"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:31
+#: ../plugins/project-wizard/templates/translatable-strings.h:33
 msgid "Create a template Gtk Builder interface file"
 msgstr "СÑ?воÑ?иÑ?и Ñ?аблон Ñ?айлÑ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? Gtk Builder"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:32
-msgid "Create a template gtk builder interface file"
-msgstr "СÑ?воÑ?иÑ?и Ñ?аблон Ñ?айлÑ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? Gtk Builder"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:35
+#: ../plugins/project-wizard/templates/translatable-strings.h:36
 msgid "Display description of the applet"
 msgstr "Ð?оказаÑ?и опиÑ? аплеÑ?Ñ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:36
+#: ../plugins/project-wizard/templates/translatable-strings.h:37
 msgid "Display description of the plugin"
 msgstr "Ð?оказаÑ?и опиÑ? доповненнÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:37
+#: ../plugins/project-wizard/templates/translatable-strings.h:38
 msgid "Display title of the applet"
 msgstr "Ð?оказаÑ?и назвÑ? аплеÑ?Ñ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:38
+#: ../plugins/project-wizard/templates/translatable-strings.h:39
 msgid "Display title of the plugin"
 msgstr "Ð?оказÑ?Ñ? заголовок доповненнÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:39
+#: ../plugins/project-wizard/templates/translatable-strings.h:40
 msgid "Django Project"
 msgstr "Ð?Ñ?оекÑ? Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:40
+#: ../plugins/project-wizard/templates/translatable-strings.h:41
 msgid "Django Project information"
 msgstr "Ð?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о пÑ?оекÑ? Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:41
+#: ../plugins/project-wizard/templates/translatable-strings.h:42
 msgid "Email address:"
 msgstr "Ð?дÑ?еÑ?а ел. поÑ?Ñ?и:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:42
+#: ../plugins/project-wizard/templates/translatable-strings.h:43
 msgid "GCJ needs to know which class contains the main() function"
 msgstr "GCJ поÑ?Ñ?Ñ?бно вказаÑ?и, Ñ?кий клаÑ? мÑ?Ñ?Ñ?иÑ?Ñ? Ñ?Ñ?нкÑ?Ñ?Ñ? main()."
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:43
+#: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GNOME Applet"
 msgstr "Ð?плеÑ? GNOME"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
+#: ../plugins/project-wizard/templates/translatable-strings.h:45
 msgid "GTK+"
 msgstr "GTK+"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
+#: ../plugins/project-wizard/templates/translatable-strings.h:46
 msgid "GTKmm"
 msgstr "GTKmm"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
+#: ../plugins/project-wizard/templates/translatable-strings.h:47
 msgid "General Project Information"
 msgstr "Ð?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о пÑ?оекÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
+#: ../plugins/project-wizard/templates/translatable-strings.h:49
 msgid "Generic"
 msgstr "Ð?виÑ?айний"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
+#: ../plugins/project-wizard/templates/translatable-strings.h:50
 msgid "Generic (Minimal)"
 msgstr "Ð?виÑ?айний (мÑ?нÑ?малÑ?ний)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
+#: ../plugins/project-wizard/templates/translatable-strings.h:51
 msgid "Generic C++"
 msgstr "Ð?виÑ?айний C++"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
+#: ../plugins/project-wizard/templates/translatable-strings.h:52
+msgid "Generic JavaScript"
+msgstr "Ð?виÑ?айний JavaScript"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:53
 msgid "Generic gcj compiled java"
 msgstr "Ð?Ñ?оекÑ? Java, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ? gcj"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
+#: ../plugins/project-wizard/templates/translatable-strings.h:54
 msgid "Generic java (automake)"
 msgstr "Ð?виÑ?айний java (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
+#: ../plugins/project-wizard/templates/translatable-strings.h:55
 msgid "Generic python (automake)"
 msgstr "Ð?виÑ?айний python (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
+#: ../plugins/project-wizard/templates/translatable-strings.h:56
 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 "
@@ -7541,215 +7665,235 @@ msgstr ""
 "Ð?апиÑ?Ñ?Ñ?Ñ? назвÑ? пакеÑ?Ñ?, Ñ?о поÑ?Ñ?Ñ?бен длÑ? пÑ?оекÑ?Ñ?. Ð?и можеÑ?е Ñ?акож вказаÑ?и "
 "веÑ?Ñ?Ñ?Ñ?. Ð?апÑ?иклад: 'libgnomeui-2.0' або 'libgnomeui-2.0 >= 2.2.0'"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
+#: ../plugins/project-wizard/templates/translatable-strings.h:57
 msgid "Icon File:"
 msgstr "Файл знаÑ?ка:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
+#: ../plugins/project-wizard/templates/translatable-strings.h:58
 msgid "Icon file for the plugin"
 msgstr "Файл знаÑ?ка длÑ? доповненнÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
+#: ../plugins/project-wizard/templates/translatable-strings.h:59
 msgid "Implement plugin interfaces"
 msgstr "РеалÑ?заÑ?Ñ?Ñ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ?в доповненнÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
+#: ../plugins/project-wizard/templates/translatable-strings.h:60
 msgid "Interface implemented by the plugin"
 msgstr "Ð?нÑ?еÑ?Ñ?ейÑ?, Ñ?о Ñ?еалÑ?зÑ?Ñ?Ñ?Ñ?Ñ?Ñ? модÑ?лем"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
+#: ../plugins/project-wizard/templates/translatable-strings.h:61
 msgid "Interface:"
 msgstr "Ð?нÑ?еÑ?Ñ?ейÑ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
+#: ../plugins/project-wizard/templates/translatable-strings.h:63
+msgid "Library"
+msgstr "Ð?Ñ?блÑ?оÑ?ека"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:64
 msgid "License"
 msgstr "Ð?Ñ?Ñ?ензÑ?Ñ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
+#: ../plugins/project-wizard/templates/translatable-strings.h:65
 msgid "Main Class:"
 msgstr "Ð?оловний клаÑ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
+#: ../plugins/project-wizard/templates/translatable-strings.h:66
 msgid "Main class"
 msgstr "Ð?оловний клаÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
+#: ../plugins/project-wizard/templates/translatable-strings.h:67
 msgid "Makefile project"
 msgstr "Ð?Ñ?оекÑ? з Makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
+#: ../plugins/project-wizard/templates/translatable-strings.h:68
 msgid "Makefile-based project"
 msgstr "Ð?Ñ?оекÑ?, Ñ?о збиÑ?аÑ?Ñ?Ñ?Ñ?Ñ? за допомогоÑ? Makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
+#: ../plugins/project-wizard/templates/translatable-strings.h:69
 msgid "Mininum SDL version required"
 msgstr "Ð?Ñ?нÑ?малÑ?на поÑ?Ñ?Ñ?бна веÑ?Ñ?Ñ?Ñ? SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
+#: ../plugins/project-wizard/templates/translatable-strings.h:70
 msgid "Name of the value to watch"
 msgstr "Ð?азва знаÑ?еннÑ? длÑ? Ñ?поÑ?Ñ?еÑ?еженнÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
+#: ../plugins/project-wizard/templates/translatable-strings.h:71
 msgid "No license"
 msgstr "Ð?Ñ?Ñ?ензÑ?Ñ? вÑ?дÑ?Ñ?Ñ?нÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
+#: ../plugins/project-wizard/templates/translatable-strings.h:72
+msgid "Only Shared"
+msgstr "Ð?иÑ?е Ñ?пÑ?лÑ?на"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:73
+msgid "Only Static"
+msgstr "Ð?иÑ?е Ñ?Ñ?аÑ?иÑ?на"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:74
 msgid "Options for project build system"
 msgstr "Ð?аÑ?амеÑ?Ñ?и Ñ?иÑ?Ñ?еми збиÑ?аннÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
+#: ../plugins/project-wizard/templates/translatable-strings.h:75
 msgid "Plugin Class Name:"
 msgstr "Ð?азва клаÑ?Ñ? доповненнÑ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
+#: ../plugins/project-wizard/templates/translatable-strings.h:76
 msgid "Plugin Dependencies:"
 msgstr "Ð?алежноÑ?Ñ?Ñ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
+#: ../plugins/project-wizard/templates/translatable-strings.h:77
 msgid "Plugin Description:"
 msgstr "Ð?пиÑ? доповненнÑ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
+#: ../plugins/project-wizard/templates/translatable-strings.h:78
 msgid "Plugin Title:"
 msgstr "Ð?азва:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
+#: ../plugins/project-wizard/templates/translatable-strings.h:79
 msgid "Plugin class name"
 msgstr "Ð?азва клаÑ?Ñ? доповненнÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
+#: ../plugins/project-wizard/templates/translatable-strings.h:80
 msgid "Plugin has menus or/and toolbars"
 msgstr "Ð?одÑ?лÑ? викоÑ?иÑ?Ñ?овÑ?Ñ? менÑ?/панелÑ? Ñ?нÑ?Ñ?Ñ?Ñ?менÑ?Ñ?в"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
+#: ../plugins/project-wizard/templates/translatable-strings.h:81
 msgid "Plugin interfaces to implement"
 msgstr "Ð?нÑ?еÑ?Ñ?ейÑ?и доповненнÑ? длÑ? Ñ?еалÑ?заÑ?Ñ?Ñ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
+#: ../plugins/project-wizard/templates/translatable-strings.h:82
 msgid "Project Name:"
 msgstr "Ð?азва пÑ?оекÑ?Ñ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
+#: ../plugins/project-wizard/templates/translatable-strings.h:83
 msgid "Project directory, output file etc."
 msgstr "Ð?аÑ?алог пÑ?оекÑ?Ñ?, Ñ?айл виводÑ? Ñ?а Ñ?.Ñ?.."
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
+#: ../plugins/project-wizard/templates/translatable-strings.h:84
 msgid "Project directory:"
 msgstr "Ð?оÑ?еневий каÑ?алог пÑ?оекÑ?Ñ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
+#: ../plugins/project-wizard/templates/translatable-strings.h:85
 msgid ""
 "Project name must not contain spaces, because it will be the name of the "
 "project build target (executable, library etc.)"
 msgstr "Ð?азва пÑ?оекÑ?Ñ? не маÑ? мÑ?Ñ?Ñ?иÑ?и пÑ?обÑ?ли"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
+#: ../plugins/project-wizard/templates/translatable-strings.h:86
 msgid "Project name:"
 msgstr "Ð?азва пÑ?оекÑ?Ñ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
+#: ../plugins/project-wizard/templates/translatable-strings.h:87
 msgid "Project options"
 msgstr "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? пÑ?оекÑ?Ñ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
+#: ../plugins/project-wizard/templates/translatable-strings.h:88
 msgid "Python webproject using Django Web Framework"
 msgstr "Ð?еб-пÑ?оекÑ? python, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ? веб-Ñ?Ñ?еймвоÑ?к Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
+#: ../plugins/project-wizard/templates/translatable-strings.h:89
 msgid "Require Package:"
 msgstr "Ð?оÑ?Ñ?Ñ?бний пакеÑ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
+#: ../plugins/project-wizard/templates/translatable-strings.h:90
 msgid "Require SDL version:"
 msgstr "Ð?оÑ?Ñ?Ñ?бна веÑ?Ñ?Ñ?Ñ? SDL:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
+#: ../plugins/project-wizard/templates/translatable-strings.h:91
 msgid "Require SDL_gfx library"
 msgstr "Ð?оÑ?Ñ?Ñ?бна бÑ?блÑ?оÑ?ека SDL_gfx"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
+#: ../plugins/project-wizard/templates/translatable-strings.h:92
 msgid "Require SDL_gfx:"
 msgstr "Ð?оÑ?Ñ?Ñ?бна SDL_gfx:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
+#: ../plugins/project-wizard/templates/translatable-strings.h:93
 msgid "Require SDL_image library"
 msgstr "Ð?оÑ?Ñ?Ñ?бна бÑ?блÑ?оÑ?ека SDL_image"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
+#: ../plugins/project-wizard/templates/translatable-strings.h:94
 msgid "Require SDL_image:"
 msgstr "Ð?оÑ?Ñ?Ñ?бна SDL_image:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
+#: ../plugins/project-wizard/templates/translatable-strings.h:95
 msgid "Require SDL_mixer library"
 msgstr "Ð?оÑ?Ñ?Ñ?бна бÑ?блÑ?оÑ?ека SDL_mixer"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
+#: ../plugins/project-wizard/templates/translatable-strings.h:96
 msgid "Require SDL_mixer:"
 msgstr "Ð?оÑ?Ñ?Ñ?бна SDL_mixer:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
+#: ../plugins/project-wizard/templates/translatable-strings.h:97
 msgid "Require SDL_net library"
 msgstr "Ð?оÑ?Ñ?Ñ?бна бÑ?блÑ?оÑ?ека SDL_net"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
+#: ../plugins/project-wizard/templates/translatable-strings.h:98
 msgid "Require SDL_net:"
 msgstr "Ð?оÑ?Ñ?Ñ?бна SDL_net:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
+#: ../plugins/project-wizard/templates/translatable-strings.h:99
 msgid "Require SDL_ttf library"
 msgstr "Ð?оÑ?Ñ?Ñ?бна бÑ?блÑ?оÑ?ека SDL_ttf "
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
+#: ../plugins/project-wizard/templates/translatable-strings.h:100
 msgid "Require SDL_ttf:"
 msgstr "Ð?оÑ?Ñ?Ñ?бна SDL_ttf:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
+#: ../plugins/project-wizard/templates/translatable-strings.h:101
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
+#: ../plugins/project-wizard/templates/translatable-strings.h:102
 msgid "Select code license"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? лÑ?Ñ?ензÑ?Ñ?, з Ñ?коÑ? бÑ?дÑ?Ñ?Ñ? поÑ?иÑ?Ñ?ваÑ?иÑ?Ñ? пеÑ?виннÑ? Ñ?екÑ?Ñ?и"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
+#: ../plugins/project-wizard/templates/translatable-strings.h:103
+msgid "Select library type to build"
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?ип бÑ?блÑ?оÑ?еки длÑ? збиÑ?аннÑ?"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:104
+msgid "Shared and Static library"
+msgstr "СпÑ?лÑ?на Ñ?и Ñ?Ñ?аÑ?иÑ?на бÑ?блÑ?оÑ?ека"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:105
 msgid "Shell values to watch"
 msgstr "Ð?наÑ?еннÑ? оболонки длÑ? Ñ?поÑ?Ñ?еÑ?еженнÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
+#: ../plugins/project-wizard/templates/translatable-strings.h:106
 msgid "Use pkg-config to add library support from other packages"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и pkg-config длÑ? викоÑ?иÑ?Ñ?аннÑ? зовнÑ?Ñ?нÑ?Ñ? бÑ?блÑ?оÑ?ек"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
+#: ../plugins/project-wizard/templates/translatable-strings.h:107
 msgid "Value Name:"
 msgstr "Ð?азва знаÑ?еннÑ?:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
+#: ../plugins/project-wizard/templates/translatable-strings.h:108
 msgid "Values to watch"
 msgstr "Ð?наÑ?еннÑ? длÑ? Ñ?поÑ?Ñ?еÑ?еженнÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:110
 msgid "Whether the plugin has menus or toolbars"
 msgstr "Чи бÑ?де модÑ?лÑ? мÑ?Ñ?Ñ?иÑ?и менÑ? або панелÑ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:104
+#: ../plugins/project-wizard/templates/translatable-strings.h:111
 msgid "Wx Widgets"
 msgstr "Wx Widgets"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:105
+#: ../plugins/project-wizard/templates/translatable-strings.h:112
 msgid "Xlib"
 msgstr "Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
+#: ../plugins/project-wizard/templates/translatable-strings.h:113
 msgid "Xlib dock"
 msgstr "Ð?ок Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:107
+#: ../plugins/project-wizard/templates/translatable-strings.h:114
 msgid "gtk-doc is used to compile API documentations for GObject based classes"
 msgstr ""
 "gtk-doc викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? длÑ? компÑ?лÑ?Ñ?Ñ?Ñ? докÑ?менÑ?аÑ?Ñ?Ñ? з API длÑ? клаÑ?Ñ?в, "
 "оÑ?нованиÑ? на GObject"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:108
+#: ../plugins/project-wizard/templates/translatable-strings.h:115
 msgid "project name"
 msgstr "Ð?азва пÑ?оекÑ?Ñ?"
 
@@ -7770,18 +7914,13 @@ msgid "Program:"
 msgstr "Ð?Ñ?огÑ?ама:"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:6
-msgid "Run In Terminal"
-msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и Ñ? Ñ?еÑ?мÑ?налÑ?"
+msgid "Run in Terminal"
+msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и в Ñ?еÑ?мÑ?налÑ?"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:7
 msgid "Working Directory:"
 msgstr "РобоÑ?ий каÑ?алог:"
 
-#: ../plugins/run-program/execute.c:76
-#, c-format
-msgid "Program '%s' does not exist"
-msgstr "Ð?Ñ?огÑ?ама '%s' не Ñ?Ñ?нÑ?Ñ?"
-
 #. Only local directory are supported
 #: ../plugins/run-program/execute.c:107
 #, c-format
@@ -7792,7 +7931,7 @@ msgstr "Ð?аÑ?алог пÑ?огÑ?ами «%s» не Ñ? локалÑ?ним"
 msgid "Load Target to run"
 msgstr "Ð?аванÑ?ажиÑ?и Ñ?Ñ?лÑ? длÑ? запÑ?Ñ?кÑ?"
 
-#: ../plugins/run-program/parameters.c:616
+#: ../plugins/run-program/parameters.c:617
 #, c-format
 msgid "Missing file %s"
 msgstr "Ð?е знайдено Ñ?айл %s"
@@ -7807,191 +7946,190 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/run-program/plugin.c:229
+#: ../plugins/run-program/plugin.c:231
 msgid "_Run"
 msgstr "_Ð?апÑ?Ñ?к"
 
-#: ../plugins/run-program/plugin.c:237
+#: ../plugins/run-program/plugin.c:239
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in.h:3
 msgid "Execute"
 msgstr "Ð?иконаÑ?и"
 
-#: ../plugins/run-program/plugin.c:239
+#: ../plugins/run-program/plugin.c:241
 msgid "Run program without debugger"
 msgstr "Ð?апÑ?Ñ?к пÑ?огÑ?ам без налагоджÑ?ваÑ?а"
 
-#: ../plugins/run-program/plugin.c:245
+#: ../plugins/run-program/plugin.c:247
 msgid "Stop Program"
 msgstr "Ð?Ñ?пиниÑ?и пÑ?огÑ?амÑ?"
 
-#: ../plugins/run-program/plugin.c:247
+#: ../plugins/run-program/plugin.c:249
 msgid "Kill program"
 msgstr "Ð?авеÑ?Ñ?иÑ?и пÑ?огÑ?амÑ?"
 
-#: ../plugins/run-program/plugin.c:253
-msgid "Program Parameters..."
-msgstr "Ð?аÑ?амеÑ?Ñ?и пÑ?огÑ?ами..."
-
 #: ../plugins/run-program/plugin.c:255
-msgid "Set current program, arguments and so on"
-msgstr "Ð?Ñ?Ñ?ановиÑ?и поÑ?оÑ?нÑ? пÑ?огÑ?амÑ?, аÑ?гÑ?менÑ?и Ñ?а Ñ?.д."
+msgid "Program Parametersâ?¦"
+msgstr "Ð?Ñ?гÑ?менÑ?и пÑ?огÑ?амиâ?¦"
+
+#: ../plugins/run-program/plugin.c:257
+msgid "Set current program, arguments, etc."
+msgstr "Ð?Ñ?Ñ?ановиÑ?и поÑ?оÑ?нÑ? пÑ?огÑ?амÑ?, аÑ?гÑ?менÑ?и Ñ?а Ñ?.Ñ?."
 
-#: ../plugins/run-program/plugin.c:280
+#: ../plugins/run-program/plugin.c:282
 msgid "Run operations"
 msgstr "Ð?оманди запÑ?Ñ?кÑ?"
 
 #: ../plugins/search/anjuta-search.ui.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Ð?Ñ?Ñ?</b>"
+msgid "Actions"
+msgstr "Ð?Ñ?Ñ?"
 
 #: ../plugins/search/anjuta-search.ui.h:2
-msgid "<b>File Filter</b>"
-msgstr "<b>ФÑ?лÑ?Ñ?Ñ? Ñ?айлÑ?</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:4
-msgid "<b>Parameters</b>"
-msgstr "<b>Ð?аÑ?амеÑ?Ñ?и</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:5
-msgid "<b>Scope</b>"
-msgstr "<b>Ð?идимÑ?Ñ?Ñ?Ñ?</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:6
-msgid "<b>Search variable</b>"
-msgstr "<b>Ð?мÑ?ннÑ? поÑ?Ñ?кÑ?</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:7
 #: ../plugins/search/search-replace.c:92
 msgid "Backward"
 msgstr "Ð?азад"
 
-#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/anjuta-search.ui.h:3
 msgid "Basic Search & Replace"
 msgstr "Ð?Ñ?оÑ?Ñ?ий поÑ?Ñ?к Ñ?а замÑ?на"
 
-#: ../plugins/search/anjuta-search.ui.h:9
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Directories:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? каÑ?алоги:"
 
-#: ../plugins/search/anjuta-search.ui.h:10
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "Choose Files:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?айли:"
 
-#: ../plugins/search/anjuta-search.ui.h:11
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "Expand regex back references"
 msgstr "РозкÑ?иваÑ?и поÑ?иланнÑ? Ñ? Ñ?аблонаÑ?"
 
-#: ../plugins/search/anjuta-search.ui.h:12
+#: ../plugins/search/anjuta-search.ui.h:7
+msgid "File Filter"
+msgstr "ФÑ?лÑ?Ñ?Ñ? Ñ?айлÑ?"
+
+#: ../plugins/search/anjuta-search.ui.h:8
 msgid "Find & Replace"
 msgstr "Ð?найÑ?и Ñ?а замÑ?ниÑ?и"
 
-#: ../plugins/search/anjuta-search.ui.h:13
+#: ../plugins/search/anjuta-search.ui.h:9
 #: ../plugins/search/search-replace.c:91
 msgid "Forward"
 msgstr "Ð?пеÑ?ед"
 
 #. the order of these matters - it must match the order of the corresponding
 #. radio buttons on another page
-#: ../plugins/search/anjuta-search.ui.h:14
+#: ../plugins/search/anjuta-search.ui.h:10
 #: ../plugins/search/search-replace.c:90
 msgid "Full Buffer"
 msgstr "Ð?еÑ?Ñ? бÑ?Ñ?еÑ?"
 
-#: ../plugins/search/anjuta-search.ui.h:15
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Greedy matching"
 msgstr "Ð?адÑ?бний поÑ?Ñ?к"
 
-#: ../plugins/search/anjuta-search.ui.h:16
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Ignore Binary Files"
 msgstr "Ð?гноÑ?Ñ?ваÑ?и двÑ?йковÑ? Ñ?айли"
 
-#: ../plugins/search/anjuta-search.ui.h:17
+#: ../plugins/search/anjuta-search.ui.h:13
 msgid "Ignore Directories:"
 msgstr "Ð?гноÑ?Ñ?ваÑ?и каÑ?алоги:"
 
-#: ../plugins/search/anjuta-search.ui.h:18
+#: ../plugins/search/anjuta-search.ui.h:14
 msgid "Ignore Files:"
 msgstr "Ð?гноÑ?Ñ?ваÑ?и Ñ?айли:"
 
-#: ../plugins/search/anjuta-search.ui.h:19
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Ignore Hidden Directories"
 msgstr "Ð?гноÑ?Ñ?ваÑ?и пÑ?иÑ?ованÑ? каÑ?алоги"
 
-#: ../plugins/search/anjuta-search.ui.h:20
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Ignore Hidden Files"
 msgstr "Ð?гноÑ?Ñ?ваÑ?и пÑ?иÑ?ованÑ? Ñ?айли"
 
-#: ../plugins/search/anjuta-search.ui.h:21
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Match at start of word"
 msgstr "Ð? поÑ?аÑ?кÑ? Ñ?лова"
 
-#: ../plugins/search/anjuta-search.ui.h:23
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Match complete lines"
 msgstr "РÑ?дки Ñ?Ñ?лком"
 
-#: ../plugins/search/anjuta-search.ui.h:24
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Match complete words"
 msgstr "Слова Ñ?Ñ?лком"
 
-#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "Maximum Actions"
 msgstr "Ð?акÑ?имÑ?м дÑ?й"
 
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/search/anjuta-search.ui.h:22
 msgid "Modify"
 msgstr "Ð?мÑ?ниÑ?и"
 
-#: ../plugins/search/anjuta-search.ui.h:27
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "New Name:"
 msgstr "Ð?ова назва:"
 
-#: ../plugins/search/anjuta-search.ui.h:28
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "No Limit"
 msgstr "Ð?ез обмеженÑ?"
 
-#: ../plugins/search/anjuta-search.ui.h:29
+#: ../plugins/search/anjuta-search.ui.h:26
+msgid "Parameters"
+msgstr "Ð?аÑ?амеÑ?Ñ?и"
+
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Regular expression"
 msgstr "РегÑ?лÑ?Ñ?ний виÑ?аз"
 
-#: ../plugins/search/anjuta-search.ui.h:30
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Replace With:"
 msgstr "Ð?амÑ?ниÑ?и на:"
 
-#: ../plugins/search/anjuta-search.ui.h:31
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Search Action:"
 msgstr "Ð?Ñ?Ñ? поÑ?Ñ?кÑ?:"
 
-#: ../plugins/search/anjuta-search.ui.h:32
+#: ../plugins/search/anjuta-search.ui.h:31
 msgid "Search Direction:"
 msgstr "Ð?апÑ?Ñ?мок поÑ?Ñ?кÑ?:"
 
+#. This is "the search expression" (noun)
 #: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search Expression"
 msgstr "Ð?иÑ?аз длÑ? поÑ?Ñ?кÑ?"
 
-#: ../plugins/search/anjuta-search.ui.h:34
+#. This is "the search expression" (noun)
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search Expression:"
 msgstr "Ð?иÑ?аз длÑ? поÑ?Ñ?кÑ?:"
 
-#: ../plugins/search/anjuta-search.ui.h:35
+#: ../plugins/search/anjuta-search.ui.h:36
 msgid "Search In:"
 msgstr "Ð?оÑ?Ñ?к Ñ?:"
 
-#: ../plugins/search/anjuta-search.ui.h:36
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search Recursively"
 msgstr "ШÑ?каÑ?и Ñ?екÑ?Ñ?Ñ?ивно"
 
-#: ../plugins/search/anjuta-search.ui.h:37
+#: ../plugins/search/anjuta-search.ui.h:38
 msgid "Search Target"
 msgstr "Ð?б'Ñ?кÑ? длÑ? поÑ?Ñ?кÑ?"
 
-#: ../plugins/search/anjuta-search.ui.h:38
+#. User can select variables that contain lists of files, so this is a combined noun
+#: ../plugins/search/anjuta-search.ui.h:40
+msgid "Search variable"
+msgstr "Ð?мÑ?нна поÑ?Ñ?кÑ?"
+
+#: ../plugins/search/anjuta-search.ui.h:41
 msgid "Setting"
 msgstr "Ð?алаÑ?Ñ?овÑ?ваннÑ?"
 
 #: ../plugins/search/plugin.c:68
-msgid "_Find..."
-msgstr "Ð?_найÑ?и..."
+msgid "_Findâ?¦"
+msgstr "Ð?_найÑ?иâ?¦"
 
 #: ../plugins/search/plugin.c:69
 msgid "Search for a string or regular expression in the editor"
@@ -8010,8 +8148,8 @@ msgid "Find _Previous"
 msgstr "Ð?найÑ?и _попеÑ?еднÑ?"
 
 #: ../plugins/search/plugin.c:78
-msgid "Find and R_eplace..."
-msgstr "Ð?найÑ?и Ñ?а за_мÑ?ниÑ?и..."
+msgid "Find and R_eplaceâ?¦"
+msgstr "Ð?найÑ?и Ñ?а за_мÑ?ниÑ?иâ?¦"
 
 #: ../plugins/search/plugin.c:80
 msgid ""
@@ -8023,16 +8161,16 @@ msgid "Search and Replace"
 msgstr "Ð?оÑ?Ñ?к Ñ?а замÑ?на"
 
 #: ../plugins/search/plugin.c:85
-msgid "Fin_d in Files..."
-msgstr "Ð?найÑ?и Ñ? _Ñ?айлаÑ?..."
+msgid "Fin_d in Filesâ?¦"
+msgstr "Ð?найÑ?и Ñ? _Ñ?айлаÑ?â?¦"
 
 #: ../plugins/search/plugin.c:86
 msgid "Search for a string in multiple files or directories"
 msgstr "Ð?найÑ?и Ñ?Ñ?док Ñ? Ñ?айлаÑ? Ñ?и каÑ?алогаÑ?"
 
 #: ../plugins/search/plugin.c:102
-msgid "Searching..."
-msgstr "Ð?оÑ?Ñ?к..."
+msgid "Searchingâ?¦"
+msgstr "Ð?оÑ?Ñ?кâ?¦"
 
 #: ../plugins/search/search_preferences.c:44
 msgid "Basic Search"
@@ -8133,50 +8271,50 @@ msgstr[1] "Ð?амÑ?нено %d збÑ?ги"
 msgstr[2] "Ð?амÑ?нено %d збÑ?гÑ?в"
 
 #: ../plugins/search/search-replace.c:1298
-msgid "Unable to build user interface for Search And Replace"
+msgid "Unable to build user interface for Search and Replace"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? побÑ?дÑ?ваÑ?и Ñ?нÑ?еÑ?Ñ?ейÑ? коÑ?иÑ?Ñ?Ñ?ваÑ?а длÑ? \"Ð?оÑ?Ñ?кÑ? Ñ?а замÑ?ни\""
 
-#: ../plugins/sourceview/sourceview.c:364
+#: ../plugins/sourceview/sourceview.c:374
 #, c-format
 msgid ""
-"The file '%s' on the disk is more recent than the current buffer.\n"
+"The file \"%s\" on the disk is more recent than the current buffer.\n"
 "Do you want to reload it?"
 msgstr ""
-"Файл '%s' на диÑ?кÑ? новÑ?Ñ?ий, нÑ?ж Ñ? поÑ?оÑ?номÑ? бÑ?Ñ?еÑ?Ñ?.\n"
+"Файл «%s» на диÑ?кÑ? новÑ?Ñ?ий, нÑ?ж Ñ? поÑ?оÑ?номÑ? бÑ?Ñ?еÑ?Ñ?.\n"
 "Ð?еÑ?езаванÑ?ажиÑ?и його?"
 
-#: ../plugins/sourceview/sourceview.c:401
+#: ../plugins/sourceview/sourceview.c:411
 #, c-format
 msgid ""
-"The file '%s' has been deleted on the disk.\n"
+"The file \"%s\" has been deleted on the disk.\n"
 "Do you want to close it?"
 msgstr ""
 "Файл «%s» бÑ?в видалений з диÑ?кÑ?.\n"
 "Ð?акÑ?иÑ?и його?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:438
+#: ../plugins/sourceview/sourceview.c:448
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и %s: %s"
 
-#: ../plugins/sourceview/sourceview.c:492
+#: ../plugins/sourceview/sourceview.c:502
 #, c-format
-msgid "The file '%s' is read-only! Edit anyway?"
+msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "Файл «%s» лиÑ?е длÑ? Ñ?иÑ?аннÑ?! РедагÑ?ваÑ?и попÑ?и вÑ?е?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:551
+#: ../plugins/sourceview/sourceview.c:561
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и %s: %s"
 
-#: ../plugins/sourceview/sourceview-io.c:274
+#: ../plugins/sourceview/sourceview-io.c:273
 #, c-format
 msgid "Could not save file because filename not yet specified"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и Ñ?айл, оÑ?кÑ?лÑ?ки не вказано назвÑ? Ñ?айлÑ?"
 
-#: ../plugins/sourceview/sourceview-io.c:504
+#: ../plugins/sourceview/sourceview-io.c:503
 #, c-format
 msgid "New file %d"
 msgstr "Ð?овий Ñ?айл %d"
@@ -8194,114 +8332,118 @@ msgid "Create backup files"
 msgstr "СÑ?воÑ?иÑ?и Ñ?айли Ñ?езеÑ?вниÑ? копÑ?й"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
+msgid "Enable autocompletion for document words"
+msgstr "УвÑ?мкнÑ?Ñ?и авÑ?одоповненнÑ? длÑ? Ñ?лÑ?в докÑ?менÑ?Ñ?"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
 msgid "Font"
 msgstr "ШÑ?иÑ?Ñ?"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
 msgid "Font:"
 msgstr "ШÑ?иÑ?Ñ?:"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
 msgid "Highlight current line"
 msgstr "Ð?идÑ?лÑ?Ñ?и колÑ?оÑ?ом поÑ?оÑ?ний Ñ?Ñ?док"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
 msgid "Highlight matching brackets"
 msgstr "Ð?идÑ?лÑ?Ñ?и колÑ?оÑ?ом паÑ?нÑ? дÑ?жки"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
 msgid "Highlight syntax"
 msgstr "Ð?идÑ?лÑ?Ñ?и колÑ?оÑ?ом Ñ?инÑ?акÑ?иÑ?"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
 msgid "Indentation and auto-format options"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?пи й паÑ?амеÑ?Ñ?и авÑ?оÑ?оÑ?маÑ?Ñ?ваннÑ?"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
-msgid "Print Linenumbers"
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+msgid "Print line numbers"
 msgstr "Ð?Ñ?Ñ?кÑ?ваÑ?и номеÑ?и Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
 msgid "Print options"
 msgstr "Ð?аÑ?амеÑ?Ñ?и доÑ?Ñ?кÑ?"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
 msgid "Print page footer"
 msgstr "Ð?Ñ?Ñ?кÑ?ваÑ?и нижнÑ?й колонÑ?иÑ?Ñ?л"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
 msgid "Print page header"
 msgstr "Ð?Ñ?Ñ?кÑ?ваÑ?и веÑ?Ñ?нÑ?й колонÑ?иÑ?Ñ?л"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
 msgid "Printing"
 msgstr "Ð?Ñ?Ñ?к"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Right margin position in characters"
 msgstr "Ð?Ñ?дÑ?Ñ?анÑ? до пÑ?авоÑ? межÑ? Ñ? Ñ?имволаÑ?"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
 msgid "Show line numbers"
 msgstr "Ð?оказаÑ?и номеÑ?и Ñ?Ñ?дкÑ?в"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
 msgid "Show marks"
 msgstr "Ð?оказаÑ?и маÑ?кеÑ?и"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
 msgid "Show right margin"
 msgstr "Ð?оказаÑ?и пÑ?авÑ? межÑ?"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
 msgid "Tab size in spaces:"
 msgstr "РозмÑ?Ñ? Ñ?абÑ?лÑ?Ñ?Ñ?Ñ? Ñ? пÑ?обÑ?лаÑ?:"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
 msgid "Use tabs for indentation"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ? вÑ?дÑ?Ñ?Ñ?паÑ? Ñ?абÑ?лÑ?Ñ?Ñ?Ñ?"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
 msgid "Use theme font"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?Ñ?иÑ?Ñ? Ñ?еми"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
 #: ../src/anjuta-app.c:493 ../src/anjuta-app.c:498
 msgid "View"
 msgstr "Ð?еÑ?еглÑ?д"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:25
 msgid "Wrap long lines to fit on paper"
 msgstr "Ð?еÑ?еноÑ?иÑ?и довгÑ? Ñ?Ñ?дки за Ñ?озмÑ?Ñ?ом Ñ?Ñ?оÑ?Ñ?нки"
 
-#: ../plugins/starter/plugin.c:50 ../plugins/starter/starter.c:344
+#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:362
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "Ð?оÑ?аÑ?ок"
 
-#: ../plugins/starter/starter.c:385
+#: ../plugins/starter/starter.c:403
 msgid "Create File/Project"
 msgstr "СÑ?воÑ?иÑ?и Ñ?айл або пÑ?оекÑ?"
 
-#: ../plugins/starter/starter.c:419
+#: ../plugins/starter/starter.c:437
 msgid "Recent Projects"
 msgstr "Ð?едавнÑ? пÑ?оекÑ?и"
 
-#: ../plugins/starter/starter.c:450
+#: ../plugins/starter/starter.c:468
 msgid "Links"
 msgstr "Ð?оÑ?иланнÑ?"
 
-#: ../plugins/starter/starter.c:469
+#: ../plugins/starter/starter.c:487
 msgid "Anjuta Home Page"
 msgstr "Ð?омаÑ?нÑ? Ñ?Ñ?оÑ?Ñ?нка Anjuta"
 
-#: ../plugins/starter/starter.c:475
+#: ../plugins/starter/starter.c:493
 msgid "Anjuta Manual"
 msgstr "Ð?оÑ?Ñ?бник коÑ?иÑ?Ñ?Ñ?ваÑ?а Anjuta"
 
-#: ../plugins/starter/starter.c:481
-msgid "Gnome Online API Documentation"
-msgstr "Ð?окÑ?менÑ?аÑ?Ñ?Ñ? до API Gnome"
+#: ../plugins/starter/starter.c:499
+msgid "GNOME Online API Documentation"
+msgstr "Ð?окÑ?менÑ?аÑ?Ñ?Ñ? до API Gnome Ñ? Ð?нÑ?еÑ?неÑ?Ñ?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:1
 msgid "Add file/directory"
@@ -8388,82 +8530,86 @@ msgid "Repository authorization"
 msgstr "Ð?вÑ?оÑ?изаÑ?Ñ?Ñ? Ñ?епозиÑ?оÑ?Ñ?Ñ?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:36
+msgid "Retrieving status��"
+msgstr "Ð?Ñ?Ñ?иманнÑ? Ñ?Ñ?аÑ?Ñ?Ñ?Ñ?â?¦"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:37
 msgid "Revert Changes"
 msgstr "Ð?Ñ?дкаÑ? змÑ?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:38
+#: ../plugins/subversion/anjuta-subversion.ui.h:39
 msgid "Save open files before diffing"
 msgstr "Ð?беÑ?егÑ?и вÑ?дкÑ?иÑ?Ñ? Ñ?айли пеÑ?ед визнаÑ?еннÑ?м змÑ?н"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:39
+#: ../plugins/subversion/anjuta-subversion.ui.h:40
 msgid "Second Path:"
 msgstr "Ð?Ñ?Ñ?гий Ñ?лÑ?Ñ?:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:41
 msgid "Select Changes to Revert:"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? змÑ?ни длÑ? вÑ?дновленнÑ?:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:44
+#: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source/Destination Paths:"
 msgstr "ШлÑ?Ñ?и джеÑ?ела/пÑ?изнаÑ?еннÑ?:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:45
+#: ../plugins/subversion/anjuta-subversion.ui.h:46
 msgid "Source:"
 msgstr "Ð?жеÑ?ело:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:46
+#: ../plugins/subversion/anjuta-subversion.ui.h:47
 msgid "Start Revision:"
 msgstr "Ð?оÑ?аÑ?кова пÑ?авка:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:47
+#: ../plugins/subversion/anjuta-subversion.ui.h:48
 msgid "Subversion Options"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:48
+#: ../plugins/subversion/anjuta-subversion.ui.h:49
 msgid "Subversion Preferences"
 msgstr "Ð?аÑ?амеÑ?Ñ?и Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:50
 msgid "Switch to branch/tag"
 msgstr "Ð?еÑ?емикнÑ?Ñ?и на гÑ?лкÑ?/мÑ?Ñ?кÑ?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:50
+#: ../plugins/subversion/anjuta-subversion.ui.h:51
 msgid "Trust server"
 msgstr "Ð?овÑ?Ñ?ений Ñ?еÑ?веÑ?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:52
 msgid "Update file/directory"
 msgstr "Ð?новиÑ?и Ñ?айл/каÑ?алог"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:52
+#: ../plugins/subversion/anjuta-subversion.ui.h:53
 msgid "Use first path"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и пеÑ?Ñ?ий Ñ?лÑ?Ñ?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:54
 msgid "Use previous message"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?йÑ?е попеÑ?еднÑ? повÑ?домленнÑ?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:56
+#: ../plugins/subversion/anjuta-subversion.ui.h:57
 msgid "View Log"
 msgstr "Ð?еÑ?еглÑ?нÑ?Ñ?и жÑ?Ñ?нал"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:57
+#: ../plugins/subversion/anjuta-subversion.ui.h:58
 msgid "View Selected Revision"
 msgstr "Ð?еÑ?еглÑ?нÑ?Ñ?и обÑ?анÑ? пÑ?авкÑ?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:59
+#: ../plugins/subversion/anjuta-subversion.ui.h:60
 msgid "Whole Project"
 msgstr "Ð?еÑ?Ñ? пÑ?оекÑ?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:61
+#: ../plugins/subversion/anjuta-subversion.ui.h:62
 msgid "Working Copy"
 msgstr "РобоÑ?а копÑ?Ñ?:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:62
+#: ../plugins/subversion/anjuta-subversion.ui.h:63
 msgid "Working Copy Path:"
 msgstr "ШлÑ?Ñ? до Ñ?обоÑ?оÑ? копÑ?Ñ?:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:63
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
 msgstr "домен"
 
@@ -8494,8 +8640,8 @@ msgstr "Ð?аÑ?Ñ?кÑ?Ñ?ваÑ?и змÑ?ни Ñ? деÑ?евÑ? Subversion"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
-msgid "_Revert..."
-msgstr "_Ð?еÑ?нÑ?Ñ?и..."
+msgid "_Revertâ?¦"
+msgstr "_Ð?еÑ?нÑ?Ñ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -8506,8 +8652,8 @@ msgstr "Ð?еÑ?нÑ?Ñ?и змÑ?ни Ñ? Ñ?обоÑ?Ñ?й копÑ?Ñ?."
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
-msgid "_Resolve Conflicts..."
-msgstr "_Розв'Ñ?заÑ?и конÑ?лÑ?кÑ?и..."
+msgid "_Resolve Conflictsâ?¦"
+msgstr "_Розв'Ñ?заÑ?и конÑ?лÑ?кÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -8518,20 +8664,20 @@ msgstr "Розв'Ñ?заÑ?и конÑ?лÑ?кÑ?и Ñ? Ñ?обоÑ?Ñ?й копÑ?Ñ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
-msgid "_Update..."
-msgstr "_Ð?новиÑ?и..."
+msgid "_Updateâ?¦"
+msgstr "_Ð?новиÑ?иâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
-msgid "Sync your local copy with the Subversion tree"
+msgid "Syncronize your local copy with the Subversion tree"
 msgstr "СинÑ?Ñ?онÑ?зÑ?ваÑ?и Ñ?обоÑ?Ñ? копÑ?Ñ? з деÑ?евом Subversion"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:108
-msgid "Copy Files/Folders..."
-msgstr "Ð?опÑ?Ñ?ваÑ?и Ñ?айли/каÑ?алоги..."
+msgid "Copy Files/Foldersâ?¦"
+msgstr "Ð?опÑ?Ñ?ваÑ?и Ñ?айли/каÑ?алогиâ?¦"
 
 #. Display label
 #. short-cut
@@ -8542,8 +8688,8 @@ msgstr "Ð?опÑ?Ñ?ваÑ?и Ñ?айли/каÑ?алоги Ñ? Ñ?епозиÑ?оÑ?Ñ?й
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:116
-msgid "Switch to a Branch/Tag..."
-msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? на гÑ?лкÑ?/мÑ?Ñ?кÑ?..."
+msgid "Switch to a Branch/Tagâ?¦"
+msgstr "Ð?еÑ?емикнÑ?Ñ?иÑ?Ñ? на гÑ?лкÑ?/мÑ?Ñ?кÑ?â?¦"
 
 #. Display label
 #. short-cut
@@ -8554,8 +8700,8 @@ msgstr "Ð?еÑ?емикаÑ? Ñ?обоÑ?Ñ? копÑ?Ñ? на гÑ?лкÑ? Ñ?и мÑ?Ñ?к
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
-msgid "Merge..."
-msgstr "Ð?б'Ñ?днаннÑ?..."
+msgid "Mergeâ?¦"
+msgstr "Ð?б'Ñ?днаÑ?иâ?¦"
 
 #. Display label
 #. short-cut
@@ -8566,8 +8712,8 @@ msgstr "Ð?б'Ñ?днанÑ? змÑ?н Ñ? Ñ?обоÑ?Ñ?й копÑ?Ñ?..."
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
-msgid "_View Log..."
-msgstr "_Ð?еÑ?еглÑ?нÑ?Ñ?и жÑ?Ñ?нал..."
+msgid "_View Logâ?¦"
+msgstr "_Ð?еÑ?еглÑ?нÑ?Ñ?и жÑ?Ñ?налâ?¦"
 
 #. Display label
 #. short-cut
@@ -8578,8 +8724,8 @@ msgstr "Ð?оказаÑ?и Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? Ñ?айлÑ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
-msgid "_Diff..."
-msgstr "Ð?_Ñ?дмÑ?нноÑ?Ñ?Ñ?..."
+msgid "_Diffâ?¦"
+msgstr "_Ð?Ñ?дмÑ?нноÑ?Ñ?Ñ?â?¦"
 
 #. Display label
 #. short-cut
@@ -8590,14 +8736,14 @@ msgstr "Ð?найÑ?и вÑ?дмÑ?нноÑ?Ñ?Ñ? локалÑ?ного деÑ?ева Ñ?
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:199
-msgid "Copy..."
-msgstr "Ð?опÑ?Ñ?ваÑ?и..."
+msgid "Copyâ?¦"
+msgstr "_Ð?опÑ?Ñ?ваÑ?иâ?¦"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:207
-msgid "Diff..."
-msgstr "Ð?Ñ?дмÑ?нноÑ?Ñ?Ñ?..."
+msgid "Diffâ?¦"
+msgstr "Ð?оÑ?Ñ?внÑ?Ñ?иâ?¦"
 
 #: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
@@ -8620,8 +8766,8 @@ msgid "Subversion: Commit complete."
 msgstr "Subversion: Ñ?Ñ?кÑ?аÑ?Ñ?Ñ? завеÑ?Ñ?ено."
 
 #: ../plugins/subversion/subversion-commit-dialog.c:123
-msgid "Subversion: Committing changes to the repository..."
-msgstr "Subversion: Ñ?Ñ?кÑ?аÑ?Ñ?Ñ? змÑ?н Ñ? Ñ?епозиÑ?оÑ?Ñ?Ñ?..."
+msgid "Subversion: Committing changes to the repositoryâ?¦"
+msgstr "Subversion: Ñ?Ñ?кÑ?аÑ?Ñ?Ñ? змÑ?н Ñ? Ñ?епозиÑ?оÑ?Ñ?Ñ?â?¦"
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
 msgid "Subversion: Copy complete."
@@ -8642,8 +8788,8 @@ msgstr "[РепозиÑ?оÑ?Ñ?й/РобоÑ?а копÑ?Ñ?]"
 #: ../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: поÑ?Ñ?к вÑ?дмÑ?нноÑ?Ñ?ей..."
+msgid "Subversion: Retrieving diffâ?¦"
+msgstr "Subversion: поÑ?Ñ?к вÑ?дмÑ?нноÑ?Ñ?ейâ?¦"
 
 #: ../plugins/subversion/subversion-log-dialog.c:119
 msgid "Diff"
@@ -8658,16 +8804,16 @@ msgid "Short Log"
 msgstr "Ð?оÑ?оÑ?ке повÑ?домленнÑ? жÑ?Ñ?налÑ?"
 
 #: ../plugins/subversion/subversion-log-dialog.c:257
-msgid "Subversion: Retrieving log..."
-msgstr "Subversion: оÑ?Ñ?иманнÑ? жÑ?Ñ?налÑ?..."
+msgid "Subversion: Retrieving logâ?¦"
+msgstr "Subversion: оÑ?Ñ?иманнÑ? жÑ?Ñ?налÑ?â?¦"
 
 #: ../plugins/subversion/subversion-log-dialog.c:309
 msgid "Subversion: File retrieved."
 msgstr "Subversion: Ñ?айл оÑ?Ñ?иманий."
 
 #: ../plugins/subversion/subversion-log-dialog.c:351
-msgid "Subversion: Retrieving file..."
-msgstr "Subversion: оÑ?Ñ?иманнÑ? Ñ?айлÑ?..."
+msgid "Subversion: Retrieving fileâ?¦"
+msgstr "Subversion: оÑ?Ñ?иманнÑ? Ñ?айлÑ?â?¦"
 
 #: ../plugins/subversion/subversion-merge-dialog.c:38
 msgid "Subversion: Merge complete."
@@ -8809,64 +8955,64 @@ msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ?й: %s"
 msgid "Obstructed: %s"
 msgstr "Ð?еÑ?егоÑ?оджений: %s"
 
-#: ../plugins/symbol-db/plugin.c:313
+#: ../plugins/symbol-db/plugin.c:316
 msgid "Tag De_claration"
 msgstr "_Ð?голоÑ?еннÑ? мÑ?Ñ?ки"
 
-#: ../plugins/symbol-db/plugin.c:315
-msgid "Goto symbol declaration"
-msgstr "Ð?еÑ?ейÑ?и до оголоÑ?енннÑ? Ñ?имволÑ?"
+#: ../plugins/symbol-db/plugin.c:318
+msgid "Go to symbol declaration"
+msgstr "Ð?еÑ?ейÑ?и до оголоÑ?еннÑ? Ñ?имволÑ?"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:322
+#: ../plugins/symbol-db/plugin.c:325
 msgid "Tag _Implementation"
 msgstr "РеалÑ?заÑ?Ñ?Ñ? _мÑ?Ñ?ки"
 
-#: ../plugins/symbol-db/plugin.c:324
-msgid "Goto symbol definition"
+#: ../plugins/symbol-db/plugin.c:327
+msgid "Go to symbol definition"
 msgstr "Ð?еÑ?ейÑ?и до визнаÑ?еннÑ? Ñ?имволÑ?"
 
-#: ../plugins/symbol-db/plugin.c:331
-msgid "_Find Symbol..."
-msgstr "Ð?найÑ?и _Ñ?имвол..."
+#: ../plugins/symbol-db/plugin.c:334
+msgid "_Find Symbolâ?¦"
+msgstr "Ð?_найÑ?и Ñ?имволâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:332
+#: ../plugins/symbol-db/plugin.c:335
 msgid "Find Symbol"
 msgstr "Ð?найÑ?и Ñ?имвол"
 
-#: ../plugins/symbol-db/plugin.c:1170
+#: ../plugins/symbol-db/plugin.c:1022
 #, c-format
-msgid "%s: Generating inheritances..."
-msgstr "%s: Ñ?Ñ?воÑ?еннÑ? Ñ?падкÑ?ваннÑ?..."
+msgid "%s: Generating inheritancesâ?¦"
+msgstr "%s: Ñ?Ñ?воÑ?еннÑ? Ñ?падкÑ?ваннÑ?â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1175
+#: ../plugins/symbol-db/plugin.c:1027
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%s: пÑ?оÑ?кановано %d Ñ?айлÑ?в з %d"
 
-#: ../plugins/symbol-db/plugin.c:1206
+#: ../plugins/symbol-db/plugin.c:1058
 #, c-format
-msgid "Generating inheritances..."
-msgstr "СÑ?воÑ?еннÑ? Ñ?падкÑ?ваннÑ?..."
+msgid "Generating inheritancesâ?¦"
+msgstr "СÑ?воÑ?еннÑ? Ñ?падкÑ?ваннÑ?â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1208
+#: ../plugins/symbol-db/plugin.c:1060
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "Ð?Ñ?оÑ?кановано %d Ñ?айлÑ?в з %d"
 
-#: ../plugins/symbol-db/plugin.c:1968
-msgid "Populating symbols' db..."
-msgstr "Ð?аповненнÑ? бази даниÑ? Ñ?имволÑ?в..."
+#: ../plugins/symbol-db/plugin.c:1785
+msgid "Populating symbol databaseâ?¦"
+msgstr "Ð?аповненнÑ? бази даниÑ? Ñ?имволÑ?вâ?¦"
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2148 ../plugins/symbol-db/plugin.c:2232
 msgid "Symbols"
 msgstr "Символи"
 
-#: ../plugins/symbol-db/plugin.c:2489
+#: ../plugins/symbol-db/plugin.c:2241
 msgid "SymbolDb popup actions"
 msgstr "Ð?онÑ?екÑ?Ñ?нÑ? дÑ?Ñ? бази даниÑ? Ñ?имволÑ?в"
 
-#: ../plugins/symbol-db/plugin.c:2497
+#: ../plugins/symbol-db/plugin.c:2249
 msgid "SymbolDb menu actions"
 msgstr "Ð?Ñ?Ñ? менÑ? бази даниÑ? Ñ?имволÑ?в"
 
@@ -8888,127 +9034,133 @@ msgstr "Теги API"
 msgid "Resuming glb scan."
 msgstr "Ð?Ñ?одовженнÑ? Ñ?канÑ?ваннÑ? glb."
 
-#: ../plugins/symbol-db/symbol-db-view-locals.c:326
-#: ../plugins/symbol-db/symbol-db-view.c:1413
-msgid "Symbol"
-msgstr "СимволÑ?нÑ? Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?оÑ?иÑ?ано"
-
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
-msgid "<b>Available API tags</b>"
-msgstr "<b>Ð?оÑ?Ñ?Ñ?пнÑ? Ñ?еги API</b>"
+msgid "Automatically scan project's packages"
+msgstr "Ð?вÑ?омаÑ?иÑ?но Ñ?канÑ?ваÑ?и пакеÑ?и пÑ?оекÑ?Ñ?"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
-msgid "<b>Global</b>"
-msgstr "<b>Ð?агалÑ?нÑ?</b>"
+msgid "Automatically update symbols without saving file"
+msgstr "Ð?вÑ?омаÑ?иÑ?но оновлÑ?ваÑ?и Ñ?имволи без збеÑ?еженнÑ? Ñ?айлÑ?"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid "Automatically scan project's packages"
-msgstr "Ð?вÑ?омаÑ?иÑ?но Ñ?канÑ?ваÑ?и пакеÑ?и пÑ?оекÑ?Ñ?"
+msgid ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by the user."
+msgstr ""
+"Ð?вÑ?омаÑ?иÑ?но оновлÑ?ваÑ?и Ñ?имволи Ñ?айлÑ?в без збеÑ?еженнÑ?. Ð?новленнÑ? вÑ?дбÑ?ваÑ?Ñ?Ñ?Ñ?Ñ? "
+"пÑ?Ñ?лÑ? 10 Ñ?екÑ?нд не наÑ?иÑ?каннÑ? на клавÑ?Ñ?Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?ем."
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
-msgid "Automatically update symbols without saving file"
-msgstr "Ð?вÑ?омаÑ?иÑ?но оновлÑ?ваÑ?и Ñ?имволи без збеÑ?еженнÑ? Ñ?айлÑ?"
+msgid "Available API tags"
+msgstr "Ð?оÑ?Ñ?Ñ?пнÑ? Ñ?еги API"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
-msgid "Checking if package is parseable..."
-msgstr "Ð?еÑ?евÑ?Ñ?ка можливоÑ?Ñ?Ñ? Ñ?озбоÑ?Ñ? пакеÑ?Ñ?..."
+msgid "Checking if package is parseableâ?¦"
+msgstr "Ð?еÑ?евÑ?Ñ?ка можливоÑ?Ñ?Ñ? Ñ?озбоÑ?Ñ? пакеÑ?Ñ?â?¦"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "Ð?аÑ?алелÑ?не Ñ?канÑ?ваннÑ? пÑ?оекÑ?Ñ? Ñ?а глобалÑ?ниÑ? Ñ?имволÑ?в"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
 msgid ""
 "This option enables the default packages required by your opened project, e."
-"g. glib and gtk+ if you create a Gtk+ project (may require more cpu work)"
+"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
 msgstr ""
 "Цей паÑ?амеÑ?Ñ? вмикаÑ? Ñ?иповÑ? пакеÑ?и, Ñ?о Ñ? обов'Ñ?зковими длÑ? вÑ?дкÑ?иÑ?ого "
-"пÑ?оекÑ?Ñ?, Ñ?обÑ?о glib Ñ?а gtk+ ЯкÑ?о ви Ñ?Ñ?воÑ?Ñ?Ñ?Ñ?е пÑ?оекÑ? Gtk+ (може вимагаÑ?и "
+"пÑ?оекÑ?Ñ?, Ñ?обÑ?о glib Ñ?а gtk+, Ñ?кÑ?о ви Ñ?Ñ?воÑ?Ñ?Ñ?Ñ?е пÑ?оекÑ? Gtk+ (може вимагаÑ?и "
 "бÑ?лÑ?Ñ?е Ñ?еÑ?Ñ?Ñ?Ñ?Ñ?в cpu)"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
-msgid ""
-"This option means that the global system packages will be scanned "
-"contemporary with the project's ones"
-msgstr "Цей паÑ?амеÑ?Ñ? ознаÑ?аÑ?, Ñ?о пакеÑ?и бÑ?дÑ?Ñ?Ñ? Ñ?канованÑ? одноÑ?аÑ?но з пÑ?оекÑ?ом"
-
 #: ../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."
+"This option means that the global system packages will be scanned "
+"simultaneously with the project's ones"
 msgstr ""
-"Ð?новлÑ?ваÑ?и Ñ?ей Ñ?айл без збеÑ?еженнÑ?. Ð?новленнÑ? вÑ?дбÑ?ваÑ?Ñ?Ñ?Ñ?Ñ? пÑ?Ñ?лÑ? 10 Ñ?екÑ?нд "
-"не наÑ?иÑ?каннÑ? на клавÑ?Ñ?Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?ем."
+"Цей паÑ?амеÑ?Ñ? ознаÑ?аÑ?, Ñ?о пакеÑ?и глобалÑ?ноÑ? Ñ?иÑ?Ñ?еми бÑ?дÑ?Ñ?Ñ? пеÑ?евÑ?Ñ?енÑ? "
+"одноÑ?аÑ?но з пакеÑ?ами пÑ?оекÑ?Ñ?"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
-msgid "<b>Terminal options</b>"
-msgstr "<b>Ð?аÑ?амеÑ?Ñ?и Ñ?еÑ?мÑ?налÑ?</b>"
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
+msgid "Terminal options"
+msgstr "Ð?аÑ?амеÑ?Ñ?и Ñ?еÑ?мÑ?налÑ?"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:3
-msgid "Use GNOME terminal profile:"
+msgid "Use GNOME Terminal profile:"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и пÑ?оÑ?Ñ?лÑ? Ñ?еÑ?мÑ?налÑ? GNOME:"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:4
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и поÑ?оÑ?ний пÑ?оÑ?Ñ?лÑ? Ñ?еÑ?мÑ?налÑ? GNOME"
 
-#: ../plugins/terminal/terminal.c:739
+#: ../plugins/terminal/terminal.c:626
+msgid "Ctrl-C"
+msgstr "Ctrl-C"
+
+#: ../plugins/terminal/terminal.c:634
+msgid "Ctrl-X"
+msgstr "Ctrl-X"
+
+#: ../plugins/terminal/terminal.c:642
+msgid "Ctrl-Z"
+msgstr "Ctrl-Z"
+
+#: ../plugins/terminal/terminal.c:781
 msgid "terminal operations"
 msgstr "Ð?оманди Ñ?еÑ?мÑ?налÑ?"
 
-#: ../plugins/terminal/terminal.c:757 ../plugins/terminal/terminal.c:926
-#: ../plugins/terminal/terminal.c:979
+#: ../plugins/terminal/terminal.c:799 ../plugins/terminal/terminal.c:968
+#: ../plugins/terminal/terminal.c:1021
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "ТеÑ?мÑ?нал"
 
-#: ../plugins/tools/anjuta-tools.ui.h:1
-msgid "<b>Tools</b>"
-msgstr "<b>Ð?нÑ?Ñ?Ñ?Ñ?менÑ?и</b>"
-
-#: ../plugins/tools/anjuta-tools.ui.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:2
 msgid "Command:"
 msgstr "Ð?оманда:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:4
+#: ../plugins/tools/anjuta-tools.ui.h:3
 msgid "Edit as script"
 msgstr "РедагÑ?ваÑ?и Ñ?к Ñ?Ñ?енаÑ?Ñ?й"
 
-#: ../plugins/tools/anjuta-tools.ui.h:5
+#: ../plugins/tools/anjuta-tools.ui.h:4
 msgid "Edit command as script in Anjuta on close"
 msgstr "РедагÑ?ваÑ?и Ñ?Ñ?енаÑ?Ñ?й команди Ñ? Anjuta пÑ?и закÑ?иÑ?Ñ?Ñ? Ñ?Ñ?ого дÑ?алогÑ?"
 
-#: ../plugins/tools/anjuta-tools.ui.h:8
+#: ../plugins/tools/anjuta-tools.ui.h:7
 msgid "Parameters:"
 msgstr "Ð?аÑ?амеÑ?Ñ?и:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:10
+#: ../plugins/tools/anjuta-tools.ui.h:9
 msgid "Save all files"
 msgstr "Ð?беÑ?егÑ?и вÑ?Ñ? Ñ?айли"
 
-#: ../plugins/tools/anjuta-tools.ui.h:11
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Short cut:"
 msgstr "Ð?омбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?:"
 
 #. This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:13
+#: ../plugins/tools/anjuta-tools.ui.h:12
 msgid "Standard error:"
 msgstr "СÑ?андаÑ?Ñ?ний поÑ?Ñ?к помилок:"
 
 #. This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:15
+#: ../plugins/tools/anjuta-tools.ui.h:14
 msgid "Standard input:"
 msgstr "СÑ?андаÑ?Ñ?ний ввÑ?д:"
 
 #. This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:17
+#: ../plugins/tools/anjuta-tools.ui.h:16
 msgid "Standard output:"
 msgstr "СÑ?андаÑ?Ñ?ний вивÑ?д:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:18
+#: ../plugins/tools/anjuta-tools.ui.h:17
 msgid "Tool Editor"
 msgstr "РедакÑ?оÑ? Ñ?нÑ?Ñ?Ñ?Ñ?менÑ?Ñ?в"
 
+#: ../plugins/tools/anjuta-tools.ui.h:18 ../plugins/tools/plugin.c:256
+#: ../plugins/tools/plugin.c:263 ../plugins/tools/anjuta-tools.plugin.in.h:1
+msgid "Tools"
+msgstr "Ð?нÑ?Ñ?Ñ?Ñ?менÑ?и"
+
 #: ../plugins/tools/anjuta-tools.ui.h:19
 msgid "Variable list"
 msgstr "СпиÑ?ок змÑ?нниÑ?"
@@ -9018,8 +9170,8 @@ msgid "Working directory:"
 msgstr "РобоÑ?ий каÑ?алог:"
 
 #: ../plugins/tools/anjuta-tools.ui.h:21
-msgid "_Variable..."
-msgstr "_Ð?мÑ?ннÑ?..."
+msgid "_Variableâ?¦"
+msgstr "_Ð?мÑ?ннаâ?¦"
 
 #: ../plugins/tools/dialog.c:177
 #, c-format
@@ -9071,8 +9223,8 @@ msgid "Unable to edit script"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дÑ?едагÑ?ваÑ?и Ñ?Ñ?енаÑ?Ñ?й: %s."
 
 #: ../plugins/tools/editor.c:1044
-msgid "New accelerator..."
-msgstr "СÑ?воÑ?иÑ?и комбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?..."
+msgid "New acceleratorâ?¦"
+msgstr "СÑ?воÑ?иÑ?и комбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?â?¦"
 
 #: ../plugins/tools/execute.c:314
 #, c-format
@@ -9098,8 +9250,8 @@ msgstr "(error)"
 #. Display the name of the command
 #: ../plugins/tools/execute.c:469
 #, c-format
-msgid "Running command: %s...\n"
-msgstr "Ð?апÑ?Ñ?к команди: %s...\n"
+msgid "Running command: %sâ?¦\n"
+msgstr "Ð?апÑ?Ñ?к команди: %sâ?¦\n"
 
 #: ../plugins/tools/execute.c:509
 #, c-format
@@ -9107,12 +9259,12 @@ msgid "Completed unsuccessfully with status code %d\n"
 msgstr "Ð?авеÑ?Ñ?ено з помилкоÑ? з кодом %d\n"
 
 #: ../plugins/tools/execute.c:629
-msgid "Unable to create a buffer, command aborted"
-msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и бÑ?Ñ?еÑ?, командÑ? пеÑ?еÑ?вано"
+msgid "Unable to create a buffer: command aborted"
+msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и бÑ?Ñ?еÑ?: командÑ? пеÑ?еÑ?вано"
 
 #: ../plugins/tools/execute.c:641
-msgid "No document currently open, command aborted"
-msgstr "Ð?емаÑ? вÑ?дкÑ?иÑ?ого докÑ?менÑ?Ñ?, командÑ? пеÑ?еÑ?вано"
+msgid "No document currently open: command aborted"
+msgstr "Ð?емаÑ? вÑ?дкÑ?иÑ?ого докÑ?менÑ?Ñ?: командÑ? пеÑ?еÑ?вано"
 
 #: ../plugins/tools/execute.c:1019
 #, c-format
@@ -9141,11 +9293,6 @@ msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дкÑ?иÑ?и Ñ?айл %s длÑ? запиÑ?Ñ?"
 msgid "Tool operations"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? з Ñ?нÑ?Ñ?Ñ?Ñ?менÑ?ами"
 
-#: ../plugins/tools/plugin.c:256 ../plugins/tools/plugin.c:263
-#: ../plugins/tools/anjuta-tools.plugin.in.h:1
-msgid "Tools"
-msgstr "Ð?нÑ?Ñ?Ñ?Ñ?менÑ?и"
-
 #: ../plugins/tools/variable.c:84
 msgid "Project root URI"
 msgstr "Ð?оÑ?иланнÑ? (URI) на коÑ?еневÑ? Ñ?екÑ? пÑ?оекÑ?Ñ?"
@@ -9238,7 +9385,7 @@ msgstr "Ð?оÑ?оÑ?ний Ñ?Ñ?док Ñ? Ñ?едакÑ?оÑ?Ñ?"
 msgid "Ask the user to get additional parameters"
 msgstr "Ð?апиÑ?Ñ?ваÑ?и Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а пÑ?о додаÑ?ковÑ? паÑ?амеÑ?Ñ?и"
 
-#: ../plugins/tools/variable.c:493
+#: ../plugins/tools/variable.c:499
 msgid "Command line parameters"
 msgstr "Ð?аÑ?амеÑ?Ñ?и командного Ñ?Ñ?дка"
 
@@ -9263,7 +9410,7 @@ msgid "Replace buffer"
 msgstr "Ð?амÑ?ниÑ?и змÑ?Ñ?Ñ? бÑ?Ñ?еÑ?Ñ?"
 
 #: ../plugins/tools/tool.c:86
-msgid "Insert in buffer"
+msgid "Insert into buffer"
 msgstr "Ð?Ñ?Ñ?авиÑ?и Ñ? бÑ?Ñ?еÑ?"
 
 #: ../plugins/tools/tool.c:87
@@ -9304,8 +9451,8 @@ msgid "Copyright (c) Naba Kumar"
 msgstr "Copyright (С) Naba Kumar"
 
 #: ../src/anjuta.c:424
-msgid "Loaded Session..."
-msgstr "СеанÑ? заванÑ?ажено..."
+msgid "Loaded Sessionâ?¦"
+msgstr "СеанÑ? заванÑ?аженоâ?¦"
 
 #: ../src/anjuta-actions.h:23
 msgid "_File"
@@ -9434,63 +9581,63 @@ msgid "About External _Plugins"
 msgstr "Ð?Ñ?о зовнÑ?Ñ?нÑ? д_оповненнÑ?"
 
 #: ../src/anjuta-actions.h:96
-msgid "About third party Anjuta plugins"
-msgstr "Ð?Ñ?о зовнÑ?Ñ?нÑ? доповненнÑ? длÑ? Anjuta"
+msgid "About third-party Anjuta plugins"
+msgstr "Ð?Ñ?о зовнÑ?Ñ?нÑ? модÑ?лÑ? Anjuta"
 
 #: ../src/anjuta-app.c:489
 msgid "Edit"
 msgstr "Ð?мÑ?ниÑ?и"
 
-#: ../src/anjuta-app.c:734
+#: ../src/anjuta-app.c:771
 msgid "Installed plugins"
 msgstr "Ð?Ñ?Ñ?ановленÑ? доповненнÑ?"
 
-#: ../src/anjuta-app.c:738
+#: ../src/anjuta-app.c:775
 msgid "Shortcuts"
 msgstr "Ð?омбÑ?наÑ?Ñ?Ñ? клавÑ?Ñ?"
 
-#: ../src/anjuta-app.c:810
+#: ../src/anjuta-app.c:847
 #, c-format
 msgid "Value doesn't exist"
 msgstr "Ð?наÑ?еннÑ? не Ñ?Ñ?нÑ?Ñ?"
 
-#: ../src/main.c:62
+#: ../src/main.c:74
 msgid "Specify the size and location of the main window"
 msgstr "Ð?кажÑ?Ñ?Ñ? Ñ?озмÑ?Ñ? Ñ?а Ñ?озÑ?аÑ?Ñ?ваннÑ? головного вÑ?кна"
 
 #. This is the format you can specify the size andposition
 #. * of the window on command line
-#: ../src/main.c:65
+#: ../src/main.c:77
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
-#: ../src/main.c:70
-msgid "Do not show the splashscreen"
-msgstr "Ð?е показÑ?ваÑ?и заÑ?Ñ?авкÑ?"
+#: ../src/main.c:82
+msgid "Do not show the splash screen"
+msgstr "Ð?е показÑ?ваÑ?и заÑ?Ñ?авкÑ? пÑ?д Ñ?аÑ? запÑ?Ñ?кÑ?"
 
-#: ../src/main.c:76
-msgid "Start a new instance and do not open the file in a existing"
-msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и новий екземплÑ?Ñ?, а не вÑ?дкÑ?иваÑ?и Ñ?айл Ñ? Ñ?Ñ?нÑ?Ñ?Ñ?омÑ?."
+#: ../src/main.c:88
+msgid "Start a new instance and do not open the file in an existing instance"
+msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и новий екземплÑ?Ñ?, а не вÑ?дкÑ?иваÑ?и Ñ?айл Ñ? наÑ?вномÑ?."
 
-#: ../src/main.c:82
+#: ../src/main.c:94
 msgid "Do not open last session on startup"
 msgstr "Ð?е вÑ?дкÑ?иваÑ?и оÑ?Ñ?аннÑ?й Ñ?еанÑ? на Ñ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../src/main.c:88
+#: ../src/main.c:100
 msgid "Do not open last project and files on startup"
 msgstr "Ð?е вÑ?дкÑ?иваÑ?и оÑ?Ñ?аннÑ?й пÑ?оекÑ? Ñ?а Ñ?айли на Ñ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../src/main.c:94
-msgid "Shutdown anjuta properly releasing all resources (for debugging)"
+#: ../src/main.c:106
+msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr ""
 "Ð?авеÑ?Ñ?Ñ?ваÑ?и Ñ?обоÑ?Ñ? anjuta, поÑ?лÑ?довно звÑ?лÑ?нÑ?Ñ?Ñ?и вÑ?Ñ? Ñ?еÑ?Ñ?Ñ?Ñ?Ñ? (длÑ? "
 "налагодженнÑ?)"
 
-#: ../src/main.c:156
+#: ../src/main.c:174
 msgid "- Integrated Development Environment"
 msgstr "- Ð?нÑ?егÑ?оване Ñ?еÑ?едовиÑ?е Ñ?озÑ?обки"
 
-#: ../src/main.c:232
+#: ../src/main.c:250
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -9523,8 +9670,8 @@ msgstr "Ð?е заванÑ?ажÑ?ваÑ?и оÑ?Ñ?аннÑ?й Ñ?еанÑ? на Ñ?Ñ?а
 msgid "Dock switcher style:"
 msgstr "СÑ?илÑ? пеÑ?емикаÑ?а вкладок:"
 
-#: ../src/preferences.ui.h:11
-msgid "Gnome toolbar setting"
+#: ../src/preferences.ui.h:10
+msgid "GNOME toolbar setting"
 msgstr "Ð?аÑ?амеÑ?Ñ?и панелÑ? Ñ?нÑ?Ñ?Ñ?Ñ?менÑ?Ñ?в Gnome"
 
 #: ../src/preferences.ui.h:12
@@ -9540,7 +9687,7 @@ msgid "Project Defaults"
 msgstr "Ð?аÑ?амеÑ?Ñ?и Ñ?ипового пÑ?оекÑ?Ñ?"
 
 #: ../src/preferences.ui.h:15
-msgid "Select projects directory"
+msgid "Select project directory"
 msgstr "Ð?ибÑ?аÑ?и каÑ?алог пÑ?оекÑ?Ñ?в"
 
 #: ../src/preferences.ui.h:16
@@ -9574,7 +9721,8 @@ msgstr "Ð?Ñ?дпиÑ?и кнопок панелÑ?:"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
 msgid "Do not display warning if not using a Debug configuration"
-msgstr "Ð?е показÑ?ваÑ?и попеÑ?едженнÑ?, Ñ?кÑ?о не викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? Debug"
+msgstr ""
+"Ð?е показÑ?ваÑ?и попеÑ?едженнÑ?, Ñ?кÑ?о не викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? Debug"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
@@ -9585,7 +9733,7 @@ msgid "Add a space after function call autocompletion"
 msgstr "Ð?одаваÑ?и пÑ?обÑ?л пÑ?Ñ?лÑ? авÑ?одоповненнÑ? викликÑ? Ñ?Ñ?нкÑ?Ñ?Ñ?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
-msgid "Autocomplete"
+msgid "Auto-complete"
 msgstr "Ð?вÑ?одоповненнÑ?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
@@ -9593,103 +9741,96 @@ msgid "Autocompletion (C/C++/Java only)"
 msgstr "Ð?вÑ?одоповненнÑ? (лиÑ?е длÑ? C/C++/Java)"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
-msgid "Autocompletion pop up choices"
-msgstr "Ð?аÑ?Ñ?анÑ?Ñ?в Ñ? вÑ?кнÑ? авÑ?одоповненнÑ?"
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Brace indentation size in spaces:"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?п дÑ?жки Ñ? пÑ?обÑ?лаÑ?:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Calltips"
 msgstr "Ð?Ñ?дказки викликÑ?в"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
 msgid "Enable code completion"
 msgstr "УвÑ?мкнÑ?Ñ?и доповненнÑ? кодÑ?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
 msgid "Enable smart brace completion"
 msgstr "УвÑ?мкнÑ?Ñ?и Ñ?нÑ?елекÑ?Ñ?алÑ?не доповненнÑ? дÑ?жок"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable smart indentation"
 msgstr "УвÑ?мкнÑ?Ñ?и «Ñ?озÑ?мнÑ?» вÑ?дÑ?Ñ?Ñ?пи"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Indent:"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?пи"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 msgid "Indentation parameters"
 msgstr "Ð?аÑ?амеÑ?Ñ?и вÑ?дÑ?Ñ?Ñ?пÑ?в"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Line up parentheses"
 msgstr "Ð?иÑ?Ñ?внÑ?ваннÑ? кÑ?Ñ?глиÑ? дÑ?жок"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
-msgid "Parenthese indentation"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+msgid "Parenthesis indentation"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?пи кÑ?Ñ?глиÑ? дÑ?жок"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "Ð?оказÑ?ваÑ?и пÑ?дказкÑ? по Ñ?Ñ?нкÑ?Ñ?Ñ?м"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Smart Indentation"
 msgstr "«РозÑ?мнÑ?» вÑ?дÑ?Ñ?Ñ?пи"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "РозмÑ?Ñ? вÑ?дÑ?Ñ?Ñ?пÑ? Ñ? пÑ?обÑ?лаÑ?:"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1921
-msgid "_AutoComplete"
-msgstr "Ð?в_Ñ?одоповненнÑ?"
-
-#: ../plugins/language-support-cpp-java/plugin.c:1922
-msgid "AutoComplete the current word"
-msgstr "Ð?вÑ?одоповненнÑ? поÑ?оÑ?ного Ñ?лова"
+#: ../plugins/language-support-cpp-java/plugin.c:1888
+msgid "Auto-Indent"
+msgstr "Ð?вÑ?омаÑ?иÑ?нÑ? вÑ?дÑ?Ñ?Ñ?пи"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1928
-msgid "Auto Indent"
-msgstr "Ð?Ñ?дÑ?Ñ?Ñ?пи"
-
-#: ../plugins/language-support-cpp-java/plugin.c:1929
-msgid "Auto indent current line or selection based on indentation settings"
+#: ../plugins/language-support-cpp-java/plugin.c:1889
+msgid "Auto-indent current line or selection based on indentation settings"
 msgstr ""
 "Ð?вÑ?омаÑ?иÑ?но виÑ?Ñ?внÑ?ваÑ?и поÑ?оÑ?ний Ñ?Ñ?док або видÑ?леннÑ? на оÑ?новÑ? паÑ?амеÑ?Ñ?Ñ?в "
 "виÑ?Ñ?внÑ?ваннÑ?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1934
+#: ../plugins/language-support-cpp-java/plugin.c:1894
 msgid "Swap .h/.c"
 msgstr "Ð?омÑ?нÑ?Ñ?и .h/.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1935
-msgid "Swap c header and source files"
+#: ../plugins/language-support-cpp-java/plugin.c:1895
+msgid "Swap C header and source files"
 msgstr "Ð?еÑ?емиканнÑ? мÑ?ж Ñ?айлами заголовкÑ?в Ñ?а пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1978
+#: ../plugins/language-support-cpp-java/plugin.c:1936
 msgid "C++/Java Assistance"
 msgstr "Ð?Ñ?дÑ?Ñ?имка C++/Java"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2071
-#: ../plugins/language-support-cpp-java/plugin.c:2080
+#: ../plugins/language-support-cpp-java/plugin.c:2048
+#: ../plugins/language-support-cpp-java/plugin.c:2061
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1368
+msgid "C/C++"
+msgstr "C/C++"
+
 #: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "РедакÑ?оÑ? GtkSourceView"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:1
-msgid "Gdb"
-msgstr "Gdb"
+msgid "GNU Debugger Plugin"
+msgstr "Ð?одÑ?лÑ? кеÑ?Ñ?ваннÑ? налагодженнÑ?м"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:2
-msgid "Gdb plugin."
-msgstr "Ð?одÑ?лÑ? Gdb"
+msgid "Gdb"
+msgstr "Gdb"
 
 #: ../plugins/git/git.plugin.in.h:2
 msgid "Git version control"
@@ -9784,23 +9925,23 @@ msgid "CVS Plugin"
 msgstr "Ð?одÑ?лÑ? CVS"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
-msgid "Import an existing autotools project to anjuta"
-msgstr "Ð?мпоÑ?Ñ? Ñ?Ñ?нÑ?Ñ?Ñ?ого пÑ?оекÑ?Ñ?, оÑ?нований на autotools Ñ? anjuta"
+msgid "Import an existing autotools project to Anjuta"
+msgstr "Ð?мпоÑ?Ñ? наÑ?вного пÑ?оекÑ?Ñ? autotools Ñ? Anjuta"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:2
-msgid "Project From Existing Sources"
-msgstr "Ð?Ñ?оекÑ? з Ñ?Ñ?нÑ?Ñ?Ñ?иÑ? пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в"
-
-#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
 msgid "Project Import Assistant"
 msgstr "Ð?омÑ?Ñ?ник Ñ?мпоÑ?Ñ?Ñ? пÑ?оекÑ?Ñ?в"
 
+#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
+msgid "Project from Existing Sources"
+msgstr "Ð?Ñ?оекÑ? з наÑ?вниÑ? пеÑ?винниÑ? Ñ?екÑ?Ñ?Ñ?в"
+
 #: ../plugins/sourceview/sourceview.plugin.in.h:1
-msgid "GtkSourceview editor"
-msgstr "РедакÑ?оÑ? GtkSourceview"
+msgid "GtkSourceView editor"
+msgstr "РедакÑ?оÑ? GtkSourceView"
 
 #: ../plugins/sourceview/sourceview.plugin.in.h:2
-msgid "The default editor based on GtkSourceview"
+msgid "The default editor based on GtkSourceView"
 msgstr "Типовий Ñ?едакÑ?оÑ?, оÑ?нований на GtkSourceview"
 
 #: ../plugins/starter/anjuta-starter.plugin.in.h:2
@@ -9812,7 +9953,7 @@ msgid "C++ and Java support Plugin"
 msgstr "Ð?одÑ?лÑ? пÑ?дÑ?Ñ?имки C++ Ñ?а Java"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in.h:2
-msgid "C++ and Java support plugin for code completion, auto indentation etc."
+msgid "C++ and Java support plugin for code completion, auto-indentation, etc."
 msgstr ""
 "Ð?одÑ?лÑ? длÑ? пÑ?дÑ?Ñ?имки авÑ?одоповненнÑ?, авÑ?омаÑ?иÑ?ниÑ? вÑ?дÑ?Ñ?Ñ?пÑ?в Ñ?а Ñ?.Ñ?. длÑ? C++ "
 "Ñ?а Java."
@@ -9897,35 +10038,67 @@ msgstr "Ð?одÑ?лÑ? Autotools"
 msgid "Autotools backend for project manager"
 msgstr "Ð?одÑ?лÑ? Autotools длÑ? менеджеÑ?а пÑ?оекÑ?Ñ?в"
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../plugins/js-debugger/plugin.c:122
+#, c-format
+msgid "Error: %s"
+msgstr "Ð?омилка: %s"
+
+#: ../plugins/js-debugger/plugin.c:142
+#: ../plugins/js-debugger/debugger-js.c:546
+msgid "Error: cant bind port"
+msgstr "Ð?омилка: не вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?иÑ?днаÑ?иÑ?Ñ? до поÑ?Ñ?а"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:1
+msgid "Anjuta JS Debugger Plugin"
+msgstr "Ð?одÑ?лÑ? Anjuta длÑ? налагодженнÑ? JS"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:2
+msgid "Javascript Debugger Plugin"
+msgstr "Ð?одÑ?лÑ? длÑ? налагодженнÑ? Javascript"
+
+#: ../plugins/language-support-js/plugin.c:332
+#: ../plugins/language-support-js/plugin.c:341
+msgid "JavaScript"
+msgstr "СÑ?енаÑ?ий JavaScript"
+
+#: ../plugins/language-support-js/plugin.c:397
+msgid "JS"
+msgstr "JS"
 
-#~ msgid "Command Line Parameters"
-#~ msgstr "Ð?аÑ?амеÑ?Ñ?и командного Ñ?Ñ?дка"
+#: ../plugins/language-support-js/js_support_plugin.plugin.in.h:1
+msgid "JS Support Plugin"
+msgstr "Ð?одÑ?лÑ? пÑ?дÑ?Ñ?имки JS"
 
-#~ msgid "Enter a Hexa adress or select one in the data"
-#~ msgstr "Ð?ведÑ?Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?надÑ?Ñ?Ñ?ковÑ? адÑ?еÑ?Ñ? або вибеÑ?Ñ?Ñ?Ñ? Ñ?Ñ? Ñ? даниÑ?"
+#: ../plugins/language-support-js/js_support_plugin.plugin.in.h:2
+msgid "JavaScript Support Plugin"
+msgstr "Ð?одÑ?лÑ? пÑ?дÑ?Ñ?имки JavaScript"
 
-#~ msgid "Execute Program"
-#~ msgstr "Ð?иконаÑ?и пÑ?огÑ?амÑ?"
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:1
+msgid "<b>JS Find dirs</b>"
+msgstr "<b>ШлÑ?Ñ?и поÑ?Ñ?кÑ? JS</b>"
 
-#~ msgid "Run in Terminal"
-#~ msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и в Ñ?еÑ?мÑ?налÑ?"
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:2
+msgid "Add brace after function call autocompletion"
+msgstr "Ð?одаваÑ?и дÑ?жкÑ? пÑ?Ñ?лÑ? авÑ?одоповненнÑ? викликÑ? Ñ?Ñ?нкÑ?Ñ?Ñ?"
 
-#~ msgid "_Pass:"
-#~ msgstr "_Ð?Ñ?оÑ?Ñ?д:"
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:3
+msgid "Gir repository's directory:   "
+msgstr "Ð?аÑ?алог Ñ?епозиÑ?оÑ?Ñ?Ñ? Gir:   "
 
-#~ msgid "on_widget_signal"
-#~ msgstr "on_widget_signal"
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:4
+msgid "Gjs repository's directory:   "
+msgstr "Ð?аÑ?алог Ñ?епозиÑ?оÑ?Ñ?Ñ? Gjs:   "
 
-#~ msgid "widget_signal_cb"
-#~ msgstr "widget_signal_cb"
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
+msgid "Highlight missed semicolon"
+msgstr "Ð?идÑ?лÑ?Ñ?и колÑ?оÑ?ом пÑ?опÑ?Ñ?енÑ? кÑ?апкÑ? з комоÑ?"
 
-#~ msgid "Ctags executable:"
-#~ msgstr "Ð?иконÑ?ваний Ñ?айл ctags:"
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:6
+msgid "Min character for completion "
+msgstr "Ð?Ñ?нÑ?малÑ?на кÑ?лÑ?кÑ?Ñ?Ñ?Ñ? Ñ?имволÑ?в длÑ? доповненнÑ?"
 
-#~ msgid "Enable adaptive indentation"
-#~ msgstr "УвÑ?мкнÑ?Ñ?и адапÑ?ивне виÑ?Ñ?внÑ?ваннÑ?"
+#~ msgid "Symbol"
+#~ msgstr "СимволÑ?нÑ? Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?оÑ?иÑ?ано"
 
-#~ msgid "Pressing tab indents"
-#~ msgstr "Ð?аÑ?иÑ?каннÑ? «Tab» вÑ?Ñ?авлÑ?Ñ? вÑ?дÑ?Ñ?Ñ?п"
+#~ msgid "Loadingâ?¦"
+#~ msgstr "Ð?аванÑ?аженнÑ?â?¦"
diff --git a/src/anjuta-app.c b/src/anjuta-app.c
index 60540c3..107d040 100644
--- a/src/anjuta-app.c
+++ b/src/anjuta-app.c
@@ -112,6 +112,141 @@ disconnect_proxy_cb (GtkUIManager *manager,
 	}
 }
 
+static void
+anjuta_app_iconify_dockable_widget (AnjutaShell *shell, GtkWidget *widget,
+                                    GError **error)
+{
+	AnjutaApp *app = NULL;
+	GtkWidget *dock_item = NULL;
+
+	/* Argumments assertions */
+	g_return_if_fail (ANJUTA_IS_APP (shell));
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+
+	app = ANJUTA_APP (shell);
+	g_return_if_fail (app->widgets != NULL);
+	
+	dock_item = g_object_get_data (G_OBJECT (widget), "dockitem");
+	g_return_if_fail (dock_item != NULL);
+
+	/* Iconify the dockable item */
+	gdl_dock_item_iconify_item (GDL_DOCK_ITEM (dock_item));
+}
+
+static void
+anjuta_app_hide_dockable_widget (AnjutaShell *shell, GtkWidget *widget,
+                                 GError **error)
+{
+	AnjutaApp *app = NULL;
+	GtkWidget *dock_item = NULL;
+
+	/* Argumments assertions */
+	g_return_if_fail (ANJUTA_IS_APP (shell));
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+
+	app = ANJUTA_APP (shell);
+	g_return_if_fail (app->widgets != NULL);
+	
+	dock_item = g_object_get_data (G_OBJECT (widget), "dockitem");
+	g_return_if_fail (dock_item != NULL);
+
+	/* Hide the dockable item */
+	gdl_dock_item_hide_item (GDL_DOCK_ITEM (dock_item));
+}
+
+static void
+anjuta_app_show_dockable_widget (AnjutaShell *shell, GtkWidget* widget,
+                                 GError **error)
+{
+	AnjutaApp *app = NULL;
+	GtkWidget *dock_item = NULL;
+
+	/* Argumments assertions */
+	g_return_if_fail (ANJUTA_IS_APP (shell));
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+
+	app = ANJUTA_APP (shell);
+	g_return_if_fail (app->widgets != NULL);
+	
+	dock_item = g_object_get_data (G_OBJECT (widget), "dockitem");
+	g_return_if_fail (dock_item != NULL);
+
+	/* Show the dockable item */	
+	gdl_dock_item_show_item(GDL_DOCK_ITEM (dock_item));
+}
+
+static void
+anjuta_app_maximize_widget (AnjutaShell *shell,
+                            const char  *widget_name,
+                            GError **error)
+{
+	AnjutaApp *app = NULL;
+	GtkWidget *dock_item = NULL;
+	gpointer  value, key;
+	GtkWidget *widget = NULL;
+	GHashTableIter iter;
+
+	/* AnjutaApp assertions */
+	g_return_if_fail (ANJUTA_IS_APP (shell));
+	app = ANJUTA_APP (shell);
+
+	/* If app->maximized is TRUE then another widget is already maximized.
+	   Restoring the UI for a new maximization. */
+	if(app->maximized)
+		gdl_dock_layout_load_layout (app->layout_manager, "back-up");
+
+	/* Back-up the layout so it can be restored */
+	gdl_dock_layout_save_layout(app->layout_manager, "back-up");
+
+	/* Mark the app as maximized (the other widgets except center are hidden) */
+	app->maximized = TRUE;
+	
+	/* Hide all DockItem's except the ones positioned in the center */
+	g_hash_table_iter_init (&iter, app->widgets);
+	while (g_hash_table_iter_next (&iter, &key, &value))
+	{
+		if (value == NULL)
+			continue;
+
+		/* If it's the widget requesting maximization then continue */
+		if(!g_strcmp0((gchar*)key, widget_name))
+			continue;
+			
+		/* Widget assertions */
+		widget = GTK_WIDGET (value);
+		if(!GTK_IS_WIDGET (widget))
+			continue;
+
+		/* DockItem assertions */
+		dock_item = g_object_get_data (G_OBJECT (widget), "dockitem");
+		if(dock_item == NULL || !GDL_IS_DOCK_ITEM (dock_item))
+			continue;
+		
+		/* Hide the item */
+		gdl_dock_item_hide_item (GDL_DOCK_ITEM (dock_item));
+	}
+}
+
+static void
+anjuta_app_unmaximize (AnjutaShell *shell,
+                       GError **error)
+{
+	AnjutaApp *app = NULL;
+
+	/* AnjutaApp assertions */
+	g_return_if_fail (ANJUTA_IS_APP (shell));
+	app = ANJUTA_APP (shell);
+
+	/* If not maximized then the operation doesn't make sence. */
+	g_return_if_fail (app->maximized);
+	
+	/* Load the backed-up layout */
+	gdl_dock_layout_load_layout (app->layout_manager, "back-up");
+	gdl_dock_layout_delete_layout (app->layout_manager, "back-up");
+	
+	/* Un-mark maximized */
+	app->maximized = FALSE;
+}
 
 static void
 on_toolbar_style_changed (AnjutaPreferences* prefs,
@@ -420,6 +555,7 @@ anjuta_app_instance_init (AnjutaApp *app)
 	
 	app->values = NULL;
 	app->widgets = NULL;
+	app->maximized = FALSE;
 	
 	/* Status bar */
 	app->status = ANJUTA_STATUS (anjuta_status_new ());
@@ -702,6 +838,11 @@ anjuta_app_layout_save (AnjutaApp *app, const gchar *filename,
 	g_return_if_fail (ANJUTA_IS_APP (app));
 	g_return_if_fail (filename != NULL);
 
+	/* If maximized, the layout should be loaded from the back-up first */
+	if(app->maximized)
+		gdl_dock_layout_load_layout (app->layout_manager, "back-up");
+
+	/* Continue with the saving */
 	gdl_dock_layout_save_layout (app->layout_manager, name);
 	if (!gdl_dock_layout_save_to_file (app->layout_manager, filename))
 		g_warning ("Saving dock layout to '%s' failed!", filename);
@@ -969,7 +1110,6 @@ anjuta_app_setup_widget (AnjutaApp* app,
 {
 	GtkCheckMenuItem* menuitem;
 
-
 	/* Add the widget to hash */
 	if (app->widgets == NULL)
 	{
@@ -1210,6 +1350,11 @@ anjuta_shell_iface_init (AnjutaShellIface *iface)
 	iface->add_widget_custom = anjuta_app_add_widget_custom;
 	iface->remove_widget = anjuta_app_remove_widget;
 	iface->present_widget = anjuta_app_present_widget;
+	iface->iconify_dockable_widget = anjuta_app_iconify_dockable_widget;
+	iface->hide_dockable_widget = anjuta_app_hide_dockable_widget;
+	iface->show_dockable_widget = anjuta_app_show_dockable_widget;
+	iface->maximize_widget = anjuta_app_maximize_widget;
+	iface->unmaximize = anjuta_app_unmaximize;
 	iface->add_value = anjuta_app_add_value;
 	iface->get_value = anjuta_app_get_value;
 	iface->remove_value = anjuta_app_remove_value;
diff --git a/src/anjuta-app.h b/src/anjuta-app.h
index 183e0ec..b9fced6 100644
--- a/src/anjuta-app.h
+++ b/src/anjuta-app.h
@@ -50,6 +50,7 @@ struct _AnjutaApp
 
 	GHashTable *values;
 	GHashTable *widgets;
+	gboolean maximized;
 
 	GtkAccelGroup *accel_group;
 	
diff --git a/src/shell.c b/src/shell.c
index 89cb644..bc8a8be 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -233,6 +233,50 @@ anjuta_test_shell_get_value (AnjutaShell *shell,
 	}
 }
 
+static void
+anjuta_test_shell_iconify_dockable_widget (AnjutaShell *shell, 
+                                           GtkWidget   *widget,
+                                           GError      **error)
+{
+	/* Not implemented. */
+	return;
+}
+
+static void
+anjuta_test_shell_hide_dockable_widget    (AnjutaShell *shell, 
+                                           GtkWidget   *widget,
+                                           GError      **error)
+{
+	/* Not implemented. */
+	return;
+}
+
+static void
+anjuta_test_shell_show_dockable_widget    (AnjutaShell *shell, 
+                                           GtkWidget   *widget,
+                                           GError      **error)
+{
+	/* Not implemented. */
+	return;
+}
+
+static void
+anjuta_test_shell_maximize_widget   (AnjutaShell *shell,
+                                     const char  *widget_name,
+                                     GError      **error)
+{
+	/* Not implemented. */
+	return;
+}
+
+static void
+anjuta_test_shell_unmaximize (AnjutaShell *shell,
+                              GError      **error)
+{
+	/* Not implemented. */
+	return;
+}
+
 static void 
 anjuta_test_shell_add_widget (AnjutaShell *shell, 
 							   GtkWidget *w, 
@@ -402,6 +446,11 @@ anjuta_shell_iface_init (AnjutaShellIface *iface)
 	iface->add_widget_full = anjuta_test_shell_add_widget;
 	iface->remove_widget = anjuta_test_shell_remove_widget;
 	iface->present_widget = anjuta_test_shell_present_widget;
+	iface->iconify_dockable_widget = anjuta_test_shell_iconify_dockable_widget;
+	iface->hide_dockable_widget = anjuta_test_shell_hide_dockable_widget;
+	iface->show_dockable_widget = anjuta_test_shell_show_dockable_widget;
+	iface->maximize_widget = anjuta_test_shell_maximize_widget;
+	iface->unmaximize = anjuta_test_shell_unmaximize;
 	iface->add_value = anjuta_test_shell_add_value;
 	iface->get_value = anjuta_test_shell_get_value;
 	iface->remove_value = anjuta_test_shell_remove_value;



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