GNOME.org
 

[dia] Revert UNICODE characters in .c (Bug 611704)

commit 4faf6074af0db848de90a8da1e1dcb12609d3569
Author: Hans Breuer <hans breuer org>
Date:   Wed Jun 1 16:37:08 2011 +0200

    Revert UNICODE characters in .c (Bug 611704)

 app/disp_callbacks.c          |    2 +-
 app/interface.c               |    6 +++---
 app/menus.c                   |   18 ++++++++----------
 app/sheets_dialog_callbacks.c |   16 ++++++++--------
 app/splash.c                  |    2 +-
 lib/diacolorselector.c        |    2 +-
 lib/dialinechooser.c          |    2 +-
 objects/SISSI/sissi_dialog.c  |    2 +-
 plug-ins/cairo/diacairo.c     |    2 +-
 plug-ins/svg/svg-import.c     |    2 +-
 plug-ins/wmf/wmf.cpp          |    2 +-
 plug-ins/xfig/xfig-export.c   |    2 +-
 plug-ins/xfig/xfig-import.c   |    4 ++--
 13 files changed, 30 insertions(+), 32 deletions(-)
---
diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c
index 995fea9..aca549d 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..."));
   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 1b41c7b..62d76f2 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -1597,12 +1597,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..."));
   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..."));
   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);
@@ -1618,7 +1618,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..."));
   gtk_widget_show(chooser);
 }
 
diff --git a/app/menus.c b/app/menus.c
index 36b2a12..a486dd4 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -89,13 +89,12 @@ 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..."), "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..."), NULL, NULL, G_CALLBACK (file_plugins_callback) },
+    { "FileTree", NULL, N_("_Diagram Tree..."), "F8", NULL, G_CALLBACK (diagram_tree_show) }
 };
 
-/* Toggle-Actions for toolbox menu */
 static const GtkToggleActionEntry integrated_ui_view_toggle_entries[] = 
 {
     { VIEW_MAIN_TOOLBAR_ACTION,   NULL, N_("Show Toolbar"),   NULL, NULL, G_CALLBACK (view_main_toolbar_callback) },
@@ -108,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 ..."), 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..."), 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) },
 
@@ -136,12 +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..."), NULL, NULL, G_CALLBACK (layers_add_layer_callback) },
+    { "LayerRename", DIA_STOCK_LAYER_RENAME, N_("Rename Layer..."), 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..."), "<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/sheets_dialog_callbacks.c b/app/sheets_dialog_callbacks.c
index 37d6ee4..89618b6 100644
--- a/app/sheets_dialog_callbacks.c
+++ b/app/sheets_dialog_callbacks.c
@@ -161,26 +161,26 @@ on_sheets_dialog_object_button_toggled(GtkToggleButton *togglebutton,
     g_object_set_data(G_OBJECT(table_sheets), "active_optionmenu",
                       optionmenu_left);
     button = lookup_widget(sheets_dialog, "button_copy");
-    g_object_set(button, "label", _("Copy â??"), NULL);
+    g_object_set(button, "label", _("Copy ->"), NULL);
     button = lookup_widget(sheets_dialog, "button_copy_all");
-    g_object_set(button, "label", _("Copy All â??"), NULL);
+    g_object_set(button, "label", _("Copy All ->"), NULL);
     button = lookup_widget(sheets_dialog, "button_move");
-    g_object_set(button, "label", _("Move â??"), NULL);
+    g_object_set(button, "label", _("Move ->"), NULL);
     button = lookup_widget(sheets_dialog, "button_move_all");
-    g_object_set(button, "label", _("Move All â??"), NULL);
+    g_object_set(button, "label", _("Move All ->"), NULL);
   }
   else
   {
     g_object_set_data(G_OBJECT(table_sheets), "active_optionmenu",
                       optionmenu_right);
     button = lookup_widget(sheets_dialog, "button_copy");
-    g_object_set(button, "label", _("â?? Copy"), NULL);
+    g_object_set(button, "label", _("<- Copy"), NULL);
     button = lookup_widget(sheets_dialog, "button_copy_all");
-    g_object_set(button, "label", _("â?? Copy All"), NULL);
+    g_object_set(button, "label", _("<- Copy All"), NULL);
     button = lookup_widget(sheets_dialog, "button_move");
-    g_object_set(button, "label", _("â?? Move"), NULL);
+    g_object_set(button, "label", _("<- Move"), NULL);
     button = lookup_widget(sheets_dialog, "button_move_all");
-    g_object_set(button, "label", _("â?? Move All"), NULL);
+    g_object_set(button, "label", _("<- Move All"), NULL);
   }
 
   sheet_left = sheet_left ? sheet_left : "";  /* initial value can be NULL */
diff --git a/app/splash.c b/app/splash.c
index e93036f..6f970f8 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 ..."));
   gtk_window_set_resizable (GTK_WINDOW (splash), FALSE);
   gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER);
 
