[Libreoffice-commits] core.git: formula/uiconfig include/svtools odk/examples sd/uiconfig wizards/source
Adolfo Jayme Barrientos
fitojb at ubuntu.com
Mon Oct 2 08:51:18 UTC 2017
formula/uiconfig/ui/formuladialog.ui | 4 +--
include/svtools/strings.hrc | 4 +--
odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl | 6 ++---
sd/uiconfig/simpress/ui/publishingdialog.ui | 4 +--
wizards/source/resources/resources_en_US.properties | 12 +++++-----
5 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 6537fac1798e1f41bb8450caeb0c2354e81fd394
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date: Mon Oct 2 03:48:52 2017 -0500
Tone down excessive directional chars in Back/Next buttons
This tiny inconsistency with other software has annoyed me for too long.
Change-Id: Ieef8cdcf13f1cea0e414fbe086e45a4e05895467
diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui
index 43575bad957e..3cc2ff212c67 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -54,7 +54,7 @@
</child>
<child>
<object class="GtkButton" id="back">
- <property name="label" translatable="yes" context="formuladialog|back"><< _Back</property>
+ <property name="label" translatable="yes" context="formuladialog|back">< _Back</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -69,7 +69,7 @@
</child>
<child>
<object class="GtkButton" id="next">
- <property name="label" translatable="yes" context="formuladialog|next">_Next >></property>
+ <property name="label" translatable="yes" context="formuladialog|next">_Next ></property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index 8e107b31088e..779abaf7509c 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -240,8 +240,8 @@
#define STR_SVT_PRNDLG_JOBCOUNT NC_("STR_SVT_PRNDLG_JOBCOUNT", "%d documents")
#define STR_WIZDLG_FINISH NC_("STR_WIZDLG_FINISH", "~Finish")
-#define STR_WIZDLG_NEXT NC_("STR_WIZDLG_NEXT", "~Next >>")
-#define STR_WIZDLG_PREVIOUS NC_("STR_WIZDLG_PREVIOUS", "<< Bac~k")
+#define STR_WIZDLG_NEXT NC_("STR_WIZDLG_NEXT", "~Next >")
+#define STR_WIZDLG_PREVIOUS NC_("STR_WIZDLG_PREVIOUS", "< Bac~k")
#define STR_WIZDLG_ROADMAP_TITLE NC_("STR_WIZDLG_ROADMAP_TITLE", "Steps")
#define STR_NO_FIELD_SELECTION NC_("STR_NO_FIELD_SELECTION", "<none>")
diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl
index b98161c2c9df..f7b28aa33c19 100644
--- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl
+++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl
@@ -20,10 +20,10 @@
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="MultiPageDlg" dlg:title="Multi Page Dialog Demo" dlg:left="138" dlg:top="80" dlg:width="203" dlg:height="157" dlg:page="1">
<dlg:bulletinboard>
<dlg:button dlg:id="CancelButton" dlg:tab-index="0" dlg:left="6" dlg:top="135" dlg:width="50" dlg:height="14" dlg:value="Cancel" dlg:button-type="cancel"/>
- <dlg:button dlg:id="BackButton" dlg:tab-index="1" dlg:left="76" dlg:top="135" dlg:width="50" dlg:height="14" dlg:value="<< Back">
+ <dlg:button dlg:id="BackButton" dlg:tab-index="1" dlg:left="76" dlg:top="135" dlg:width="50" dlg:height="14" dlg:value="< Back">
<script:event script:event-name="on-performaction" script:location="application" script:macro-name="ToolkitControls.MultiPage.PreviousPage" script:language="StarBasic"/>
</dlg:button>
- <dlg:button dlg:id="NextButton" dlg:tab-index="2" dlg:left="147" dlg:top="135" dlg:width="50" dlg:height="14" dlg:value="Next >>">
+ <dlg:button dlg:id="NextButton" dlg:tab-index="2" dlg:left="147" dlg:top="135" dlg:width="50" dlg:height="14" dlg:value="Next >">
<script:event script:event-name="on-performaction" script:location="application" script:macro-name="ToolkitControls.MultiPage.NextPage" script:language="StarBasic"/>
</dlg:button>
<dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="3" dlg:left="6" dlg:top="6" dlg:width="185" dlg:height="9" dlg:page="1" dlg:value="Select a Pizza"/>
@@ -89,4 +89,4 @@
<dlg:textfield dlg:id="TextField7" dlg:tab-index="39" dlg:left="76" dlg:top="85" dlg:width="70" dlg:height="12" dlg:page="3"/>
<dlg:textfield dlg:id="TextField1" dlg:tab-index="40" dlg:left="-47" dlg:top="46" dlg:width="0" dlg:height="2" dlg:page="3"/>
</dlg:bulletinboard>
-</dlg:window>
\ No newline at end of file
+</dlg:window>
diff --git a/sd/uiconfig/simpress/ui/publishingdialog.ui b/sd/uiconfig/simpress/ui/publishingdialog.ui
index 496bedf9f0db..e4af1d495735 100644
--- a/sd/uiconfig/simpress/ui/publishingdialog.ui
+++ b/sd/uiconfig/simpress/ui/publishingdialog.ui
@@ -1604,7 +1604,7 @@
</child>
<child>
<object class="GtkButton" id="lastPageButton">
- <property name="label" translatable="yes" context="publishingdialog|lastPageButton"><< Back</property>
+ <property name="label" translatable="yes" context="publishingdialog|lastPageButton">< Back</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1618,7 +1618,7 @@
</child>
<child>
<object class="GtkButton" id="nextPageButton">
- <property name="label" translatable="yes" context="publishingdialog|nextPageButton">Ne_xt >></property>
+ <property name="label" translatable="yes" context="publishingdialog|nextPageButton">Ne_xt ></property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties
index 788b96ed5a69..53148ef4503c 100644
--- a/wizards/source/resources/resources_en_US.properties
+++ b/wizards/source/resources/resources_en_US.properties
@@ -151,8 +151,8 @@ RID_REPORT_121=Generic
RID_REPORT_122=Worldmap
RID_DB_COMMON_0=C~reate
RID_DB_COMMON_1=~Cancel
-RID_DB_COMMON_2=<< ~Back
-RID_DB_COMMON_3=~Next >>
+RID_DB_COMMON_2=< ~Back
+RID_DB_COMMON_3=~Next >
RID_DB_COMMON_4=~Database
RID_DB_COMMON_5=~Table name
RID_DB_COMMON_6=An error occurred while running the wizard. The wizard will be terminated.
@@ -372,12 +372,12 @@ RID_TABLE_50=Schema of the table
RID_TABLE_51=The field '%FIELDNAME' already exists.
STEP_ZERO_0=~Cancel
STEP_ZERO_1=~Help
-STEP_ZERO_2=<<~Back
+STEP_ZERO_2=< ~Back
STEP_ZERO_3=~Convert
STEP_ZERO_4=Note: Currency amounts from external links and currency conversion factors in formulas cannot be converted.
STEP_ZERO_5=First, unprotect all sheets.
STEP_ZERO_6=Currencies:
-STEP_ZERO_7=C~ontinue>>
+STEP_ZERO_7=C~ontinue >
STEP_ZERO_8=C~lose
STEP_CONVERTER_0=~Entire document
STEP_CONVERTER_1=Selection
@@ -525,8 +525,8 @@ MsgDirNotThere=The '%1' directory does not exist.
QueryfornewCreation=Do you want to create it now?
HelpButton=~Help
CancelButton=~Cancel
-BackButton=<< ~Back
-NextButton=Ne~xt >>
+BackButton=< ~Back
+NextButton=Ne~xt >
BeginButton=~Convert
CloseButton=~Close
WelcometextLabel1=This wizard convert legacy format documents to Open Document Format for Office Applications.
More information about the Libreoffice-commits
mailing list