[anjuta] 595834 - String fixes



commit f79f8ab92cb330f68341875b3e593b13e64d5a19
Author: Philip Withnall <bugzilla tecnocode co uk>
Date:   Tue Sep 22 10:50:24 2009 +0200

    595834 -  String fixes

 libanjuta/anjuta-convert.c                         |    4 +-
 libanjuta/anjuta-profile.c                         |    4 +-
 libanjuta/anjuta-utils.c                           |    8 +-
 libanjuta/anjuta-vcs-status-tree-view.c            |    2 +-
 plugins/build-basic-autotools/executer.c           |    2 +-
 plugins/build-basic-autotools/plugin.c             |    6 +-
 plugins/class-gen/anjuta-class-gen-plugin.ui       |    2 +-
 plugins/class-gen/plugin.c                         |    4 +-
 plugins/cvs-plugin/anjuta-cvs-plugin.ui            |   18 +++---
 plugins/cvs-plugin/cvs-execute.c                   |    8 +-
 plugins/cvs-plugin/plugin.c                        |    4 +-
 plugins/debug-manager/anjuta-debug-manager.ui      |    4 +-
 plugins/debug-manager/breakpoints.c                |    2 +-
 plugins/debug-manager/data_view.c                  |    2 +-
 plugins/debug-manager/plugin.c                     |   22 +++---
 plugins/debug-manager/queue.c                      |    2 +-
 plugins/debug-manager/sparse_view.c                |    2 +-
 plugins/debug-manager/start.c                      |    4 +-
 plugins/debug-manager/threads.c                    |    2 +-
 plugins/debug-manager/watch.c                      |    4 +-
 plugins/devhelp/plugin.c                           |    2 +-
 plugins/document-manager/plugin.c                  |   22 +++---
 plugins/document-manager/search-box.c              |    4 +-
 plugins/file-loader/anjuta-recent-chooser-menu.c   |    4 +-
 plugins/file-loader/plugin.c                       |   14 ++--
 plugins/file-manager/file-view.c                   |    4 +-
 plugins/gbf-am/gbf-am-properties.c                 |    4 +-
 plugins/gbf-mkfile/gbf-mkfile-project.c            |    2 +-
 plugins/gdb/debugger.c                             |   10 ++--
 plugins/gdb/plugin.c                               |    2 +-
 plugins/git/anjuta-git.ui                          |   20 +++---
 plugins/git/git-add-remote-dialog.c                |    2 +-
 plugins/git/git-fetch-dialog.c                     |    2 +-
 plugins/git/git-log-dialog.c                       |    2 +-
 plugins/git/git-push-dialog.c                      |    4 +-
 plugins/git/plugin.c                               |   74 ++++++++++----------
 plugins/glade/anjuta-design-document.c             |    4 +-
 plugins/glade/plugin.c                             |   18 +++---
 plugins/gtodo/add_edit_item.c                      |   12 ++--
 plugins/gtodo/callback.c                           |    8 +-
 plugins/gtodo/libgtodo.c                           |    4 +-
 plugins/gtodo/plugin.c                             |   14 ++--
 plugins/gtodo/preferences.c                        |   14 ++--
 .../anjuta-language-cpp-java.plugin.in             |    2 +-
 .../anjuta-language-cpp-java.ui                    |    4 +-
 plugins/language-support-cpp-java/plugin.c         |   10 ++--
 plugins/macro/anjuta-macro.ui                      |    2 +-
 plugins/macro/macro-actions.c                      |    2 +-
 plugins/macro/plugin.c                             |   10 ++--
 .../message-view/anjuta-message-manager-plugin.ui  |    2 +-
 plugins/message-view/plugin.c                      |    2 +-
 plugins/patch/patch-plugin.c                       |    6 +-
 plugins/patch/plugin.c                             |    6 +-
 .../project-import/anjuta-project-import.plugin.in |    4 +-
 plugins/project-import/plugin.c                    |   14 ++--
 plugins/project-manager/create_dialogs.ui          |    2 +-
 plugins/project-manager/gbf-project-util.c         |   14 ++--
 plugins/project-manager/plugin.c                   |   30 ++++----
 plugins/project-wizard/druid.c                     |   12 ++--
 plugins/project-wizard/install.c                   |    6 +-
 .../templates/translatable-strings.h               |   34 +++++-----
 plugins/run-program/anjuta-run-program.ui          |    2 +-
 plugins/run-program/plugin.c                       |    8 +-
 plugins/search/plugin.c                            |    8 +-
 plugins/search/search-replace.c                    |    2 +-
 plugins/sourceview/anjuta-editor-sourceview.ui     |    2 +-
 plugins/sourceview/sourceview.c                    |    6 +-
 plugins/sourceview/sourceview.plugin.in            |    4 +-
 plugins/starter/starter.c                          |    2 +-
 plugins/subversion/anjuta-subversion.ui            |   26 ++++----
 plugins/subversion/plugin.c                        |   44 ++++++------
 plugins/subversion/subversion-commit-dialog.c      |    2 +-
 plugins/subversion/subversion-diff-dialog.c        |    2 +-
 plugins/subversion/subversion-log-dialog.c         |    8 +-
 plugins/symbol-db/anjuta-symbol-db.ui              |    8 +-
 plugins/symbol-db/plugin.c                         |   24 +++---
 plugins/symbol-db/symbol-db-view.c                 |    2 +-
 plugins/terminal/anjuta-terminal-plugin.ui         |    2 +-
 plugins/tools/anjuta-tools.ui                      |   10 ++--
 plugins/tools/editor.c                             |    2 +-
 plugins/tools/execute.c                            |    6 +-
 plugins/tools/tool.c                               |    2 +-
 src/anjuta-actions.h                               |    2 +-
 src/anjuta.c                                       |    2 +-
 src/main.c                                         |    6 +-
 src/preferences.ui                                 |    4 +-
 86 files changed, 350 insertions(+), 350 deletions(-)
---
diff --git a/libanjuta/anjuta-convert.c b/libanjuta/anjuta-convert.c
index 62e503b..e6c9690 100644
--- a/libanjuta/anjuta-convert.c
+++ b/libanjuta/anjuta-convert.c
@@ -165,7 +165,7 @@ anjuta_convert_to_utf8 (const gchar          *content,
 		{
 			g_set_error (error, ANJUTA_CONVERT_ERROR, 
 				     ANJUTA_CONVERT_ERROR_AUTO_DETECTION_FAILED,
-			 	     _("anjuta was not able to automatically determine "
+			 	     _("Anjuta was not able to automatically determine "
 				     "the encoding of the file you want to open."));
 			return NULL;
 		}
@@ -204,7 +204,7 @@ anjuta_convert_to_utf8 (const gchar          *content,
 		{
 			g_set_error (error, ANJUTA_CONVERT_ERROR,
 				     ANJUTA_CONVERT_ERROR_AUTO_DETECTION_FAILED,
-			 	     _("anjuta was not able to automatically determine "
+			 	     _("Anjuta was not able to automatically determine "
 				     "the encoding of the file you want to open."));
 		}
 
diff --git a/libanjuta/anjuta-profile.c b/libanjuta/anjuta-profile.c
index 31b59ad..d0092d0 100644
--- a/libanjuta/anjuta-profile.c
+++ b/libanjuta/anjuta-profile.c
@@ -278,7 +278,7 @@ anjuta_profile_class_init (AnjutaProfileClass *klass)
 	                                 PROP_SYNC_FILE,
 	                                 g_param_spec_object ("sync-file",
 											  _("Synchronization file"),
-											  _("File to sync the profile xml"),
+											  _("File to syncronize the profile XML"),
 											  G_TYPE_FILE,
 											  G_PARAM_READABLE |
 											  G_PARAM_WRITABLE |
@@ -670,7 +670,7 @@ anjuta_profile_read_plugins_from_xml (AnjutaProfile *profile,
 		g_set_error (error, ANJUTA_PROFILE_ERROR,
 					 ANJUTA_PROFILE_ERROR_URI_READ_FAILED,
 					 _("Failed to read '%s': XML parse error. "
-					   "Invalid or corrupted anjuta plugins profile."),
+					   "Invalid or corrupted Anjuta plugins profile."),
 			 		uri);
 		g_free (uri);
 		
diff --git a/libanjuta/anjuta-utils.c b/libanjuta/anjuta-utils.c
index f64379c..c42323f 100644
--- a/libanjuta/anjuta-utils.c
+++ b/libanjuta/anjuta-utils.c
@@ -983,7 +983,7 @@ anjuta_util_user_terminal (void)
 	}
 
 	/* Try xterm */
-	g_warning (_("Cannot find a terminal, using "
+	g_warning (_("Cannot find a terminal; using "
 			"xterm, even if it may not work"));
 	terminal = g_strdup ("xterm");
 
@@ -1687,9 +1687,9 @@ anjuta_util_help_display (GtkWidget   *parent,
 
 	if (uri == NULL)
 	{
-		anjuta_util_dialog_error (GTK_WINDOW (parent), _("Unable to display help. Please make sure Anjuta "
-								  "documentation package is install. It can be downloaded "
-								  "from http://anjuta.org";));
+		anjuta_util_dialog_error (GTK_WINDOW (parent), _("Unable to display help. Please make sure the Anjuta "
+								  "documentation package is installed. It can be downloaded "
+								  "from http://anjuta.org.";));
 
 		return;
 	}
diff --git a/libanjuta/anjuta-vcs-status-tree-view.c b/libanjuta/anjuta-vcs-status-tree-view.c
index fd31b0c..9b631bb 100644
--- a/libanjuta/anjuta-vcs-status-tree-view.c
+++ b/libanjuta/anjuta-vcs-status-tree-view.c
@@ -102,7 +102,7 @@ anjuta_vcs_status_tree_view_status_function (GtkTreeViewColumn *tree_column,
 									NULL);
 			break;
 		case ANJUTA_VCS_STATUS_UPTODATE:
-			g_object_set (G_OBJECT (renderer), "text", _("Up to date"), 
+			g_object_set (G_OBJECT (renderer), "text", _("Up-to-date"), 
 						  NULL);
 			break;
 		case ANJUTA_VCS_STATUS_LOCKED:
diff --git a/plugins/build-basic-autotools/executer.c b/plugins/build-basic-autotools/executer.c
index 9e11199..ec14228 100644
--- a/plugins/build-basic-autotools/executer.c
+++ b/plugins/build-basic-autotools/executer.c
@@ -307,7 +307,7 @@ execute_program (BasicAutotoolsPlugin* plugin, const gchar *pre_select_uri)
 	{
 		error_condition = TRUE;
 		anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell),
-								  _("Program '%s' does not exists"), target);
+								  _("Program '%s' does not exist"), target);
 	}
 	
 	if (!error_condition &&
diff --git a/plugins/build-basic-autotools/plugin.c b/plugins/build-basic-autotools/plugin.c
index c259ecc..470f86c 100644
--- a/plugins/build-basic-autotools/plugin.c
+++ b/plugins/build-basic-autotools/plugin.c
@@ -1799,7 +1799,7 @@ build_compile_file (BasicAutotoolsPlugin *plugin, const gchar *filename)
 		*/
 		GtkWindow *window;
 		window = GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell);
-		anjuta_util_dialog_error (window, _("Can not compile \"%s\": No compile rule defined for this file type."), filename);
+		anjuta_util_dialog_error (window, _("Cannot compile \"%s\": No compile rule defined for this file type."), filename);
 	}
 	
 	return context;
@@ -1925,7 +1925,7 @@ build_configure_after_autogen (GObject *sender,
 			
 			return;
 		}
-		anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell), _("Can not configure project: Missing configure script in %s."), plugin->project_root_dir);
+		anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell), _("Cannot configure project: Missing configure script in %s."), plugin->project_root_dir);
 	}
 
 	if (pack)
@@ -2413,7 +2413,7 @@ static GtkActionEntry build_actions[] =
 	},
 	{
 		"ActionBuildConfigure", NULL,
-		N_("C_onfigure Project..."), NULL,
+		N_("C_onfigure Projectâ?¦"), NULL,
 		N_("Configure project"),
 		G_CALLBACK (on_configure_project)
 	},
diff --git a/plugins/class-gen/anjuta-class-gen-plugin.ui b/plugins/class-gen/anjuta-class-gen-plugin.ui
index a19b474..5b9fa72 100644
--- a/plugins/class-gen/anjuta-class-gen-plugin.ui
+++ b/plugins/class-gen/anjuta-class-gen-plugin.ui
@@ -841,7 +841,7 @@
                   <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Author Email:</property>
+                    <property name="label" translatable="yes">Author Email Address:</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
diff --git a/plugins/class-gen/plugin.c b/plugins/class-gen/plugin.c
index 8304244..c1a8bf1 100644
--- a/plugins/class-gen/plugin.c
+++ b/plugins/class-gen/plugin.c
@@ -95,9 +95,9 @@ activate_plugin (AnjutaPlugin *plugin)
 	{
 		anjuta_util_dialog_error(
 			NULL,
-			_("Could not find autogen version 5, please install the "
+			_("Could not find autogen version 5; please install the "
 			  "autogen package. You can get it from "
-			  "http://autogen.sourceforge.net";));
+			  "http://autogen.sourceforge.net.";));
 
 		return FALSE;
 	}
diff --git a/plugins/cvs-plugin/anjuta-cvs-plugin.ui b/plugins/cvs-plugin/anjuta-cvs-plugin.ui
index a97deef..2f7b689 100644
--- a/plugins/cvs-plugin/anjuta-cvs-plugin.ui
+++ b/plugins/cvs-plugin/anjuta-cvs-plugin.ui
@@ -202,7 +202,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_add_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -329,7 +329,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_remove_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -351,7 +351,7 @@
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;Please note: &lt;/b&gt;
 
-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. &lt;b&gt;You have been warned!&lt;/b&gt;</property>
+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. &lt;b&gt;You have been warned!&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
               </object>
@@ -458,7 +458,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_commit_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -698,7 +698,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_update_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -968,7 +968,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_status_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1155,7 +1155,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_diff_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1367,7 +1367,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <object class="GtkLabel" id="label19">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Choose file or directory to get log:</property>
+                <property name="label" translatable="yes">Choose file or directory to get log for:</property>
                 <property name="use_markup">True</property>
               </object>
               <packing>
