tdf#117969: Translate Light/Dark Magenta

Also remove Light/Dark Violet variants
Place Magenta into the Standard colors list
and Violet into the Tonal colors list

Change-Id: Id27bb5fe62b7c69af39158680ae07d4f1f2efc95
Reviewed-on: https://gerrit.libreoffice.org/55257
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>

3 files changed, 16 insertions, 16 deletions

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 57d0944913f6..86c2215ac1c4 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -562,7 +562,7 @@
 #define RID_SVXSTR_COLOR_ORANGE                             NC_("RID_SVXSTR_COLOR_ORANGE", "Orange")
 #define RID_SVXSTR_COLOR_BRICK                              NC_("RID_SVXSTR_COLOR_BRICK", "Brick")
 #define RID_SVXSTR_COLOR_RED                                NC_("RID_SVXSTR_COLOR_RED", "Red")
-#define RID_SVXSTR_COLOR_VIOLET                             NC_("RID_SVXSTR_COLOR_VIOLET", "Violet")
+#define RID_SVXSTR_COLOR_MAGENTA                            NC_("RID_SVXSTR_COLOR_MAGENTA", "Magenta")
 #define RID_SVXSTR_COLOR_PURPLE                             NC_("RID_SVXSTR_COLOR_PURPLE", "Purple")
 #define RID_SVXSTR_COLOR_INDIGO                             NC_("RID_SVXSTR_COLOR_INDIGO", "Indigo")
 #define RID_SVXSTR_COLOR_BLUE                               NC_("RID_SVXSTR_COLOR_BLUE", "Blue")
@@ -576,7 +576,7 @@
 #define RID_SVXSTR_COLOR_LIGHTORANGE                        NC_("RID_SVXSTR_COLOR_LIGHTORANGE", "Light Orange")
 #define RID_SVXSTR_COLOR_LIGHTBRICK                         NC_("RID_SVXSTR_COLOR_LIGHTBRICK", "Light Brick")
 #define RID_SVXSTR_COLOR_LIGHTRED                           NC_("RID_SVXSTR_COLOR_LIGHTRED", "Light Red")
-#define RID_SVXSTR_COLOR_LIGHTVIOLET                        NC_("RID_SVXSTR_COLOR_LIGHTVIOLET", "Light Violet")
+#define RID_SVXSTR_COLOR_LIGHTMAGENTA                       NC_("RID_SVXSTR_COLOR_LIGHTMAGENTA", "Light Magenta")
 #define RID_SVXSTR_COLOR_LIGHTPURPLE                        NC_("RID_SVXSTR_COLOR_LIGHTPURPLE", "Light Purple")
 #define RID_SVXSTR_COLOR_LIGHTINDIGO                        NC_("RID_SVXSTR_COLOR_LIGHTINDIGO", "Light Indigo")
 #define RID_SVXSTR_COLOR_LIGHTBLUE                          NC_("RID_SVXSTR_COLOR_LIGHTBLUE", "Light Blue")
@@ -590,7 +590,7 @@
 #define RID_SVXSTR_COLOR_DARKORANGE                         NC_("RID_SVXSTR_COLOR_DARKORANGE", "Dark Orange")
 #define RID_SVXSTR_COLOR_DARKBRICK                          NC_("RID_SVXSTR_COLOR_DARKBRICK", "Dark Brick")
 #define RID_SVXSTR_COLOR_DARKRED                            NC_("RID_SVXSTR_COLOR_DARKRED", "Dark Red")
-#define RID_SVXSTR_COLOR_DARKVIOLET1                        NC_("RID_SVXSTR_COLOR_DARKVIOLET1", "Dark Violet")
+#define RID_SVXSTR_COLOR_DARKMAGENTA                        NC_("RID_SVXSTR_COLOR_DARKMAGENTA", "Dark Magenta")
 #define RID_SVXSTR_COLOR_DARKPURPLE                         NC_("RID_SVXSTR_COLOR_DARKPURPLE", "Dark Purple")
 #define RID_SVXSTR_COLOR_DARKINDIGO                         NC_("RID_SVXSTR_COLOR_DARKINDIGO", "Dark Indigo")
 #define RID_SVXSTR_COLOR_DARKBLUE                           NC_("RID_SVXSTR_COLOR_DARKBLUE", "Dark Blue")
