From 43cb9c0bf44d9585e1c9dbbb9c4f144db4908530 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Sun, 29 Oct 2017 12:16:29 -0700
Subject: [PATCH] Change every "pop this menu" option text to the two words "go
 back".

And add translations for "go back", copied from the existing translations
for the word "return".
---
 config.cpp      | 11 ++++++-----
 conformal.cpp   |  2 +-
 debug.cpp       |  4 ++--
 dialogs.cpp     |  4 ++--
 language-cz.cpp |  1 +
 language-de.cpp |  1 +
 language-pl.cpp |  1 +
 language-ru.cpp |  3 ++-
 language-tr.cpp |  1 +
 mapeditor.cpp   |  2 +-
 menus.cpp       |  2 +-
 netgen.cpp      |  3 ++-
 rogueviz.cpp    |  2 +-
 rug.cpp         |  2 +-
 scores.cpp      |  2 +-
 shmup.cpp       |  2 +-
 tour.cpp        |  2 +-
 17 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/config.cpp b/config.cpp
index 11f521da..51ee26f6 100644
--- a/config.cpp
+++ b/config.cpp
@@ -527,7 +527,7 @@ void loadConfig() {
 
 void showAllConfig() {
   dialog::addBreak(50);
-  dialog::addItem(XLAT("exit configuration"), ' ');
+  dialog::addItem(XLAT("go back"), ' ');
 #if CAP_CONFIG
   dialog::addItem(XLAT("save the current config"), 's');
   if(getcstat == 's')
@@ -851,7 +851,8 @@ void showJoyConfig() {
   dialog::addSelItem(XLAT("second joystick: pan threshold"), its(vid.joypanthreshold), 'c');
   dialog::addSelItem(XLAT("second joystick: panning speed"), fts(vid.joypanspeed * 1000), 'd');
 
-  dialog::addItem(XLAT("back"), ' ');
+  dialog::addBreak(50);
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
@@ -1005,7 +1006,7 @@ void show3D() {
   else
     dialog::addInfo(XLAT("parameters set correctly"));
   dialog::addBreak(50);
-  dialog::addItem(XLAT("exit 3D configuration"), ' ');
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
@@ -1106,7 +1107,7 @@ void showCustomizeChar() {
   if(numplayers() > 1) dialog::addSelItem(XLAT("player"), its(shmup::cpid+1), 'a');
   
   dialog::addBreak(50);
-  dialog::addItem(XLAT("return to the game"), ' ');
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   
   int firsty = dialog::items[0].position / 2;
@@ -1191,7 +1192,7 @@ void selectLanguageScreen() {
   dialog::addBreak(50);
   vid.language = -1;
   dialog::addBoolItem(XLAT("default") + ": " + XLAT("EN"), v == -1, '0');
-  dialog::addItem(XLAT("exit configuration"), ' ');
+  dialog::addItem(XLAT("go back"), ' ');
 
   dialog::addBreak(50);
 
diff --git a/conformal.cpp b/conformal.cpp
index 9682ce1d..3e79eed7 100644
--- a/conformal.cpp
+++ b/conformal.cpp
@@ -591,7 +591,7 @@ namespace conformal {
       }
 #endif
       
-    dialog::addItem(XLAT("exit this menu"), ' ');
+    dialog::addItem(XLAT("go back"), ' ');
     dialog::display();
     mouseovers = XLAT("see http://www.roguetemple.com/z/hyper/conformal.php");
     keyhandler = handleKeyC;
diff --git a/debug.cpp b/debug.cpp
index 2f32876e..514cf81a 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -310,8 +310,6 @@ void debugScreen() {
 void showCheatMenu() {
   gamescreen(1);
   dialog::init("cheat menu");
-  dialog::addItem(XLAT("return to the game"), ' ');
-  dialog::addBreak(50);
   dialog::addItem(XLAT("gain orb powers"), 'F');
   dialog::addItem(XLAT("summon treasure"), 'T');
   dialog::addItem(XLAT("summon dead orbs"), 'D');
@@ -331,6 +329,8 @@ void showCheatMenu() {
   dialog::addItem(XLAT("switch ghost timer"), 'G'-64);
   dialog::addItem(XLAT("switch web display"), 'W'-64);
   dialog::addItem(XLAT("peaceful mode"), 'P'-64);
+  dialog::addBreak(50);
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   keyhandler = []   (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
diff --git a/dialogs.cpp b/dialogs.cpp
index 7694fe2f..2d50c58e 100644
--- a/dialogs.cpp
+++ b/dialogs.cpp
@@ -646,7 +646,7 @@ namespace dialog {
     addBreak(100);
 #endif
     
-    addItem("return", ' ');
+    addItem("go back", ' ');
     addSelItem("default value", disp(ne.dft), SDLK_HOME);
 
     addBreak(100);
@@ -769,7 +769,7 @@ namespace dialog {
       getcstat = '2';
     if(pages) if(displayfrZ(xr*40, i0, 1, vid.fsize, IFM("3 - ") + XLAT("all"), nlpage == 1 ? 0xD8D8C0 : 0xC0C0C0, 8))
       getcstat = '3';
-    if(i&1) if(displayfrZ(xr*56, i0, 1, vid.fsize, IFM(keyname(' ') + " - ") + XLAT("return"), 0xC0C0C0, 8))
+    if(i&1) if(displayfrZ(xr*56, i0, 1, vid.fsize, IFM(keyname(' ') + " - ") + XLAT("go back"), 0xC0C0C0, 8))
       getcstat = '0';
     if(i&2) if(displayfrZ(xr*72, i0, 1, vid.fsize, IFM("F1 - ") + XLAT("help"), 0xC0C0C0, 8))
       getcstat = SDLK_F1;
diff --git a/language-cz.cpp b/language-cz.cpp
index 91792fd7..7b1a6c52 100644
--- a/language-cz.cpp
+++ b/language-cz.cpp
@@ -4351,6 +4351,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
 
 S("0 - return", "0 - návrat")
 S("return", "návrat")
+S("go back", "návrat")
 S("F1 - help", "F1 - nápověda")
 
 // for the conformal polynomial
diff --git a/language-de.cpp b/language-de.cpp
index 1eb2465a..9bb0bf3b 100644
--- a/language-de.cpp
+++ b/language-de.cpp
@@ -898,6 +898,7 @@ S("Shift=random, Ctrl=mix", "Shift=Zufällig, Ctrl=Mischen")
 
 S("Euclidean mode", "Euklidischer Modus")
 S("Return to the hyperbolic world", "Zur hyperbolischen Welt zurückkehren")
+S("go back", "zurück")
 S("Choose from the lands visited this game.", "Wähle aus den Ländern, die diese Sitzung besucht wurden.")
 S("Scores and achievements are not", "Im euklidischem Modus werden");
 S("saved in the Euclidean mode!", "Punkte und Errungenschaften nicht gespeichert!");
diff --git a/language-pl.cpp b/language-pl.cpp
index f411e310..a6c33099 100644
--- a/language-pl.cpp
+++ b/language-pl.cpp
@@ -4266,6 +4266,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
 
 S("0 - return", "0 - powrót")
 S("return", "powrót")
+S("go back", "powrót")
 S("F1 - help", "F1 - pomoc")
 
 // for the conformal polynomial
diff --git a/language-ru.cpp b/language-ru.cpp
index ee065902..e009ec6e 100644
--- a/language-ru.cpp
+++ b/language-ru.cpp
@@ -4418,6 +4418,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
  
 S("0 - return", "0 - вернуться")
 S("return", "вернуться")
+S("go back", "вернуться")
 S("F1 - help", "F1 - помощь")
  
 // for the conformal polynomial
@@ -6065,4 +6066,4 @@ S(
 
 #undef Orb
 
-  
\ No newline at end of file
+  
diff --git a/language-tr.cpp b/language-tr.cpp
index 85cf1837..cf51bb7e 100644
--- a/language-tr.cpp
+++ b/language-tr.cpp
@@ -1639,6 +1639,7 @@ S("You are killed by %the1!", "%1 tarafından öldürüldün!")
 N("Great Wall", GEN_M, "Büyük Duvar", "Büyük Duvarları", "Büyük Duvarı", "Büyük Duvarda")
 
 S("(v) menu", "(v) menü")
+S("go back", "dön")
 S("return to the game", "oyuna dön")
 S("or 'v' to see the main menu", "veya ana menüyü görmek için 'v'ye bas.")
 
diff --git a/mapeditor.cpp b/mapeditor.cpp
index 92a6df8f..da05b649 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -2247,7 +2247,7 @@ lessalphaif(col, behindsphere(V), behindsphere(gmatrix[c2]))
       dialog::addColorItem(XLAT(patterns[numpat].lpname), patterns[numpat].color, 'a'+numpat);
   
     dialog::addBreak(50);
-    dialog::addItem(XLAT("exit menu"), ' ');
+    dialog::addItem(XLAT("go back"), ' ');
     
     dialog::addBreak(50);
     dialog::addInfo("change the alpha parameter to show the lines");
diff --git a/menus.cpp b/menus.cpp
index 12897c20..d56d9630 100644
--- a/menus.cpp
+++ b/menus.cpp
@@ -448,7 +448,7 @@ void showChangeMode() {
 
   dialog::addBreak(50);
   
-  dialog::addItem(XLAT("return to the game"), ' ');
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
diff --git a/netgen.cpp b/netgen.cpp
index 72afd32e..ba45fe42 100644
--- a/netgen.cpp
+++ b/netgen.cpp
@@ -656,8 +656,9 @@ namespace netgen {
       dialog::addItem(XLAT("synchronize net and map"), 's');
       dialog::addItem(XLAT("display the scope"), 't');  
       dialog::addItem(XLAT("create the model"), 'c');
-      dialog::addItem(XLAT("back to HyperRogue"), ' ');
       dialog::addItem(XLAT("design the net"), 'd');
+      dialog::addBreak(50);
+      dialog::addItem(XLAT("go back"), ' ');
       
       dialog::display();
       }
diff --git a/rogueviz.cpp b/rogueviz.cpp
index 528a5171..34a15a1a 100644
--- a/rogueviz.cpp
+++ b/rogueviz.cpp
@@ -1739,7 +1739,7 @@ void showMenu() {
     kohonen::showMenu();
 
   dialog::addBreak(50);
-  dialog::addItem(XLAT("exit menu"), ' ');
+  dialog::addItem(XLAT("go back"), ' ');
 
   dialog::display();
   
diff --git a/rug.cpp b/rug.cpp
index 91d7f3e2..38dff107 100644
--- a/rug.cpp
+++ b/rug.cpp
@@ -661,7 +661,7 @@ void show() {
   dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100);
 
   dialog::addItem(XLAT("what's this?"), 'h');
-  dialog::addItem(XLAT("take me back"), ' ');
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::addItem(XLAT("enable the Hypersian Rug mode"), 'u');
   dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o');
   dialog::addBoolItem(XLAT("render texture without OpenGL"), (rendernogl), 'g');  
diff --git a/scores.cpp b/scores.cpp
index 4d65caa0..348620d8 100644
--- a/scores.cpp
+++ b/scores.cpp
@@ -238,7 +238,7 @@ void show() {
 
   displayButton(xr*10, i0, IFM("s - ") + XLAT("sort"), 's', 8);
   displayButton(xr*30, i0, IFM("t - ") + XLAT("choose"), 't', 8);
-  displayButton(xr*50, i0, IFM(dialog::keyname(' ') + " - ") + XLAT("play"), '0', 8);
+  displayButton(xr*50, i0, IFM(dialog::keyname(' ') + " - ") + XLAT("go back"), '0', 8);
 
   keyhandler = [] (int sym, int uni) {
     if(sym == SDLK_LEFT || sym == SDLK_KP4 || sym == 'h' || sym == 'a') {
diff --git a/shmup.cpp b/shmup.cpp
index 09969b12..4917faba 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -300,7 +300,7 @@ void showShmupConfig() {
 
     dialog::addItem(XLAT("help"), 'h');
 
-    dialog::addItem(XLAT("exit configuration"), ' ');
+    dialog::addItem(XLAT("go back"), ' ');
     dialog::display();
     }
   
diff --git a/tour.cpp b/tour.cpp
index b4ff9cbd..4417b965 100644
--- a/tour.cpp
+++ b/tour.cpp
@@ -249,7 +249,7 @@ namespace ss {
       }
     dialog::addBreak(50);
     if(size(slideshows) > 1) dialog::addItem(XLAT("change slideshow"), '1');
-    dialog::addItem(XLAT("exit menu"), ' ');
+    dialog::addItem(XLAT("go back"), ' ');
     dialog::display();
     keyhandler = [] (int sym, int uni) {
       if(uni >= 'a' && uni < 'a' + sssize) {