anjuta r4559 - in trunk: . plugins/debug-manager plugins/gdb plugins/project-wizard plugins/project-wizard/templates plugins/tools

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Sat Jan 10 08:54:24 2009
New Revision: 4559
URL: http://svn.gnome.org/viewvc/anjuta?rev=4559&view=rev

Log:
	* plugins/tools/execute.c:
	Fix #567227 â Don't leave trailing spaces

	* plugins/project-wizard/install.c,
	plugins/project-wizard/druid.c,
	plugins/project-wizard/templates/minimal.wiz:
	Fix #567223 â Don't leave trailing spaces

	* plugins/gdb/debugger.c:
	Fix #567219 â String fixes

	* plugins/debug-manager/signals.c,
	plugins/debug-manager/anjuta-debug-manager.glade:
	Fix #567218 â Don't leave spaces before punctuation


Modified:
   trunk/ChangeLog
   trunk/plugins/debug-manager/anjuta-debug-manager.glade
   trunk/plugins/debug-manager/signals.c
   trunk/plugins/gdb/debugger.c
   trunk/plugins/project-wizard/druid.c
   trunk/plugins/project-wizard/install.c
   trunk/plugins/project-wizard/templates/minimal.wiz
   trunk/plugins/project-wizard/templates/translatable-strings.h
   trunk/plugins/tools/execute.c

Modified: trunk/plugins/debug-manager/anjuta-debug-manager.glade
==============================================================================
--- trunk/plugins/debug-manager/anjuta-debug-manager.glade	(original)
+++ trunk/plugins/debug-manager/anjuta-debug-manager.glade	Sat Jan 10 08:54:24 2009
@@ -1879,7 +1879,7 @@
                       <widget class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Address :</property>
+                        <property name="label" translatable="yes">Address:</property>
                       </widget>
                     </child>
                     <child>
@@ -1896,7 +1896,7 @@
                       <widget class="GtkLabel" id="label13">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Port :</property>
+                        <property name="label" translatable="yes">Port:</property>
                       </widget>
                       <packing>
                         <property name="position">2</property>
@@ -2067,7 +2067,7 @@
                               <widget class="GtkLabel" id="label12">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Address :</property>
+                                <property name="label" translatable="yes">Address:</property>
                               </widget>
                             </child>
                             <child>
@@ -2084,7 +2084,7 @@
                               <widget class="GtkLabel" id="label14">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Port :</property>
+                                <property name="label" translatable="yes">Port:</property>
                               </widget>
                               <packing>
                                 <property name="position">2</property>

Modified: trunk/plugins/debug-manager/signals.c
==============================================================================
--- trunk/plugins/debug-manager/signals.c	(original)
+++ trunk/plugins/debug-manager/signals.c	Sat Jan 10 08:54:24 2009
@@ -464,11 +464,11 @@
 	gtk_widget_show (hbox4);
 	gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox4, TRUE, TRUE, 0);
 	
-	label5 = gtk_label_new (_(" Stop: "));
+	label5 = gtk_label_new (_("Stop:"));
 	gtk_widget_show (label5);
 	gtk_box_pack_start (GTK_BOX (hbox4), label5, TRUE, TRUE, 0);
 	
-	label6 = gtk_label_new (_(" Print: "));
+	label6 = gtk_label_new (_("Print:"));
 	gtk_widget_show (label6);
 	gtk_box_pack_start (GTK_BOX (hbox4), label6, TRUE, TRUE, 0);
 	

