From 6a1ddad8f8d9875fcd33c111af936338e0d642be Mon Sep 17 00:00:00 2001
From: Dav999-v <dav999.tolp@gmail.com>
Date: Wed, 7 Dec 2022 21:03:01 +0100
Subject: [PATCH] Add cases for intermission replay options, button fillers in
 editor

The strings "Vitellary"/"Vermilion"/"Verdigris"/"Victoria" now have two
cases to support changing them for the intermission replay menu options
(like "with Vitellary").

Also, the string "< and > keys change tool" is now "{button1} and
{button2} keys change tool", so it can be changed dynamically without
having to retranslate the string.
---
 desktop_version/lang/en/strings.xml | 14 +++++++++-----
 desktop_version/lang/eo/strings.xml | 14 +++++++++-----
 desktop_version/lang/es/strings.xml | 14 +++++++++-----
 desktop_version/lang/nl/strings.xml | 14 +++++++++-----
 desktop_version/src/Editor.cpp      |  7 ++++++-
 desktop_version/src/Game.cpp        | 16 ++++++++--------
 6 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/desktop_version/lang/en/strings.xml b/desktop_version/lang/en/strings.xml
index 79f47aff..57b2198d 100644
--- a/desktop_version/lang/en/strings.xml
+++ b/desktop_version/lang/en/strings.xml
@@ -555,7 +555,7 @@
     <string english="CURRENT SCRIPT: {name}" translation="" explanation="Commodore 64-style script editor. Char limit is soft, but the longer this is, the more often users&quot; script names run offscreen. Consider SCRIPT: instead" max="20"/>
     <string english="Left click to place warp destination" translation="" explanation="warp token: small teleporter with entrance and destination" max="39"/>
     <string english="Right click to cancel" translation="" explanation="" max="39"/>
-    <string english="&lt; and &gt; keys change tool" translation="" explanation="The &lt; and &gt; keys (actually , and . keys, even on non-US-QWERTY!) can be used to switch between tools" max="36"/>
+    <string english="{button1} and {button2} keys change tool" translation="" explanation="These keys can be used to switch between tools" max="36"/>
     <string english="1: Walls" translation="" explanation="editor tool. Solid tiles" max="32"/>
     <string english="2: Backing" translation="" explanation="editor tool. Non-solid background tiles" max="32"/>
     <string english="3: Spikes" translation="" explanation="editor tool" max="32"/>
@@ -653,10 +653,14 @@ You have found the secret lab!" translation="" explanation="" max="34*4"/>
     <string english="The secret lab is separate from the rest of the game. You can now come back here at any time by selecting the new SECRET LAB option in the play menu." translation="" explanation="" max="36*10"/>
     <string english="Viridian" translation="" explanation="crewmate name (player)" max="15"/>
     <string english="Violet" translation="" explanation="crewmate name" max="15"/>
-    <string english="Vitellary" translation="" explanation="crewmate name" max="15"/>
-    <string english="Vermilion" translation="" explanation="crewmate name" max="15"/>
-    <string english="Verdigris" translation="" explanation="crewmate name" max="15"/>
-    <string english="Victoria" translation="" explanation="crewmate name" max="15"/>
+    <string english="Vitellary" translation="" case="0" explanation="crewmate name" max="15"/>
+    <string english="Vermilion" translation="" case="0" explanation="crewmate name" max="15"/>
+    <string english="Verdigris" translation="" case="0" explanation="crewmate name" max="15"/>
+    <string english="Victoria" translation="" case="0" explanation="crewmate name" max="15"/>
+    <string english="Vitellary" translation="" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Vermilion" translation="" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Verdigris" translation="" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Victoria" translation="" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
     <string english="Starring" translation="" explanation="credits roll. Starring the following 6 crew members" max="20"/>
     <string english="Captain Viridian" translation="" explanation="credits roll. Starring the following 6 crew members" max="27"/>
     <string english="Doctor Violet" translation="" explanation="credits roll. Starring the following 6 crew members" max="27"/>