@@ -598,6 +598,7 @@
 #define RID_SVXSTR_COLOR_DARKGREEN                          NC_("RID_SVXSTR_COLOR_DARKGREEN", "Dark Green")
 #define RID_SVXSTR_COLOR_DARKLIME                           NC_("RID_SVXSTR_COLOR_DARKLIME", "Dark Lime")
 // Elements of the Tonal color palette
+#define RID_SVXSTR_COLOR_VIOLET                             NC_("RID_SVXSTR_COLOR_VIOLET", "Violet")
 #define RID_SVXSTR_COLOR_VIOLET_OUG                         NC_("RID_SVXSTR_COLOR_VIOLET_OUG", "Violet (Out of Gamut)")
 #define RID_SVXSTR_COLOR_BLUE_OUG                           NC_("RID_SVXSTR_COLOR_BLUE_OUG", "Blue (Out of Gamut)")
 #define RID_SVXSTR_COLOR_AZURE_OUG                          NC_("RID_SVXSTR_COLOR_AZURE_OUG", "Azure (Out of Gamut)")
@@ -607,7 +608,6 @@
 #define RID_SVXSTR_COLOR_ORANGE_OUG                         NC_("RID_SVXSTR_COLOR_ORANGE_OUG", "Orange (Out of Gamut)")
 #define RID_SVXSTR_COLOR_RED_OUG                            NC_("RID_SVXSTR_COLOR_RED_OUG", "Red (Out of Gamut)")
 #define RID_SVXSTR_COLOR_ROSE_OUG                           NC_("RID_SVXSTR_COLOR_ROSE_OUG", "Rose (Out of Gamut)")
-#define RID_SVXSTR_COLOR_MAGENTA                            NC_("RID_SVXSTR_COLOR_MAGENTA", "Magenta")
 #define RID_SVXSTR_COLOR_AZURE                              NC_("RID_SVXSTR_COLOR_AZURE", "Azure")
 #define RID_SVXSTR_COLOR_CYAN                               NC_("RID_SVXSTR_COLOR_CYAN", "Cyan")
 #define RID_SVXSTR_COLOR_SPRINGGREEN                        NC_("RID_SVXSTR_COLOR_SPRINGGREEN", "Spring Green")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index b0869793f2cc..81b9901980b6 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -28,7 +28,7 @@
 #define RID_SVXSTR_COLOR_WHITE_DEF                  "White"
 #define RID_SVXSTR_COLOR_BLUEGREY_DEF               "Blue gray"
 #define RID_SVXSTR_COLOR_ORANGE_DEF                 "Orange"
-#define RID_SVXSTR_COLOR_VIOLET_DEF                 "Violet"
+#define RID_SVXSTR_COLOR_MAGENTA_DEF                "Magenta"
 #define RID_SVXSTR_COLOR_BORDEAUX_DEF               "Bordeaux"
 #define RID_SVXSTR_COLOR_PALE_YELLOW_DEF            "Pale yellow"
 #define RID_SVXSTR_COLOR_PALE_GREEN_DEF             "Pale green"
@@ -54,7 +54,7 @@
 #define RID_SVXSTR_COLOR_LIGHTORANGE_DEF            "Light Orange"
 #define RID_SVXSTR_COLOR_LIGHTBRICK_DEF             "Light Brick"
 #define RID_SVXSTR_COLOR_LIGHTRED_DEF               "Light Red"
-#define RID_SVXSTR_COLOR_LIGHTVIOLET_DEF            "Light Violet"
+#define RID_SVXSTR_COLOR_LIGHTMAGENTA_DEF           "Light Magenta"
 #define RID_SVXSTR_COLOR_LIGHTPURPLE_DEF            "Light Purple"
 #define RID_SVXSTR_COLOR_LIGHTINDIGO_DEF            "Light Indigo"
 #define RID_SVXSTR_COLOR_LIGHTBLUE_DEF              "Light Blue"
@@ -68,7 +68,7 @@
 #define RID_SVXSTR_COLOR_DARKORANGE_DEF             "Dark Orange"
 #define RID_SVXSTR_COLOR_DARKBRICK_DEF              "Dark Brick"
 #define RID_SVXSTR_COLOR_DARKRED_DEF                "Dark Red"