Modified: trunk/plugins/gdb/debugger.c
==============================================================================
--- trunk/plugins/gdb/debugger.c	(original)
+++ trunk/plugins/gdb/debugger.c	Sat Jan 10 08:54:24 2009
@@ -686,7 +686,8 @@
 
 	if (debugger->priv->output_callback)
 	{
-		msg = g_strconcat (_("Loading Executable: "), prog, "\n", NULL);
+		/* The %s argument is a program name, anjuta by example */
+		msg = g_strdup_printf (_("Loading Executable: %s\n"), prog);
 		debugger->priv->output_callback (IANJUTA_DEBUGGER_OUTPUT, msg, 
 							   debugger->priv->output_user_data);
 		g_free (msg);
@@ -716,7 +717,8 @@
 
 	if (debugger->priv->output_callback)
 	{
-		msg = g_strconcat (_("Loading Core: "), core, "\n", NULL);
+		/* The %s argument is a file name */
+		msg = g_strdup_printf (_("Loading Core: %s\n"), core);
 		debugger->priv->output_callback (IANJUTA_DEBUGGER_OUTPUT, msg, 
 									 debugger->priv->output_user_data);
 		g_free (msg);
@@ -1842,8 +1844,10 @@
 	{
 		gchar *msg;
 		gboolean retry;
-		
-		msg = g_strdup_printf(_("Unable to connect to remote target, %s.\n Do you want to try again ?"),
+	
+		/* The %s argument is an error message returned by gdb.
+		 * It is something like, "No such file or directory" */
+		msg = g_strdup_printf(_("Unable to connect to remote target, %s\nDo you want to try again?"),
 							  error->message);
 		retry = anjuta_util_dialog_boolean_question (debugger->priv->parent_win, msg);
 		g_free (msg);

Modified: trunk/plugins/project-wizard/druid.c
==============================================================================
--- trunk/plugins/project-wizard/druid.c	(original)
+++ trunk/plugins/project-wizard/druid.c	Sat Jan 10 08:54:24 2009
@@ -178,10 +178,10 @@
 	GString* text;
 
 	text = g_string_new (_("Confirm the following information:\n\n"));
-	
-	g_string_append (text,_("Project Type: "));
-	g_string_append (text, _(npw_header_get_name (this->header)));
-	g_string_append (text,"\n");
+
+	/* The project type is translated too, it is something like
+	 * generic, GNOME applet, Makefile project... */
+	g_string_append_printf (text, _("Project Type: %s\n"), _(npw_header_get_name (this->header)));
 
 	for (i = 0; (page = g_queue_peek_nth (this->page_list, i)) != NULL; ++i)
 	{

Modified: trunk/plugins/project-wizard/install.c
==============================================================================
--- trunk/plugins/project-wizard/install.c	(original)
+++ trunk/plugins/project-wizard/install.c	Sat Jan 10 08:54:24 2009
@@ -565,8 +565,12 @@
 		this->launcher = anjuta_launcher_new ();
 	}
 	g_signal_connect (G_OBJECT (this->launcher), "child-exited", G_CALLBACK (on_run_terminated), this);
-	msg = g_strconcat (_("Executing: "), npw_action_get_command (action), NULL);
+	/* The %s is a name of a unix command line, by example
+	 * cp foobar.c project */
+	msg = g_strdup_printf (_("Executing: %s"), npw_action_get_command (action));
 	npw_plugin_print_view (this->plugin, IANJUTA_MESSAGE_VIEW_TYPE_INFO, msg, "");
+	g_free (msg);
+
 	return anjuta_launcher_execute (this->launcher, npw_action_get_command (action), on_run_output, this);
 }
 

Modified: trunk/plugins/project-wizard/templates/minimal.wiz
==============================================================================
--- trunk/plugins/project-wizard/templates/minimal.wiz	(original)
+++ trunk/plugins/project-wizard/templates/minimal.wiz	Sat Jan 10 08:54:24 2009
@@ -1,6 +1,6 @@
 <project-wizard>
 	<_name>Generic (Minimal)</_name>
-	<_description>A generic minimal and flat project </_description>
+	<_description>A generic minimal and flat project</_description>
 	<icon>terminal-logo.png</icon>
 	<category>C</category>
 	<required-program>automake</required-program>

Modified: trunk/plugins/project-wizard/templates/translatable-strings.h
==============================================================================
--- trunk/plugins/project-wizard/templates/translatable-strings.h	(original)
+++ trunk/plugins/project-wizard/templates/translatable-strings.h	Sat Jan 10 08:54:24 2009
@@ -6,7 +6,7 @@
 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 minimal and flat project ");
+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 project");
 char *s = N_("A generic python project using automake project management");

Modified: trunk/plugins/tools/execute.c
==============================================================================
--- trunk/plugins/tools/execute.c	(original)
+++ trunk/plugins/tools/execute.c	Sat Jan 10 08:54:24 2009
@@ -454,6 +454,7 @@
 atp_output_context_print_command (ATPOutputContext *this, const gchar* command)
 {
 	gboolean ok;
+	gchar *msg;
 
 	ok = TRUE;
 	switch (this->type)
@@ -463,10 +464,10 @@
 		break;
 	case ATP_TOUT_COMMON_PANE:
 	case ATP_TOUT_NEW_PANE:
-		
-		ok = atp_output_context_print (this, _("Running command: "));
-		ok &= atp_output_context_print (this, command);
-		ok &= atp_output_context_print (this, "...\n");	
+		/* Display the name of the command */
+		msg = g_strdup_printf(_("Running command: %s...\n"), command);	
+		ok = atp_output_context_print (this, msg);
+		g_free (msg);
 		break;
 	case ATP_TOUT_NEW_BUFFER:
 	case ATP_TOUT_REPLACE_BUFFER: