Commit ea84be51 authored by Yukihiro Nakai's avatar Yukihiro Nakai Committed by Morten Welinder

Obsolete Newly added for gettextize. Gettextize the toolbar.

2004-10-16  Yukihiro Nakai  <nakai@gnome.gr.jp>

	* src/GNOME_Gnumeric-gtk.xml: Obsolete
	* src/GNOME_Gnumeric-gtk.xml.in: Newly added for gettextize.
	* src/wbc-gtk.c: Gettextize the toolbar.
parent d930d032
2004-10-16 Yukihiro Nakai <nakai@gnome.gr.jp>
* src/GNOME_Gnumeric-gtk.xml: Obsolete
* src/GNOME_Gnumeric-gtk.xml.in: Newly added for gettextize.
* src/wbc-gtk.c: Gettextize the toolbar.
2004-10-18 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=152516
......
2004-10-16 Yukihiro Nakai <nakai@gnome.gr.jp>
* src/GNOME_Gnumeric-gtk.xml: Obsolete
* src/GNOME_Gnumeric-gtk.xml.in: Newly added for gettextize.
* src/wbc-gtk.c: Gettextize the toolbar.
2004-10-18 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=152516
......
......@@ -301,7 +301,7 @@ src/func-builtin.c
src/func.c
src/gnm-so-filled.c
src/gnm-so-line.c
src/GNOME_Gnumeric-gtk.xml
src/GNOME_Gnumeric-gtk.xml.in
src/gnumeric-canvas.c
src/gnumeric-pane.c
src/gui-clipboard.c
......
......@@ -218,7 +218,7 @@
<menuitem action="HelpAbout"/>
</menu>
</menubar>
<toolbar name="StandardToolbar">
<toolbar _name="StandardToolbar">
<toolitem action="FileNew"/>
<toolitem action="FileOpen"/>
<toolitem action="FileSave"/>
......@@ -242,7 +242,7 @@
<toolitem action="ChartGuru" />
<toolitem action="Zoom"/>
</toolbar>
<toolbar name="FormatToolbar">
<toolbar _name="FormatToolbar">
<toolitem action="FontName"/>
<toolitem action="FontSize"/>
<toolitem action="FontBold"/>
......@@ -269,7 +269,7 @@
<toolitem action="ColorBack"/>
<toolitem action="ColorFore"/>
</toolbar>
<toolbar name="ObjectToolbar">
<toolbar _name="ObjectToolbar">
<toolitem action="CreateLabel"/>
<toolitem action="CreateFrame"/>
<!-- Not useful until we have scripts
......
......@@ -375,7 +375,7 @@ dist-hook :
# include conditional files to ensure everything gets distributed no matter
# what the build
EXTRA_DIST = GNOME_Gnumeric-gtk.xml \
EXTRA_DIST = GNOME_Gnumeric-gtk.xml.in \
gnm-marshalers.list \
main-application.c \
main-component.c \
......@@ -393,6 +393,8 @@ EXTRA_DIST = GNOME_Gnumeric-gtk.xml \
gtkactiondir=$(gnumeric_datadir)
gtkaction_DATA = GNOME_Gnumeric-gtk.xml
@INTLTOOL_XML_RULE@
# Bonobo requires things to be in a subdir of this form
#bonobo_component_uidir=$(gnumeric_datadir)/gnome-2.0/ui
#bonobo_component_ui_DATA = GNOME_Gnumeric.xml GNOME_Gnumeric_Component.xml
......
......@@ -1115,7 +1115,7 @@ cb_add_menus_toolbars (G_GNUC_UNUSED GtkUIManager *ui,
GtkToggleActionEntry entry;
char const *name = gtk_widget_get_name (w);
char *toggle_name = g_strdup_printf ("ViewMenuToolbar%s", name);
char *tooltip = g_strdup_printf (_("Show/Hide toolbar %s"), name);
char *tooltip = g_strdup_printf (_("Show/Hide toolbar %s"), _(name));
gtk_container_add (GTK_CONTAINER (box), w);
g_object_connect (box,
......@@ -1129,7 +1129,7 @@ cb_add_menus_toolbars (G_GNUC_UNUSED GtkUIManager *ui,
entry.name = toggle_name;
entry.stock_id = NULL;
entry.label = name;
entry.label = _(name);
entry.accelerator = (0 == strcmp (name, "StandardToolbar")) ? "<control>7" : NULL;
entry.tooltip = tooltip;
entry.callback = G_CALLBACK (cb_toolbar_activate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment