GNOME.org
 

[dia] Bug 611704 - Use proper Unicode characters

commit 33658ffed08791c9718379047f2cc6442d656d79
Author: Hans Breuer <hans breuer org>
Date:   Sat Jul 9 15:03:22 2011 +0200

    Bug 611704 - Use proper Unicode characters
    
    Replace ..."  with \342\200\246" to have the best of both worlds:
    proper Unicode menu entries in UTF-8 and still ASCII source code.
    
    Suggested by Philip Withnall, bug 611704#c3

 app/disp_callbacks.c      |    2 +-
 app/interface.c           |    6 +++---
 app/menus.c               |   16 ++++++++--------
 app/splash.c              |    2 +-
 lib/diaarrowchooser.c     |    2 +-
 lib/diacolorselector.c    |    2 +-
 lib/dialinechooser.c      |    2 +-
 plug-ins/cairo/diacairo.c |    2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c
index 7eb8673..2449895 100644
--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -124,7 +124,7 @@ add_properties_menu_item (GtkMenu *menu, gboolean separator)
     gtk_widget_show(menu_item);
   }
 
-  menu_item = gtk_menu_item_new_with_label(_("Properties..."));
+  menu_item = gtk_menu_item_new_with_label(_("Properties\342\200\246"));
   g_signal_connect(GTK_OBJECT(menu_item), "activate", G_CALLBACK(dialogs_properties_callback), NULL);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
   gtk_widget_show(menu_item);
diff --git a/app/interface.c b/app/interface.c
index 44e9dfa..e6c46e8 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -1593,12 +1593,12 @@ create_lineprops_area(GtkWidget *parent)
   g_free(arrow_name);
   dia_arrow_chooser_set_arrow(DIA_ARROW_CHOOSER(chooser), &arrow);
   attributes_set_default_start_arrow(arrow);
-  gtk_widget_set_tooltip_text(chooser, _("Arrow style at the beginning of new lines.  Click to pick an arrow, or set arrow parameters with Details..."));
+  gtk_widget_set_tooltip_text(chooser, _("Arrow style at the beginning of new lines.  Click to pick an arrow, or set arrow parameters with Details\342\200\246"));
   gtk_widget_show(chooser);
 
   chooser = dia_line_chooser_new(change_line_style, NULL);
   gtk_wrap_box_pack(GTK_WRAP_BOX(parent), chooser, TRUE, TRUE, FALSE, TRUE);
-  gtk_widget_set_tooltip_text (chooser, _("Line style for new lines.  Click to pick a line style, or set line style parameters with Details..."));
+  gtk_widget_set_tooltip_text (chooser, _("Line style for new lines.  Click to pick a line style, or set line style parameters with Details\342\200\246"));
   style = persistence_register_integer("line-style", LINESTYLE_SOLID);
   dash_length = persistence_register_real("dash-length", DEFAULT_LINESTYLE_DASHLEN);
   dia_line_chooser_set_line_style(DIA_LINE_CHOOSER(chooser), style, dash_length);
@@ -1614,7 +1614,7 @@ create_lineprops_area(GtkWidget *parent)
   attributes_set_default_end_arrow(arrow);
 
   gtk_wrap_box_pack(GTK_WRAP_BOX(parent), chooser, FALSE, TRUE, FALSE, TRUE);
-  gtk_widget_set_tooltip_text(chooser, _("Arrow style at the end of new lines.  Click to pick an arrow, or set arrow parameters with Details..."));
+  gtk_widget_set_tooltip_text(chooser, _("Arrow style at the end of new lines.  Click to pick an arrow, or set arrow parameters with Details\342\200\246"));
   gtk_widget_show(chooser);
 }
 
