[Fwd: [Xfce4-commits] CVS: xfce4/xfwm4/mcs-plugin xfwm4_shortcuteditor.c, 1.32, 1.33]

Jean-François Wauthy pollux at xfce.org
Tue Nov 16 22:01:20 CET 2004


Le mardi 16 novembre 2004 à 21:01 +0100, Olivier Fourdan a écrit :
> Salut Jean-Francois,
> 
Bonsoir Olivier,

> You've break the translations several times in the past few days
> (xfprint, xfwm4 shortcut editor).
> 
perhaps i did it in the past, but lately i took care to not break the
translation freeze; oh yes i did it in the xfprint mcs-plugin but i
changed all the .po files in order to not break anything (i removed the
<b>...</b> that i don't remember who told me it wasn't the best way to
do it), it was a tweak not a break IMHO, if you don't agree with my
point of view, let me know, i'll revert.
about the forwarded commit, it really doesn't break anything because the
"Workspace %d" string exists in .po file at least since beta1
(mcs-plugin/workspaces.c:355), it only removes some strings in fact.

> Please check all of your changes revert any change that breaks the
> translations.
> 
> TIA
> Olivier.
> pièce jointe email message, "Forwarded message - [Xfce4-commits] CVS:
> xfce4/xfwm4/mcs-plugin xfwm4_shortcuteditor.c, 1.32, 1.33"
> Le mardi 16 novembre 2004 à 21:01 +0100, Olivier Fourdan a écrit :
> > Update of /var/cvs/xfce/xfce4/xfwm4/mcs-plugin
> > In directory espresso.foo-projects.org:/tmp/cvs-serv14169
> > 
> > Modified Files:
> > 	xfwm4_shortcuteditor.c 
> > Log Message:
> > use one translation entry instead of nine BTW should fix #495
> > 
> > Index: xfwm4_shortcuteditor.c
> > ===================================================================
> > RCS file: /var/cvs/xfce/xfce4/xfwm4/mcs-plugin/xfwm4_shortcuteditor.c,v
> > retrieving revision 1.32
> > retrieving revision 1.33
> > diff -u -d -r1.32 -r1.33
> > --- xfwm4_shortcuteditor.c	11 Nov 2004 15:59:00 -0000	1.32
> > +++ xfwm4_shortcuteditor.c	15 Nov 2004 22:39:59 -0000	1.33
> > @@ -468,48 +468,84 @@
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_1_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 1);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 1"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_2_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 2);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 2"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_3_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 3);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 3"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_4_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 4);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 4"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_5_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 5);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 5"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_6_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 6);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 6"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_7_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 7);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 7"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_8_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 8);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 8"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "workspace_9_key") == 0)
> >          {
> > +	    gchar *text;
> > +	    
> > +	    text = g_strdup_printf (_("Workspace %d"), 9);
> >              gtk_list_store_append (GTK_LIST_STORE (model3), &iter);
> > -            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Workspace 9"), COLUMN_SHORTCUT, entry_value, -1);
> > +            gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, -1);
> > +	    g_free (text);
> >          }
> >          else if (g_ascii_strcasecmp (*shortcut, "move_window_next_workspace_key") == 0)
> >          {
> > 
> > _______________________________________________
> > Xfce4-commits mailing list
> > Xfce4-commits at xfce.org
> > http://lunar-linux.org/mailman/listinfo/xfce4-commits
> _______________________________________________
> Xfce4-dev mailing list
> Xfce4-dev at xfce.org
> http://lunar-linux.org/mailman/listinfo/xfce4-dev
-- 
Jean-François Wauthy <pollux at xfce.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Ceci est une partie de message num?riquement sign?e
URL: <http://mail.xfce.org/pipermail/xfce4-dev/attachments/20041116/50843302/attachment.pgp>


More information about the Xfce4-dev mailing list