i18npool/source/localedata/data/en_US.xml | 40 +++++++++----------
include/svx/strings.hrc | 16 ++++---
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py | 2
3 files changed, 31 insertions(+), 27 deletions(-)
New commits:
commit 293959d42c0eb19a5e953c6d2610b2c7b1908412
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Sat Apr 22 07:13:27 2023 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Apr 25 20:44:59 2023 +0200
tdf#56258 i18npool en-US: re-arrange outline numbering suggestions
This patch brings order out of chaos,
organizing the outline choices into
academic, modern, simple numeric, and misc columns.
The very first suggestion should be the academic standard.
Next comes a distinctly different modern alternative
Simple numeric moves over to be above the other numeric,
followed by a demo of the kind of mixture that can be designed in LO.
Since the academic standard uses Roman numerals,
it is offset on the next row by the other one containing Roman numerals
followed by a modern classic,
and the all-numeric ISO standard retains it current position.
The bullet oddball logically remains as the last suggestion.
In this patch there was no change made to the actual suggestions
themselves. Earlier patches made changes to 3 definitions,
which allowed for the nice correlations.
I missed changing the descriptive "strings" in the earlier patches.
I had assumed earlier that these monotonous descriptions
were dynamically produced...
Since the English description should not be translated,
I added a comment that will be extracted to the PO as a comment.
(Thanks Andras).
I think it would be nice to use strings
"Academic MLA/CMOS/Turabian/OWL compliant outline"
"ISO 2145 outine"
but that could be made in a separate patch.
Let me just point out what happened with the strings
in case this helps with translation
NOTE: only languages that ultimately inherit from en_US need to
re-translate:
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
-no string change
-moved to _3
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
-string changed / list modified earlier
-moved to _5
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
-string changed / list modified earlier
-moved to _1
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
-no string change
-moved to _2
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
-string changed / list modified earlier
-moved to _0
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
-no string change
-moved to _4
RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
-no change
RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
-no change
Suggested translation order:
-cut _3 and paste into _2
-cut _0 and paste into _3
-cut _4 and paste into _0 and fix definition
-cut _5 and paste into _4
-cut _1 and paste into _5 and re-define
-re-define _1
Change-Id: Ie4ec8423acddc24efefb270d9ed19ab77566e6e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150805
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/i18npool/source/localedata/data/en_US.xml
b/i18npool/source/localedata/data/en_US.xml
index b6e0924c8e97..fed41b84d33b 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -568,20 +568,12 @@
<NumberingLevel NumType="3" Prefix=" " Suffix="."/>
</LC_NumberingLevel>
<LC_OutLineNumberingLevel>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle> <!-- 1) a) 1) A) -->
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutlineStyle> <!-- I.A.1.a.i. based on MLA Handbook; also similar to
Chicago Mode of Style-->
+ <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0" Adjust="1"/>
+ <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="1" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200"
SymbolTextDistance="50" FirstLineOffset="0" Adjust="1"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle> <!-- A.1.a.1. -->
@@ -600,12 +592,12 @@
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="250"
SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
- <OutlineStyle> <!-- I.A.1.a.i. based on MLA Handbook; also similar to
Chicago Mode of Style-->
- <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0" Adjust="1"/>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200"
SymbolTextDistance="50" FirstLineOffset="0" Adjust="1"/>
+ <OutlineStyle>
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle> <!-- A.I.a.i. -->
@@ -616,6 +608,14 @@
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
+ <OutlineStyle> <!-- 1) a) 1) A) -->
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="0" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
+ </OutlineStyle>
<OutlineStyle> <!-- ISO 2145 compliant decimal outline-->
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 7799a69bca11..e0573c485d99 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1377,6 +1377,8 @@
#define RID_SVXSTR_BULLET_DESCRIPTION_5
NC_("RID_SVXSTR_BULLET_DESCRIPTION_5", "Right pointing arrow bullets")
#define RID_SVXSTR_BULLET_DESCRIPTION_6
NC_("RID_SVXSTR_BULLET_DESCRIPTION_6", "Cross mark bullets")
#define RID_SVXSTR_BULLET_DESCRIPTION_7
NC_("RID_SVXSTR_BULLET_DESCRIPTION_7", "Check mark bullets")
+
+// do not translate this; instead describe the nth numbering style
(LC_NumberingLevel) defined by your locale
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_0", "Number 1) 2) 3)")
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_1", "Number 1. 2. 3.")
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_2", "Number (1) (2) (3)")
@@ -1385,12 +1387,14 @@
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_5", "Lowercase letter a) b) c)")
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_6", "Lowercase letter (a) (b) (c)")
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_7", "Lowercase Roman number i. ii. iii.")
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_0", "Numeric, numeric, lowercase
letters, solid small circular bullet")
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_1", "Numeric, lowercase letters, solid
small circular bullet")
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_2", "Numeric, lowercase letters,
lowercase Roman, uppercase letters, solid small circular bullet")
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_3", "Numeric")
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_4", "Uppercase Roman, uppercase letters,
lowercase Roman, lowercase letters, solid small circular bullet")
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_5", "Uppercase letters, uppercase Roman,
lowercase letters, lowercase Roman, solid small circular bullet")
+
+// do not translate this; instead describe the nth outline style
(LC_OutLineNumberingLevel) defined by your locale
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_0", "Uppercase Roman, uppercase letters,
numeric, lowercase letters, lowercase Roman, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_1", "Uppercase letters, numeric,
lowercase letters, numeric, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_2", "Numeric")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_3", "Numeric, numeric, lowercase
letters, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_4", "Uppercase letters, uppercase Roman,
lowercase letters, lowercase Roman, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_5", "Numeric, lowercase letters,
numeric, uppercase letters, solid small circular bullet")
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_6", "Numeric with all sublevels")
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_7", "Right pointing bullet, right
pointing arrow bullet, solid diamond bullet, solid small circular bullet")
diff --git a/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
index f04fb1e27335..c01ad8010587 100644
--- a/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
+++ b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
@@ -244,7 +244,7 @@ class formatBulletsNumbering(UITestCase):
xselector.executeAction("CHOOSE", mkPropertyValues({"POS":
"1"}))
self.assertEqual(get_state_as_dict(xselector)["SelectedItemPos"], "0")
self.assertEqual(get_state_as_dict(xselector)["SelectedItemId"], "1")
- self.assertEqual(get_state_as_dict(xselector)["ItemText"],
"Numeric, numeric, lowercase letters, solid small circular bullet")
+ self.assertEqual(get_state_as_dict(xselector)["ItemText"],
"Uppercase Roman, uppercase letters, numeric, lowercase letters, lowercase
Roman, solid small circular bullet")
# Select the GraphicPage's Selector
xTabs = xDialog.getChild("tabcontrol")
