[dia] l10n: make the sheets dialog for translation
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] l10n: make the sheets dialog for translation
- Date: Sun, 8 Dec 2019 16:56:37 +0000 (UTC)
commit 311198374d5cb6fad2ecac16ed60158e881548a3
Author: Zander Brown <zbrown gnome org>
Date: Sun Dec 8 16:56:15 2019 +0000
l10n: make the sheets dialog for translation
Fix https://gitlab.gnome.org/GNOME/dia/issues/435
app/dia-line-width-area.c | 2 +-
app/find-and-replace.c | 2 -
data/ui/sheets-edit-dialog.xml | 126 +++++++++++++++++++--------------------
data/ui/sheets-main-dialog.xml | 40 ++++++-------
data/ui/sheets-new-dialog.xml | 109 ++++++++++++++++-----------------
data/ui/sheets-remove-dialog.xml | 119 +++++++++++++++++-------------------
plug-ins/xslt/xsltdialog.c | 2 +-
po/POTFILES.in | 4 ++
8 files changed, 194 insertions(+), 210 deletions(-)
---
diff --git a/app/dia-line-width-area.c b/app/dia-line-width-area.c
index 07f72d2f..3acda66f 100644
--- a/app/dia-line-width-area.c
+++ b/app/dia-line-width-area.c
@@ -103,7 +103,7 @@ dia_line_width_area_create_dialog (DiaLineWidthArea *self,
self->dialog = gtk_dialog_new_with_buttons (_("Line width"), toplevel, 0,
_("Cancel"), GTK_RESPONSE_CANCEL,
- _("Okay"), GTK_RESPONSE_OK,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG(self->dialog), GTK_RESPONSE_OK);
diff --git a/app/find-and-replace.c b/app/find-and-replace.c
index 760327a3..5378542f 100644
--- a/app/find-and-replace.c
+++ b/app/find-and-replace.c
@@ -573,8 +573,6 @@ edit_replace_callback(GtkAction *action)
* the default "Find and Replace" is just too long for my taste ;)
*/
button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Replace"), RESPONSE_REPLACE);
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_stock (_("Find and _Replace"), GTK_ICON_SIZE_BUTTON));
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Find"), RESPONSE_FIND);
diff --git a/data/ui/sheets-edit-dialog.xml b/data/ui/sheets-edit-dialog.xml
index 18aff85d..08e45d8d 100644
--- a/data/ui/sheets-edit-dialog.xml
+++ b/data/ui/sheets-edit-dialog.xml
@@ -1,67 +1,61 @@
<?xml version="1.0" ?>
-<!--*- mode: xml -*--><interface>
-
-<object class="GtkDialog" id="sheets_edit_dialog">
- <property name="border_width">5</property>
- <property name="visible">False</property>
- <property name="title" translatable="yes">Edit Attributes</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
- <property name="role">sheets_edit_dialog</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog_vbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog_action_area3">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <object class="GtkButton" id="button_cancel">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- </object>
- </child>
-
- <child>
- <object class="GtkButton" id="button_ok">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkDialog" id="sheets_edit_dialog">
+ <property name="border_width">5</property>
+ <property name="visible">False</property>
+ <property name="title" translatable="yes">Edit Attributes</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">False</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="role">sheets_edit_dialog</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="has_separator">True</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog_vbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog_action_area3">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="button_cancel">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">_Cancel</property>
+ <property name="use-underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_ok">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">_OK</property>
+ <property name="use-underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
<child>
<object class="GtkVBox" id="vbox1">
@@ -223,7 +217,7 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
</object>
-
+
</child>
</object>
<packing>
@@ -370,7 +364,7 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
</object>
-
+
</child>
</object>
<packing>
@@ -394,4 +388,4 @@
</action-widgets>
</object>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/data/ui/sheets-main-dialog.xml b/data/ui/sheets-main-dialog.xml
index f5c11fca..b6671daa 100644
--- a/data/ui/sheets-main-dialog.xml
+++ b/data/ui/sheets-main-dialog.xml
@@ -40,12 +40,12 @@
</child>
<child>
<object class="GtkButton" id="button_move_up">
- <property name="label">gtk-go-up</property>
+ <property name="label">_Up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use-underline">True</property>
<accelerator key="u" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object>
<packing>
@@ -56,12 +56,12 @@
</child>
<child>
<object class="GtkButton" id="button_move_down">
- <property name="label">gtk-go-down</property>
+ <property name="label">_Down</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use-underline">True</property>
<accelerator key="d" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object>
<packing>
@@ -72,12 +72,12 @@
</child>
<child>
<object class="GtkButton" id="button_remove">
- <property name="label">gtk-remove</property>
+ <property name="label">_Remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use-underline">True</property>
<accelerator key="r" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object>
<packing>
@@ -88,11 +88,11 @@
</child>
<child>
<object class="GtkButton" id="button_copy">
- <property name="label" translatable="yes"><- Copy</property>
+ <property name="label" translatable="yes"><- C_opy</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<accelerator key="c" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object>
<packing>
@@ -103,11 +103,11 @@
</child>
<child>
<object class="GtkButton" id="button_copy_all">
- <property name="label" translatable="yes"><- Copy All</property>
+ <property name="label" translatable="yes"><- Copy _All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -117,11 +117,11 @@
</child>
<child>
<object class="GtkButton" id="button_move">
- <property name="label" translatable="yes"><- Move</property>
+ <property name="label" translatable="yes"><- _Move</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<accelerator key="m" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object>
<packing>
@@ -132,11 +132,11 @@
</child>
<child>
<object class="GtkButton" id="button_move_all">
- <property name="label" translatable="yes"><- Move All</property>
+ <property name="label" translatable="yes"><- Move A_ll</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -253,12 +253,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button_new">
- <property name="label">gtk-new</property>
+ <property name="label">_New</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="use-underline">True</property>
<accelerator key="n" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object>
<packing>
@@ -269,12 +269,12 @@
</child>
<child>
<object class="GtkButton" id="button_apply">
- <property name="label">gtk-apply</property>
+ <property name="label">_Apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -299,12 +299,12 @@
</child>
<child>
<object class="GtkButton" id="button_close">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/ui/sheets-new-dialog.xml b/data/ui/sheets-new-dialog.xml
index e13a4413..2bcd4d12 100644
--- a/data/ui/sheets-new-dialog.xml
+++ b/data/ui/sheets-new-dialog.xml
@@ -1,64 +1,59 @@
<?xml version="1.0" ?>
-<!--*- mode: xml -*--><interface>
-<object class="GtkDialog" id="sheets_new_dialog">
- <property name="visible">False</property>
- <property name="title" translatable="yes">New</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="role">sheets_new_dialog</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkDialog" id="sheets_new_dialog">
+ <property name="visible">False</property>
+ <property name="title" translatable="yes">New</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="role">sheets_new_dialog</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="has_separator">True</property>
+ <child internal-child="vbox">
<object class="GtkVBox" id="dialog_vbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
-
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog_action_area2">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <object class="GtkButton" id="button_cancel">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- </object>
- </child>
-
- <child>
- <object class="GtkButton" id="button_ok">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
+ <object class="GtkHButtonBox" id="dialog_action_area2">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="button_cancel">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">_Cancel</property>
+ <property name="use-underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_ok">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">_OK</property>
+ <property name="use-underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
</child>
<child>
@@ -302,7 +297,7 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
</object>
-
+
</child>
</object>
<packing>
@@ -319,4 +314,4 @@
</action-widgets>
</object>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/data/ui/sheets-remove-dialog.xml b/data/ui/sheets-remove-dialog.xml
index 7d8bef03..9861031b 100644
--- a/data/ui/sheets-remove-dialog.xml
+++ b/data/ui/sheets-remove-dialog.xml
@@ -1,65 +1,58 @@
<?xml version="1.0" ?>
-<!--*- mode: xml -*--><interface>
-
-<object class="GtkDialog" id="sheets_remove_dialog">
- <property name="visible">False</property>
- <property name="title" translatable="yes">Remove</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
- <property name="role">sheets_remove_dialog</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog_vbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog_action_area4">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <object class="GtkButton" id="button_cancel">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- </object>
- </child>
-
- <child>
- <object class="GtkButton" id="button_ok">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
+<interface>
+ <object class="GtkDialog" id="sheets_remove_dialog">
+ <property name="visible">False</property>
+ <property name="title" translatable="yes">Remove</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">False</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="role">sheets_remove_dialog</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="has_separator">True</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog_vbox4">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog_action_area4">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="button_cancel">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">_Cancel</property>
+ <property name="use-underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_ok">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">_OK</property>
+ <property name="use-underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
</child>
<child>
@@ -213,7 +206,7 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
</object>
-
+
</child>
</object>
<packing>
@@ -230,4 +223,4 @@
</action-widgets>
</object>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/plug-ins/xslt/xsltdialog.c b/plug-ins/xslt/xsltdialog.c
index adaf1462..2fc6ab76 100644
--- a/plug-ins/xslt/xsltdialog.c
+++ b/plug-ins/xslt/xsltdialog.c
@@ -81,7 +81,7 @@ xslt_dialog_create (void)
dialog = gtk_dialog_new_with_buttons (_("Export through XSLT"),
NULL, 0,
_("_Cancel"), GTK_RESPONSE_CANCEL,
- _("_Okay"), GTK_RESPONSE_OK,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8ef207b0..97b24674 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,6 +41,10 @@ app/winmain.c
data/org.gnome.Dia.appdata.xml.in
data/org.gnome.Dia.desktop.in
data/ui/properties-dialog.ui
+data/ui/sheets-edit-dialog.xml
+data/ui/sheets-main-dialog.xml
+data/ui/sheets-new-dialog.xml
+data/ui/sheets-remove-dialog.xml
installer/win32/gennsh.c
lib/arrows.c
lib/attributes.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]