[goffice] Fix some translatable strings. [#596003]



commit b43672006da98b6618b9c50ff6bb6dbe06014a8b
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Sep 29 15:49:42 2009 +0200

    Fix some translatable strings. [#596003]

 ChangeLog                         |   19 +++++++++++++++++++
 NEWS                              |    3 +++
 goffice/canvas/goc-line.c         |    2 +-
 goffice/graph/gog-series-prefs.ui |    5 +++--
 goffice/graph/gog-series.c        |    3 +++
 goffice/gtk/go-color-palette.c    |    4 ++--
 goffice/gtk/go-color-selector.c   |    4 ++--
 goffice/gtk/go-image-sel.ui       |    8 ++++----
 goffice/gtk/go-palette.c          |    2 +-
 goffice/gtk/go-rotation-sel.ui    |    2 +-
 goffice/utils/go-style-prefs.ui   |    2 +-
 plugins/plot_radar/plugin.xml.in  |    2 +-
 tests/go-demo.ui                  |    2 +-
 13 files changed, 42 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1d56cc7..c59ef3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2009-09-29  Jean Brefort  <jean brefort normalesup org>
 
+	* goffice/canvas/goc-line.c (goc_line_class_init): fixed translatable
+	strings using a patch from Bruce Cowan. [#596003]
+	* goffice/graph/gog-series-prefs.ui: add translators comments. [#596003]
+	* goffice/graph/gog-series.c (gog_series_populate_editor): add tooltips
+	to the clamped spline derivatives data selectors.
+	* goffice/gtk/go-color-palette.c (go_color_palette_setup),
+	(go_color_palette_make_menu): fixed translatable
+	strings
+	* goffice/gtk/go-color-selector.c (cb_combo_custom_activate),
+	(go_color_selector_new): ditto.
+	* goffice/gtk/go-image-sel.ui: ditto.
+	* goffice/gtk/go-palette.c (go_palette_show_custom): ditto.
+	* goffice/gtk/go-rotation-sel.ui: ditto.
+	* goffice/utils/go-style-prefs.ui: ditto.
+	* plugins/plot_radar/plugin.xml.in: ditto.
+	* tests/go-demo.ui: ditto.
+
+2009-09-29  Jean Brefort  <jean brefort normalesup org>
+
 	* plugins/plot_xy/gog-xy.c (gog_xy_view_render): fix point custom 
 	marker rendering. [#596585]
 
diff --git a/NEWS b/NEWS
index c1cf021..34d40fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 goffice 0.7.14:
 
+Bruce Cowan:
+	* Fix some trnaslatable strings. [#596003]
+
 Jean:
 	* Fix unicolor gradient brightness.
 	* Fix custom point marker in scatter plots. [#596585]
diff --git a/goffice/canvas/goc-line.c b/goffice/canvas/goc-line.c
index 4f590a0..044591d 100644
--- a/goffice/canvas/goc-line.c
+++ b/goffice/canvas/goc-line.c
@@ -283,7 +283,7 @@ goc_line_class_init (GocItemClass *item_klass)
 	g_object_class_install_property (obj_klass, LINE_PROP_ARROWHEAD,
 		g_param_spec_boolean ("arrowhead",
 			_("Arrow head"),
-			_("Wether to add an arrow head atthe end of the line or not"),
+			_("Whether to add an arrow head at the end of the line or not"),
 			FALSE,
 			GSF_PARAM_STATIC | G_PARAM_READWRITE));
 	g_object_class_install_property (obj_klass, LINE_PROP_ARROW_SHAPE_A,
diff --git a/goffice/graph/gog-series-prefs.ui b/goffice/graph/gog-series-prefs.ui
index 4c381aa..b1bb13b 100644
--- a/goffice/graph/gog-series-prefs.ui
+++ b/goffice/graph/gog-series-prefs.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="model1">
     <columns>
@@ -49,7 +50,7 @@
                   <object class="GtkLabel" id="deriv-last-btn">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;i&gt;y'&lt;/i&gt;(&lt;i&gt;x&lt;/i&gt;&lt;sub&gt;last&lt;/sub&gt;):</property>
+                    <property name="label" translatable="yes" comments="derivative (curve slope) at last point for the clamped cubic spline">&lt;i&gt;y'&lt;/i&gt;(&lt;i&gt;x&lt;/i&gt;&lt;sub&gt;last&lt;/sub&gt;):</property>
                     <property name="use_markup">True</property>
                   </object>
                   <packing>
@@ -62,7 +63,7 @@
                   <object class="GtkLabel" id="deriv-first-btn">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;i&gt;y'&lt;/i&gt;(&lt;i&gt;x&lt;/i&gt;&lt;sub&gt;first&lt;/sub&gt;):</property>
+                    <property name="label" translatable="yes" comments="derivative (curve slope) at first point for the clamped cubic spline">&lt;i&gt;y'&lt;/i&gt;(&lt;i&gt;x&lt;/i&gt;&lt;sub&gt;first&lt;/sub&gt;):</property>
                     <property name="use_markup">True</property>
                   </object>
                   <packing>
diff --git a/goffice/graph/gog-series.c b/goffice/graph/gog-series.c
index 5710fa3..ad214df 100644
--- a/goffice/graph/gog-series.c
+++ b/goffice/graph/gog-series.c
@@ -557,14 +557,17 @@ gog_series_populate_editor (GogObject *gobj,
 				GtkWidget *w;
 				widget = go_gtk_builder_get_widget (gui, "clamps-table");
 				w = GTK_WIDGET (gog_data_allocator_editor (dalloc, clamp_set, 0, GOG_DATA_SCALAR));
+				gtk_widget_set_tooltip_text (w, _("Derivative at first point of the clamped cubic spline."));
 				gtk_widget_show (w);
 				gtk_table_attach (GTK_TABLE (widget), w, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 				w = GTK_WIDGET (gog_data_allocator_editor (dalloc, clamp_set, 1, GOG_DATA_SCALAR));
+				gtk_widget_set_tooltip_text (w, _("Derivative at last point of the clamped cubic spline."));
 				gtk_widget_show (w);
 				gtk_table_attach (GTK_TABLE (widget), w, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 				if (series->interpolation != GO_LINE_INTERPOLATION_CLAMPED_CUBIC_SPLINE)
 					gtk_widget_hide (widget);
 			}
+			g_object_set_data (G_OBJECT (combo), "gui", gui);
 			g_signal_connect_swapped (G_OBJECT (combo), "destroy", G_CALLBACK (g_object_unref), gui);
 		}
 	}
diff --git a/goffice/gtk/go-color-palette.c b/goffice/gtk/go-color-palette.c
index 8fb17b6..ff73ab8 100644
--- a/goffice/gtk/go-color-palette.c
+++ b/goffice/gtk/go-color-palette.c
@@ -453,7 +453,7 @@ custom_colors :
 			&color_name, col, row + 1);
 	}
 
-	w = go_gtk_button_new_with_stock (_("Custom Color..."),
+	w = go_gtk_button_new_with_stock (_("Custom Colorâ?¦"),
 		GTK_STOCK_SELECT_COLOR);
 	gtk_button_set_alignment (GTK_BUTTON (w), 0., .5);
 	gtk_table_attach (GTK_TABLE (table), w, 0, cols,
@@ -707,7 +707,7 @@ custom_colors :
 			"activate",
 			G_CALLBACK (cb_menu_color_activate), submenu);
 	}
-	w = gtk_image_menu_item_new_with_label (_("Custom Color..."));
+	w = gtk_image_menu_item_new_with_label (_("Custom Colorâ?¦"));
 	/* Workaround for bug http://bugzilla.gnome.org/show_bug.cgi?id=585421 */
 	/* We can't have an image in one of the gtk_menu_item, it would lead to an
 	   ugly item spacing. */
diff --git a/goffice/gtk/go-color-selector.c b/goffice/gtk/go-color-selector.c
index 4f66319..ff366bb 100644
--- a/goffice/gtk/go-color-selector.c
+++ b/goffice/gtk/go-color-selector.c
@@ -202,7 +202,7 @@ cb_combo_custom_activate (GOPalette *palette, GOSelector *selector)
 		return;
 	}
 
-	color_dialog = gtk_color_selection_dialog_new (_("Custom color..."));
+	color_dialog = gtk_color_selection_dialog_new (_("Custom colorâ?¦"));
 	color_selection = GTK_COLOR_SELECTION_DIALOG (color_dialog)->colorsel;
 	gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION (color_selection), state->allow_alpha);
 	g_object_set_data_full (G_OBJECT (selector), "color-dialog", color_dialog,
@@ -308,7 +308,7 @@ go_color_selector_new (GOColor initial_color,
 				  go_color_palette_render_func, NULL,
 				  state, go_color_selector_state_free);
 	go_palette_show_automatic (GO_PALETTE (palette), default_index, NULL);
-	go_palette_show_custom (GO_PALETTE (palette), "Custom color...");
+	go_palette_show_custom (GO_PALETTE (palette), "Custom colorâ?¦");
 	selector = go_selector_new (GO_PALETTE (palette));
 	go_selector_set_active (GO_SELECTOR (selector), initial_index);
 	g_signal_connect (palette, "custom-activate", G_CALLBACK (cb_combo_custom_activate), selector);
diff --git a/goffice/gtk/go-image-sel.ui b/goffice/gtk/go-image-sel.ui
index c075c26..dc0f8de 100644
--- a/goffice/gtk/go-image-sel.ui
+++ b/goffice/gtk/go-image-sel.ui
@@ -77,7 +77,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="label" translatable="yes">gtk-add</property>
+                            <property name="label">gtk-add</property>
                             <property name="use_stock">True</property>
                           </object>
                           <packing>
@@ -111,7 +111,7 @@
                                     <child>
                                       <object class="GtkLabel" id="label32">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">_Select...</property>
+                                        <property name="label" translatable="yes">_Selectâ?¦</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
@@ -197,7 +197,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -209,7 +209,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/goffice/gtk/go-palette.c b/goffice/gtk/go-palette.c
index e22636e..804d489 100644
--- a/goffice/gtk/go-palette.c
+++ b/goffice/gtk/go-palette.c
@@ -402,7 +402,7 @@ go_palette_show_custom (GOPalette *palette,
 	priv = palette->priv;
 	g_return_if_fail (!priv->show_custom);
 
-	priv->custom_label = g_strdup (label == NULL ?  _("Custom...") : _(label));
+	priv->custom_label = g_strdup (label == NULL ?  _("Customâ?¦") : _(label));
 	priv->show_custom = TRUE;
 }
 
diff --git a/goffice/gtk/go-rotation-sel.ui b/goffice/gtk/go-rotation-sel.ui
index a1a21b5..b82711f 100644
--- a/goffice/gtk/go-rotation-sel.ui
+++ b/goffice/gtk/go-rotation-sel.ui
@@ -29,7 +29,7 @@
         <child>
           <object class="GtkLabel" id="label73">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">    </property>
+            <property name="label">    </property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/goffice/utils/go-style-prefs.ui b/goffice/utils/go-style-prefs.ui
index e41ba75..915bda5 100644
--- a/goffice/utils/go-style-prefs.ui
+++ b/goffice/utils/go-style-prefs.ui
@@ -654,7 +654,7 @@
                                     <child>
                                       <object class="GtkLabel" id="label32">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">_Select...</property>
+                                        <property name="label" translatable="yes">_Selectâ?¦</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
diff --git a/plugins/plot_radar/plugin.xml.in b/plugins/plot_radar/plugin.xml.in
index 245a2cc..0b604b2 100644
--- a/plugins/plot_radar/plugin.xml.in
+++ b/plugins/plot_radar/plugin.xml.in
@@ -25,7 +25,7 @@
 		</service>
 		<service type="plot_engine" id="GogColorPolarPlot">
 			<information>
-				<_description>Polar plotting engine with coloured marks</_description>
+				<_description>Polar plotting engine with colored marks</_description>
 			</information>
 		</service>
 		<service type="plot_type" id="radar">
diff --git a/tests/go-demo.ui b/tests/go-demo.ui
index d871cde..e279e5f 100644
--- a/tests/go-demo.ui
+++ b/tests/go-demo.ui
@@ -364,7 +364,7 @@
         </child>
         <child>
           <object class="GtkAction" id="menu_item_quit">
-            <property name="stock_id" translatable="yes">gtk-quit</property>
+            <property name="stock_id">gtk-quit</property>
             <property name="name">menu_item_quit</property>
           </object>
         </child>



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