@@ -1392,7 +1392,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_log_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/plugins/cvs-plugin/cvs-execute.c b/plugins/cvs-plugin/cvs-execute.c
index 45e06b3..0a4c3a8 100644
--- a/plugins/cvs-plugin/cvs-execute.c
+++ b/plugins/cvs-plugin/cvs-execute.c
@@ -122,13 +122,13 @@ on_cvs_terminated (AnjutaLauncher *launcher, gint child_pid, gint status,
 	{
 		ianjuta_message_view_append (plugin->mesg_view,
 									 IANJUTA_MESSAGE_VIEW_TYPE_INFO,
-			_("CVS command failed - See above for details"), "", NULL);
+			_("CVS command failed. See above for details"), "", NULL);
 	}
 	else
 	{
 		gchar *mesg;
-		mesg = g_strdup_printf (ngettext("CVS command successful! - Time taken: %ld second",
-										 "CVS command successful! - Time taken: %ld seconds",
+		mesg = g_strdup_printf (ngettext("CVS command successful! Time taken: %ld second",
+										 "CVS command successful! Time taken: %ld seconds",
 										 time_taken), time_taken);
 		ianjuta_message_view_append (plugin->mesg_view,
 									 IANJUTA_MESSAGE_VIEW_TYPE_INFO,
@@ -218,7 +218,7 @@ cvs_execute_common (CVSPlugin* plugin, const gchar* command, const gchar* dir,
 	if (plugin->executing_command)
 	{
 		anjuta_util_dialog_error
-			(NULL,_("CVS command is running - please wait until it finishes!"),
+			(NULL,_("CVS command is running â?? please wait until it finishes!"),
 			 NULL);
 		return;
 	}
diff --git a/plugins/cvs-plugin/plugin.c b/plugins/cvs-plugin/plugin.c
index 32c077f..6b0ff94 100644
--- a/plugins/cvs-plugin/plugin.c
+++ b/plugins/cvs-plugin/plugin.c
@@ -75,7 +75,7 @@ static GtkActionEntry actions_cvs[] = {
 		GTK_STOCK_REFRESH,         /* Stock icon, if any */
 		N_("_Update"),             /* Display label */
 		"<control>u",              /* short-cut */
-		N_("Sync your local copy with the CVS tree"), /* Tooltip */
+		N_("Syncronize your local copy with the CVS tree"), /* Tooltip */
 		G_CALLBACK (on_menu_cvs_update) /* action callback */
 	},
 	{
@@ -134,7 +134,7 @@ static GtkActionEntry popup_actions_cvs[] = {
 		GTK_STOCK_REFRESH,         /* Stock icon, if any */
 		N_("_Update"),             /* Display label */
 		NULL,                      /* short-cut */
-		N_("Sync your local copy with the CVS tree"), /* Tooltip */
+		N_("Syncronize your local copy with the CVS tree"), /* Tooltip */
 		G_CALLBACK (on_fm_cvs_update) /* action callback */
 	},
 	{
diff --git a/plugins/debug-manager/anjuta-debug-manager.ui b/plugins/debug-manager/anjuta-debug-manager.ui
index 66cec1e..674686e 100644
--- a/plugins/debug-manager/anjuta-debug-manager.ui
+++ b/plugins/debug-manager/anjuta-debug-manager.ui
@@ -2408,9 +2408,9 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="ypad">3</property>
-                    <property name="label" translatable="yes">&lt;span weight="bold" size="larger"&gt;Are you sure you want to debug a program not using the Debug configuration ?&lt;/span&gt;
+                    <property name="label" translatable="yes">&lt;span weight="bold" size="larger"&gt;Are you sure you want to debug a program not using the Debug configuration?&lt;/span&gt;
 
-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.</property>
+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.</property>
                     <property name="use_markup">True</property>
                     <property name="wrap">True</property>
                     <property name="selectable">True</property>
diff --git a/plugins/debug-manager/breakpoints.c b/plugins/debug-manager/breakpoints.c
index 9475568..8c3d296 100644
--- a/plugins/debug-manager/breakpoints.c
+++ b/plugins/debug-manager/breakpoints.c
@@ -1783,7 +1783,7 @@ static GtkActionEntry actions_debugger_breakpoints[] = {
 	{
 		"ActionDmaSetBreakpoint",                 /* Action name */
 		ANJUTA_STOCK_BREAKPOINT_ENABLED,          /* Stock icon, if any */
-		N_("Add Breakpoint..."),                  /* Display label */
+		N_("Add Breakpointâ?¦"),                  /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Add a breakpoint"),                   /* Tooltip */
 		G_CALLBACK (on_add_breakpoint_activate)   /* action callback */
diff --git a/plugins/debug-manager/data_view.c b/plugins/debug-manager/data_view.c
index ead9aed..f86440f 100644
--- a/plugins/debug-manager/data_view.c
+++ b/plugins/debug-manager/data_view.c
@@ -387,7 +387,7 @@ dma_data_view_populate_popup (GtkTextView *widget,
 	gtk_widget_show (menu_item);
 
 	/* create goto menu_item. */
-	menu_item = gtk_menu_item_new_with_mnemonic (_("_Goto address"));
+	menu_item = gtk_menu_item_new_with_mnemonic (_("_Go to address"));
 	g_signal_connect (G_OBJECT (menu_item), "activate",
 			  G_CALLBACK (dma_data_view_goto_activate), view);
 	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
diff --git a/plugins/debug-manager/plugin.c b/plugins/debug-manager/plugin.c
index 7126cfd..7483c94 100644
--- a/plugins/debug-manager/plugin.c
+++ b/plugins/debug-manager/plugin.c
@@ -426,7 +426,7 @@ dma_plugin_program_running (DebugManagerPlugin *this)
 	gtk_action_group_set_sensitive (this->running_group, TRUE);
 	
 	status = anjuta_shell_get_status(ANJUTA_PLUGIN (this)->shell, NULL);
-	anjuta_status_set_default (status, _("Debugger"), _("Running..."));
+	anjuta_status_set_default (status, _("Debugger"), _("Runningâ?¦"));
 
 	set_program_counter(this, NULL, 0, 0);
 }
@@ -850,7 +850,7 @@ static GtkActionEntry actions_start[] =
 	{
 		"ActionDebuggerAttachProcess",
 		"debugger-attach",
-		N_("_Debug Process..."),
+		N_("_Debug Processâ?¦"),
 		NULL,
 		N_("Start debugger and attach to a running program"),
 		G_CALLBACK (on_attach_to_project_action_activate)
@@ -858,7 +858,7 @@ static GtkActionEntry actions_start[] =
 	{
 		"ActionDebuggerDebugRemote",
 		"debugger-remote-target",
-		N_("Debug _Remote Target..."),
+		N_("Debug _Remote Targetâ?¦"),
 		NULL,
 		N_("Connect to a remote debugging target"),
 		G_CALLBACK (on_start_remote_debug_action_activate),
@@ -874,7 +874,7 @@ static GtkActionEntry actions_start[] =
 	{
 		"ActionDebuggerAddSource",
 		NULL,
-		N_("Add source paths..."), 
+		N_("Add source pathsâ?¦"), 
 		NULL,
 		N_("Add additional source paths"),
 		G_CALLBACK (on_add_source_activate)
@@ -886,7 +886,7 @@ static GtkActionEntry actions_loaded[] =
 	{
 		"ActionGdbCommand",                              /* Action name */
 		NULL,                                            /* Stock icon, if any */
-		N_("Debugger Command..."),                       /* Display label */
+		N_("Debugger Commandâ?¦"),                       /* Display label */
 		NULL,                                            /* short-cut */
 		N_("Custom debugger command"),                   /* Tooltip */ 
 		G_CALLBACK (on_debugger_custom_command_activate) /* action callback */
@@ -936,7 +936,7 @@ static GtkActionEntry actions_loaded[] =
 		NULL,
 		N_("Shared Libraries"),
 		NULL,
-		N_("Show shared libraries mappings"),
+		N_("Show shared library mappings"),
 		G_CALLBACK (on_debugger_sharedlibs_activate)
 	},
 	{
@@ -980,7 +980,7 @@ static GtkActionEntry actions_stopped[] =
 		"debugger-step-out",
 		N_("Step _Out"),                    
 		"<shift>F5",                              
-		N_("Single step out of the function"), 
+		N_("Single step out of function"), 
 		G_CALLBACK (on_step_out_action_activate) 
 	},
 	{
@@ -994,7 +994,7 @@ static GtkActionEntry actions_stopped[] =
 	{
 		"ActionGdbCommand",
 		NULL,
-		N_("Debugger Command..."),
+		N_("Debugger Commandâ?¦"),
 		NULL,
 		N_("Custom debugger command"),
 		G_CALLBACK (on_debugger_custom_command_activate)
@@ -1036,7 +1036,7 @@ static GtkActionEntry actions_stopped[] =
 		NULL,
 		N_("Shared Libraries"),
 		NULL,
-		N_("Show shared libraries mappings"),
+		N_("Show shared library mappings"),
 		G_CALLBACK (on_debugger_sharedlibs_activate)
 	},
 	{
@@ -1071,7 +1071,7 @@ dma_plugin_activate (AnjutaPlugin* plugin)
 	static gboolean initialized = FALSE;
 	AnjutaUI *ui;
 	
-	DEBUG_PRINT ("%s", "DebugManagerPlugin: Activating Debug Manager plugin...");
+	DEBUG_PRINT ("%s", "DebugManagerPlugin: Activating Debug Manager pluginâ?¦");
 	this = ANJUTA_PLUGIN_DEBUG_MANAGER (plugin);
 	
     if (!initialized)
@@ -1175,7 +1175,7 @@ dma_plugin_deactivate (AnjutaPlugin* plugin)
 	DebugManagerPlugin *this;
 	AnjutaUI *ui;
 
-	DEBUG_PRINT ("%s", "DebugManagerPlugin: Deactivating Debug Manager plugin...");
+	DEBUG_PRINT ("%s", "DebugManagerPlugin: Deactivating Debug Manager pluginâ?¦");
 
 	this = ANJUTA_PLUGIN_DEBUG_MANAGER (plugin);
 
diff --git a/plugins/debug-manager/queue.c b/plugins/debug-manager/queue.c
index d42cd35..4b7a074 100644
--- a/plugins/debug-manager/queue.c
+++ b/plugins/debug-manager/queue.c
@@ -540,7 +540,7 @@ dma_debugger_activate_plugin (DmaDebuggerQueue* self, const gchar *mime_type)
 	{
 		/* No plugin found */
 		anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (self->plugin)->shell),
-				_("Unable to find one debugger plugin supporting a target with %s mime type"), mime_type);
+				_("Unable to find a debugger plugin supporting a target with %s MIME type"), mime_type);
 			
 		return FALSE;
 	}
diff --git a/plugins/debug-manager/sparse_view.c b/plugins/debug-manager/sparse_view.c
index 783d8aa..c612d78 100644
--- a/plugins/debug-manager/sparse_view.c
+++ b/plugins/debug-manager/sparse_view.c
@@ -495,7 +495,7 @@ dma_sparse_view_populate_popup (DmaSparseView *view,
 	gtk_widget_show (menu_item);
 
 	/* create goto menu_item. */
-	menu_item = gtk_menu_item_new_with_mnemonic (_("_Goto address"));
+	menu_item = gtk_menu_item_new_with_mnemonic (_("_Go to address"));
 	g_signal_connect (G_OBJECT (menu_item), "activate",
 			  G_CALLBACK (dma_sparse_view_goto_activate), view);
 	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
diff --git a/plugins/debug-manager/start.c b/plugins/debug-manager/start.c
index a836ad2..82d0cd1 100644
--- a/plugins/debug-manager/start.c
+++ b/plugins/debug-manager/start.c
@@ -95,7 +95,7 @@ enum {
 };
 
 static char *column_names[COLUMNS_NB] = {
-	N_("Pid"), N_("User"), N_("Time"), N_("Command")
+	N_("PID"), N_("User"), N_("Time"), N_("Command")
 };
 
 enum {
@@ -972,7 +972,7 @@ load_target (DmaStart *this, const gchar *target)
 	if (mime_type == NULL)
 	{
 		anjuta_util_dialog_error(GTK_WINDOW (this->plugin->shell),
-				_("Unable to detect mime-type of %s. Debugger cannot start."), target);
+				_("Unable to detect MIME type of %s. Debugger cannot start."), target);
 		g_object_unref (file_info);
 		g_object_unref (file);
 		return FALSE;
diff --git a/plugins/debug-manager/threads.c b/plugins/debug-manager/threads.c
index edfa32d..5f4de8e 100644
--- a/plugins/debug-manager/threads.c
+++ b/plugins/debug-manager/threads.c
@@ -433,7 +433,7 @@ dma_threads_create_gui(DmaThreads *self)
 	
 	column = gtk_tree_view_column_new ();
 	gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-	gtk_tree_view_column_set_title (column, _("Id"));
+	gtk_tree_view_column_set_title (column, _("ID"));
 	renderer = gtk_cell_renderer_text_new ();
 	gtk_tree_view_column_pack_start (column, renderer, TRUE);
 	gtk_tree_view_column_add_attribute (column, renderer, "text",
diff --git a/plugins/debug-manager/watch.c b/plugins/debug-manager/watch.c
index ddf2557..ac515f1 100644
--- a/plugins/debug-manager/watch.c
+++ b/plugins/debug-manager/watch.c
@@ -369,7 +369,7 @@ static GtkActionEntry actions_watch[] = {
     {
 		"ActionDmaInspect",                      /* Action name */
 		GTK_STOCK_DIALOG_INFO,                   /* Stock icon, if any */
-		N_("Ins_pect/Evaluate..."),              /* Display label */
+		N_("Ins_pect/Evaluateâ?¦"),              /* Display label */
 		NULL,                                    /* short-cut */
 		N_("Inspect or evaluate an expression or variable"), /* Tooltip */
 		G_CALLBACK (on_debug_tree_inspect) /* action callback */
@@ -377,7 +377,7 @@ static GtkActionEntry actions_watch[] = {
 	{
 		"ActionDmaAddWatch",                      
 		NULL,                                     
-		N_("Add Watch..."),                      
+		N_("Add Watchâ?¦"),                      
 		NULL,                                    
 		NULL,                                     
 		G_CALLBACK (on_debug_tree_add_watch)     
diff --git a/plugins/devhelp/plugin.c b/plugins/devhelp/plugin.c
index 7516791..ce7baf6 100644
--- a/plugins/devhelp/plugin.c
+++ b/plugins/devhelp/plugin.c
@@ -219,7 +219,7 @@ static GtkActionEntry actions[] = {
 	{
 		"ActionMenuGoto",
 		NULL,
-		N_("_Goto"),
+		N_("_Go to"),
 		NULL,
 		NULL,
 		NULL
diff --git a/plugins/document-manager/plugin.c b/plugins/document-manager/plugin.c
index e4260f0..800ab81 100644
--- a/plugins/document-manager/plugin.c
+++ b/plugins/document-manager/plugin.c
@@ -146,7 +146,7 @@ static ShortcutMapping global_keymap[] = {
 static GtkActionEntry actions_file[] = {
   { "ActionFileSave", GTK_STOCK_SAVE, N_("_Save"), "<control>s",
 	N_("Save current file"), G_CALLBACK (on_save_activate)},
-  { "ActionFileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."),  "<shift><control>s",
+  { "ActionFileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _Asâ?¦"),  "<shift><control>s",
 	N_("Save the current file with a different name"),
     G_CALLBACK (on_save_as_activate)},
   { "ActionFileSaveAll", GTK_STOCK_SAVE, N_("Save A_ll"), "<shift><control>l",
@@ -165,7 +165,7 @@ static GtkActionEntry actions_file[] = {
 };
 
 static GtkActionEntry actions_print[] = {
-  { "ActionPrintFile", GTK_STOCK_PRINT, N_("_Print..."), "<control>p",
+  { "ActionPrintFile", GTK_STOCK_PRINT, N_("_Printâ?¦"), "<control>p",
 	N_("Print the current file"), G_CALLBACK (on_print_activate)},
   { "ActionPrintPreview",
 #ifdef GTK_STOCK_PRINT_PREVIEW
@@ -174,7 +174,7 @@ static GtkActionEntry actions_print[] = {
 	NULL
 #endif
 	, N_("_Print Preview"), NULL,
-	N_("Preview the current file in print-format"),
+	N_("Preview the current file in print format"),
     G_CALLBACK (on_print_preview_activate)},
 };
 
@@ -196,7 +196,7 @@ static GtkActionEntry actions_transform[] = {
 	N_("Convert End Of Line characters to Mac OS EOL (CR)"),
     G_CALLBACK (on_editor_command_eol_cr_activate)},
   { "ActionEditConvertEOL", NULL, N_("Convert EOL to Majority EOL"), NULL,
-	N_("Convert End Of Line characters to majority of the EOL found in the file"),
+	N_("Convert End Of Line characters to the most common EOL found in the file"),
     G_CALLBACK (on_transform_eolchars1_activate)},
 };
 
@@ -233,8 +233,8 @@ static GtkActionEntry actions_comment[] = {
 };
 
 static GtkActionEntry actions_navigation[] = {
-  { "ActionMenuGoto", NULL, N_("_Goto"), NULL, NULL, NULL},/* menu title */
-  { "ActionEditGotoLine", ANJUTA_STOCK_GOTO_LINE, N_("_Line Number..."),
+  { "ActionMenuGoto", NULL, N_("_Go to"), NULL, NULL, NULL},/* menu title */
+  { "ActionEditGotoLine", ANJUTA_STOCK_GOTO_LINE, N_("_Line Numberâ?¦"),
 	"<control><alt>g", N_("Go to a particular line in the editor"),
     G_CALLBACK (on_goto_line_no1_activate)},
   { "ActionEditGotoMatchingBrace", GTK_STOCK_JUMP_TO, N_("Matching _Brace"),
@@ -247,10 +247,10 @@ static GtkActionEntry actions_navigation[] = {
 	"<control><alt>e", N_("Go to the end of the current block"),
     G_CALLBACK (on_goto_block_end1_activate)},
   { "ActionEditGotoHistoryPrev", ANJUTA_STOCK_HISTORY_PREV, N_("Previous _History"),
-	"<alt>Left", N_("Goto previous history"),
+	"<alt>Left", N_("Go to previous history"),
     G_CALLBACK (on_prev_history)},
   { "ActionEditGotoHistoryNext", ANJUTA_STOCK_HISTORY_NEXT, N_("Next Histor_y"),
-	"<alt>Right", N_("Goto next history"),
+	"<alt>Right", N_("Go to next history"),
     G_CALLBACK (on_next_history)}
 };
 
@@ -603,7 +603,7 @@ ui_give_shorter_names (AnjutaPlugin *plugin)
 	g_object_set (G_OBJECT (action), "is-important", TRUE, NULL);
 	action = anjuta_ui_get_action (ui, "ActionGroupEditorNavigate",
 								   "ActionEditGotoLine");
-	g_object_set (G_OBJECT (action), "short-label", _("Goto"), NULL);
+	g_object_set (G_OBJECT (action), "short-label", _("Go to"), NULL);
 }
 
 static void
@@ -1642,7 +1642,7 @@ activate_plugin (AnjutaPlugin *plugin)
 	static gboolean initialized = FALSE;
 	GList *actions, *act;
 	
-	DEBUG_PRINT ("%s", "DocmanPlugin: Activating document manager plugin...");
+	DEBUG_PRINT ("%s", "DocmanPlugin: Activating document manager pluginâ?¦");
 	
 	dplugin = ANJUTA_PLUGIN_DOCMAN (plugin);
 	dplugin->ui = anjuta_shell_get_ui (plugin->shell, NULL);
@@ -1768,7 +1768,7 @@ deactivate_plugin (AnjutaPlugin *plugin)
 	AnjutaStatus *status;
 	GList *node;
 	
-	DEBUG_PRINT ("%s", "DocmanPlugin: Deactivating document manager plugin...");
+	DEBUG_PRINT ("%s", "DocmanPlugin: Deactivating document manager pluginâ?¦");
 	
 	eplugin = ANJUTA_PLUGIN_DOCMAN (plugin);
 
diff --git a/plugins/document-manager/search-box.c b/plugins/document-manager/search-box.c
index 93f08b0..266bb65 100644
--- a/plugins/document-manager/search-box.c
+++ b/plugins/document-manager/search-box.c
@@ -380,13 +380,13 @@ on_search_activated (GtkWidget* widget, SearchBox* search_box)
 			{
 				found = TRUE;
 				anjuta_status_push (private->status, 
-									_("Search for \"%s\" reached end and was continued on top."), search_text);
+									_("Search for \"%s\" reached the end and was continued at the top."), search_text);
 			}
 			else if (ianjuta_editor_selection_has_selection (selection, NULL))
 			{
 				anjuta_status_pop (private->status);
 				anjuta_status_push (private->status, 
-									_("Search for \"%s\" reached end and was continued on top but no new match was found."), search_text);
+									_("Search for \"%s\" reached the end and was continued at the top but no new match was found."), search_text);
 			}				
 		}
 	}
diff --git a/plugins/file-loader/anjuta-recent-chooser-menu.c b/plugins/file-loader/anjuta-recent-chooser-menu.c
index cb202bf..41820bd 100644
--- a/plugins/file-loader/anjuta-recent-chooser-menu.c
+++ b/plugins/file-loader/anjuta-recent-chooser-menu.c
@@ -667,7 +667,7 @@ anjuta_recent_chooser_menu_set_current_uri (GtkRecentChooser  *chooser,
     {
       g_set_error (error, GTK_RECENT_CHOOSER_ERROR,
       		   GTK_RECENT_CHOOSER_ERROR_NOT_FOUND,
-      		   _("No recently used resource found with URI `%s'"),
+      		   _("No recently used resource found with URI \"%s\""),
       		   uri);
     }
   
@@ -723,7 +723,7 @@ anjuta_recent_chooser_menu_select_uri (GtkRecentChooser  *chooser,
     {
       g_set_error (error, GTK_RECENT_CHOOSER_ERROR,
       		   GTK_RECENT_CHOOSER_ERROR_NOT_FOUND,
-      		   _("No recently used resource found with URI `%s'"),
+      		   _("No recently used resource found with URI \"%s\""),
       		   uri);
       return FALSE;
     }
diff --git a/plugins/file-loader/plugin.c b/plugins/file-loader/plugin.c
index fdde478..7711879 100644
--- a/plugins/file-loader/plugin.c
+++ b/plugins/file-loader/plugin.c
@@ -113,7 +113,7 @@ launch_application_failure (AnjutaFileLoaderPlugin *plugin,
 		gtk_widget_get_toplevel (GTK_WIDGET(ANJUTA_PLUGIN (plugin)->shell));
 	basename = g_path_get_basename (uri);
 	anjuta_util_dialog_error (GTK_WINDOW (parent),
-							  _("Can not open \"%s\".\n\n%s"),
+							  _("Cannot open \"%s\".\n\n%s"),
 							  basename, errmsg);
 	g_free (basename);
 }
@@ -258,7 +258,7 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
 								 "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."),
@@ -552,7 +552,7 @@ setup_file_filters (GtkFileChooser *fc)
 	gtk_file_chooser_add_filter (fc, filter);
 
 	filter = gtk_file_filter_new ();
-	gtk_file_filter_set_name (filter, _("Hyper text markup files"));
+	gtk_file_filter_set_name (filter, _("Hypertext markup files"));
 	gtk_file_filter_add_pattern (filter, "*.htm");
 	gtk_file_filter_add_pattern (filter, "*.html");
 	gtk_file_filter_add_pattern (filter, "*.xhtml");
@@ -561,7 +561,7 @@ setup_file_filters (GtkFileChooser *fc)
 	gtk_file_chooser_add_filter (fc, filter);
 
 	filter = gtk_file_filter_new ();
-	gtk_file_filter_set_name (filter, _("Shell scripts files"));
+	gtk_file_filter_set_name (filter, _("Shell script files"));
 	gtk_file_filter_add_pattern (filter, "*.sh");
 	gtk_file_chooser_add_filter (fc, filter);
 
@@ -889,7 +889,7 @@ static GtkActionEntry actions_file[] = {
 	{
 		"ActionFileOpen",
 		GTK_STOCK_OPEN,
-		N_("_Open..."),
+		N_("_Openâ?¦"),
 		"<control>o",
 		N_("Open file"),
 		G_CALLBACK (on_open_activate)
@@ -1232,7 +1232,7 @@ activate_plugin (AnjutaPlugin *plugin)
 	
 	loader_plugin = ANJUTA_PLUGIN_FILE_LOADER (plugin);
 	
-	DEBUG_PRINT ("%s", "AnjutaFileLoaderPlugin: Activating File Loader plugin...");
+	DEBUG_PRINT ("%s", "AnjutaFileLoaderPlugin: Activating File Loader pluginâ?¦");
 	
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	
@@ -1340,7 +1340,7 @@ deactivate_plugin (AnjutaPlugin *plugin)
 	
 	loader_plugin = ANJUTA_PLUGIN_FILE_LOADER (plugin);
 	
-	DEBUG_PRINT ("%s", "AnjutaFileLoaderPlugin: Deactivating File Loader plugin...");
+	DEBUG_PRINT ("%s", "AnjutaFileLoaderPlugin: Deactivating File Loader pluginâ?¦");
 	
 	/* Disconnect session */
 	g_signal_handlers_disconnect_by_func (G_OBJECT (plugin->shell),
diff --git a/plugins/file-manager/file-view.c b/plugins/file-manager/file-view.c
index 6df80ad..c615197 100644
--- a/plugins/file-manager/file-view.c
+++ b/plugins/file-manager/file-view.c
@@ -587,8 +587,8 @@ file_view_class_init (AnjutaFileViewClass *klass)
 	g_object_class_install_property (object_class,
 									 PROP_BASE_URI,
 									 g_param_spec_string ("base_uri",
-														  _("Base uri"),
-														  _("Uri of the top-most path displayed"),
+														  _("Base URI"),
+														  _("URI of the top-most path displayed"),
 														  NULL,
 														  G_PARAM_READABLE |
 														  G_PARAM_WRITABLE |
diff --git a/plugins/gbf-am/gbf-am-properties.c b/plugins/gbf-am/gbf-am-properties.c
index a1b9d41..669ba8a 100644
--- a/plugins/gbf-am/gbf-am-properties.c
+++ b/plugins/gbf-am/gbf-am-properties.c
@@ -860,7 +860,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 				_("Version:"), NULL, "package_version",
 				table, 2);
 	add_configure_property (project, config, GBF_AM_CONFIG_ENTRY,
-				_("Url:"), NULL, "package_url",
+				_("URI:"), NULL, "package_url",
 				table, 3);
 	
 	/* pkg config packages */
@@ -1580,7 +1580,7 @@ gbf_am_properties_get_target_widget (GbfAmProject *project,
 		GtkWidget* scrolled_window;
 		GtkWidget* view =  create_module_list(project, target, 
 						      config, group_config);
-		GtkWidget* button = gtk_button_new_with_label (_("Advanced..."));
+		GtkWidget* button = gtk_button_new_with_label (_("Advancedâ?¦"));
 		scrolled_window = gtk_scrolled_window_new (NULL, NULL);
 		gtk_container_add (GTK_CONTAINER(scrolled_window), view);
 		gtk_table_attach (GTK_TABLE (table), scrolled_window, 0, 2, 4, 5,
diff --git a/plugins/gbf-mkfile/gbf-mkfile-project.c b/plugins/gbf-mkfile/gbf-mkfile-project.c
index 1abc49d..e1aeb5b 100644
--- a/plugins/gbf-mkfile/gbf-mkfile-project.c
+++ b/plugins/gbf-mkfile/gbf-mkfile-project.c
@@ -3342,7 +3342,7 @@ impl_remove_source (GbfProject  *_project,
 	doc = xml_new_change_doc (project);
 	if (!xml_write_remove_source (project, doc, g_node)) {
 		error_set (error, GBF_PROJECT_ERROR_DOESNT_EXIST,
-			   _("Source coudn't be removed"));
+			   _("Source couldn't be removed"));
 		xmlFreeDoc (doc);
 		return;
 	}
diff --git a/plugins/gdb/debugger.c b/plugins/gdb/debugger.c
index f088e7a..fe26f1e 100644
--- a/plugins/gdb/debugger.c
+++ b/plugins/gdb/debugger.c
@@ -931,7 +931,7 @@ debugger_start (Debugger *debugger, const GList *search_dirs,
 			/* TODO		anjuta_update_app_status (TRUE, _("Debugger")); */
 			debugger->priv->output_callback (IANJUTA_DEBUGGER_OUTPUT,
 										 _("Getting ready to start debugging "
-										   "session...\n"),
+										   "sessionâ?¦\n"),
 										 debugger->priv->output_user_data);
 		
 			if (prog)
@@ -1325,7 +1325,7 @@ debugger_parse_stopped (Debugger *debugger)
 			debugger->priv->current_cmd.parser (debugger, val,
 												debugger->priv->cli_lines, FALSE);
 			debugger->priv->command_output_sent = TRUE;
-			DEBUG_PRINT ("%s", "In function: Sending output...");
+			DEBUG_PRINT ("%s", "In function: Sending outputâ?¦");
 		}
 		
 		if (val)
@@ -1575,7 +1575,7 @@ debugger_stdo_flush (Debugger *debugger)
 				debugger->priv->current_cmd.parser (debugger, val,
 										  debugger->priv->cli_lines, FALSE);
 				debugger->priv->command_output_sent = TRUE;
-				DEBUG_PRINT ("%s", "In function: Sending output...");
+				DEBUG_PRINT ("%s", "In function: Sending outputâ?¦");
 			}
 			else /* if (val) */
 			{
@@ -1967,7 +1967,7 @@ debugger_attach_process_real (Debugger *debugger, pid_t pid)
 
 	if (debugger->priv->output_callback)
 	{	
-		buff = g_strdup_printf (_("Attaching to process: %d...\n"), pid);
+		buff = g_strdup_printf (_("Attaching to process: %dâ?¦\n"), pid);
 		debugger->priv->output_callback (IANJUTA_DEBUGGER_OUTPUT,
 							   buff, debugger->priv->output_user_data);
 		g_free (buff);
@@ -2095,7 +2095,7 @@ debugger_detach_process (Debugger *debugger)
 
 	if (debugger->priv->output_callback)
 	{	
-		buff = g_strdup_printf (_("Detaching the process...\n"));
+		buff = g_strdup_printf (_("Detaching the processâ?¦\n"));
 		debugger->priv->output_callback (IANJUTA_DEBUGGER_OUTPUT,
 							   buff, debugger->priv->output_user_data);
 		g_free (buff);
diff --git a/plugins/gdb/plugin.c b/plugins/gdb/plugin.c
index 97f4f43..159305b 100644
--- a/plugins/gdb/plugin.c
+++ b/plugins/gdb/plugin.c
@@ -109,7 +109,7 @@ gdb_plugin_start_terminal (GdbPlugin* plugin)
 	if (mkfifo (file, 0664) < 0)
 	{
 		anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell),
-					  _("Failed to create fifo file named %s. The program will run without a terminal."), file);
+					  _("Failed to create FIFO file named %s. The program will run without a terminal."), file);
 		g_free (file);
 
 		return NULL;
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index b57e437..4e00036 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -338,7 +338,7 @@
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
-                <property name="text" translatable="yes">Retrieving status...</property>
+                <property name="text" translatable="yes">Retrieving statusâ?¦</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -819,7 +819,7 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
                 <property name="show_text">True</property>
-                <property name="text" translatable="yes">Retrieving status...</property>
+                <property name="text" translatable="yes">Retrieving statusâ?¦</property>
               </object>
               <packing>
                 <property name="fill">False</property>
@@ -1815,7 +1815,7 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
                 <property name="show_text">True</property>
-                <property name="text" translatable="yes">Retrieving status...</property>
+                <property name="text" translatable="yes">Retrieving statusâ?¦</property>
               </object>
               <packing>
                 <property name="fill">False</property>
@@ -1994,7 +1994,7 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
                 <property name="show_text">True</property>
-                <property name="text" translatable="yes">Retrieving status...</property>
+                <property name="text" translatable="yes">Retrieving statusâ?¦</property>
               </object>
               <packing>
                 <property name="fill">False</property>
@@ -2174,7 +2174,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="log_browse_button">
-                                <property name="label" translatable="yes">Browse...</property>
+                                <property name="label" translatable="yes">Browseâ?¦</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -3683,7 +3683,7 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
                 <property name="show_text">True</property>
-                <property name="text" translatable="yes">Retrieving status...</property>
+                <property name="text" translatable="yes">Retrieving statusâ?¦</property>
               </object>
               <packing>
                 <property name="fill">False</property>
@@ -4143,7 +4143,7 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="action">select-folder</property>
-                        <property name="title" translatable="yes">Select A Folder</property>
+                        <property name="title" translatable="yes">Select a Folder</property>
                       </object>
                     </child>
                   </object>
@@ -4177,7 +4177,7 @@
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkCheckButton" id="patch_series_signoff_check">
-                        <property name="label" translatable="yes" comments="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.">Add signed off by line</property>
+                        <property name="label" translatable="yes" comments="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.">Add signed-off-by line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -5140,7 +5140,7 @@
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkCheckButton" id="apply_mailbox_signoff_check">
-                        <property name="label" translatable="yes">Add signed off by line</property>
+                        <property name="label" translatable="yes">Add signed-off-by line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -5311,7 +5311,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cherry_pick_signoff_check">
-                            <property name="label" translatable="yes">Add signed-off by line</property>
+                            <property name="label" translatable="yes">Add signed-off-by line</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
diff --git a/plugins/git/git-add-remote-dialog.c b/plugins/git/git-add-remote-dialog.c
index 5a93a54..7a0669a 100644
--- a/plugins/git/git-add-remote-dialog.c
+++ b/plugins/git/git-add-remote-dialog.c
@@ -108,7 +108,7 @@ on_add_remote_dialog_response (GtkDialog *dialog, gint response_id,
 		if (fetch)
 		{
 			progress_data = git_progress_data_new (data->plugin, 
-												   _("Git: Fetching..."));
+												   _("Git: Fetchingâ?¦"));
 			
 			git_create_message_view (data->plugin);
 			
diff --git a/plugins/git/git-fetch-dialog.c b/plugins/git/git-fetch-dialog.c
index ec4926c..5d71764 100644
--- a/plugins/git/git-fetch-dialog.c
+++ b/plugins/git/git-fetch-dialog.c
@@ -51,7 +51,7 @@ git_fetch (Git *plugin)
 	GitProgressData *data;
 	GitFetchCommand *fetch_command;
 	
-	data = git_progress_data_new (plugin, _("Git: Fetching..."));
+	data = git_progress_data_new (plugin, _("Git: Fetchingâ?¦"));
 	fetch_command = git_fetch_command_new (plugin->project_root_directory);
 	
 	g_signal_connect (G_OBJECT (fetch_command), "data-arrived",
diff --git a/plugins/git/git-log-dialog.c b/plugins/git/git-log-dialog.c
index 3823860..1ea3edf 100644
--- a/plugins/git/git-log-dialog.c
+++ b/plugins/git/git-log-dialog.c
@@ -315,7 +315,7 @@ on_ref_command_finished (AnjutaCommand *command, guint return_code,
 	
 	pulse_timer_id = git_status_bar_progress_pulse (data->plugin,
 													_("Git: Retrieving"
-													  " log..."));
+													  " logâ?¦"));
 	
 	g_signal_connect (G_OBJECT (log_command), "command-finished",
 					  G_CALLBACK (git_stop_status_bar_progress_pulse),
diff --git a/plugins/git/git-push-dialog.c b/plugins/git/git-push-dialog.c
index 1b44ca9..98d4abb 100644
--- a/plugins/git/git-push-dialog.c
+++ b/plugins/git/git-push-dialog.c
@@ -190,7 +190,7 @@ on_push_dialog_response (GtkDialog *dialog, gint response_id,
 											 selected_refs,
 		                                     push_all_tags,
 		                                     push_all_refs);
-		progress_data = git_progress_data_new (data->plugin, _("Git: Pushing..."));
+		progress_data = git_progress_data_new (data->plugin, _("Git: Pushingâ?¦"));
 
 		g_free (url);
 		git_command_free_string_list (selected_refs);
@@ -367,4 +367,4 @@ void
 on_menu_git_push (GtkAction *action, Git *plugin)
 {
 	push_dialog (plugin);
-}
\ No newline at end of file
+}
diff --git a/plugins/git/plugin.c b/plugins/git/plugin.c
index fa4e71d..21bedab 100644
--- a/plugins/git/plugin.c
+++ b/plugins/git/plugin.c
@@ -84,7 +84,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitCommit",                       /* Action name */
 		GTK_STOCK_YES,                            /* Stock icon, if any */
-		N_("_Commit..."),                     /* Display label */
+		N_("_Commitâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Commit changes to the local repository"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_commit)    /* action callback */
@@ -108,7 +108,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitStashUncommitted",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Stash uncommitted changes..."),                     /* Display label */
+		N_("_Stash uncommitted changesâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Save uncommitted changes and re-apply them later"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_stash_changes)    /* action callback */
@@ -116,7 +116,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitApplyStash",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Apply stashed changes..."),                     /* Display label */
+		N_("_Apply stashed changesâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Apply stashed changes to the working tree"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_apply_stash)    /* action callback */
@@ -124,7 +124,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitLog",                       /* Action name */
 		GTK_STOCK_ZOOM_100,                            /* Stock icon, if any */
-		N_("_View log..."),                     /* Display label */
+		N_("_View logâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("View change history"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_log)    /* action callback */
@@ -140,7 +140,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitPush",                       /* Action name */
 		GTK_STOCK_GO_FORWARD,                            /* Stock icon, if any */
-		N_("_Push..."),                     /* Display label */
+		N_("_Pushâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Push changes to a remote repository"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_push)    /* action callback */
@@ -148,7 +148,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitPull",                       /* Action name */
 		GTK_STOCK_GO_BACK,                            /* Stock icon, if any */
-		N_("_Pull..."),                     /* Display label */
+		N_("_Pullâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Update the working copy"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_pull)    /* action callback */
@@ -172,7 +172,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitAdd",                       /* Action name */
 		GTK_STOCK_ADD,                            /* Stock icon, if any */
-		N_("_Add..."),                     /* Display label */
+		N_("_Addâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Add files to the repository"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_add)    /* action callback */
@@ -180,7 +180,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitRemove",                       /* Action name */
 		GTK_STOCK_REMOVE,                            /* Stock icon, if any */
-		N_("_Remove..."),                     /* Display label */
+		N_("_Removeâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Remove files from the repository"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_remove)    /* action callback */
@@ -188,7 +188,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitIgnore",                       /* Action name */
 		GTK_STOCK_DIALOG_ERROR,                            /* Stock icon, if any */
-		N_("_Ignore..."),                     /* Display label */
+		N_("_Ignoreâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Ignore files"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_ignore)    /* action callback */
@@ -196,7 +196,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitCheckoutFiles",                       /* Action name */
 		GTK_STOCK_UNDO,                            /* Stock icon, if any */
-		N_("_Check out files..."),                     /* Display label */
+		N_("_Check out filesâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Revert uncommitted changes to files"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_checkout_files)    /* action callback */
@@ -204,7 +204,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitUnstageFiles",                       /* Action name */
 		GTK_STOCK_CANCEL,                            /* Stock icon, if any */
-		N_("_Unstage files..."),                     /* Display label */
+		N_("_Unstage filesâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Remove files from the commit index"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_unstage)    /* action callback */
@@ -212,7 +212,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitResolve",                       /* Action name */
 		GTK_STOCK_PREFERENCES,                            /* Stock icon, if any */
-		N_("_Resolve conflicts..."),                     /* Display label */
+		N_("_Resolve conflictsâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Mark conflicted files as resolved"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_resolve)    /* action callback */
@@ -228,7 +228,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitCreatePatchSeries",                       /* Action name */
 		GTK_STOCK_DND_MULTIPLE,                            /* Stock icon, if any */
-		N_("Create patch series..."),                     /* Display label */
+		N_("Create patch seriesâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Generate patch files for submission upstream"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_create_patch_series)    /* action callback */
@@ -244,7 +244,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitApplyMailboxApply",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Apply..."),                     /* Display label */
+		N_("_Applyâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Start applying a patch series"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_apply_mailbox_apply)    /* action callback */
@@ -284,7 +284,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitCreateBranch",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Create branch..."),                     /* Display label */
+		N_("_Create branchâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Create a branch"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_create_branch)    /* action callback */
@@ -292,7 +292,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitDeleteBranch",                       /* Action name */
 		GTK_STOCK_DELETE,                            /* Stock icon, if any */
-		N_("_Delete branch..."),                     /* Display label */
+		N_("_Delete branchâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Delete branches"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_delete_branch)    /* action callback */
@@ -300,7 +300,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitSwitch",                       /* Action name */
 		GTK_STOCK_JUMP_TO,                            /* Stock icon, if any */
-		N_("_Switch to another branch..."),                     /* Display label */
+		N_("_Switch to another branchâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Switch to another branch"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_switch)    /* action callback */
@@ -308,7 +308,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitMerge",                       /* Action name */
 		GTK_STOCK_CONVERT,                            /* Stock icon, if any */
-		N_("_Merge..."),                     /* Display label */
+		N_("_Mergeâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Merge changes from another branch into the current one"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_merge)    /* action callback */
@@ -324,7 +324,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitRebaseStart",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Start..."),                     /* Display label */
+		N_("_Startâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Start a rebase"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_rebase_start)    /* action callback */
@@ -356,7 +356,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitCherryPick",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Cherry pick..."),                     /* Display label */
+		N_("_Cherry pickâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Selectively merge individual changes from other branches into the current one"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_cherry_pick)    /* action callback */
@@ -372,7 +372,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitRemoteAdd",                       /* Action name */
 		GTK_STOCK_ADD,                            /* Stock icon, if any */
-		N_("_Add..."),                     /* Display label */
+		N_("_Addâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Add a remote branch"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_add_remote)    /* action callback */
@@ -380,7 +380,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitRemoteDelete",                       /* Action name */
 		GTK_STOCK_DELETE,                            /* Stock icon, if any */
-		N_("_Delete..."),                     /* Display label */
+		N_("_Deleteâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Delete a remote branch"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_delete_remote)    /* action callback */
@@ -396,7 +396,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitCreateTag",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Create tag..."),                     /* Display label */
+		N_("_Create tagâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Create a tag"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_create_tag)    /* action callback */
@@ -404,7 +404,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitDeleteTag",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Delete tag..."),                     /* Display label */
+		N_("_Delete tagâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Delete tags"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_delete_tag)    /* action callback */
@@ -420,7 +420,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitReset",                       /* Action name */
 		GTK_STOCK_REFRESH,                            /* Stock icon, if any */
-		N_("_Reset tree..."),                     /* Display label */
+		N_("_Reset treeâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Reset repository head to any past state"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_reset)    /* action callback */
@@ -428,7 +428,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitRevert",                       /* Action name */
 		GTK_STOCK_UNDO,                            /* Stock icon, if any */
-		N_("_Revert commit..."),                     /* Display label */
+		N_("_Revert commitâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Revert a commit"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_revert)    /* action callback */
@@ -444,7 +444,7 @@ static GtkActionEntry actions_git[] =
 	{
 		"ActionGitBisectStart",                       /* Action name */
 		GTK_STOCK_MEDIA_PLAY,                            /* Stock icon, if any */
-		N_("_Start..."),                     /* Display label */
+		N_("_Startâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Start a bisect operation"),                      /* Tooltip */
 		G_CALLBACK (on_menu_git_bisect_start)    /* action callback */
@@ -504,7 +504,7 @@ static GtkActionEntry actions_log[] =
 	{
 		"ActionGitLogCreateBranch",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Create branch..."),                     /* Display label */
+		N_("_Create branchâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Create a branch with the selected revision as its head"),                      /* Tooltip */
 		G_CALLBACK (on_log_menu_git_create_branch)    /* action callback */
@@ -512,7 +512,7 @@ static GtkActionEntry actions_log[] =
 	{
 		"ActionGitLogCreateTag",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Create tag..."),                     /* Display label */
+		N_("_Create tagâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Create a tag at this revision"),                      /* Tooltip */
 		G_CALLBACK (on_log_menu_git_create_tag)    /* action callback */
@@ -520,7 +520,7 @@ static GtkActionEntry actions_log[] =
 	{
 		"ActionGitLogReset",                       /* Action name */
 		GTK_STOCK_REFRESH,                            /* Stock icon, if any */
-		N_("_Reset tree..."),               /* Display label */
+		N_("_Reset treeâ?¦"),               /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Reset repository head to this revision"),                      /* Tooltip */
 		G_CALLBACK (on_log_menu_git_reset)    /* action callback */
@@ -528,7 +528,7 @@ static GtkActionEntry actions_log[] =
 	{
 		"ActionGitLogRevert",                       /* Action name */
 		GTK_STOCK_UNDO,                            /* Stock icon, if any */
-		N_("_Revert commit..."),               /* Display label */
+		N_("_Revert commitâ?¦"),               /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Revert this commit"),                      /* Tooltip */
 		G_CALLBACK (on_log_menu_git_revert)    /* action callback */
@@ -536,7 +536,7 @@ static GtkActionEntry actions_log[] =
 	{
 		"ActionGitLogCherryPick",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Cherry pick..."),                     /* Display label */
+		N_("_Cherry pickâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Merge this commit into the current branch"),                      /* Tooltip */
 		G_CALLBACK (on_log_menu_git_cherry_pick)    /* action callback */
@@ -580,7 +580,7 @@ static GtkActionEntry actions_fm[] =
 	{
 		"ActionGitFMLog",                       /* Action name */
 		GTK_STOCK_ZOOM_100,                            /* Stock icon, if any */
-		N_("_View log..."),                     /* Display label */
+		N_("_View logâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("View changes to this file or folder"),                      /* Tooltip */
 		G_CALLBACK (on_fm_git_log)    /* action callback */
@@ -588,7 +588,7 @@ static GtkActionEntry actions_fm[] =
 	{
 		"ActionGitFMAdd",                       /* Action name */
 		GTK_STOCK_ADD,                            /* Stock icon, if any */
-		N_("_Add..."),                     /* Display label */
+		N_("_Addâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Add this file or folder to the repository"),                      /* Tooltip */
 		G_CALLBACK (on_fm_git_add)    /* action callback */
@@ -596,7 +596,7 @@ static GtkActionEntry actions_fm[] =
 	{
 		"ActionGitFMRemove",                       /* Action name */
 		GTK_STOCK_REMOVE,                            /* Stock icon, if any */
-		N_("_Remove..."),                     /* Display label */
+		N_("_Removeâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Remove this file or folder from the repository"),                      /* Tooltip */
 		G_CALLBACK (on_fm_git_remove)    /* action callback */
@@ -755,7 +755,7 @@ git_activate_plugin (AnjutaPlugin *plugin)
 	Git *git_plugin;
 	GtkAction *git_fm_menu_action;
 	
-	DEBUG_PRINT ("%s", "Git: Activating Git plugin ...");
+	DEBUG_PRINT ("%s", "Git: Activating Git plugin â?¦");
 	
 	git_plugin = ANJUTA_PLUGIN_GIT (plugin);
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
@@ -862,7 +862,7 @@ git_deactivate_plugin (AnjutaPlugin *plugin)
 	git_plugin = ANJUTA_PLUGIN_GIT (plugin);
 	status = anjuta_shell_get_status (plugin->shell, NULL);
 	
-	DEBUG_PRINT ("%s", "Git: Dectivating Git plugin ...");
+	DEBUG_PRINT ("%s", "Git: Dectivating Git plugin â?¦");
 
 	anjuta_status_set_default (status, _("Branch"), NULL);
 	
diff --git a/plugins/glade/anjuta-design-document.c b/plugins/glade/anjuta-design-document.c
index 7560350..916df57 100644
--- a/plugins/glade/anjuta-design-document.c
+++ b/plugins/glade/anjuta-design-document.c
@@ -376,7 +376,7 @@ static void ifile_savable_save (IAnjutaFileSavable* file, GError **e)
 		else
 		{
 			anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(priv->glade_plugin)->shell),
-										_("Invalid glade file name"));
+										_("Invalid Glade file name"));
 			g_signal_emit_by_name(G_OBJECT(self), "saved", NULL);
 		}
 		return;
@@ -403,7 +403,7 @@ static void ifile_savable_save_as(IAnjutaFileSavable* ifile, GFile* file, GError
 	else
 	{
 		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(priv->glade_plugin)->shell),
-									_("Invalid glade file name"));
+									_("Invalid Glade file name"));
 	}
 	return;
 }
diff --git a/plugins/glade/plugin.c b/plugins/glade/plugin.c
index bc82ac2..0bcf9be 100644
--- a/plugins/glade/plugin.c
+++ b/plugins/glade/plugin.c
@@ -852,7 +852,7 @@ glade_plugin_do_save_associations (GladePlugin *plugin, GError **error)
 	{
 		g_set_error (error, PLUGIN_GLADE_ERROR,
 		             PLUGIN_GLADE_ERROR_GENERIC,
-		             _("No associations initialized, nothing to save"));
+		             _("No associations initialized: nothing to save"));
 		return FALSE;
 	}
 	if (!plugin->priv->project_root)
@@ -1977,7 +1977,7 @@ insert_handler_stub_auto (IAnjutaDocument *doc, GladePlugin *plugin,
 			g_set_error (error,
 			             PLUGIN_GLADE_ERROR,
 			             PLUGIN_GLADE_ERROR_GENERIC,
-			             _("Unknown language of the editor \"%s\""), uri);
+			             _("Unknown editor language \"%s\""), uri);
 			g_free (uri);
 			return;
 		}
@@ -2051,7 +2051,7 @@ on_insert_handler_stub_auto (GtkAction* action, GladePlugin* plugin)
 	}
 	else
 		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                            _("Couldn't find a signal information"));
+		                            _("Couldn't find signal information"));
 }
 
 static void
@@ -2135,7 +2135,7 @@ on_insert_handler_stub_manual (GtkAction* action, GladePlugin* plugin)
 		insert_handler_stub_manual (plugin, TRUE);
 	else
 		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
-		                            _("Couldn't find a signal information"));
+		                            _("Couldn't find signal information"));
 }
 
 /* return true only if symbol definitely exists */
@@ -4036,15 +4036,15 @@ static GtkActionEntry actions_glade[] =
 	{
 		"ActionGladeAssociationsDialog",
 		NULL,
-		N_("Associations dialog..."),
+		N_("Associations dialogâ?¦"),
 		NULL,
-		N_("Associations dialog..."),
+		N_("Associations dialogâ?¦"),
 		G_CALLBACK (on_show_associations_dialog)
 	},
 	{
 		"ActionVersionDialog",
 		GTK_STOCK_PROPERTIES,
-		N_("Versioning..."),
+		N_("Versioningâ?¦"),
 		NULL,
 		N_("Switch between library versions and check deprecations"),
 		G_CALLBACK (on_glade_show_version_dialog)
@@ -4289,7 +4289,7 @@ activate_plugin (AnjutaPlugin *plugin)
 	GtkCellRenderer *renderer;
 	GtkAction *action;
 
-	DEBUG_PRINT ("%s", "GladePlugin: Activating Glade plugin...");
+	DEBUG_PRINT ("%s", "GladePlugin: Activating Glade pluginâ?¦");
 
 	glade_plugin = ANJUTA_PLUGIN_GLADE (plugin);
 
@@ -4526,7 +4526,7 @@ deactivate_plugin (AnjutaPlugin *plugin)
 		return TRUE;
 	priv->deactivating = TRUE;
 
-	DEBUG_PRINT ("%s", "GladePlugin: Dectivating Glade plugin...");
+	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);
diff --git a/plugins/gtodo/add_edit_item.c b/plugins/gtodo/add_edit_item.c
index 2617a4d..fa6fb65 100644
--- a/plugins/gtodo/add_edit_item.c
+++ b/plugins/gtodo/add_edit_item.c
@@ -286,14 +286,14 @@ void gui_add_todo_item(GtkWidget *useless, gpointer data, guint32 openid){
 		llabel = gtk_label_new("");
 
 		hbox2 = gtk_hbox_new(FALSE,12);
-		tempstr = g_strdup_printf("<i>%s %s</i>", _("started:"), _("n/a"));
+		tempstr = g_strdup_printf("<i>%s %s</i>", _("started:"), _("N/A"));
 		gtk_label_set_markup(GTK_LABEL(llabel), tempstr);
 		gtk_box_pack_start(GTK_BOX(hbox2),llabel, TRUE, TRUE, 6);
 		gtk_misc_set_alignment(GTK_MISC(llabel), 0,0.5);	
 		g_free(tempstr);
 
 		rlabel = gtk_label_new("");	
-		tempstr = g_strdup_printf("<i>%s %s</i>", _("stopped:"), _("n/a"));
+		tempstr = g_strdup_printf("<i>%s %s</i>", _("stopped:"), _("N/A"));
 		gtk_label_set_markup(GTK_LABEL(rlabel), tempstr);
 		gtk_box_pack_start(GTK_BOX(hbox2),rlabel, TRUE, TRUE, 6);
 		gtk_misc_set_alignment(GTK_MISC(rlabel), 1,0.5);
@@ -329,8 +329,8 @@ void gui_add_todo_item(GtkWidget *useless, gpointer data, guint32 openid){
 		gtk_text_buffer_set_text(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_view)), gtodo_todo_item_get_comment(item), -1);
 		{
 			gchar *buffer, *buffer1;
-			if((buffer1 = gtodo_todo_item_get_stop_date_as_string(item)) == NULL)  buffer1 = g_strdup_printf(_("n/a"));
-			if((buffer = gtodo_todo_item_get_start_date_as_string(item)) == NULL)  buffer = g_strdup_printf(_("n/a"));		
+			if((buffer1 = gtodo_todo_item_get_stop_date_as_string(item)) == NULL)  buffer1 = g_strdup_printf(_("N/A"));
+			if((buffer = gtodo_todo_item_get_start_date_as_string(item)) == NULL)  buffer = g_strdup_printf(_("N/A"));		
 
 			tempstr = g_strdup_printf("<i>%s %s</i>", _("started:"), buffer);
 			gtk_label_set_markup(GTK_LABEL(llabel),tempstr);
@@ -435,14 +435,14 @@ void add_edit_completed_toggled(GtkWidget *checkbox, GtkWidget *rlabel)
 		g_date_strftime(buffer, 64, "%x", date);
 		g_date_free(date);
 	}
-	else strcpy(buffer, "n/a");
+	else strcpy(buffer, "N/A");
 	if(stop_jul)
 	{
 		date1= g_date_new_julian(stop_jul);
 		g_date_strftime(buffer1, 64, "%x", date1);	
 		g_date_free(date1);
 	}
-	else strcpy(buffer1, "n/a");
+	else strcpy(buffer1, "N/A");
 	
 	tempstr = g_strdup_printf("<i>%s %s \t%s %s</i>",
 							  _("started:"), _("stopped:"),
diff --git a/plugins/gtodo/callback.c b/plugins/gtodo/callback.c
index 8907a11..dbe248e 100644
--- a/plugins/gtodo/callback.c
+++ b/plugins/gtodo/callback.c
@@ -14,10 +14,10 @@ void remove_todo_item(GtkWidget *fake, gboolean internall){
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(mw.treeview));	
 	if(!gtk_tree_selection_get_selected(selection, &model, &iter))
 	{
-		if(!internall)message_box( _("You need to select a todo item before you can remove it"),"",GTK_MESSAGE_INFO);
+		if(!internall)message_box( _("You need to select a to-do item before you can remove it"),"",GTK_MESSAGE_INFO);
 		return; 
 	}
-	if(!internall) if(!message_box( _("Are you sure you want to remove the selected todo item?"), _("Remove"), GTK_MESSAGE_WARNING))
+	if(!internall) if(!message_box( _("Are you sure you want to remove the selected to-do item?"), _("Remove"), GTK_MESSAGE_WARNING))
 	{
 		return;
 	}
@@ -95,8 +95,8 @@ void purge_category(void)
 	gchar *category;
 	gchar *tm;
 
-	if(gtk_combo_box_get_active(GTK_COMBO_BOX(mw.option))== 0)tm = g_strdup_printf(_("Are you sure you want to remove all the completed todo items?"));
-	else tm = g_strdup_printf(_("Are you sure you want to remove all the completed todo items in the category \"%s\"?"), mw.mitems[gtk_combo_box_get_active(GTK_COMBO_BOX(mw.option))-2]->date);
+	if(gtk_combo_box_get_active(GTK_COMBO_BOX(mw.option))== 0)tm = g_strdup_printf(_("Are you sure you want to remove all the completed to-do items?"));
+	else tm = g_strdup_printf(_("Are you sure you want to remove all the completed to-do items in the category \"%s\"?"), mw.mitems[gtk_combo_box_get_active(GTK_COMBO_BOX(mw.option))-2]->date);
 
 	if(!message_box( tm, _("Remove"), GTK_MESSAGE_WARNING))
 	{
diff --git a/plugins/gtodo/libgtodo.c b/plugins/gtodo/libgtodo.c
index e8a6fbc..ea8dd9d 100644
--- a/plugins/gtodo/libgtodo.c
+++ b/plugins/gtodo/libgtodo.c
@@ -623,7 +623,7 @@ gboolean gtodo_client_check_file(GTodoClient *cl, GError **error)
 		cl->gtodo_doc = xmlParseMemory(read_buf, size);
 		if(cl->gtodo_doc == NULL)
 		{
-			g_set_error(&tmp_error,LIBGTODO_ERROR,LIBGTODO_ERROR_XML,_("Failed to parse xml structure"));
+			g_set_error(&tmp_error,LIBGTODO_ERROR,LIBGTODO_ERROR_XML,_("Failed to parse XML structure"));
 			g_propagate_error(error, tmp_error);
 			DEBUG_PRINT("%s", "failed to read the file");
 			g_free (read_buf);
@@ -634,7 +634,7 @@ gboolean gtodo_client_check_file(GTodoClient *cl, GError **error)
 		cl->root = xmlDocGetRootElement(cl->gtodo_doc);
 		if(cl->root == NULL)
 		{
-			g_set_error(&tmp_error,LIBGTODO_ERROR,LIBGTODO_ERROR_XML,_("Failed to parse xml structure"));
+			g_set_error(&tmp_error,LIBGTODO_ERROR,LIBGTODO_ERROR_XML,_("Failed to parse XML structure"));
 			g_propagate_error(error, tmp_error);
 			DEBUG_PRINT("%s", "failed to get root node.");
 			g_free (read_buf);
diff --git a/plugins/gtodo/plugin.c b/plugins/gtodo/plugin.c
index bc4648a..6511818 100644
--- a/plugins/gtodo/plugin.c
+++ b/plugins/gtodo/plugin.c
@@ -73,7 +73,7 @@ static GtkToggleActionEntry actions_view[] = {
 		NULL,
 		N_("Hide _Completed Items"),
 		NULL,
-		N_("Hide completed todo items"),
+		N_("Hide completed to-do items"),
 		G_CALLBACK (on_hide_completed_action_activate),
 		FALSE
 	},
@@ -119,13 +119,13 @@ create_gui (GTodoPlugin *gtodo_plugin)
 	/* Add all our editor actions */
 	gtodo_plugin->action_group = 
 		anjuta_ui_add_action_group_entries (ui, "ActionGroupTodoView",
-											_("Tasks manager"),
+											_("Task manager"),
 											actions_todo_view,
 											G_N_ELEMENTS (actions_todo_view),
 											GETTEXT_PACKAGE, FALSE, gtodo_plugin);
 	gtodo_plugin->action_group2 = 
 		anjuta_ui_add_toggle_action_group_entries (ui, "ActionGroupTodoViewOps",
-												_("Tasks manager view"),
+												_("Task manager view"),
 												actions_view,
 												G_N_ELEMENTS (actions_view),
 												GETTEXT_PACKAGE, TRUE, gtodo_plugin);
@@ -193,7 +193,7 @@ project_root_added (AnjutaPlugin *plugin, const gchar *name,
 		if (!gtodo_client_load (cl, file, &error))
 		{
 			remove_gui (ANJUTA_PLUGIN_GTODO (plugin));
-			anjuta_util_dialog_error (GTK_WINDOW (plugin->shell), "Unable to load todo file: %s", error->message);
+			anjuta_util_dialog_error (GTK_WINDOW (plugin->shell), "Unable to load TODO file: %s", error->message);
 			g_error_free (error);
 			error = NULL;
 		}
@@ -222,7 +222,7 @@ project_root_removed (AnjutaPlugin *plugin, const gchar *name,
 	if (!gtodo_client_load (cl, file, &error))
 	{
 		remove_gui (ANJUTA_PLUGIN_GTODO (plugin));
-		anjuta_util_dialog_error (GTK_WINDOW (plugin->shell), "Unable to load todo file: %s", error->message);
+		anjuta_util_dialog_error (GTK_WINDOW (plugin->shell), "Unable to load TODO file: %s", error->message);
 		g_error_free (error);
 		error = NULL;
 	}
@@ -339,7 +339,7 @@ ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError**
 	gtodo_plugin->prefs = preferences_widget();
 	anjuta_preferences_dialog_add_page (ANJUTA_PREFERENCES_DIALOG (anjuta_preferences_get_dialog (prefs)), 
 										"GTodo",
-										_("Todo Manager"),
+										_("To-do Manager"),
 										pixbuf, gtodo_plugin->prefs);
 	g_object_unref (pixbuf);
 }
@@ -348,7 +348,7 @@ static void
 ipreferences_unmerge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
 {
 	preferences_remove_signals();
-	anjuta_preferences_remove_page(prefs, _("Todo Manager"));
+	anjuta_preferences_remove_page(prefs, _("To-do Manager"));
 }
 
 
diff --git a/plugins/gtodo/preferences.c b/plugins/gtodo/preferences.c
index 875926d..34b4136 100644
--- a/plugins/gtodo/preferences.c
+++ b/plugins/gtodo/preferences.c
@@ -18,7 +18,7 @@ void gui_preferences(void)
 	GtkWidget *notebook;
 	
 	notebook = preferences_widget ();
-	dialog = gtk_dialog_new_with_buttons(_("Todo List Preferences"), GTK_WINDOW(mw.window), 
+	dialog = gtk_dialog_new_with_buttons(_("To-do List Preferences"), GTK_WINDOW(mw.window), 
 			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 			GTK_STOCK_CLOSE, 
 			GTK_RESPONSE_CANCEL,
@@ -165,10 +165,10 @@ GtkWidget *preferences_widget()
 	/************ Second Tab *****************/
 	vbox2 = gtk_vbox_new(FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 12);
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Misc")));
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Miscellaneous")));
 
 	vbox = gtk_vbox_new(FALSE, 6);
-	cb_auto_purge = gtk_check_button_new_with_label(_("Auto purge completed items"));
+	cb_auto_purge = gtk_check_button_new_with_label(_("Auto-purge completed items"));
 	gtk_box_pack_start(GTK_BOX(vbox),cb_auto_purge, FALSE, TRUE, 0); 	
 
 
@@ -192,9 +192,9 @@ GtkWidget *preferences_widget()
 	preferences_cb_auto_purge(cb_auto_purge, hbox);
 	/** add the page **/
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
-	frame = gtk_frame_new(_("Auto Purge"));
+	frame = gtk_frame_new(_("Auto-Purge"));
 	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE);	
-	tmp = g_strdup_printf("<b>%s</b>", _("Auto Purge"));
+	tmp = g_strdup_printf("<b>%s</b>", _("Auto-Purge"));
 	gtk_label_set_markup(GTK_LABEL(gtk_frame_get_label_widget(GTK_FRAME(frame))), tmp);
 	g_free(tmp);
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 0);
@@ -215,8 +215,8 @@ GtkWidget *preferences_widget()
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
 	gtk_box_pack_start(GTK_BOX(vbox2), frame, FALSE, FALSE, 0);
-	tmp = g_strdup_printf(ngettext("Allow todo items to notifiy me when they are due in %i minute",
-                                 "Allow todo items to notifiy me when they are due in %i minutes",
+	tmp = g_strdup_printf(ngettext("Allow to-do items to notify me when they are due in %i minute",
+                                 "Allow to-do items to notify me when they are due in %i minutes",
                                  gconf_client_get_int(client, "/apps/gtodo/prefs/notify_in_minutes",NULL)),
                                  gconf_client_get_int(client, "/apps/gtodo/prefs/notify_in_minutes",NULL));
 	cb = gtk_check_button_new_with_label(tmp);
diff --git a/plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in b/plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in
index fa8c469..6c27261 100644
--- a/plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in
+++ b/plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in
@@ -2,7 +2,7 @@
 Location=anjuta-language-cpp-java:CppJavaPlugin
 Icon=anjuta-language-cpp-java-plugin.png
 _Name=C++ and Java support Plugin
-_Description=C++ and Java support plugin for code completion, auto indentation etc.
+_Description=C++ and Java support plugin for code completion, auto-indentation, etc.
 Interfaces=IAnjutaLanguageSupport
 UserActivatable=no
 
diff --git a/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui b/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
index 8a28dd3..82a2791 100644
--- a/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
+++ b/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
@@ -243,7 +243,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Parenthese indentation</property>
+                        <property name="label" translatable="yes">Parenthesis indentation</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -472,7 +472,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Autocomplete</property>
+            <property name="label" translatable="yes">Auto-complete</property>
           </object>
           <packing>
             <property name="position">1</property>
diff --git a/plugins/language-support-cpp-java/plugin.c b/plugins/language-support-cpp-java/plugin.c
index 8683abd..9fd804f 100644
--- a/plugins/language-support-cpp-java/plugin.c
+++ b/plugins/language-support-cpp-java/plugin.c
@@ -1918,21 +1918,21 @@ static GtkActionEntry actions[] = {
 	{
 		"ActionEditAutocomplete",
 		ANJUTA_STOCK_AUTOCOMPLETE,
-		N_("_AutoComplete"), "<control>Return",
-		N_("AutoComplete the current word"),
+		N_("_Auto-Complete"), "<control>Return",
+		N_("Auto-complete the current word"),
 		G_CALLBACK (on_auto_complete)
 	},
 	{
 		"ActionEditAutoindent",
 		ANJUTA_STOCK_AUTOINDENT,
-		N_("Auto Indent"), "<control>i",
-		N_("Auto indent current line or selection based on indentation settings"),
+		N_("Auto-Indent"), "<control>i",
+		N_("Auto-indent current line or selection based on indentation settings"),
 		G_CALLBACK (on_auto_indent)
 	},
 	{   "ActionFileSwap", 
 		ANJUTA_STOCK_SWAP, 
 		N_("Swap .h/.c"), NULL,
-		N_("Swap c header and source files"),
+		N_("Swap C header and source files"),
 		G_CALLBACK (on_swap_activate)
 	}
 };
diff --git a/plugins/macro/anjuta-macro.ui b/plugins/macro/anjuta-macro.ui
index 72e82ff..0c1b038 100644
--- a/plugins/macro/anjuta-macro.ui
+++ b/plugins/macro/anjuta-macro.ui
@@ -164,7 +164,7 @@
         </child>
         <child>
           <object class="GtkButton" id="macro_edit">
-            <property name="label" translatable="yes">Edit...</property>
+            <property name="label" translatable="yes">Edit&#x2026;</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="can_default">True</property>
diff --git a/plugins/macro/macro-actions.c b/plugins/macro/macro-actions.c
index a4c4fcb..abdb9d7 100644
--- a/plugins/macro/macro-actions.c
+++ b/plugins/macro/macro-actions.c
@@ -124,7 +124,7 @@ on_menu_insert_macro (GtkAction * action, MacroPlugin * plugin)
 	GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	GtkWidget* entry = gtk_entry_new();
 	gtk_entry_set_max_length (GTK_ENTRY(entry), 1);
-	GtkWidget* label = gtk_label_new_with_mnemonic(_("Press macro shortcut..."));
+	GtkWidget* label = gtk_label_new_with_mnemonic(_("Press macro shortcutâ?¦"));
 	GtkWidget* hbox = gtk_hbox_new (FALSE, 0);	
 	
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
diff --git a/plugins/macro/plugin.c b/plugins/macro/plugin.c
index 859e819..54223a9 100644
--- a/plugins/macro/plugin.c
+++ b/plugins/macro/plugin.c
@@ -39,21 +39,21 @@ static GtkActionEntry actions_macro[] = {
 	 {
 	 "ActionEditMacroInsert",
 	 NULL,
-	 N_("_Insert Macro..."),
+	 N_("_Insert Macroâ?¦"),
 	 "<control><alt>i",
 	 N_("Insert a macro using a shortcut"),
 	 G_CALLBACK (on_menu_insert_macro)},
 	 {
 	 "ActionEditMacroAdd",
 	 NULL,
-	 N_("_Add Macro..."),
+	 N_("_Add Macroâ?¦"),
 	 "<control>m",
 	 N_("Add a macro"),
 	 G_CALLBACK (on_menu_add_macro)},
 	 {
 	 "ActionEditMacroManager",
 	 NULL,
-	 N_("Macros..."),
+	 N_("Macrosâ?¦"),
 	 NULL,
 	 N_("Add/Edit/Remove macros"),
 	 G_CALLBACK (on_menu_manage_macro)}
@@ -105,7 +105,7 @@ activate_plugin (AnjutaPlugin * plugin)
 	AnjutaUI *ui;
 	MacroPlugin *macro_plugin;
 
-	DEBUG_PRINT ("%s", "MacroPlugin: Activating Macro plugin...");
+	DEBUG_PRINT ("%s", "MacroPlugin: Activating Macro pluginâ?¦");
 
 	macro_plugin = ANJUTA_PLUGIN_MACRO (plugin);
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
@@ -135,7 +135,7 @@ deactivate_plugin (AnjutaPlugin * plugin)
 {
 	AnjutaUI *ui = anjuta_shell_get_ui (plugin->shell, NULL);
 
-	DEBUG_PRINT ("%s", "MacroPlugin: Deactivating Macro plugin...");
+	DEBUG_PRINT ("%s", "MacroPlugin: Deactivating Macro pluginâ?¦");
 
 	anjuta_plugin_remove_watch (plugin,
 								ANJUTA_PLUGIN_MACRO (plugin)->editor_watch_id,
diff --git a/plugins/message-view/anjuta-message-manager-plugin.ui b/plugins/message-view/anjuta-message-manager-plugin.ui
index 59022a1..0312427 100644
--- a/plugins/message-view/anjuta-message-manager-plugin.ui
+++ b/plugins/message-view/anjuta-message-manager-plugin.ui
@@ -128,7 +128,7 @@
                   <object class="GtkLabel" id="label138">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Tabs position:</property>
+                    <property name="label" translatable="yes">Tab position:</property>
                   </object>
                   <packing>
                     <property name="top_attach">3</property>
diff --git a/plugins/message-view/plugin.c b/plugins/message-view/plugin.c
index fd244a8..ecb7af2 100644
--- a/plugins/message-view/plugin.c
+++ b/plugins/message-view/plugin.c
@@ -73,7 +73,7 @@ static void on_save_message(GtkAction* menuitem, MessageViewPlugin *plugin)
 }
 
 static GtkActionEntry actions_goto[] = {
-  { "ActionMenuGoto", NULL, N_("_Goto"), NULL, NULL, NULL},
+  { "ActionMenuGoto", NULL, N_("_Go to"), NULL, NULL, NULL},
   { "ActionMessageCopy", GTK_STOCK_COPY,
     N_("_Copy Message"), NULL,
 	N_("Copy message"),
diff --git a/plugins/patch/patch-plugin.c b/plugins/patch/patch-plugin.c
index 0917af4..80eda29 100644
--- a/plugins/patch/patch-plugin.c
+++ b/plugins/patch/patch-plugin.c
@@ -206,7 +206,7 @@ on_ok_clicked (GtkButton *button, PatchPlugin* p_plugin)
 	
 	ianjuta_message_view_append (p_plugin->mesg_view,
 								 IANJUTA_MESSAGE_VIEW_TYPE_NORMAL,
-								 _("Patching...\n"), "", NULL);
+								 _("Patchingâ?¦\n"), "", NULL);
 
 	g_signal_connect (p_plugin->launcher, "child-exited",
 					  G_CALLBACK (on_patch_terminated), p_plugin);
@@ -216,12 +216,12 @@ on_ok_clicked (GtkButton *button, PatchPlugin* p_plugin)
 		anjuta_launcher_execute (p_plugin->launcher, command->str,
 								 (AnjutaLauncherOutputCallback)on_msg_arrived, p_plugin);
 		p_plugin->executing = TRUE;
-		gtk_label_set_text(GTK_LABEL(p_plugin->output_label), _("Patching..."));
+		gtk_label_set_text(GTK_LABEL(p_plugin->output_label), _("Patchingâ?¦"));
 		gtk_widget_set_sensitive(p_plugin->patch_button, FALSE);
 	}
 	else
 		anjuta_util_dialog_error(GTK_WINDOW(p_plugin->dialog),
-			_("There are unfinished jobs, please wait until they are finished."));
+			_("There are unfinished jobs: please wait until they are finished."));
 	g_string_free(command, TRUE);
 }
 
diff --git a/plugins/patch/plugin.c b/plugins/patch/plugin.c
index 94a83df..f16fdaf 100644
--- a/plugins/patch/plugin.c
+++ b/plugins/patch/plugin.c
@@ -58,7 +58,7 @@ static GtkActionEntry actions_tools[] = {
 	{
 		"ActionToolsPatch",		/* Action name */
 		"patch-plugin-icon",							/* Stock icon, if any */
-		N_("_Patch..."), 				/* Display label */
+		N_("_Patchâ?¦"), 				/* Display label */
 		NULL, 						/* short-cut */
 		NULL, 						/* Tooltip */
 		G_CALLBACK (on_patch_action_activate) /* action callback */
@@ -73,7 +73,7 @@ patch_plugin_activate (AnjutaPlugin *plugin)
 	AnjutaUI *ui;
 	PatchPlugin *p_plugin;
 	
-	DEBUG_PRINT ("%s", "PatchPlugin: Activating Patch plugin...");
+	DEBUG_PRINT ("%s", "PatchPlugin: Activating Patch pluginâ?¦");
 	
 	p_plugin = ANJUTA_PLUGIN_PATCH (plugin);
 
@@ -104,7 +104,7 @@ static gboolean
 patch_plugin_deactivate (AnjutaPlugin *plugin)
 {
 	AnjutaUI *ui = anjuta_shell_get_ui (plugin->shell, NULL);
-	DEBUG_PRINT ("%s", "AnjutaPatchPlugin: Dectivating Patch plugin ...");
+	DEBUG_PRINT ("%s", "AnjutaPatchPlugin: Dectivating Patch plugin â?¦");
 
 	anjuta_ui_unmerge (ui, ANJUTA_PLUGIN_PATCH (plugin)->uiid);
 
diff --git a/plugins/project-import/anjuta-project-import.plugin.in b/plugins/project-import/anjuta-project-import.plugin.in
index f69b768..365aa7e 100644
--- a/plugins/project-import/anjuta-project-import.plugin.in
+++ b/plugins/project-import/anjuta-project-import.plugin.in
@@ -1,6 +1,6 @@
 [Anjuta Plugin]
 _Name=Project Import Assistant
-_Description=Import an existing autotools project to anjuta
+_Description=Import an existing autotools project to Anjuta
 Location=anjuta-project-import:AnjutaProjectImportPlugin
 Icon=anjuta-project-import-plugin-48.png
 UserActivatable=no
@@ -10,4 +10,4 @@ Interfaces=IAnjutaWizard,IAnjutaFile
 SupportedMimeTypes=application/x-anjuta-old
 
 [Wizard]
-_Title=Project From Existing Sources
+_Title=Project from Existing Sources
diff --git a/plugins/project-import/plugin.c b/plugins/project-import/plugin.c
index d417ed8..44d9c21 100644
--- a/plugins/project-import/plugin.c
+++ b/plugins/project-import/plugin.c
@@ -66,7 +66,7 @@ project_import_generate_file (AnjutaProjectImportPlugin* import_plugin, ProjectI
 		                          _("Generation of project file failed. Cannot "
 		                            "find an appropriate project template to "
 		                            "use. Please make sure your version of "
-		                            "Anjuta is up to date."));
+		                            "Anjuta is up-to-date."));
 		return FALSE;
 	}
 	
@@ -131,7 +131,7 @@ project_import_generate_file (AnjutaProjectImportPlugin* import_plugin, ProjectI
 		gtk_widget_show (GTK_WIDGET (import_dialog));
 		
 		anjuta_util_dialog_error (GTK_WINDOW (import_dialog),
-				_("A file named \"%s\" cannot be written: %s.  "
+				_("A file named \"%s\" cannot be written: %s. "
 				  "Check if you have write access to the project directory."),
 				  prjfile, error->message);
 
@@ -202,7 +202,7 @@ project_import_import_project (AnjutaProjectImportPlugin *import_plugin, Project
 
 		anjuta_util_dialog_error (GTK_WINDOW (import_dialog),
 		                          _("Could not find a valid project backend for the "
-		                            "directory given (%s). Please select a different "
+		                            "given directory (%s). Please select a different "
 		                            "directory, or try upgrading to a newer version of "
 		                            "Anjuta."), path);
 
@@ -271,8 +271,8 @@ checkout_finished (AnjutaAsyncNotify *async_notify, gpointer user_data)
 		
 		vcs_uri = project_import_dialog_get_vcs_uri (ch->import_dialog);
 		anjuta_util_dialog_error (GTK_WINDOW (ch->import_dialog),
-		                          _("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\""),
 		                          vcs_uri, err->message);
 
 		g_free (vcs_uri);
@@ -327,8 +327,8 @@ project_import_checkout_project (AnjutaProjectImportPlugin *import_plugin,
 	if (err)
 	{
 		anjuta_util_dialog_error (GTK_WINDOW (import_dialog),
-		                          _("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\""),
 		                          vcs_uri, err->message);
 
 		g_error_free (err);
diff --git a/plugins/project-manager/create_dialogs.ui b/plugins/project-manager/create_dialogs.ui
index 05b4595..13fe5c4 100644
--- a/plugins/project-manager/create_dialogs.ui
+++ b/plugins/project-manager/create_dialogs.ui
@@ -391,7 +391,7 @@
                   <object class="GtkButton" id="browse_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Select file to add...</property>
+                    <property name="label" translatable="yes">_Select file to addâ?¦</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
diff --git a/plugins/project-manager/gbf-project-util.c b/plugins/project-manager/gbf-project-util.c
index 9a830bf..c57d702 100644
--- a/plugins/project-manager/gbf-project-util.c
+++ b/plugins/project-manager/gbf-project-util.c
@@ -233,7 +233,7 @@ gbf_project_util_new_group (GbfProjectModel *model,
 		    
                     new_group = gbf_project_add_group (project, parent_id, name, &err);
                     if (err) {
-                        error_dialog (parent, _("Can not add group"), "%s",
+                        error_dialog (parent, _("Cannot add group"), "%s",
                                       err->message);
                         g_error_free (err);
                     } else {
@@ -241,7 +241,7 @@ gbf_project_util_new_group (GbfProjectModel *model,
 		    }
                     g_free (parent_id);
                 } else {
-                    error_dialog (parent, _("Can not add group"),
+                    error_dialog (parent, _("Cannot add group"),
 				  "%s", _("No parent group selected"));
                 }
                 g_free (name);
@@ -414,7 +414,7 @@ gbf_project_util_new_target (GbfProjectModel *model,
             
                     new_target = gbf_project_add_target (project, group_id, name, type, &err);
                     if (err) {
-                        error_dialog (parent, _("Can not add target"), "%s",
+                        error_dialog (parent, _("Cannot add target"), "%s",
                                       err->message);
                         g_error_free (err);
                     } else {
@@ -423,7 +423,7 @@ gbf_project_util_new_target (GbfProjectModel *model,
 		    g_free (group_id);
                     g_free (type);
                 } else {
-                    error_dialog (parent, _("Can not add target"), "%s",
+                    error_dialog (parent, _("Cannot add target"), "%s",
 				  _("No group selected"));
                 }
             
@@ -529,7 +529,7 @@ browse_button_clicked_cb (GtkWidget *widget, gpointer user_data)
 	else
 		uri = g_strdup("");
 	
-    dialog = GTK_FILE_CHOOSER_DIALOG(gtk_file_chooser_dialog_new (_("Select sources..."),
+    dialog = GTK_FILE_CHOOSER_DIALOG(gtk_file_chooser_dialog_new (_("Select sourcesâ?¦"),
 				      GTK_WINDOW (gtk_widget_get_toplevel (widget)),
 				      GTK_FILE_CHOOSER_ACTION_OPEN,
 				      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -769,14 +769,14 @@ gbf_project_util_add_source_multi (GbfProjectModel *model,
                     g_free (target_id);
 		    
 		    if (err_mesg->str && strlen (err_mesg->str) > 0) {
-			error_dialog (parent, _("Can not add source files"),
+			error_dialog (parent, _("Cannot add source files"),
 				      "%s", err_mesg->str);
 		    } else {
 			finished = TRUE;
 		    }
 		    g_string_free (err_mesg, TRUE);
                 } else {
-                    error_dialog (parent, _("Can not add source files"),
+                    error_dialog (parent, _("Cannot add source files"),
 				  "%s", _("No target has been selected"));
                 }
                 
diff --git a/plugins/project-manager/plugin.c b/plugins/project-manager/plugin.c
index ea8732c..48492d2 100644
--- a/plugins/project-manager/plugin.c
+++ b/plugins/project-manager/plugin.c
@@ -475,7 +475,7 @@ on_refresh_idle (gpointer user_data)
 	plugin = ANJUTA_PLUGIN_PROJECT_MANAGER (user_data);
 	
 	status = anjuta_shell_get_status (ANJUTA_PLUGIN (plugin)->shell, NULL);
-	anjuta_status_push (status, "Refreshing symbol tree...");
+	anjuta_status_push (status, _("Refreshing symbol treeâ?¦"));
 	anjuta_status_busy_push (status);
 	
 	gbf_project_refresh (GBF_PROJECT (plugin->project), &err);
@@ -660,16 +660,16 @@ confirm_removal (ProjectManagerPlugin *plugin, GbfTreeData *data)
 	switch (data->type)
 	{
 		case GBF_TREE_NODE_GROUP:
-			question = _("Are you sure you want to remove the following group from project?\n\n");
-			mesg = _("Group: %s\n\nThe group will not be deleted from file system.");
+			question = _("Are you sure you want to remove the following group from the project?\n\n");
+			mesg = _("Group: %s\n\nThe group will not be deleted from the file system.");
 			break;
 		case GBF_TREE_NODE_TARGET:
-			question = _("Are you sure you want to remove the following target from project?\n\n");
+			question = _("Are you sure you want to remove the following target from the project?\n\n");
 			mesg = _("Target: %s");
 			break;
 		case GBF_TREE_NODE_TARGET_SOURCE:
-			question = _("Are you sure you want to remove the following source file from project?\n\n");
-			mesg = _("Source: %s\n\nThe source file will not be deleted from file system.");
+			question = _("Are you sure you want to remove the following source file from the project?\n\n");
+			mesg = _("Source: %s\n\nThe source file will not be deleted from the file system.");
 			break;
 		default:
 			g_warning ("Unknown node");
@@ -833,17 +833,17 @@ static GtkActionEntry pm_actions[] =
 	},
 	{
 		"ActionProjectAddGroup", GTK_STOCK_ADD,
-		N_("Add _Group..."), NULL, N_("Add a group to project"),
+		N_("Add _Groupâ?¦"), NULL, N_("Add a group to project"),
 		G_CALLBACK (on_add_group)
 	},
 	{
 		"ActionProjectAddTarget", GTK_STOCK_ADD,
-		N_("Add _Target..."), NULL, N_("Add a target to project"),
+		N_("Add _Targetâ?¦"), NULL, N_("Add a target to project"),
 		G_CALLBACK (on_add_target)
 	},
 	{
 		"ActionProjectAddSource", GTK_STOCK_ADD,
-		N_("Add _Source File..."), NULL, N_("Add a source file to project"),
+		N_("Add _Source Fileâ?¦"), NULL, N_("Add a source file to project"),
 		G_CALLBACK (on_add_source)
 	},
 	{
@@ -862,7 +862,7 @@ static GtkActionEntry popup_actions[] =
 	},
 	{
 		"ActionPopupProjectAddToProject", GTK_STOCK_ADD,
-		N_("_Add To Project"), NULL, N_("Add a source file to project"),
+		N_("_Add to Project"), NULL, N_("Add a source file to project"),
 		G_CALLBACK (on_popup_add_to_project)
 	},
 	{
@@ -1198,7 +1198,7 @@ project_manager_load_gbf (ProjectManagerPlugin *pm_plugin)
 	if (pm_plugin->project != NULL)
 			g_object_unref (pm_plugin->project);
 	
-	DEBUG_PRINT ("loading gbf backend...\n");
+	DEBUG_PRINT ("loading gbf backendâ?¦\n");
 	plugin_manager = anjuta_shell_get_plugin_manager (ANJUTA_PLUGIN(pm_plugin)->shell, NULL);
 	descs = anjuta_plugin_manager_query (plugin_manager,
 										 "Anjuta Plugin",
@@ -1264,7 +1264,7 @@ project_manager_load_gbf (ProjectManagerPlugin *pm_plugin)
 	 * was loaded successfully */
 	gbf_project_load (pm_plugin->project, dirname, &error);
 	
-	anjuta_status_progress_tick (status, NULL, _("Created project view..."));
+	anjuta_status_progress_tick (status, NULL, _("Created project viewâ?¦"));
 	
 	if (error)
 	{
@@ -1486,7 +1486,7 @@ project_manager_plugin_activate_plugin (AnjutaPlugin *plugin)
 	/* GladeXML *gxml; */
 	ProjectManagerPlugin *pm_plugin;
 	
-	DEBUG_PRINT ("ProjectManagerPlugin: Activating Project Manager plugin %p...", plugin);
+	DEBUG_PRINT ("ProjectManagerPlugin: Activating Project Manager plugin %pâ?¦", plugin);
 	
 	if (!initialized)
 		register_stock_icons (plugin);
@@ -1598,7 +1598,7 @@ project_manager_plugin_deactivate_plugin (AnjutaPlugin *plugin)
 	ProjectManagerPlugin *pm_plugin;
 	pm_plugin = ANJUTA_PLUGIN_PROJECT_MANAGER (plugin);
 
-	DEBUG_PRINT ("ProjectManagerPlugin: Deactivate Project Manager plugin...");
+	DEBUG_PRINT ("ProjectManagerPlugin: Deactivate Project Manager pluginâ?¦");
 	if (pm_plugin->close_project_idle > -1)
 	{
 		g_source_remove (pm_plugin->close_project_idle);
@@ -2638,7 +2638,7 @@ ifile_open (IAnjutaFile *ifile, GFile* file, GError **e)
 	}
 	
 	anjuta_status_progress_tick (status, NULL,
-								 _("Initializing Project..."));
+								 _("Initializing Projectâ?¦"));
 	update_ui (plugin);
 
 	anjuta_status_progress_tick (status, NULL, _("Project Loaded"));
diff --git a/plugins/project-wizard/druid.c b/plugins/project-wizard/druid.c
index f7c4268..c617caf 100644
--- a/plugins/project-wizard/druid.c
+++ b/plugins/project-wizard/druid.c
@@ -587,7 +587,7 @@ cb_save_valid_property (NPWProperty* property, gpointer user_data)
 		{
 		case NPW_FILENAME_RESTRICTION:
 			g_string_append_printf (data->error,
-									_("Field \"%s\" must start with a letter, a digit or an underscore and contains only letters, digits, underscore, minus and dot. Please fix it."),
+									_("Field \"%s\" must start with a letter, a digit or an underscore and contain only letters, digits, underscore, minus and dot. Please fix it."),
 									_(npw_property_get_label (property)));
 			break;
 		default:
@@ -799,11 +799,11 @@ check_and_warn_missing (NPWDruid *druid)
 		npw_druid_fill_error_page (druid,
 								   GTK_MESSAGE_WARNING,
 								  _("The missing programs are usually part of some distrubution "
-									"packages and can be searched in your Application Manager. "
+									"packages and can be searched for 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 "
+									"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."),
 									"<b>%s</b>\n\n%s",
 									_("Missing components"),
@@ -1037,7 +1037,7 @@ npw_druid_new (NPWPlugin* plugin)
 	/* Check if autogen is present */
 	if (!npw_check_autogen())
 	{
-		anjuta_util_dialog_error (NULL, _("Could not find autogen version 5, please install the autogen package. You can get it from http://autogen.sourceforge.net";));
+		anjuta_util_dialog_error (NULL, _("Could not find autogen version 5; please install the autogen package. You can get it from http://autogen.sourceforge.net.";));
 		return NULL;
 	}	
 
diff --git a/plugins/project-wizard/install.c b/plugins/project-wizard/install.c
index 76bf226..e954895 100644
--- a/plugins/project-wizard/install.c
+++ b/plugins/project-wizard/install.c
@@ -500,7 +500,7 @@ npw_install_install_file (NPWInstall* this)
 			{
 				if (mkdir (buffer, 0755) == -1)
 				{
-					msg = g_strdup_printf (_("Creating %s ... Fail to create directory"), destination);
+					msg = g_strdup_printf (_("Creating %s â?¦ Failed to create directory"), destination);
 					ok = FALSE;
 					break;
 				}
@@ -516,12 +516,12 @@ npw_install_install_file (NPWInstall* this)
 			npw_autogen_set_input_file (this->gen, source, NULL, NULL);
 			npw_autogen_set_output_file (this->gen, destination);
 			ok = npw_autogen_execute (this->gen, on_install_end_install_file, this, NULL);
-			msg = g_strdup_printf (_("Creating %s (using AutoGen)... %s"), destination, ok ? "Ok" : "Fail to Execute");
+			msg = g_strdup_printf (_("Creating %s (using AutoGen)â?¦ %s"), destination, ok ? "Ok" : "Fail to Execute");
 		}
 		else
 		{
 			ok = npw_copy_file (destination, source);
-			msg = g_strdup_printf (_("Creating %s ... %s"), destination, ok ? "Ok" : "Fail to copy file");
+			msg = g_strdup_printf (_("Creating %s â?¦ %s"), destination, ok ? "Ok" : "Fail to copy file");
 		}
 	}
 
diff --git a/plugins/project-wizard/templates/translatable-strings.h b/plugins/project-wizard/templates/translatable-strings.h
index 587c595..49c2567 100644
--- a/plugins/project-wizard/templates/translatable-strings.h
+++ b/plugins/project-wizard/templates/translatable-strings.h
@@ -4,12 +4,12 @@ char *s = N_("A generic GTK+ project");
 char *s = N_("A generic GTKmm (C++) project");
 char *s = N_("A generic Xlib dock applet");
 char *s = N_("A generic Xlib project");
-char *s = N_("A generic java project using automake project management");
+char *s = N_("A generic Java project using automake project management");
 char *s = N_("A generic minimal and flat project");
-char *s = N_("A generic natively compiled java project using the GNU Java Compiler (gcj)");
+char *s = N_("A generic natively compiled Java project using the GNU Java Compiler (gcj)");
 char *s = N_("A generic project");
-char *s = N_("A generic python project using automake project management");
-char *s = N_("A generic wx Widgets project");
+char *s = N_("A generic Python project using automake project management");
+char *s = N_("A generic wxWidgets project");
 char *s = N_("A sample SDL project");
 char *s = N_("Add C++ support:");
 char *s = N_("Add gtk-doc system:");
@@ -24,12 +24,12 @@ char *s = N_("Applet Title:");
 char *s = N_("Author:");
 char *s = N_("Basic information");
 char *s = N_("Berkeley Software Distribution License (BSD)");
-char *s = N_("Comma separated, other plugins that this plugin depends on. It could be either primary interface name or plugin location (library:class)");
+char *s = N_("Comma-separated, other plugins that this plugin depends on. It could be either primary interface name or plugin location (library:class)");
 char *s = N_("Configure external packages");
 char *s = N_("Configure external packages:");
-char *s = N_("Create Gtk Builder interface file");
-char *s = N_("Create a template Gtk Builder interface file");
-char *s = N_("Create a template gtk builder interface file");
+char *s = N_("Create GtkBuilder interface file");
+char *s = N_("Create a template GtkBuilder interface file");
+char *s = N_("Create a template GtkBuilder interface file");
 char *s = N_("Description:");
 char *s = N_("Destination:");
 char *s = N_("Display description of the applet");
@@ -48,9 +48,9 @@ char *s = N_("General Public License (GPL)");
 char *s = N_("Generic");
 char *s = N_("Generic (Minimal)");
 char *s = N_("Generic C++");
-char *s = N_("Generic gcj compiled java");
-char *s = N_("Generic java (automake)");
-char *s = N_("Generic python (automake)");
+char *s = N_("Generic gcj compiled Java");
+char *s = N_("Generic Java (automake)");
+char *s = N_("Generic Python (automake)");
 char *s = N_("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'");
 char *s = N_("Icon File:");
 char *s = N_("Icon file for the plugin");
@@ -72,15 +72,15 @@ char *s = N_("Plugin Dependencies:");
 char *s = N_("Plugin Description:");
 char *s = N_("Plugin Title:");
 char *s = N_("Plugin class name");
-char *s = N_("Plugin has menus or/and toolbars");
+char *s = N_("Plugin has menus and/or toolbars");
 char *s = N_("Plugin interfaces to implement");
 char *s = N_("Project Name:");
-char *s = N_("Project directory, output file etc.");
+char *s = N_("Project directory, output file, etc.");
 char *s = N_("Project directory:");
-char *s = N_("Project name must not contain spaces, because it will be the name of the project build target (executable, library etc.)");
+char *s = N_("Project name must not contain spaces, because it will be the name of the project build target (executable, library, etc.)");
 char *s = N_("Project name:");
 char *s = N_("Project options");
-char *s = N_("Python webproject using Django Web Framework");
+char *s = N_("Python web project using Django Web Framework");
 char *s = N_("Require Package:");
 char *s = N_("Require SDL version:");
 char *s = N_("Require SDL_gfx library");
@@ -101,8 +101,8 @@ char *s = N_("Value Name:");
 char *s = N_("Values to watch");
 char *s = N_("Version:");
 char *s = N_("Whether the plugin has menus or toolbars");
-char *s = N_("Wx Widgets");
+char *s = N_("wxWidgets");
 char *s = N_("Xlib");
 char *s = N_("Xlib dock");
-char *s = N_("gtk-doc is used to compile API documentations for GObject based classes");
+char *s = N_("gtk-doc is used to compile API documentation for GObject-based classes");
 char *s = N_("project name");
diff --git a/plugins/run-program/anjuta-run-program.ui b/plugins/run-program/anjuta-run-program.ui
index e6b9b17..f44eac5 100644
--- a/plugins/run-program/anjuta-run-program.ui
+++ b/plugins/run-program/anjuta-run-program.ui
@@ -23,7 +23,7 @@
               <object class="GtkCheckButton" id="parameter_run_in_term_check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Run In Terminal</property>
+                <property name="label" translatable="yes">Run in Terminal</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
               </object>
diff --git a/plugins/run-program/plugin.c b/plugins/run-program/plugin.c
index 2dffb24..2a97d3a 100644
--- a/plugins/run-program/plugin.c
+++ b/plugins/run-program/plugin.c
@@ -250,9 +250,9 @@ static GtkActionEntry actions_run[] = {
 	{
 		"ActionProgramParameters",
 		NULL,
-		N_("Program Parameters..."),
+		N_("Program Parametersâ?¦"),
 		NULL,
-		N_("Set current program, arguments and so on"),
+		N_("Set current program, arguments, etc."),
 		G_CALLBACK (on_program_parameters_activate)
 	},
 };
@@ -266,7 +266,7 @@ run_plugin_activate (AnjutaPlugin *plugin)
 	RunProgramPlugin *self = ANJUTA_PLUGIN_RUN_PROGRAM (plugin);
 	AnjutaUI *ui;
 	
-	DEBUG_PRINT ("%s", "Run Program Plugin: Activating plugin...");
+	DEBUG_PRINT ("%s", "Run Program Plugin: Activating pluginâ?¦");
 
 	/* Connect to session signal */
 	g_signal_connect (plugin->shell, "save-session",
@@ -294,7 +294,7 @@ run_plugin_deactivate (AnjutaPlugin *plugin)
 	RunProgramPlugin *self = ANJUTA_PLUGIN_RUN_PROGRAM (plugin);
 	AnjutaUI *ui;
 
-	DEBUG_PRINT ("%s", "Run Program Plugin: Deactivating plugin...");
+	DEBUG_PRINT ("%s", "Run Program Plugin: Deactivating pluginâ?¦");
 	
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	anjuta_ui_remove_action_group (ui, self->action_group);
diff --git a/plugins/search/plugin.c b/plugins/search/plugin.c
index 50ca958..71dec66 100644
--- a/plugins/search/plugin.c
+++ b/plugins/search/plugin.c
@@ -65,7 +65,7 @@ on_findprevious1_activate (GtkAction * action, gpointer user_data)
 
 static GtkActionEntry actions_search[] = {
   { "ActionMenuEditSearch", NULL, N_("_Search"), NULL, NULL, NULL},
-  { "ActionEditSearchFind", GTK_STOCK_FIND, N_("_Find..."), "<control><alt>f",
+  { "ActionEditSearchFind", GTK_STOCK_FIND, N_("_Findâ?¦"), "<control><alt>f",
 	N_("Search for a string or regular expression in the editor"),
     G_CALLBACK (on_find1_activate)},
   { "ActionEditSearchFindNext", GTK_STOCK_FIND, N_("Find _Next"), "<control>g",
@@ -75,14 +75,14 @@ static GtkActionEntry actions_search[] = {
 	"<control><shift>g",
 	N_("Repeat the last Find command"),
 	G_CALLBACK (on_findprevious1_activate)},
-  { "ActionEditSearchReplace", GTK_STOCK_FIND_AND_REPLACE, N_("Find and R_eplace..."),
+  { "ActionEditSearchReplace", GTK_STOCK_FIND_AND_REPLACE, N_("Find and R_eplaceâ?¦"),
 	"<control>h",
 	N_("Search for and replace a string or regular expression with another string"),
     G_CALLBACK (on_find_and_replace1_activate)},
   { "ActionEditAdvancedSearch", GTK_STOCK_FIND, N_("Search and Replace"),
 	NULL, N_("Search and Replace"),
 	G_CALLBACK (on_find1_activate)},
-  { "ActionEditSearchInFiles", NULL, N_("Fin_d in Files..."), NULL,
+  { "ActionEditSearchInFiles", NULL, N_("Fin_d in Filesâ?¦"), NULL,
 	N_("Search for a string in multiple files or directories"),
     G_CALLBACK (on_find_in_files1_activate)},
 };
@@ -99,7 +99,7 @@ activate_plugin (AnjutaPlugin *plugin)
 	
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	anjuta_ui_add_action_group_entries (ui, "ActionGroupSearch",
-					_("Searching..."),
+					_("Searchingâ?¦"),
 					actions_search,
 					G_N_ELEMENTS (actions_search),
 					GETTEXT_PACKAGE, TRUE, plugin);
diff --git a/plugins/search/search-replace.c b/plugins/search/search-replace.c
index 3360217..aec503b 100644
--- a/plugins/search/search-replace.c
+++ b/plugins/search/search-replace.c
@@ -1295,7 +1295,7 @@ create_dialog(void)
 	sg->bxml = gtk_builder_new ();
 	if (!gtk_builder_add_from_file (sg->bxml, BUILDER_FILE_SEARCH_REPLACE, &error))
 	{
-		anjuta_util_dialog_error(NULL, _("Unable to build user interface for Search And Replace"));
+		anjuta_util_dialog_error(NULL, _("Unable to build user interface for Search and Replace"));
 		g_free(sg);
 		sg = NULL;
 		g_error_free (error);
diff --git a/plugins/sourceview/anjuta-editor-sourceview.ui b/plugins/sourceview/anjuta-editor-sourceview.ui
index eb153dd..7c3f022 100644
--- a/plugins/sourceview/anjuta-editor-sourceview.ui
+++ b/plugins/sourceview/anjuta-editor-sourceview.ui
@@ -596,7 +596,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.linenumbers">
-                    <property name="label" translatable="yes">Print Linenumbers</property>
+                    <property name="label" translatable="yes">Print line numbers</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
diff --git a/plugins/sourceview/sourceview.c b/plugins/sourceview/sourceview.c
index 53de0a6..4ba83ab 100644
--- a/plugins/sourceview/sourceview.c
+++ b/plugins/sourceview/sourceview.c
@@ -361,7 +361,7 @@ on_file_changed (SourceviewIO* sio, Sourceview* sv)
 	
 	buff =
 		g_strdup_printf (_
-						 ("The file '%s' on the disk is more recent than "
+						 ("The file \"%s\" on the disk is more recent than "
 						  "the current buffer.\nDo you want to reload it?"),
 						 filename);
 
@@ -398,7 +398,7 @@ on_file_deleted (SourceviewIO* sio, Sourceview* sv)
 	
 	buff =
 		g_strdup_printf (_
-						 ("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?"),
 						 filename);
 
@@ -489,7 +489,7 @@ on_open_finish(SourceviewIO* io, Sourceview* sv)
 	if (sourceview_io_get_read_only (io))
 	{
 		gchar* filename = sourceview_io_get_filename (io);
-		gchar* buff = g_strdup_printf (_("The file '%s' is read-only! Edit anyway?"),
+		gchar* buff = g_strdup_printf (_("The file \"%s\" is read-only! Edit anyway?"),
 									   filename);
 		GtkWidget* message_area;
 		g_free (filename);
diff --git a/plugins/sourceview/sourceview.plugin.in b/plugins/sourceview/sourceview.plugin.in
index 2212dd5..8303956 100644
--- a/plugins/sourceview/sourceview.plugin.in
+++ b/plugins/sourceview/sourceview.plugin.in
@@ -1,7 +1,7 @@
 [Anjuta Plugin]
 Location=anjuta-sourceview:SourceviewPlugin
 Icon=anjuta-editor-sourceview-plugin-48.png
-_Name=GtkSourceview editor
-_Description=The default editor based on GtkSourceview
+_Name=GtkSourceView editor
+_Description=The default editor based on GtkSourceView
 Interfaces=IAnjutaEditorFactory
 UserActivatable=no
diff --git a/plugins/starter/starter.c b/plugins/starter/starter.c
index feefefb..6612203 100644
--- a/plugins/starter/starter.c
+++ b/plugins/starter/starter.c
@@ -478,7 +478,7 @@ starter_instance_init (Starter* wcm)
 	g_signal_connect (wcm->priv->anjuta_manual, "clicked",
 					  G_CALLBACK (anjuta_manual_clicked_cb), NULL);
 
-	wcm->priv->gnome_library = anjuta_starter_button_new (_("Gnome Online API Documentation"));
+	wcm->priv->gnome_library = anjuta_starter_button_new (_("GNOME Online API Documentation"));
 	gtk_widget_show (wcm->priv->gnome_library);
 	gtk_box_pack_start (GTK_BOX (vbox), wcm->priv->gnome_library, TRUE, TRUE, 0);
 	g_signal_connect (wcm->priv->gnome_library, "clicked",
diff --git a/plugins/subversion/anjuta-subversion.ui b/plugins/subversion/anjuta-subversion.ui
index fd1e882..f1cef1e 100644
--- a/plugins/subversion/anjuta-subversion.ui
+++ b/plugins/subversion/anjuta-subversion.ui
@@ -70,7 +70,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_add_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -239,7 +239,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="remove_path_browse_button">
-                        <property name="label" translatable="yes">Browse...</property>
+                        <property name="label" translatable="yes">Browseâ?¦</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -449,7 +449,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browse_button_update_dialog">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes">Browseâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -655,7 +655,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="browse_button_diff_dialog">
-                            <property name="label" translatable="yes">Browse...</property>
+                            <property name="label" translatable="yes">Browseâ?¦</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1207,7 +1207,7 @@
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
-                <property name="text" translatable="yes">Retrieving status...</property>
+                <property name="text" translatable="yes">Retrieving statusâ?¦</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1519,7 +1519,7 @@
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
-                <property name="text" translatable="yes">Retrieving status...</property>
+                <property name="text" translatable="yes">Retrieving statusâ?¦</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1664,7 +1664,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="browse_button_log_dialog">
-                                <property name="label" translatable="yes">Browse...</property>
+                                <property name="label" translatable="yes">Browseâ?¦</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -2047,7 +2047,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="copy_browse_button">
-                                <property name="label" translatable="yes">Browse...</property>
+                                <property name="label" translatable="yes">Browseâ?¦</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -2368,7 +2368,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="browse_button_switch_dialog">
-                            <property name="label" translatable="yes">Browse...</property>
+                            <property name="label" translatable="yes">Browseâ?¦</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -2661,7 +2661,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="merge_first_path_browse_button">
-                            <property name="label" translatable="yes">Browse...</property>
+                            <property name="label" translatable="yes">Browseâ?¦</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -2725,7 +2725,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="merge_second_path_browse_button">
-                                <property name="label" translatable="yes">Browse...</property>
+                                <property name="label" translatable="yes">Browseâ?¦</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -2804,7 +2804,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="browse_button_merge_dialog">
-                            <property name="label" translatable="yes">Browse...</property>
+                            <property name="label" translatable="yes">Browseâ?¦</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -3227,7 +3227,7 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
                 <property name="show_text">True</property>
-                <property name="text" translatable="yes">Retrieving status...</property>
+                <property name="text" translatable="yes">Retrieving status��</property>
               </object>
               <packing>
                 <property name="fill">False</property>
diff --git a/plugins/subversion/plugin.c b/plugins/subversion/plugin.c
index ff087e5..8edb6e3 100644
--- a/plugins/subversion/plugin.c
+++ b/plugins/subversion/plugin.c
@@ -57,7 +57,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionAdd",                       /* Action name */
 		GTK_STOCK_ADD,                            /* Stock icon, if any */
-		N_("_Add..."),                     /* Display label */
+		N_("_Addâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Add a new file/directory to the Subversion tree"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_add)    /* action callback */
@@ -65,7 +65,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionRemove",                       /* Action name */
 		GTK_STOCK_REMOVE,                            /* Stock icon, if any */
-		N_("_Remove..."),                     /* Display label */
+		N_("_Removeâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Remove a file/directory from Subversion tree"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_remove)    /* action callback */
@@ -73,7 +73,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionCommit",                       /* Action name */
 		GTK_STOCK_YES,                            /* Stock icon, if any */
-		N_("_Commit..."),                     /* Display label */
+		N_("_Commitâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Commit your changes to the Subversion tree"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_commit)    /* action callback */
@@ -81,7 +81,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionRevert",                       /* Action name */
 		GTK_STOCK_UNDO,                            /* Stock icon, if any */
-		N_("_Revert..."),                     /* Display label */
+		N_("_Revertâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Revert changes to your working copy."),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_revert)    /* action callback */
@@ -89,7 +89,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionResolve",                       /* Action name */
 		GTK_STOCK_PREFERENCES,                            /* Stock icon, if any */
-		N_("_Resolve Conflicts..."),                     /* Display label */
+		N_("_Resolve Conflictsâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Resolve conflicts in your working copy."),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_resolve)    /* action callback */
@@ -97,15 +97,15 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionUpdate",                       /* Action name */
 		GTK_STOCK_REFRESH,                            /* Stock icon, if any */
-		N_("_Update..."),                     /* Display label */
+		N_("_Updateâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
-		N_("Sync your local copy with the Subversion tree"),                      /* Tooltip */
+		N_("Syncronize your local copy with the Subversion tree"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_update)    /* action callback */
 	},
 	{
 		"ActionSubversionCopy",                       /* Action name */
 		GTK_STOCK_COPY,                            /* Stock icon, if any */
-		N_("Copy Files/Folders..."),                     /* Display label */
+		N_("Copy Files/Foldersâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Copy files/folders in the repository"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_copy)    /* action callback */
@@ -113,7 +113,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionSwitch",                       /* Action name */
 		GTK_STOCK_JUMP_TO,                            /* Stock icon, if any */
-		N_("Switch to a Branch/Tag..."),                     /* Display label */
+		N_("Switch to a Branch/Tagâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Switch your local copy to a branch or tag in the repository"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_switch)    /* action callback */
@@ -121,7 +121,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionMerge",                       /* Action name */
 		GTK_STOCK_CONVERT,                            /* Stock icon, if any */
-		N_("Merge..."),                     /* Display label */
+		N_("Mergeâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Merge changes into your working copy"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_merge)    /* action callback */
@@ -129,7 +129,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionLog",                       /* Action name */
 		GTK_STOCK_ZOOM_100,                            /* Stock icon, if any */
-		N_("_View Log..."),                     /* Display label */
+		N_("_View Logâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("View file history"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_log)    /* action callback */
@@ -137,7 +137,7 @@ static GtkActionEntry actions_subversion[] = {
 	{
 		"ActionSubversionDiff",                       /* Action name */
 		GTK_STOCK_ZOOM_100,                            /* Stock icon, if any */
-		N_("_Diff..."),                     /* Display label */
+		N_("_Diffâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Diff local tree with repository"),                      /* Tooltip */
 		G_CALLBACK (on_menu_subversion_diff)    /* action callback */
@@ -156,15 +156,15 @@ static GtkActionEntry popup_actions_subversion[] = {
 	{
 		"ActionPopupSubversionUpdate",                       /* Action name */
 		GTK_STOCK_REFRESH,                            /* Stock icon, if any */
-		N_("_Update..."),                     /* Display label */
+		N_("_Updateâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
-		N_("Sync your local copy with the Subversion tree"),                      /* Tooltip */
+		N_("Syncronize your local copy with the Subversion tree"),                      /* Tooltip */
 		G_CALLBACK (on_fm_subversion_update)    /* action callback */
 	},
 	{
 		"ActionPopupSubversionRevert",                       /* Action name */
 		GTK_STOCK_UNDO,                            /* Stock icon, if any */
-		N_("_Revert..."),                     /* Display label */
+		N_("_Revertâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Revert changes to your working copy."),                      /* Tooltip */
 		G_CALLBACK (on_fm_subversion_revert)    /* action callback */
@@ -172,7 +172,7 @@ static GtkActionEntry popup_actions_subversion[] = {
 	{
 		"ActionPopupSubversionAdd",                       /* Action name */
 		GTK_STOCK_ADD,                            /* Stock icon, if any */
-		N_("_Add..."),                     /* Display label */
+		N_("_Addâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Add a new file/directory to the Subversion tree"),                      /* Tooltip */
 		G_CALLBACK (on_fm_subversion_add)    /* action callback */
@@ -180,7 +180,7 @@ static GtkActionEntry popup_actions_subversion[] = {
 	{
 		"ActionPopupSubversionRemove",                       /* Action name */
 		GTK_STOCK_REMOVE,                            /* Stock icon, if any */
-		N_("_Remove..."),                     /* Display label */
+		N_("_Removeâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Remove a file/directory from Subversion tree"),                      /* Tooltip */
 		G_CALLBACK (on_fm_subversion_remove)    /* action callback */
@@ -188,7 +188,7 @@ static GtkActionEntry popup_actions_subversion[] = {
 	{
 		"ActionPopupSubversionLog",                       /* Action name */
 		GTK_STOCK_ZOOM_100,                            /* Stock icon, if any */
-		N_("_View Log..."),                     /* Display label */
+		N_("_View Logâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("View file history"),                      /* Tooltip */
 		G_CALLBACK (on_fm_subversion_log)    /* action callback */
@@ -196,7 +196,7 @@ static GtkActionEntry popup_actions_subversion[] = {
 	{
 		"ActionPopupSubversionCopy",                       /* Action name */
 		GTK_STOCK_COPY,                            /* Stock icon, if any */
-		N_("Copy..."),                     /* Display label */
+		N_("Copyâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Copy files/folders in the repository"),                      /* Tooltip */
 		G_CALLBACK (on_fm_subversion_copy)    /* action callback */
@@ -204,7 +204,7 @@ static GtkActionEntry popup_actions_subversion[] = {
 	{
 		"ActionPopupSubversionDiff",                       /* Action name */
 		GTK_STOCK_ZOOM_100,                            /* Stock icon, if any */
-		N_("Diff..."),                     /* Display label */
+		N_("Diffâ?¦"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		N_("Diff local tree with repository"),                      /* Tooltip */
 		G_CALLBACK (on_fm_subversion_diff)    /* action callback */
@@ -477,7 +477,7 @@ activate_plugin (AnjutaPlugin *plugin)
 	GtkAction *resolve_action;
 	GError* error = NULL;
 	
-	DEBUG_PRINT ("%s", "Subversion: Activating Subversion plugin ...");
+	DEBUG_PRINT ("%s", "Subversion: Activating Subversion plugin â?¦");
 	subversion = ANJUTA_PLUGIN_SUBVERSION (plugin);
 	
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
@@ -563,7 +563,7 @@ deactivate_plugin (AnjutaPlugin *plugin)
 {
 	Subversion *subversion = ANJUTA_PLUGIN_SUBVERSION (plugin);
 	AnjutaUI *ui = anjuta_shell_get_ui (plugin->shell, NULL);
-	DEBUG_PRINT ("%s", "Subversion: Dectivating Subversion plugin ...");
+	DEBUG_PRINT ("%s", "Subversion: Dectivating Subversion plugin â?¦");
 	anjuta_plugin_remove_watch (plugin, subversion->fm_watch_id, TRUE);
 	anjuta_plugin_remove_watch (plugin, subversion->project_watch_id, TRUE);
 	anjuta_plugin_remove_watch (plugin, subversion->editor_watch_id, TRUE);
diff --git a/plugins/subversion/subversion-commit-dialog.c b/plugins/subversion/subversion-commit-dialog.c
index 771fd46..5bf447d 100644
--- a/plugins/subversion/subversion-commit-dialog.c
+++ b/plugins/subversion/subversion-commit-dialog.c
@@ -123,7 +123,7 @@ on_subversion_commit_response(GtkDialog* dialog, gint response,
 														_("Subversion: " 
 														  "Committing changes "
 														  "to the "
-														  "repository..."));
+														  "repositoryâ?¦"));
 			
 			g_signal_connect (G_OBJECT (commit_command), "command-finished",
 							  G_CALLBACK (stop_status_bar_progress_pulse),
diff --git a/plugins/subversion/subversion-diff-dialog.c b/plugins/subversion/subversion-diff-dialog.c
index bfa3140..d663b0e 100644
--- a/plugins/subversion/subversion-diff-dialog.c
+++ b/plugins/subversion/subversion-diff-dialog.c
@@ -60,7 +60,7 @@ subversion_show_diff (const gchar *path, gboolean recursive,
 	pulse_timer_id = status_bar_progress_pulse (plugin,
 												_("Subversion: " 
 												  "Retrieving "
-												  "diff..."));
+												  "diffâ?¦"));
 	
 	g_signal_connect (G_OBJECT (diff_command), "command-finished",
 					  G_CALLBACK (stop_status_bar_progress_pulse),
diff --git a/plugins/subversion/subversion-log-dialog.c b/plugins/subversion/subversion-log-dialog.c
index c3bea3a..8fa091d 100644
--- a/plugins/subversion/subversion-log-dialog.c
+++ b/plugins/subversion/subversion-log-dialog.c
@@ -255,7 +255,7 @@ subversion_show_log (LogData *data)
 		
 		pulse_timer_id = status_bar_progress_pulse (data->plugin,
 													  _("Subversion: Retrieving"
-														" log..."));
+														" logâ?¦"));
 		
 		g_signal_connect (G_OBJECT (log_command), "command-finished",
 						  G_CALLBACK (stop_status_bar_progress_pulse),
@@ -349,7 +349,7 @@ on_log_view_selected_button_clicked (GtkButton *button, LogData *data)
 	
 	pulse_timer_id = status_bar_progress_pulse (data->plugin,
 												_("Subversion: Retrieving "
-												  "file..."));
+												  "fileâ?¦"));
 	
 	g_signal_connect (G_OBJECT (cat_command), "command-finished",
 					  G_CALLBACK (stop_status_bar_progress_pulse),
@@ -424,7 +424,7 @@ on_log_diff_selected_button_clicked (GtkButton *button, LogData *data)
 		
 		pulse_timer_id = status_bar_progress_pulse (data->plugin,
 													_("Subversion: Retrieving " 
-													  "diff..."));
+													  "diffâ?¦"));
 		
 		g_signal_connect (G_OBJECT (diff_command), "command-finished",
 						  G_CALLBACK (stop_status_bar_progress_pulse),
@@ -491,7 +491,7 @@ on_log_diff_previous_button_clicked (GtkButton *button, LogData *data)
 	
 	pulse_timer_id = status_bar_progress_pulse (data->plugin,
 												_("Subversion: Retrieving " 
-												  "diff..."));
+												  "diffâ?¦"));
 	
 	g_signal_connect (G_OBJECT (diff_command), "command-finished",
 					  G_CALLBACK (stop_status_bar_progress_pulse),
diff --git a/plugins/symbol-db/anjuta-symbol-db.ui b/plugins/symbol-db/anjuta-symbol-db.ui
index 3ca3ee0..a63ee22 100644
--- a/plugins/symbol-db/anjuta-symbol-db.ui
+++ b/plugins/symbol-db/anjuta-symbol-db.ui
@@ -36,7 +36,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">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)</property>
+                            <property name="tooltip_text" translatable="yes">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)</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -58,7 +58,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">This option means that the global system packages will be scanned contemporary with the project's ones</property>
+                            <property name="tooltip_text" translatable="yes">This option means that the global system packages will be scanned simultaneously with the project's ones</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -80,7 +80,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Update automatically the file's symbols without saving. The update occurs after 10 seconds of no keypress by user.</property>
+                            <property name="tooltip_text" translatable="yes">Automatically update the file's symbols without saving. The update occurs after 10 seconds without keypresses by the user.</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -178,7 +178,7 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="show_text">True</property>
-                        <property name="text" translatable="yes">Checking if package is parseable...</property>
+                        <property name="text" translatable="yes">Checking if package is parseableâ?¦</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
diff --git a/plugins/symbol-db/plugin.c b/plugins/symbol-db/plugin.c
index 2612a30..87666a8 100644
--- a/plugins/symbol-db/plugin.c
+++ b/plugins/symbol-db/plugin.c
@@ -306,13 +306,13 @@ on_find_symbol (GtkAction *action, SymbolDBPlugin *sdb_plugin)
 
 static GtkActionEntry actions[] = 
 {
-	{ "ActionMenuGoto", NULL, N_("_Goto"), NULL, NULL, NULL},
+	{ "ActionMenuGoto", NULL, N_("_Go to"), NULL, NULL, NULL},
 	{
 		"ActionSymbolDBGotoDecl",
 		ANJUTA_STOCK_GOTO_DECLARATION,
 		N_("Tag De_claration"),
 		"<shift><control>d",
-		N_("Goto symbol declaration"),
+		N_("Go to symbol declaration"),
 		G_CALLBACK (on_goto_file_tag_decl_activate)
 	},
 	{
@@ -321,14 +321,14 @@ static GtkActionEntry actions[] =
 		/* Translators: Go to the line where the tag is implemented */
 		N_("Tag _Implementation"),
 		"<control>d",
-		N_("Goto symbol definition"),
+		N_("Go to symbol definition"),
 		G_CALLBACK (on_goto_file_tag_impl_activate)
 	}	
 };
 
 static GtkActionEntry actions_search[] = {
   { 
-	"ActionEditSearchFindSymbol", GTK_STOCK_FIND, N_("_Find Symbol..."),
+	"ActionEditSearchFindSymbol", GTK_STOCK_FIND, N_("_Find Symbolâ?¦"),
 	"<control>l", N_("Find Symbol"),
     G_CALLBACK (on_find_symbol)
   }
@@ -541,7 +541,7 @@ on_editor_destroy (SymbolDBPlugin *sdb_plugin, IAnjutaEditor *editor)
 	DEBUG_PRINT ("%s", "on_editor_destroy ()");
 	if (!sdb_plugin->editor_connected || !sdb_plugin->dbv_view_tree)
 	{
-		DEBUG_PRINT ("%s", "on_editor_destroy (): returning....");
+		DEBUG_PRINT ("%s", "on_editor_destroy (): returningâ?¦.");
 		return;
 	}
 	
@@ -551,7 +551,7 @@ on_editor_destroy (SymbolDBPlugin *sdb_plugin, IAnjutaEditor *editor)
 	/* was it the last file loaded? */
 	if (g_hash_table_size (sdb_plugin->editor_connected) <= 0)
 	{
-		DEBUG_PRINT ("%s", "displaying nothing...");
+		DEBUG_PRINT ("%s", "displaying nothingâ?¦");
 		symbol_db_view_locals_display_nothing (
 				SYMBOL_DB_VIEW_LOCALS (sdb_plugin->dbv_view_tree_locals), TRUE);
 	}
@@ -1167,7 +1167,7 @@ on_system_single_file_scan_end (SymbolDBEngine *dbe, gpointer data)
 	sdb_plugin->files_count_system_done++;	
 	if (sdb_plugin->files_count_system_done >= sdb_plugin->files_count_system)
 	{
-		message = g_strdup_printf (_("%s: Generating inheritances..."), 
+		message = g_strdup_printf (_("%s: Generating inheritancesâ?¦"), 
 								   sdb_plugin->current_scanned_package);
 	}
 	else
@@ -1203,7 +1203,7 @@ on_project_single_file_scan_end (SymbolDBEngine *dbe, gpointer data)
 	
 	sdb_plugin->files_count_project_done++;	
 	if (sdb_plugin->files_count_project_done >= sdb_plugin->files_count_project)
-		message = g_strdup_printf (_("Generating inheritances..."));
+		message = g_strdup_printf (_("Generating inheritancesâ?¦"));
 	else
 		message = g_strdup_printf (_("%d files scanned out of %d"), 
 							   sdb_plugin->files_count_project_done, sdb_plugin->files_count_project);
@@ -1428,7 +1428,7 @@ do_import_project_sources (AnjutaPlugin *plugin, IAnjutaProjectManager *pm,
 	sdb_plugin->is_project_importing = TRUE;
 	enable_view_signals (sdb_plugin, FALSE, TRUE);
 	
-	DEBUG_PRINT ("Retrieving %d gbf sources of the project...",
+	DEBUG_PRINT ("Retrieving %d gbf sources of the projectâ?¦",
 					 g_list_length (prj_elements_list));
 
 	/* create the storage array. The file names will be strdup'd and put here. 
@@ -1965,7 +1965,7 @@ on_project_root_added (AnjutaPlugin *plugin, const gchar *name,
 			}				
 		}
 		gtk_progress_bar_set_text (GTK_PROGRESS_BAR (sdb_plugin->progress_bar_project),
-								   _("Populating symbols' db..."));
+								   _("Populating symbol databaseâ?¦"));
 		id = g_idle_add ((GSourceFunc) gtk_progress_bar_pulse, 
 						 sdb_plugin->progress_bar_project);
 		gtk_widget_show (sdb_plugin->progress_bar_project);
@@ -2198,7 +2198,7 @@ symbol_db_activate (AnjutaPlugin *plugin)
 	gchar *ctags_path;
 	GtkWidget *label;
 	
-	DEBUG_PRINT ("SymbolDBPlugin: Activating SymbolDBPlugin plugin ...");
+	DEBUG_PRINT ("SymbolDBPlugin: Activating SymbolDBPlugin plugin â?¦");
 	
 	/* Initialize gda library. */
 	gda_init ();
@@ -2526,7 +2526,7 @@ symbol_db_deactivate (AnjutaPlugin *plugin)
 	
 	sdb_plugin = ANJUTA_PLUGIN_SYMBOL_DB (plugin);
 
-	DEBUG_PRINT ("%s", "SymbolDBPlugin: Dectivating SymbolDBPlugin plugin ...");
+	DEBUG_PRINT ("%s", "SymbolDBPlugin: Dectivating SymbolDBPlugin plugin â?¦");
 	
 	/* disconnect some signals */
 	g_signal_handlers_disconnect_by_func (G_OBJECT (sdb_plugin->dbv_view_tree_locals),
diff --git a/plugins/symbol-db/symbol-db-view.c b/plugins/symbol-db/symbol-db-view.c
index 9db1790..053c21f 100644
--- a/plugins/symbol-db/symbol-db-view.c
+++ b/plugins/symbol-db/symbol-db-view.c
@@ -796,7 +796,7 @@ sdb_view_do_add_hidden_dummy_child (SymbolDBView *dbv, SymbolDBEngine *dbe,
 		gtk_tree_store_append (store, &child_iter, parent_iter);			
 		gtk_tree_store_set (store, &child_iter,
 					COLUMN_PIXBUF, NULL,
-					COLUMN_NAME, _("Loading..."),
+					COLUMN_NAME, _("Loadingâ?¦"),
 					COLUMN_SYMBOL_ID, DUMMY_SYMBOL_ID,
 					-1);
 
diff --git a/plugins/terminal/anjuta-terminal-plugin.ui b/plugins/terminal/anjuta-terminal-plugin.ui
index bb9bba0..addd619 100644
--- a/plugins/terminal/anjuta-terminal-plugin.ui
+++ b/plugins/terminal/anjuta-terminal-plugin.ui
@@ -68,7 +68,7 @@
               <object class="GtkLabel" id="label167">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Use GNOME terminal profile:</property>
+                <property name="label" translatable="yes">Use GNOME Terminal profile:</property>
               </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
diff --git a/plugins/tools/anjuta-tools.ui b/plugins/tools/anjuta-tools.ui
index 95e62eb..437a72f 100644
--- a/plugins/tools/anjuta-tools.ui
+++ b/plugins/tools/anjuta-tools.ui
@@ -261,7 +261,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="browse_button_directory_entry">
-                        <property name="label" translatable="yes">Browse...</property>
+                        <property name="label" translatable="yes">Browseâ?¦</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -279,7 +279,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="button22">
-                    <property name="label" translatable="yes">_Variable...</property>
+                    <property name="label" translatable="yes">_Variableâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -329,7 +329,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="button20">
-                    <property name="label" translatable="yes">_Variable...</property>
+                    <property name="label" translatable="yes">_Variableâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -519,7 +519,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="input_button">
-                    <property name="label" translatable="yes">_Variable...</property>
+                    <property name="label" translatable="yes">_Variableâ?¦</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -561,7 +561,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="browse_button_command_entry">
-                        <property name="label" translatable="yes">Browse...</property>
+                        <property name="label" translatable="yes">Browseâ?¦</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/plugins/tools/editor.c b/plugins/tools/editor.c
index 9bf3134..d67286e 100644
--- a/plugins/tools/editor.c
+++ b/plugins/tools/editor.c
@@ -1041,7 +1041,7 @@ atp_on_editor_shortcut_toggle (GtkToggleButton *tb, gpointer user_data)
 		gtk_grab_add(GTK_WIDGET(tb));
 
   		g_signal_connect (G_OBJECT (tb), "key_press_event", G_CALLBACK (on_editor_get_keys), this);
-  		gtk_button_set_label (GTK_BUTTON (tb), _("New accelerator..."));
+  		gtk_button_set_label (GTK_BUTTON (tb), _("New acceleratorâ?¦"));
 	}
 	else
 	{
diff --git a/plugins/tools/execute.c b/plugins/tools/execute.c
index 4f98b11..61c4827 100644
--- a/plugins/tools/execute.c
+++ b/plugins/tools/execute.c
@@ -466,7 +466,7 @@ atp_output_context_print_command (ATPOutputContext *this, const gchar* command)
 	case ATP_TOUT_COMMON_PANE:
 	case ATP_TOUT_NEW_PANE:
 		/* Display the name of the command */
-		msg = g_strdup_printf(_("Running command: %s...\n"), command);	
+		msg = g_strdup_printf(_("Running command: %sâ?¦\n"), command);	
 		ok = atp_output_context_print (this, msg);
 		g_free (msg);
 		break;
@@ -626,7 +626,7 @@ atp_output_context_initialize (ATPOutputContext *this,
 		this->editor = get_current_editor(docman);
 		if (this->editor == NULL)
 		{
-			anjuta_util_dialog_warning (GTK_WINDOW (this->execution->plugin->shell), _("Unable to create a buffer, command aborted"));
+			anjuta_util_dialog_warning (GTK_WINDOW (this->execution->plugin->shell), _("Unable to create a buffer: command aborted"));
 			return NULL;
 		}
 		g_object_add_weak_pointer (G_OBJECT (this->editor), (gpointer *)(gpointer)&this->editor);
@@ -638,7 +638,7 @@ atp_output_context_initialize (ATPOutputContext *this,
 		this->editor = docman == NULL ? NULL : IANJUTA_EDITOR( ianjuta_document_manager_get_current_document (docman, NULL));
 		if (this->editor == NULL)
 		{
-			anjuta_util_dialog_warning (GTK_WINDOW (this->execution->plugin->shell), _("No document currently open, command aborted"));
+			anjuta_util_dialog_warning (GTK_WINDOW (this->execution->plugin->shell), _("No document currently open: command aborted"));
 			return NULL;
 		}
 		g_object_add_weak_pointer (G_OBJECT (this->editor), (gpointer *)(gpointer)&this->editor);
diff --git a/plugins/tools/tool.c b/plugins/tools/tool.c
index ad6f256..82f3a34 100644
--- a/plugins/tools/tool.c
+++ b/plugins/tools/tool.c
@@ -83,7 +83,7 @@ ATPEnumType output_type_list[] = {
  {ATP_TOUT_NEW_PANE, N_("New message pane")},
  {ATP_TOUT_NEW_BUFFER, N_("New buffer")},
  {ATP_TOUT_REPLACE_BUFFER, N_("Replace buffer")},
- {ATP_TOUT_INSERT_BUFFER, N_("Insert in buffer")},
+ {ATP_TOUT_INSERT_BUFFER, N_("Insert into buffer")},
  {ATP_TOUT_APPEND_BUFFER, N_("Append to buffer")},
  {ATP_TOUT_REPLACE_SELECTION, N_("Replace selection")},
  /* Translators: Checkbox if a dialog should be shown after some operation finishes, so translate as "to pop up a dialog" */
diff --git a/src/anjuta-actions.h b/src/anjuta-actions.h
index 100254b..1fa0541 100644
--- a/src/anjuta-actions.h
+++ b/src/anjuta-actions.h
@@ -93,6 +93,6 @@ static GtkActionEntry menu_entries_help[] = {
     G_CALLBACK (on_about_activate)},
   { "ActionAboutPlugins", GTK_STOCK_ABOUT,
     N_("About External _Plugins"), NULL,
-	N_("About third party Anjuta plugins"),
+	N_("About third-party Anjuta plugins"),
     NULL}
 };
diff --git a/src/anjuta.c b/src/anjuta.c
index 5eefbd9..9e0d0a8 100644
--- a/src/anjuta.c
+++ b/src/anjuta.c
@@ -421,7 +421,7 @@ anjuta_new (gchar *prog_name, gchar **files, gboolean no_splash,
 	g_signal_connect (profile_manager, "profile-descoped",
 					  G_CALLBACK (on_profile_descoped), app);
 	
-	anjuta_status_progress_tick (status, NULL, _("Loaded Session..."));
+	anjuta_status_progress_tick (status, NULL, _("Loaded Sessionâ?¦"));
 	anjuta_status_disable_splash (status, TRUE);
 	return app;
 }
diff --git a/src/main.c b/src/main.c
index b037557..ec64f73 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,13 +67,13 @@ static const GOptionEntry anjuta_options[] = {
 	{
 		"no-splash", 's', 0, G_OPTION_ARG_NONE,
 		&no_splash,
-		N_("Do not show the splashscreen"),
+		N_("Do not show the splash screen"),
 		NULL
 	},
 	{
 		"no-client", 'c', 0, G_OPTION_ARG_NONE,
 		&no_client,
-		N_("Start a new instance and do not open the file in a existing"),
+		N_("Start a new instance and do not open the file in an existing instance"),
 		NULL
 	},
 	{
@@ -91,7 +91,7 @@ static const GOptionEntry anjuta_options[] = {
 	{
 		"proper-shutdown", 'p', 0, G_OPTION_ARG_NONE,
 		&proper_shutdown,
-		N_("Shutdown anjuta properly releasing all resources (for debugging)"),
+		N_("Shut down Anjuta properly, releasing all resources (for debugging)"),
 		NULL
 	},
 	{
diff --git a/src/preferences.ui b/src/preferences.ui
index a8f3522..80b2a26 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -18,7 +18,7 @@
         <col id="0" translatable="yes">Text + Icons</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Gnome toolbar setting</col>
+        <col id="0" translatable="yes">GNOME toolbar setting</col>
       </row>
       <row>
         <col id="0" translatable="yes">Tabs</col>
@@ -144,7 +144,7 @@
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="action">select-folder</property>
-                            <property name="title" translatable="yes">Select projects directory</property>
+                            <property name="title" translatable="yes">Select project directory</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>



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