diff --git a/desktop_version/lang/eo/strings.xml b/desktop_version/lang/eo/strings.xml
index 4f6f4a4a..cfce21ca 100644
--- a/desktop_version/lang/eo/strings.xml
+++ b/desktop_version/lang/eo/strings.xml
@@ -555,7 +555,7 @@
     <string english="CURRENT SCRIPT: {name}" translation="NUNA SKRIPTO: {name}" explanation="Commodore 64-style script editor. Char limit is soft, but the longer this is, the more often users&quot; script names run offscreen. Consider SCRIPT: instead" max="20"/>
     <string english="Left click to place warp destination" translation="Maldekstraklaku por meti teleport-celon" explanation="warp token: small teleporter with entrance and destination" max="39"/>
     <string english="Right click to cancel" translation="Dekstraklaku por nuligi" explanation="" max="39"/>
-    <string english="&lt; and &gt; keys change tool" translation="Klavoj &lt; kaj &gt; ŝanĝas ilojn" explanation="The &lt; and &gt; keys (actually , and . keys, even on non-US-QWERTY!) can be used to switch between tools" max="36"/>
+    <string english="{button1} and {button2} keys change tool" translation="Klavoj {button1} kaj {button2} ŝanĝas ilojn" explanation="These keys can be used to switch between tools" max="36"/>
     <string english="1: Walls" translation="1: Muro" explanation="editor tool. Solid tiles" max="32"/>
     <string english="2: Backing" translation="2: Fonaĵo" explanation="editor tool. Non-solid background tiles" max="32"/>
     <string english="3: Spikes" translation="3: Pikaĵoj" explanation="editor tool" max="32"/>
@@ -659,10 +659,14 @@ Vi trovis la sekretan labon!" explanation="" max="34*4"/>
     <string english="The secret lab is separate from the rest of the game. You can now come back here at any time by selecting the new SECRET LAB option in the play menu." translation="La sekreta labo estas aparta de la aliaj partoj de la ludo. Eblas reveni ĉi tien iam ajn, elektante SEKRETAN LABON en la ludmenuo." explanation="" max="36*10"/>
     <string english="Viridian" translation="Viridiano" explanation="crewmate name (player)" max="15"/>
     <string english="Violet" translation="Violeto" explanation="crewmate name" max="15"/>
-    <string english="Vitellary" translation="Vitelario" explanation="crewmate name" max="15"/>
-    <string english="Vermilion" translation="Vermiljo" explanation="crewmate name" max="15"/>
-    <string english="Verdigris" translation="Verdigriso" explanation="crewmate name" max="15"/>
-    <string english="Victoria" translation="Viktoria" explanation="crewmate name" max="15"/>
+    <string english="Vitellary" translation="Vitelario" case="0" explanation="crewmate name" max="15"/>
+    <string english="Vermilion" translation="Vermiljo" case="0" explanation="crewmate name" max="15"/>
+    <string english="Verdigris" translation="Verdigriso" case="0" explanation="crewmate name" max="15"/>
+    <string english="Victoria" translation="Viktoria" case="0" explanation="crewmate name" max="15"/>
+    <string english="Vitellary" translation="Vitelario" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Vermilion" translation="Vermiljo" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Verdigris" translation="Verdigriso" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Victoria" translation="Viktoria" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
     <string english="Starring" translation="Stelumis" explanation="credits roll. Starring the following 6 crew members" max="20"/>
     <string english="Captain Viridian" translation="Kapitano Viridiano" explanation="credits roll. Starring the following 6 crew members" max="27"/>
     <string english="Doctor Violet" translation="Doktoro Violeto" explanation="credits roll. Starring the following 6 crew members" max="27"/>
diff --git a/desktop_version/lang/es/strings.xml b/desktop_version/lang/es/strings.xml
index 2018dbad..ea31c9d0 100644
--- a/desktop_version/lang/es/strings.xml
+++ b/desktop_version/lang/es/strings.xml
@@ -555,7 +555,7 @@
     <string english="CURRENT SCRIPT: {name}" translation="" explanation="Commodore 64-style script editor. Char limit is soft, but the longer this is, the more often users&quot; script names run offscreen. Consider SCRIPT: instead" max="20"/>
     <string english="Left click to place warp destination" translation="" explanation="warp token: small teleporter with entrance and destination" max="39"/>
     <string english="Right click to cancel" translation="" explanation="" max="39"/>