diff --git a/app/menus.c b/app/menus.c
index 5a0ffad..67300f3 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -89,10 +89,10 @@ extern void diagram_tree_show(void);
 /* Actions for toolbox menu */
 static const GtkActionEntry toolbox_entries[] = 
 {
-    { "FileSheets", NULL, N_("Sheets and Objects..."), "F9", NULL, G_CALLBACK (sheets_dialog_show_callback) },
+    { "FileSheets", NULL, N_("Sheets and Objects\342\200\246"), "F9", NULL, G_CALLBACK (sheets_dialog_show_callback) },
     { "FilePrefs", GTK_STOCK_PREFERENCES, NULL, NULL, NULL, G_CALLBACK (file_preferences_callback) },
-    { "FilePlugins", NULL, N_("Plugins..."), NULL, NULL, G_CALLBACK (file_plugins_callback) },
-    { "FileTree", NULL, N_("_Diagram Tree..."), "F8", NULL, G_CALLBACK (diagram_tree_show) }
+    { "FilePlugins", NULL, N_("Plugins\342\200\246"), NULL, NULL, G_CALLBACK (file_plugins_callback) },
+    { "FileTree", NULL, N_("_Diagram Tree\342\200\246"), "F8", NULL, G_CALLBACK (diagram_tree_show) }
 };
 
 static const GtkToggleActionEntry integrated_ui_view_toggle_entries[] = 
