diff options
-rw-r--r-- | cui/uiconfig/ui/optappearancepage.ui | 4 | ||||
-rw-r--r-- | fpicker/uiconfig/ui/explorerfiledialog.ui | 3 | ||||
-rw-r--r-- | fpicker/uiconfig/ui/remotefilesdialog.ui | 8 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/conditionalformatdialog.ui | 8 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/photoalbum.ui | 8 | ||||
-rw-r--r-- | sfx2/uiconfig/ui/querysavedialog.ui | 4 | ||||
-rw-r--r-- | sfx2/uiconfig/ui/versionscmis.ui | 4 | ||||
-rw-r--r-- | sfx2/uiconfig/ui/versionsofdialog.ui | 4 | ||||
-rw-r--r-- | vcl/inc/strings.hrc | 2 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 8 |
10 files changed, 21 insertions, 32 deletions
diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui index a37cc56f1e3f..84cf5de40879 100644 --- a/cui/uiconfig/ui/optappearancepage.ui +++ b/cui/uiconfig/ui/optappearancepage.ui @@ -41,11 +41,11 @@ </child> <child> <object class="GtkButton" id="save"> - <property name="label">gtk-save</property> + <property name="label" translatable="yes" context="optappearancepage|save">_Save</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="save-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|save">Saves the current settings as a color scheme that you can reload later.</property> diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui b/fpicker/uiconfig/ui/explorerfiledialog.ui index 936bc63f9536..48fb59b3b3cd 100644 --- a/fpicker/uiconfig/ui/explorerfiledialog.ui +++ b/fpicker/uiconfig/ui/explorerfiledialog.ui @@ -500,14 +500,13 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="open"> - <property name="label">gtk-open</property> + <property name="label" translatable="yes" context="explorerfiledialog|open">_Open</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> <property name="use_underline">True</property> - <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui index 5a3bd9b0a311..130612b39cfc 100644 --- a/fpicker/uiconfig/ui/remotefilesdialog.ui +++ b/fpicker/uiconfig/ui/remotefilesdialog.ui @@ -139,12 +139,12 @@ </child> <child> <object class="GtkButton" id="open"> - <property name="label">gtk-open</property> + <property name="label" translatable="yes" context="remotefilesdialog|open">_Open</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_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">True</property> @@ -154,12 +154,12 @@ </child> <child> <object class="GtkButton" id="save"> - <property name="label">gtk-save</property> + <property name="label" translatable="yes" context="remotefilesdialog|save">_Save</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_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">True</property> diff --git a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui index f8c4e7e9594d..ffaa3844dbfd 100644 --- a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui +++ b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui @@ -213,11 +213,11 @@ </child> <child> <object class="GtkButton" id="up"> - <property name="label">gtk-go-up</property> + <property name="label" translatable="yes" context="conditionalformatdialog|up">_Up</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="up-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|up">Increase priority of the selected condition.</property> @@ -232,11 +232,11 @@ </child> <child> <object class="GtkButton" id="down"> - <property name="label">gtk-go-down</property> + <property name="label" translatable="yes" context="conditionalformatdialog|down">_Down</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="down-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|down">Decrease priority of the selected condition.</property> diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui index 1f990c82cbb2..769f6367e48e 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -172,12 +172,12 @@ </child> <child> <object class="GtkButton" id="up_btn"> - <property name="label">gtk-go-up</property> + <property name="label" translatable="yes" context="photoalbum|up_btn">_Up</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="photoalbum|up_btn|tooltip_text">Move Image Up</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -187,12 +187,12 @@ </child> <child> <object class="GtkButton" id="down_btn"> - <property name="label">gtk-go-down</property> + <property name="label" translatable="yes" context="photoalbum|down_btn">_Down</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="photoalbum|down_btn|tooltip_text">Move Image Down</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> diff --git a/sfx2/uiconfig/ui/querysavedialog.ui b/sfx2/uiconfig/ui/querysavedialog.ui index 150d318a68c9..70fd338bed29 100644 --- a/sfx2/uiconfig/ui/querysavedialog.ui +++ b/sfx2/uiconfig/ui/querysavedialog.ui @@ -50,13 +50,13 @@ </child> <child> <object class="GtkButton" id="save"> - <property name="label">gtk-save</property> + <property name="label" translatable="yes" context="querysavedialog|save">_Save</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_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/sfx2/uiconfig/ui/versionscmis.ui b/sfx2/uiconfig/ui/versionscmis.ui index ce3e4e43e941..c9de484e7c6b 100644 --- a/sfx2/uiconfig/ui/versionscmis.ui +++ b/sfx2/uiconfig/ui/versionscmis.ui @@ -90,11 +90,11 @@ </child> <child> <object class="GtkButton" id="open"> - <property name="label">gtk-open</property> + <property name="label" translatable="yes" context="versionscmis|open">_Open</property> <property name="visible">True</property> <property name="can_focus">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/sfx2/uiconfig/ui/versionsofdialog.ui b/sfx2/uiconfig/ui/versionsofdialog.ui index fa5ee51c15dd..c1061e0b9de3 100644 --- a/sfx2/uiconfig/ui/versionsofdialog.ui +++ b/sfx2/uiconfig/ui/versionsofdialog.ui @@ -117,11 +117,11 @@ </child> <child> <object class="GtkButton" id="open"> - <property name="label">gtk-open</property> + <property name="label" translatable="yes" context="versionsofdialog|open">_Open</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="open-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="versionsofdialog|extended_tip|open">Opens the selected version in a read-only window.</property> diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc index 0907447bfd81..72de1fead32d 100644 --- a/vcl/inc/strings.hrc +++ b/vcl/inc/strings.hrc @@ -67,8 +67,6 @@ #define SV_BUTTONTEXT_EDIT NC_("SV_BUTTONTEXT_EDIT", "~Edit") #define SV_BUTTONTEXT_APPLY NC_("SV_BUTTONTEXT_APPLY", "~Apply") #define SV_BUTTONTEXT_SAVE NC_("SV_BUTTONTEXT_SAVE", "~Save") -#define SV_BUTTONTEXT_GO_UP NC_("SV_BUTTONTEXT_GO_UP", "~Up") -#define SV_BUTTONTEXT_GO_DOWN NC_("SV_BUTTONTEXT_GO_DOWN", "Do~wn") #define SV_BUTTONTEXT_OPEN NC_("SV_BUTTONTEXT_OPEN", "~Open") #define SV_BUTTONTEXT_SCREENSHOT NC_("SV_BUTTONTEXT_SCREENSHOT", "~Screenshot") diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index cb7ba91796fb..a668260e892e 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1113,14 +1113,6 @@ namespace return VclResId(SV_BUTTONTEXT_EDIT); else if (rType == "gtk-apply") return VclResId(SV_BUTTONTEXT_APPLY); - else if (rType == "gtk-save") - return VclResId(SV_BUTTONTEXT_SAVE); - else if (rType == "gtk-open") - return VclResId(SV_BUTTONTEXT_OPEN); - else if (rType == "gtk-go-up") - return VclResId(SV_BUTTONTEXT_GO_UP); - else if (rType == "gtk-go-down") - return VclResId(SV_BUTTONTEXT_GO_DOWN); else if (rType == "gtk-yes") return VclResId(SV_BUTTONTEXT_YES); else if (rType == "gtk-no") |