-#define RID_SVXSTR_COLOR_DARKVIOLET1_DEF            "Dark Violet"
+#define RID_SVXSTR_COLOR_DARKMAGENTA_DEF            "Dark Magenta"
 #define RID_SVXSTR_COLOR_DARKPURPLE_DEF             "Dark Purple"
 #define RID_SVXSTR_COLOR_DARKINDIGO_DEF             "Dark Indigo"
 #define RID_SVXSTR_COLOR_DARKBLUE_DEF               "Dark Blue"
@@ -76,6 +76,7 @@
 #define RID_SVXSTR_COLOR_DARKGREEN_DEF              "Dark Green"
 #define RID_SVXSTR_COLOR_DARKLIME_DEF               "Dark Lime"
 // Reference strings for the Tonal palette
+#define RID_SVXSTR_COLOR_VIOLET_DEF                 "Violet"
 #define RID_SVXSTR_COLOR_VIOLET_OUG_DEF             "Violet (Out of Gamut)"
 #define RID_SVXSTR_COLOR_BLUE_OUG_DEF               "Blue (Out of Gamut)"
 #define RID_SVXSTR_COLOR_AZURE_OUG_DEF              "Azure (Out of Gamut)"
@@ -85,7 +86,6 @@
 #define RID_SVXSTR_COLOR_ORANGE_OUG_DEF             "Orange (Out of Gamut)"
 #define RID_SVXSTR_COLOR_RED_OUG_DEF                "Red (Out of Gamut)"
 #define RID_SVXSTR_COLOR_ROSE_OUG_DEF               "Rose (Out of Gamut)"
-#define RID_SVXSTR_COLOR_MAGENTA_DEF                "Magenta"
 #define RID_SVXSTR_COLOR_AZURE_DEF                  "Azure"
 #define RID_SVXSTR_COLOR_CYAN_DEF                   "Cyan"
 #define RID_SVXSTR_COLOR_SPRINGGREEN_DEF            "Spring Green"
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 8bbeceaaa980..84c72e467373 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1605,12 +1605,12 @@ static const char* SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_BLUE_DEF,
     RID_SVXSTR_COLOR_GREEN_DEF,
     RID_SVXSTR_COLOR_RED_DEF,
+    RID_SVXSTR_COLOR_MAGENTA_DEF,
     RID_SVXSTR_COLOR_GREY_DEF,
     RID_SVXSTR_COLOR_YELLOWGREEN_DEF,
     RID_SVXSTR_COLOR_YELLOW_DEF,
     RID_SVXSTR_COLOR_WHITE_DEF,
     RID_SVXSTR_COLOR_ORANGE_DEF,
-    RID_SVXSTR_COLOR_VIOLET_DEF,
     RID_SVXSTR_COLOR_BORDEAUX_DEF,
     RID_SVXSTR_COLOR_PALE_YELLOW_DEF,
     RID_SVXSTR_COLOR_PALE_GREEN_DEF,
@@ -1633,7 +1633,7 @@ static const char* SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_LIGHTORANGE_DEF,
     RID_SVXSTR_COLOR_LIGHTBRICK_DEF,
     RID_SVXSTR_COLOR_LIGHTRED_DEF,
-    RID_SVXSTR_COLOR_LIGHTVIOLET_DEF,
+    RID_SVXSTR_COLOR_LIGHTMAGENTA_DEF,
     RID_SVXSTR_COLOR_LIGHTPURPLE_DEF,
     RID_SVXSTR_COLOR_LIGHTINDIGO_DEF,
     RID_SVXSTR_COLOR_LIGHTBLUE_DEF,
@@ -1646,13 +1646,14 @@ static const char* SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_DARKORANGE_DEF,
     RID_SVXSTR_COLOR_DARKBRICK_DEF,
     RID_SVXSTR_COLOR_DARKRED_DEF,
-    RID_SVXSTR_COLOR_DARKVIOLET1_DEF,
+    RID_SVXSTR_COLOR_DARKMAGENTA_DEF,
     RID_SVXSTR_COLOR_DARKPURPLE_DEF,
     RID_SVXSTR_COLOR_DARKINDIGO_DEF,
     RID_SVXSTR_COLOR_DARKBLUE_DEF,
     RID_SVXSTR_COLOR_DARKTEAL_DEF,
     RID_SVXSTR_COLOR_DARKGREEN_DEF,
     RID_SVXSTR_COLOR_DARKLIME_DEF,