-    <string english="&lt; and &gt; keys change tool" translation="" explanation="The &lt; and &gt; keys (actually , and . keys, even on non-US-QWERTY!) can be used to switch between tools" max="36"/>
+    <string english="{button1} and {button2} keys change tool" translation="" explanation="These keys can be used to switch between tools" max="36"/>
     <string english="1: Walls" translation="" explanation="editor tool. Solid tiles" max="32"/>
     <string english="2: Backing" translation="" explanation="editor tool. Non-solid background tiles" max="32"/>
     <string english="3: Spikes" translation="" explanation="editor tool" max="32"/>
@@ -653,10 +653,14 @@ You have found the secret lab!" translation="" explanation="" max="34*4"/>
     <string english="The secret lab is separate from the rest of the game. You can now come back here at any time by selecting the new SECRET LAB option in the play menu." translation="" explanation="" max="36*10"/>
     <string english="Viridian" translation="" explanation="crewmate name (player)" max="15"/>
     <string english="Violet" translation="" explanation="crewmate name" max="15"/>
-    <string english="Vitellary" translation="" explanation="crewmate name" max="15"/>
-    <string english="Vermilion" translation="" explanation="crewmate name" max="15"/>
-    <string english="Verdigris" translation="" explanation="crewmate name" max="15"/>
-    <string english="Victoria" translation="" explanation="crewmate name" max="15"/>
+    <string english="Vitellary" translation="" case="0" explanation="crewmate name" max="15"/>
+    <string english="Vermilion" translation="" case="0" explanation="crewmate name" max="15"/>
+    <string english="Verdigris" translation="" case="0" explanation="crewmate name" max="15"/>
+    <string english="Victoria" translation="" case="0" explanation="crewmate name" max="15"/>
+    <string english="Vitellary" translation="" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Vermilion" translation="" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Verdigris" translation="" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Victoria" translation="" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
     <string english="Starring" translation="" explanation="credits roll. Starring the following 6 crew members" max="20"/>
     <string english="Captain Viridian" translation="" explanation="credits roll. Starring the following 6 crew members" max="27"/>
     <string english="Doctor Violet" translation="" explanation="credits roll. Starring the following 6 crew members" max="27"/>
diff --git a/desktop_version/lang/nl/strings.xml b/desktop_version/lang/nl/strings.xml
index ef22fdd0..a312cba2 100644
--- a/desktop_version/lang/nl/strings.xml
+++ b/desktop_version/lang/nl/strings.xml
@@ -555,7 +555,7 @@
     <string english="CURRENT SCRIPT: {name}" translation="HUIDIG SCRIPT: {name}" explanation="Commodore 64-style script editor. Char limit is soft, but the longer this is, the more often users&quot; script names run offscreen. Consider SCRIPT: instead" max="20"/>
     <string english="Left click to place warp destination" translation="Klik links om bestemming te plaatsen" explanation="warp token: small teleporter with entrance and destination" max="39"/>
     <string english="Right click to cancel" translation="Klik rechts om te annuleren" explanation="" max="39"/>
-    <string english="&lt; and &gt; keys change tool" translation="&lt; en &gt; wijzigen tool" explanation="The &lt; and &gt; keys (actually , and . keys, even on non-US-QWERTY!) can be used to switch between tools" max="36"/>
+    <string english="{button1} and {button2} keys change tool" translation="{button1} en {button2} wijzigen tool" explanation="These keys can be used to switch between tools" max="36"/>
     <string english="1: Walls" translation="1: Muur" explanation="editor tool. Solid tiles" max="32"/>
     <string english="2: Backing" translation="2: Achtergrond" explanation="editor tool. Non-solid background tiles" max="32"/>
     <string english="3: Spikes" translation="3: Spijker" explanation="editor tool" max="32"/>