diff --git a/lib/diacolorselector.c b/lib/diacolorselector.c
index a24ddf0..dccced2 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..."));
   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 6f38193..4d79cab 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..."));
   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/objects/SISSI/sissi_dialog.c b/objects/SISSI/sissi_dialog.c
index f1bb394..584cdf4 100644
--- a/objects/SISSI/sissi_dialog.c
+++ b/objects/SISSI/sissi_dialog.c
@@ -178,7 +178,7 @@ static SISSI_Property property_reseau_data[] = {
 static SISSI_Property property_logiciel_data[] = {
   { N_("Software"), "LOG",NULL},
     { N_("Operating System"), "LOG_OS",NULL},
-    { N_("Service â?? maintenance or administration software"), "LOG_SRV",NULL},
+    { N_("Service - maintenance or administration software"), "LOG_SRV",NULL},
     { N_("Packaged software or standard software"), "LOG_STD",NULL},
     { N_("Business application"), "LOG_APP",NULL},
       { N_("Standard business application"), "LOG_APP1",NULL},
diff --git a/plug-ins/cairo/diacairo.c b/plug-ins/cairo/diacairo.c
index 83d5c10..295f09f 100644
--- a/plug-ins/cairo/diacairo.c
+++ b/plug-ins/cairo/diacairo.c
@@ -446,7 +446,7 @@ static DiaCallbackFilter cb_clipboard = {
 
 static DiaCallbackFilter cb_gtk_print = {
     "FilePrintGTK",
-    N_("Print (GTK+)â?¦"),
+    N_("Print (GTK) ..."),
     "/InvisibleMenu/File/FilePrint",
     cairo_print_callback,
     (void*)OUTPUT_PDF
diff --git a/plug-ins/svg/svg-import.c b/plug-ins/svg/svg-import.c
index 3b2cf31..0ef1d5d 100644
--- a/plug-ins/svg/svg-import.c
+++ b/plug-ins/svg/svg-import.c
@@ -940,7 +940,7 @@ import_svg(const gchar *filename, DiagramData *dia, void* user_data)
   }
 
   if (root->ns != svg_ns && 0 != xmlStrcmp(root->name, (const xmlChar *)"svg")) {
-    message_warning(_("root element was '%s' â?? expecting 'svg'."), root->name);
+    message_warning(_("root element was '%s' -- expecting 'svg'."), root->name);
     xmlFreeDoc(doc);
     return FALSE;
   }
diff --git a/plug-ins/wmf/wmf.cpp b/plug-ins/wmf/wmf.cpp
index d70ac85..1697e44 100644
--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -1486,7 +1486,7 @@ print_callback (DiagramData *data,
 
 static DiaCallbackFilter cb_gdi_print = {
     "FilePrintGDI",
-    N_("Print (GDI)â?¦"),
+    N_("Print (GDI) ..."),
     "/InvisibleMenu/File/FilePrint",
     print_callback,
     NULL
diff --git a/plug-ins/xfig/xfig-export.c b/plug-ins/xfig/xfig-export.c
index ad63918..f8a9806 100644
--- a/plug-ins/xfig/xfig-export.c
+++ b/plug-ins/xfig/xfig-export.c
@@ -484,7 +484,7 @@ begin_render(DiaRenderer *self)
   if (renderer->color_pass) {
     /* Set up warnings */
     renderer->warnings[WARNING_OUT_OF_COLORS] = 
-      _("No more user-definable colors â?? using black");
+      _("No more user-definable colors - using black");
     renderer->max_user_color = 0;
   }
 
diff --git a/plug-ins/xfig/xfig-import.c b/plug-ins/xfig/xfig-import.c
index 70f00e9..08bed85 100644
--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -379,7 +379,7 @@ static int compound_depth;
 static void
 add_at_depth(DiaObject *newobj, int depth) {
     if (depth < 0 || depth >= FIG_MAX_DEPTHS) {
-	message_error(_("Depth %d out of range; only 0â??%d allowed.\n"),
+	message_error(_("Depth %d of of range, only 0-%d allowed.\n"),
 		      depth, FIG_MAX_DEPTHS-1);
 	depth = FIG_MAX_DEPTHS - 1;
     }
@@ -1051,7 +1051,7 @@ fig_read_object(FILE *file) {
 	}
 
 	if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) {
-	    message_error(_("Color number %d out of range 0â??%d.  Discarding color.\n"),
+	    message_error(_("Color number %d out of range 0..%d.  Discarding color.\n"),
 			  colornumber, FIG_MAX_USER_COLORS);
 	    return FALSE;
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]