+    RID_SVXSTR_COLOR_VIOLET_DEF,
     RID_SVXSTR_COLOR_VIOLET_OUG_DEF,
     RID_SVXSTR_COLOR_BLUE_OUG_DEF,
     RID_SVXSTR_COLOR_AZURE_OUG_DEF,
@@ -1662,7 +1663,6 @@ static const char* SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_ORANGE_OUG_DEF,
     RID_SVXSTR_COLOR_RED_OUG_DEF,
     RID_SVXSTR_COLOR_ROSE_OUG_DEF,
-    RID_SVXSTR_COLOR_MAGENTA_DEF,
     RID_SVXSTR_COLOR_AZURE_DEF,
     RID_SVXSTR_COLOR_CYAN_DEF,
     RID_SVXSTR_COLOR_SPRINGGREEN_DEF,
@@ -1693,12 +1693,12 @@ static const char* SvxUnoColorNameResId[] =
     RID_SVXSTR_COLOR_BLUE,
     RID_SVXSTR_COLOR_GREEN,
     RID_SVXSTR_COLOR_RED,
+    RID_SVXSTR_COLOR_MAGENTA,
     RID_SVXSTR_COLOR_GREY,
     RID_SVXSTR_COLOR_YELLOWGREEN,
     RID_SVXSTR_COLOR_YELLOW,
     RID_SVXSTR_COLOR_WHITE,
     RID_SVXSTR_COLOR_ORANGE,
-    RID_SVXSTR_COLOR_VIOLET,
     RID_SVXSTR_COLOR_BORDEAUX,
     RID_SVXSTR_COLOR_PALE_YELLOW,
     RID_SVXSTR_COLOR_PALE_GREEN,
@@ -1721,7 +1721,7 @@ static const char* SvxUnoColorNameResId[] =
     RID_SVXSTR_COLOR_LIGHTORANGE,
     RID_SVXSTR_COLOR_LIGHTBRICK,
     RID_SVXSTR_COLOR_LIGHTRED,
-    RID_SVXSTR_COLOR_LIGHTVIOLET,
+    RID_SVXSTR_COLOR_LIGHTMAGENTA,
     RID_SVXSTR_COLOR_LIGHTPURPLE,
     RID_SVXSTR_COLOR_LIGHTINDIGO,
     RID_SVXSTR_COLOR_LIGHTBLUE,
@@ -1734,13 +1734,14 @@ static const char* SvxUnoColorNameResId[] =
     RID_SVXSTR_COLOR_DARKORANGE,
     RID_SVXSTR_COLOR_DARKBRICK,
     RID_SVXSTR_COLOR_DARKRED,
-    RID_SVXSTR_COLOR_DARKVIOLET1,
+    RID_SVXSTR_COLOR_DARKMAGENTA,
     RID_SVXSTR_COLOR_DARKPURPLE,
     RID_SVXSTR_COLOR_DARKINDIGO,
     RID_SVXSTR_COLOR_DARKBLUE,
     RID_SVXSTR_COLOR_DARKTEAL,
     RID_SVXSTR_COLOR_DARKGREEN,
     RID_SVXSTR_COLOR_DARKLIME,
+    RID_SVXSTR_COLOR_VIOLET,
     RID_SVXSTR_COLOR_VIOLET_OUG,
     RID_SVXSTR_COLOR_BLUE_OUG,
     RID_SVXSTR_COLOR_AZURE_OUG,
@@ -1750,7 +1751,6 @@ static const char* SvxUnoColorNameResId[] =
     RID_SVXSTR_COLOR_ORANGE_OUG,
     RID_SVXSTR_COLOR_RED_OUG,
     RID_SVXSTR_COLOR_ROSE_OUG,
-    RID_SVXSTR_COLOR_MAGENTA,
     RID_SVXSTR_COLOR_AZURE,
     RID_SVXSTR_COLOR_CYAN,
     RID_SVXSTR_COLOR_SPRINGGREEN,