@@ -660,10 +660,14 @@ Je hebt het geheime lab gevonden!" explanation="" max="34*4"/>
     <string english="The secret lab is separate from the rest of the game. You can now come back here at any time by selecting the new SECRET LAB option in the play menu." translation="Het geheime lab is gescheiden van de rest van het spel. Je kunt hier nu altijd terugkeren door de nieuwe optie GEHEIM LAB te kiezen in het speelmenu." explanation="" max="36*10"/>
     <string english="Viridian" translation="Viridian" explanation="crewmate name (player)" max="15"/>
     <string english="Violet" translation="Violet" explanation="crewmate name" max="15"/>
-    <string english="Vitellary" translation="Vitellary" explanation="crewmate name" max="15"/>
-    <string english="Vermilion" translation="Vermilion" explanation="crewmate name" max="15"/>
-    <string english="Verdigris" translation="Verdigris" explanation="crewmate name" max="15"/>
-    <string english="Victoria" translation="Victoria" explanation="crewmate name" max="15"/>
+    <string english="Vitellary" translation="Vitellary" case="0" explanation="crewmate name" max="15"/>
+    <string english="Vermilion" translation="Vermilion" case="0" explanation="crewmate name" max="15"/>
+    <string english="Verdigris" translation="Verdigris" case="0" explanation="crewmate name" max="15"/>
+    <string english="Victoria" translation="Victoria" case="0" explanation="crewmate name" max="15"/>
+    <string english="Vitellary" translation="Vitellary" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Vermilion" translation="Vermilion" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Verdigris" translation="Verdigris" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
+    <string english="Victoria" translation="Victoria" case="1" explanation="crewmate name as menu option: Who do you want to play the level with?"/>
     <string english="Starring" translation="Met in de hoofdrol" explanation="credits roll. Starring the following 6 crew members" max="20"/>
     <string english="Captain Viridian" translation="Kapitein Viridian" explanation="credits roll. Starring the following 6 crew members" max="27"/>
     <string english="Doctor Violet" translation="Doctor Violet" explanation="credits roll. Starring the following 6 crew members" max="27"/>
diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp
index 4d9c24ff..495a49bf 100644
--- a/desktop_version/src/Editor.cpp
+++ b/desktop_version/src/Editor.cpp
@@ -1392,7 +1392,12 @@ void editorrender(void)
                 graphics.Print(4, 232, "2/2", 196, 196, 255 - help.glow, false);
             }
 
-            const char* changetooltext = loc::gettext("< and > keys change tool");
+            char changetooltext[SCREEN_WIDTH_CHARS + 1];
+            vformat_buf(changetooltext, sizeof(changetooltext),
+                loc::gettext("{button1} and {button2} keys change tool"),
+                "button1:str, button2:str",
+                ",", "."
+            );
             graphics.Print(320-graphics.len(changetooltext), 232, changetooltext, 196, 196, 255 - help.glow, false);
 
             const char* toolname;
diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index b7b3d188..29f65f47 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -6692,19 +6692,19 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
         break;
     case Menu::playint1:
         start_translator_exploring = false;
-        option(loc::gettext("Vitellary"));
-        option(loc::gettext("Vermilion"));
-        option(loc::gettext("Verdigris"));
-        option(loc::gettext("Victoria"));
+        option(loc::gettext_case("Vitellary", 1));
+        option(loc::gettext_case("Vermilion", 1));
+        option(loc::gettext_case("Verdigris", 1));
+        option(loc::gettext_case("Victoria", 1));
         option(loc::gettext("return"));
         menuyoff = 10;
         break;
     case Menu::playint2:
         start_translator_exploring = false;
-        option(loc::gettext("Vitellary"));
-        option(loc::gettext("Vermilion"));
-        option(loc::gettext("Verdigris"));
-        option(loc::gettext("Victoria"));
+        option(loc::gettext_case("Vitellary", 1));
+        option(loc::gettext_case("Vermilion", 1));
+        option(loc::gettext_case("Verdigris", 1));
+        option(loc::gettext_case("Victoria", 1));
         option(loc::gettext("return"));
         menuyoff = 10;
         break;