include/svx/strings.hrc | 11 +++++------
svx/source/dialog/charmap.cxx | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit ff7b432c4d42932c08a48504b01ec0aee8b94a1e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Apr 28 15:35:56 2024 +0900
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jun 13 10:37:15 2024 +0200
Fix Unicode block names
=== Unicode block names ===
* Change "Basic Greek" to "Greek and Coptic".
* Change "Canadian..." to "Unified Canadian...".
* Change "C1 Controls and Latin-1 Supplement" to "Latin-1 Supplement"
because "Latin-1 Supplement" is the more commonly used name.
These modified Unicode block names are based on the descriptions on the
following pages:
https://www.unicode.org/charts/PDF/U0370.pdf
https://www.unicode.org/charts/PDF/U1400.pdf
https://www.unicode.org/charts/PDF/U18B0.pdf
https://www.unicode.org/charts/PDF/U11AB0.pdf
https://www.unicode.org/charts/
https://en.wikipedia.org/wiki/Latin-1_Supplement
=== Others ===
* Remove unused RID_SUBSETSTR_GREEK_SYMS_COPTIC.
* Change RID_SUBSETSTR_BASIC_GREEK to RID_SUBSETSTR_GREEK.
Change-Id: I91573a825a7b34349f29143ea8940da2383b260f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166790
Tested-by: Jenkins
Reviewed-by: <20001...@ymail.ne.jp>
(cherry picked from commit 1f3c82e3b0171bac89cbc7d1ec1ca89fac1c7eec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168714
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index b8e69dc3dbe1..2b46e77b6b66 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1464,14 +1464,13 @@
#define RID_SVXSTR_SAVE_MODIFIED_IMAGE
NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default
the original image will be saved.
Do you want to save the modified version instead?")
#define RID_SUBSETSTR_BASIC_LATIN
NC_("RID_SUBSETMAP", "Basic Latin")
-#define RID_SUBSETSTR_LATIN_1_SUPPLEMENT
NC_("RID_SUBSETMAP", "C1 Controls and Latin-1 Supplement")
+#define RID_SUBSETSTR_LATIN_1_SUPPLEMENT
NC_("RID_SUBSETMAP", "Latin-1 Supplement")
#define RID_SUBSETSTR_LATIN_EXTENDED_A
NC_("RID_SUBSETMAP", "Latin Extended-A")
#define RID_SUBSETSTR_LATIN_EXTENDED_B
NC_("RID_SUBSETMAP", "Latin Extended-B")
#define RID_SUBSETSTR_IPA_EXTENSIONS
NC_("RID_SUBSETMAP", "IPA Extensions")
#define RID_SUBSETSTR_SPACING_MODIFIERS
NC_("RID_SUBSETMAP", "Spacing Modifier Letters")
#define RID_SUBSETSTR_COMB_DIACRITICAL
NC_("RID_SUBSETMAP", "Combining Diacritical Marks")
-#define RID_SUBSETSTR_BASIC_GREEK
NC_("RID_SUBSETMAP", "Basic Greek")
-#define RID_SUBSETSTR_GREEK_SYMS_COPTIC
NC_("RID_SUBSETMAP", "Greek Symbols And Coptic")
+#define RID_SUBSETSTR_GREEK
NC_("RID_SUBSETMAP", "Greek and Coptic")
#define RID_SUBSETSTR_CYRILLIC
NC_("RID_SUBSETMAP", "Cyrillic")
#define RID_SUBSETSTR_ARMENIAN
NC_("RID_SUBSETMAP", "Armenian")
#define RID_SUBSETSTR_BASIC_HEBREW
NC_("RID_SUBSETMAP", "Basic Hebrew")
@@ -1571,7 +1570,7 @@
#define RID_SUBSETSTR_THAANA
NC_("RID_SUBSETMAP", "Thaana")
#define RID_SUBSETSTR_ETHIOPIC
NC_("RID_SUBSETMAP", "Ethiopic")
#define RID_SUBSETSTR_CHEROKEE
NC_("RID_SUBSETMAP", "Cherokee")
-#define RID_SUBSETSTR_CANADIAN_ABORIGINAL
NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllables")
+#define RID_SUBSETSTR_CANADIAN_ABORIGINAL
NC_("RID_SUBSETMAP", "Unified Canadian Aboriginal Syllables")
#define RID_SUBSETSTR_MONGOLIAN
NC_("RID_SUBSETMAP", "Mongolian")
#define RID_SUBSETSTR_MISC_MATH_SYMS_A
NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-A")
#define RID_SUBSETSTR_SUPPL_ARROWS_A
NC_("RID_SUBSETMAP", "Supplemental Arrows-A")
@@ -1638,7 +1637,7 @@
#define RID_SUBSETSTR_MAHJONG_TILES
NC_("RID_SUBSETMAP", "Mahjong Tiles")
#define RID_SUBSETSTR_DOMINO_TILES
NC_("RID_SUBSETMAP", "Domino Tiles")
#define RID_SUBSETSTR_SAMARITAN
NC_("RID_SUBSETMAP", "Samaritan")
-#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED
NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllabics Extended")
+#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED
NC_("RID_SUBSETMAP", "Unified Canadian Aboriginal Syllabics Extended")
#define RID_SUBSETSTR_TAI_THAM
NC_("RID_SUBSETMAP", "Tai Tham")
#define RID_SUBSETSTR_VEDIC_EXTENSIONS
NC_("RID_SUBSETMAP", "Vedic Extensions")
#define RID_SUBSETSTR_LISU
NC_("RID_SUBSETMAP", "Lisu")
@@ -1780,7 +1779,7 @@
#define RID_SUBSETSTR_OLD_UYGHUR
NC_("RID_SUBSETMAP", "Old Uyghur")
#define RID_SUBSETSTR_TANGSA
NC_("RID_SUBSETMAP", "Tangsa")
#define RID_SUBSETSTR_TOTO
NC_("RID_SUBSETMAP", "Toto")
-#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_A
NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllabics Extended-A")
+#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_A
NC_("RID_SUBSETMAP", "Unified Canadian Aboriginal Syllabics Extended-A")
#define RID_SUBSETSTR_VITHKUQI
NC_("RID_SUBSETMAP", "Vithkuqi")
#define RID_SUBSETSTR_ZNAMENNY_MUSICAL_NOTATION
NC_("RID_SUBSETMAP", "Znamenny Musical Notation")
#define RID_SUBSETSTR_ARABIC_EXTENDED_C
NC_("RID_SUBSETMAP", "Arabic Extended-C")
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index a73b0e263d60..adb2749b11f8 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -970,7 +970,7 @@ void SubsetMap::InitList()
aAllSubsets.emplace_back( 0x0300, 0x036F,
SvxResId(RID_SUBSETSTR_COMB_DIACRITICAL) );
break;
case UBLOCK_GREEK:
- aAllSubsets.emplace_back( 0x0370, 0x03FF,
SvxResId(RID_SUBSETSTR_BASIC_GREEK) );
+ aAllSubsets.emplace_back( 0x0370, 0x03FF,
SvxResId(RID_SUBSETSTR_GREEK) );
break;
case UBLOCK_CYRILLIC:
aAllSubsets.emplace_back( 0x0400, 0x04FF,
SvxResId(RID_SUBSETSTR_CYRILLIC) );