@@ -107,9 +107,9 @@ static const GtkActionEntry display_entries[] =
 {
     { "FileSave", GTK_STOCK_SAVE, NULL, "<control>S", N_("Save the diagram"), G_CALLBACK (file_save_callback) },
     { "FileSaveas", GTK_STOCK_SAVE_AS, NULL, "<control><shift>S", N_("Save the diagram with a new name"), G_CALLBACK (file_save_as_callback) },
-    { "FileExport", GTK_STOCK_CONVERT, N_("_Export ..."), NULL, N_("Export the diagram"), G_CALLBACK (file_export_callback) },
+    { "FileExport", GTK_STOCK_CONVERT, N_("_Export\342\200\246"), NULL, N_("Export the diagram"), G_CALLBACK (file_export_callback) },
     { "DiagramProperties", GTK_STOCK_PROPERTIES, N_("_Diagram Properties"), "<shift><alt>Return", NULL, G_CALLBACK (view_diagram_properties_callback) },
-    { "FilePagesetup", NULL, N_("Page Set_up..."), NULL, NULL, G_CALLBACK (file_pagesetup_callback) },
+    { "FilePagesetup", NULL, N_("Page Set_up\342\200\246"), NULL, NULL, G_CALLBACK (file_pagesetup_callback) },
     { "FilePrint", GTK_STOCK_PRINT, NULL, "<control>P", N_("Print the diagram"), G_CALLBACK (file_print_callback) },
     { "FileClose", GTK_STOCK_CLOSE, NULL, "<control>W", NULL, G_CALLBACK (file_close_callback) },
 
@@ -135,11 +135,11 @@ static const GtkActionEntry display_entries[] =
     { "EditPasteImage", NULL, N_("Paste _Image"), "<control><alt>V", NULL, G_CALLBACK (edit_paste_image_callback) },
 
   { "Layers", NULL, N_("_Layers"), NULL, NULL, NULL }, 
-    { "LayerAdd", DIA_STOCK_LAYER_ADD, N_("Add Layer..."), NULL, NULL, G_CALLBACK (layers_add_layer_callback) },
-    { "LayerRename", DIA_STOCK_LAYER_RENAME, N_("Rename Layer..."), NULL, NULL, G_CALLBACK (layers_rename_layer_callback) },
+    { "LayerAdd", DIA_STOCK_LAYER_ADD, N_("Add Layer\342\200\246"), NULL, NULL, G_CALLBACK (layers_add_layer_callback) },
+    { "LayerRename", DIA_STOCK_LAYER_RENAME, N_("Rename Layer\342\200\246"), NULL, NULL, G_CALLBACK (layers_rename_layer_callback) },
     { "ObjectsLayerAbove", DIA_STOCK_OBJECTS_LAYER_ABOVE, N_("Move Selection to Layer above"), NULL, NULL, G_CALLBACK (objects_move_up_layer) },
     { "ObjectsLayerBelow", DIA_STOCK_OBJECTS_LAYER_BELOW, N_("Move Selection to Layer below"), NULL, NULL, G_CALLBACK (objects_move_down_layer) },
-    { "DiagramLayers", DIA_STOCK_LAYERS, N_("_Layers..."), "<control>L", NULL, G_CALLBACK (dialogs_layers_callback) },
+    { "DiagramLayers", DIA_STOCK_LAYERS, N_("_Layers\342\200\246"), "<control>L", NULL, G_CALLBACK (dialogs_layers_callback) },
   { "View", NULL, N_("_View"), NULL, NULL, NULL },
     { "ViewZoomin", GTK_STOCK_ZOOM_IN, NULL, "<control>plus", N_("Zoom in"), G_CALLBACK (view_zoom_in_callback) },
     { "ViewZoomout", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus", N_("Zoom out"), G_CALLBACK (view_zoom_out_callback) },
diff --git a/app/splash.c b/app/splash.c
index 6f970f8..fecf445 100644
--- a/app/splash.c
+++ b/app/splash.c
@@ -47,7 +47,7 @@ app_splash_init (const gchar* fname)
 
   splash = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_role (GTK_WINDOW (splash), "start_dialog");
-  gtk_window_set_title (GTK_WINDOW (splash), _("Loading ..."));
+  gtk_window_set_title (GTK_WINDOW (splash), _("Loading \342\200\246"));
   gtk_window_set_resizable (GTK_WINDOW (splash), FALSE);
   gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER);
 
diff --git a/lib/diaarrowchooser.c b/lib/diaarrowchooser.c
index a72c65c..a03cf02 100644
--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -475,7 +475,7 @@ dia_arrow_chooser_new(gboolean left, DiaChangeArrowCallback callback,
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
     gtk_widget_show(mi);
   }
-  mi = gtk_menu_item_new_with_label(_dia_translate("Details...", NULL));
+  mi = gtk_menu_item_new_with_label(_dia_translate("Details\342\200\246", NULL));
   g_signal_connect(G_OBJECT(mi), "activate",
 		   G_CALLBACK(dia_arrow_chooser_dialog_show), chooser);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
diff --git a/lib/diacolorselector.c b/lib/diacolorselector.c
index dccced2..6b979ae 100644
--- a/lib/diacolorselector.c
+++ b/lib/diacolorselector.c
@@ -284,7 +284,7 @@ dia_color_selector_more_callback(GtkWidget *widget, gpointer userdata)
 static GtkWidget *
 dia_color_selector_menu_new (DiaColorSelector *cs)
 {
-  GtkWidget *otheritem = gtk_menu_item_new_with_label(_("More colors..."));
+  GtkWidget *otheritem = gtk_menu_item_new_with_label(_("More colors\342\200\246"));
   GtkWidget *ddm = dia_dynamic_menu_new(dia_color_selector_create_string_item,
 					NULL,
 					GTK_MENU_ITEM(otheritem),
diff --git a/lib/dialinechooser.c b/lib/dialinechooser.c
index 4d79cab..da8f19c 100644
--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -341,7 +341,7 @@ dia_line_chooser_init (DiaLineChooser *lchooser)
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
     gtk_widget_show (mi);
   }
-  mi = gtk_menu_item_new_with_label(_("Details..."));
+  mi = gtk_menu_item_new_with_label(_("Details\342\200\246"));
   g_signal_connect_swapped(G_OBJECT(mi), "activate",
 			   G_CALLBACK(gtk_widget_show), lchooser->dialog);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
diff --git a/plug-ins/cairo/diacairo.c b/plug-ins/cairo/diacairo.c
index d899a95..75af9f5 100644
--- a/plug-ins/cairo/diacairo.c
+++ b/plug-ins/cairo/diacairo.c
@@ -465,7 +465,7 @@ static DiaCallbackFilter cb_clipboard = {
 
 static DiaCallbackFilter cb_gtk_print = {
     "FilePrintGTK",
-    N_("Print (GTK) ..."),
+    N_("Print (GTK) \342\200\246"),
     "/InvisibleMenu/File/FilePrint",
     cairo_print_callback,
     (void*)OUTPUT_PDF
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]