resolved conflicts introduced by merging zenorogue/hyperrogue#21

config.cpp

@@ -554,7 +554,7 @@ void loadConfig() {
 
 void showAllConfig() {
   dialog::addBreak(50);
-  dialog::addItem(XLAT("exit configuration"), 'v');
+  dialog::addItem(XLAT("go back"), ' ');
 #if CAP_CONFIG
   dialog::addItem(XLAT("save the current config"), 's');
   if(getcstat == 's')
@@ -565,7 +565,7 @@ void showAllConfig() {
 void handleAllConfig(int sym, int uni) {
   if(sym == SDLK_F1 || uni == 'h') gotoHelp(help);
 
-  else if(uni == 'v') popScreen();
+  else if(uni == ' ') popScreen();
   else if(sym == SDLK_ESCAPE) popScreen();
 #if CAP_CONFIG
   else if(uni == 's') saveConfig();
@@ -648,6 +648,8 @@ void showGraphConfig() {
     
     char xuni = uni | 96;
   
+    if(uni >= 32 && uni < 64) xuni = uni;
+
     if(xuni == 'u') vid.particles = !vid.particles;
     if(xuni == 'd') vid.graphglyph = (1+vid.graphglyph)%3;
         
@@ -905,12 +907,13 @@ 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"), 'v');
+  dialog::addBreak(50);
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
-    char xuni = uni | 96;
+    char xuni = uni | 32;
     if(xuni == 'p') autojoy = !autojoy;
     else if(xuni == 'a') 
       dialog::editNumber(vid.joyvalue, 0, 32768, 100, 4800, XLAT("first joystick: movement threshold"), "");
@@ -1143,7 +1146,7 @@ void show3D() {
     dialog::addInfo(XLAT("parameters set correctly"));
   dialog::addBreak(50);
   dialog::addItem(XLAT("stereo vision config"), 'e');
-  dialog::addItem(XLAT("exit 3D configuration"), 'v');
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
@@ -1232,7 +1235,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"), 'v');
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   
   int firsty = dialog::items[0].position / 2;
@@ -1247,7 +1250,7 @@ void showCustomizeChar() {
   
   keyhandler = [] (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
-    char xuni = uni | 96;
+    char xuni = uni | 32;
   
     if(shmup::on || multi::players) shmup::cpid = shmup::cpid_edit % shmup::players;
     charstyle& cs = getcs();
@@ -1265,7 +1268,7 @@ void showCustomizeChar() {
     if(xuni == 'd') switchcolor(cs.dresscolor, cat ? haircolors : dresscolors);
     if(xuni == 'f') switchcolor(cs.dresscolor2, dresscolors2);
     if(xuni == 'u') switchcolor(cs.uicolor, eyecolors);
-    if(xuni == 'v' || sym == SDLK_ESCAPE) popScreen();
+    if(uni == ' ' || sym == SDLK_ESCAPE) popScreen();
     };
   }
 
@@ -1317,7 +1320,7 @@ void selectLanguageScreen() {
   dialog::addBreak(50);
   vid.language = -1;
   dialog::addBoolItem(XLAT("default") + ": " + XLAT("EN"), v == -1, '0');
-  dialog::addItem(XLAT("exit configuration"), '1');
+  dialog::addItem(XLAT("go back"), ' ');
 
   dialog::addBreak(50);
 
@@ -1344,7 +1347,7 @@ void selectLanguageScreen() {
   keyhandler = []   (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
     
-    char xuni = uni | 96;
+    char xuni = uni | 32;
     if(uni == '0') {
       vid.language = -1;
       ANDROID_SETTINGS;

conformal.cpp

@@ -770,7 +770,7 @@ namespace conformal {
       }
 #endif
       
-    dialog::addItem(XLAT("exit this menu"), 'q');
+    dialog::addItem(XLAT("go back"), ' ');
     dialog::display();
     mouseovers = XLAT("see http://www.roguetemple.com/z/hyper/models.php");
     keyhandler = handleKeyC;

debug.cpp

@@ -359,8 +359,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');
@@ -380,6 +378,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);

dialogs.cpp

@@ -673,7 +673,7 @@ namespace dialog {
     addBreak(100);
 #endif
     
-    addItem(XLAT("return"), ' ');
+    addItem("go back", ' ');
     addSelItem(XLAT("default value"), disp(ne.dft), SDLK_HOME);
 
     addBreak(100);
@@ -826,7 +826,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("0 - ") + 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;

hyper.h

@@ -1446,6 +1446,8 @@ namespace dialog {
 
   item& lastItem();
   extern unsigned int *palette;
+
+  string keyname(int k);
   
   void addSelItem(string body, string value, int key);
   void addBoolItem(string body, bool value, int key);

language-cz.cpp

@@ -415,7 +415,6 @@ S("heptagonal game board", "sedmiúhelníková herní deska")
 S("triangular game board", "Trojúhelníková herní deska")
 S("HyperRogue game board", "herní deska HyperRogue")
 S("first page [Space]", "první stránka [mezerník]")
-S("exit configuration", "opustit nastavení")
 S("Configuration:", "Nastavení:")
 S("video resolution", "rozlišení")
 S("fullscreen mode", "zobrazení na celou obrazovku")
@@ -442,7 +441,6 @@ S("use Shift to decrease and Ctrl to fine tune ", "použij Shift ke zmenšení a
 S("(e.g. Shift+Ctrl+Z)", "ladění (například Shift+Ctrl+Z)")
 S("the second page [Space]", "druhá stránka [mezerník]")
 S("special features [Space]", "zvláštní možnosti [mezerník]")
-S("exit configuration", "opustit nastavení")
 S("see the help screen", "zobrazit obrazovku s nápovědou")
 S("save the current config", "uložit současné nastavení")
 S("(v) config", "(v) nast.")
@@ -2867,7 +2865,6 @@ S("paper model creator", "generátor papírových modelů")
 S("synchronize net and map", "synchronizuj síť a mapu")
 S("display the scope", "zobraz rozsah")
 S("create the model", "vytvoř model")
-S("back to HyperRogue", "zpět do HyperRogue")
 S("design the net", "vytvoř síť")
 
 S("The paper model created as papermodel-*.bmp", "Papírový model byl vytvořen jako papermodel-*.bmp")
@@ -3381,7 +3378,6 @@ S("Use arrow keys to rotate, Page Up/Down to zoom.",
   "Model se otáčí šipkami a lze ho zoomovat klávesami Page Up/Down.")
 
 S("what's this?", "co to je?")
-S("take me back", "návrat do menu")
 S("enable the Hypersian Rug mode", "aktivuj mód hyperského koberce")
 S("render the texture only once", "renderuj textury pouze jednou")
 S("render texture without OpenGL", "renderuj textury bez OpenGL")
@@ -3643,7 +3639,6 @@ S("band width", "šířka pásu")
 S("length of a segment", "délka segmentu")
 S("spiral on rendering", "spirála při renderování")
 S("render now (length: %1)", "renderovat hned (délka: %1)")
-S("exit this menu", "ven z menu")
 S("Enable cheat mode or GAME OVER to use this", "Dostupné pouze v cheat módu nebo po skončení hry")
 
 // remember to note it's in English
@@ -4370,7 +4365,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
   "koberce s pomocí červenomodrých 3D brýlí.")
 
 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
@@ -4568,7 +4563,6 @@ S("Level of water bottom", "Úroveň dna")
 S("set 3D monsters or walls in basic config first",
   "nejprve musíš nastavit 3D netvory nebo zdi v základní konfiguraci")
 S("parameters set correctly", "správně nastavené parametry")
-S("exit 3D configuration", "opustit 3D konfiguraci")
 
 S("Objects at distance less than %1 absolute units "
   "from the center will be displayed with high "

language-de.cpp

@@ -398,7 +398,6 @@ S("heptagonal game board", "Heptagonales Spielbrett")
 S("triangular game board", "Triangulares Spielbrett")
 S("HyperRogue game board", "HyperRogue-Spielbrett")
 S("first page [Space]", "Erste Seite [LEER]")
-S("exit configuration", "Einstellungen verlassen")
 S("Configuration:", "Einstellungen:")
 S("video resolution", "Videoauflösung")
 S("fullscreen mode", "Vollbild")
@@ -425,7 +424,6 @@ S("use Shift to decrease and Ctrl to fine tune ", "Shift zum Verringern, Strg zu
 S("(e.g. Shift+Ctrl+Z)", "Ändern (z.B. Strg+Shift+Z)")
 S("the second page [Space]", "Zweite Seite [LEER]")
 S("special features [Space]", "Spezielle Features [LEER]")
-S("exit configuration", "Einstellungen verlassen")
 S("see the help screen", "siehe Hilfe Bildschirm")
 S("save the current config", "momentane Einstellungen speichern")
 S("(v) config", "(v) Konfig.")
@@ -918,6 +916,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!");
@@ -2685,7 +2684,6 @@ S("paper model creator", "Papiermodell-Schöpfer")
 S("synchronize net and map", "Synchronisier Netz und Karte")
 S("display the scope", "Bereich anzeigen")
 S("create the model", "Erzeuge das Modell")
-S("back to HyperRogue", "Zurück zu HyperRogue")
 S("design the net", "entwirf das Netz")
 
 S("The paper model created as papermodel-*.bmp", "Das Papiermodell wurde als papermodel-*.bmp erzeugt")
@@ -3169,7 +3167,6 @@ S("Use arrow keys to rotate, Page Up/Down to zoom.",
   "Verwende die Pfeiltasten zum Rotieren, Bild auf/ab zum Zoomen.")
 
 S("what's this?", "Was ist das?")
-S("take me back", "Bring mich zurück")
 S("enable the Hypersian Rug mode", "Aktiviere den Hypersischen-Teppich-Modus")
 S("render the texture only once", "Rendere die Textur nur einmal")
 S("render texture without OpenGL", "Rendere die Textur ohne OpenGL")
@@ -3409,7 +3406,6 @@ S("band width", "Bandbreite")
 S("length of a segment", "Länge eines Segments")
 S("spiral on rendering", "Spirale beim Rendering")
 S("render now (length: %1)", "rendere jetzt (Länge: %1)")
-S("exit this menu", "Menü verlassen")
 S("Enable cheat mode or GAME OVER to use this", "Aktivere den Cheat-Modus oder GAME OVER um diese Funktion zu nutzen")
 
 S("see http://www.roguetemple.com/z/hyper/conformal.php", "siehe http://www.roguetemple.com/z/hyper/conformal.php (in Englisch)")

language-pl.cpp

@@ -387,7 +387,6 @@ S("heptagonal game board", "plansza do gry z siedmiokątów")
 S("triangular game board", "plansza do gry z trójkątów")
 S("HyperRogue game board", "plansza do gry HyperRogue")
 S("first page [Space]", "pierwsza strona [Space]")
-S("exit configuration", "wyjdź z konfiguracji")
 S("Configuration:", "Konfiguracja:")
 S("video resolution", "rozdzielczość obrazu")
 S("fullscreen mode", "tryb pełnoekranowy")
@@ -414,7 +413,6 @@ S("use Shift to decrease and Ctrl to fine tune ", "użyj Shift by zmniejszyć, C
 S("(e.g. Shift+Ctrl+Z)", " (na przykład Shift+Ctrl+Z)")
 S("the second page [Space]", "druga strona [Space]")
 S("special features [Space]", "opcje specjalne [Space]")
-S("exit configuration", "wyjdź z konfiguracji")
 S("see the help screen", "obejrzyj ekran pomocy")
 S("save the current config", "zapisz obecną konfigurację")
 S("(v) config", "(v) ust.")
@@ -2809,7 +2807,6 @@ S("paper model creator", "kreator modeli papierowych")
 S("synchronize net and map", "synchronizuj siatkę z mapą")
 S("display the scope", "pokaż zasięg")
 S("create the model", "twórz model")
-S("back to HyperRogue", "powrót do HyperRogue")
 S("design the net", "projektuj siatkę")
 
 S("The paper model created as papermodel-*.bmp", "Model stworzony jako papermodel-*.bmp")
@@ -3317,7 +3314,6 @@ S("Use arrow keys to rotate, Page Up/Down to zoom.", "Możesz obracać model str
   "klawiszami Page Up/Down.")
 
 S("what's this?", "co to jest?")
-S("take me back", "powrót do menu")
 S("enable the Hypersian Rug mode", "włącz tryb hiperskiego dywanu")
 S("render the texture only once", "renderuj teksturę tylko raz")
 S("render texture without OpenGL", "renderuj teksturę bez OpenGL")
@@ -3558,7 +3554,6 @@ S("band width", "szerokość wstęgi")
 S("length of a segment", "długość segmentu")
 S("spiral on rendering", "spirala przy renderowaniu")
 S("render now (length: %1)", "rysuj teraz (długość: %1)")
-S("exit this menu", "wyjdź")
 S("Enable cheat mode or GAME OVER to use this", "Dostępne tylko po końcu gry albo w trybie oszusta")
 
 // remember to note it's in English
@@ -4289,7 +4284,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
   "Oglądaj hiperboloidę Minkowskiego albo tryb hiperskiego dywanu przez czerwono-turkusowe okulary 3D.")
 
 S("0 - return", "0 - powrót")
-S("return", "powrót")
+S("go back", "powrót")
 S("F1 - help", "F1 - pomoc")
 
 // for the conformal polynomial
@@ -4480,7 +4475,6 @@ S("Level of water bottom", "Poziom dna wody")
 S("set 3D monsters or walls in basic config first",
   "najpierw ustaw 3D potwory/ściany w konfiguracji podstawowej")
 S("parameters set correctly", "parametry prawidłowe")
-S("exit 3D configuration", "wyjdź z konfiguracji 3D")
 
 S("Objects at distance less than %1 absolute units "
   "from the center will be displayed with high "

language-ptbr.cpp

@@ -390,7 +390,6 @@ S("heptagonal game board", "tabuleiro de jogo heptagonal")
 S("triangular game board", "tabuleiro de jogo triangular")
 S("HyperRogue game board", "tabuleiro de jogo HyperRogue")
 S("first page [Space]", "primeira página [Space]")
-S("exit configuration", "sair das configurações")
 S("Configuration:", "Configuração:")
 S("video resolution", "resolução de vídeo")
 S("fullscreen mode", "modo de tela cheia")
@@ -417,7 +416,6 @@ S("use Shift to decrease and Ctrl to fine tune ", "use Shift para diminuir e Ctr
 S("(e.g. Shift+Ctrl+Z)", " (ex: Shift+Ctrl+Z)")
 S("the second page [Space]", "a segunda página [Space]")
 S("special features [Space]", "características especiais [Space]")
-S("exit configuration", "sair das configurações")
 S("see the help screen", "veja a tela de ajuda")
 S("save the current config", "salvar as configurações")
 S("(v) config", "(v) configurações")
@@ -2900,7 +2898,6 @@ S("paper model creator", "kreator modeli papierowych")
 S("synchronize net and map", "synchronizuj siatkę z mapą")
 S("display the scope", "pokaż zasięg")
 S("create the model", "twórz model")
-S("back to HyperRogue", "powrót do HyperRogue")
 S("design the net", "projektuj siatkę")
 
 S("The paper model created as papermodel-*.bmp", "Model stworzony jako papermodel-*.bmp")
@@ -3406,7 +3403,6 @@ S(
   "klawiszami Page Up/Down.")
 
 S("what's this?", "co to jest?")
-S("take me back", "powrót do menu")
 S("enable the Hypersian Rug mode", "włącz tryb hiperskiego dywanu")
 S("render the texture only once", "renderuj teksturę tylko raz")
 S("render texture without OpenGL", "renderuj teksturę bez OpenGL")
@@ -3647,7 +3643,6 @@ S("band width", "szerokość wstęgi")
 S("length of a segment", "długość segmentu")
 S("spiral on rendering", "spirala przy renderowaniu")
 S("render now (length: %1)", "rysuj teraz (długość: %1)")
-S("exit this menu", "wyjdź")
 S("Enable cheat mode or GAME OVER to use this", "Dostępne tylko po końcu gry albo w trybie oszusta")
 
 // remember to note it's in English
@@ -4374,7 +4369,6 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
   "Oglądaj hiperboloidę Minkowskiego albo tryb hiperskiego dywanu przez czerwono-turkusowe okulary 3D.")
 
 S("0 - return", "0 - powrót")
-S("return", "powót")
 S("F1 - help", "F1 - pomoc")
 
 // for the conformal polynomial
@@ -4567,7 +4561,6 @@ S("Level of water bottom", "Poziom dna wody")
 S("set 3D monsters or walls in basic config first",
   "najpierw ustaw 3D potwory/ściany w konfiguracji podstawowej")
 S("parameters set correctly", "parametry prawidłowe")
-S("exit 3D configuration", "wyjdź z konfiguracji 3D")
 
 S("Objects at distance less than %1 absolute units "
   "from the center will be displayed with high "

language-ru.cpp

@@ -389,7 +389,6 @@ S("heptagonal game board", "семиугольная игровая доска")
 S("triangular game board", "треугольная игровая доска")
 S("HyperRogue game board", "игровая доска HyperRogue")
 S("first page [Space]", "первая страница [пробел]")
-S("exit configuration", "выйти из настроек")
 S("Configuration:", "Настройки:")
 S("video resolution", "видео разрешение")
 S("fullscreen mode", "полноэкранный режим")
@@ -416,7 +415,6 @@ S("use Shift to decrease and Ctrl to fine tune ", "используйте Shift
 S("(e.g. Shift+Ctrl+Z)", "Ctrl для тонкой настройки") // (например, Shift+Ctrl+Z)")
 S("the second page [Space]", "вторая страница [Пробел]")
 S("special features [Space]", "специальные опции [Пробел]")
-S("exit configuration", "выйти из настроек")
 S("see the help screen", "смотри экран помощи")
 S("save the current config", "сохранить текущие настройки")
 S("(v) config", "(v) настр.")
@@ -2845,7 +2843,6 @@ S("paper model creator", "создатель бумажных моделей")
 S("synchronize net and map", "синхронизовать сеть и карту")
 S("display the scope", "показать охват")
 S("create the model", "создать модель")
-S("back to HyperRogue", "вернуться в игру")
 S("design the net", "разработать сеть")
  
 S("The paper model created as papermodel-*.bmp", "Модель сохранена как papermodel-*.bmp")
@@ -3406,7 +3403,6 @@ S("Use arrow keys to rotate, Page Up/Down to zoom.",
   "Используйте стрелки для вращения, Page Up/Down для изменения масштаба.")
  
 S("what's this?", "что это?")
-S("take me back", "вернуться в меню")
 S("enable the Hypersian Rug mode", "включить режим гиперсидского ковра")
 S("render the texture only once", "отрисовать один раз")
 S("render texture without OpenGL", "не использовать OpenGL")
@@ -3698,7 +3694,6 @@ S("band width", "ширина ленты")
 S("length of a segment", "длина отрезка")
 S("spiral on rendering", "спираль отрисовки")
 S("render now (length: %1)", "рисуется сейчас (длина: %1)")
-S("exit this menu", "выход")
 S("Enable cheat mode or GAME OVER to use this", "Доступно только в конце игры и в режиме обманщика")
  
 // remember to note it's in English
@@ -4440,7 +4435,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
   "Смотреть гиперболоид Минковского или режим гиперсидского через красно-голубые 3D очки.")
  
 S("0 - return", "0 - вернуться")
-S("return", "вернуться")
+S("go back", "вернуться")
 S("F1 - help", "F1 - помощь")
  
 // for the conformal polynomial
@@ -4656,7 +4651,6 @@ S("Level of water bottom", "Уровень дна водоёма")
 S("set 3D monsters or walls in basic config first",
   "сначала выставлять монстров или стены в режиме 3D ")
 S("parameters set correctly", "параметры корректны")
-S("exit 3D configuration", "выйти из настроек 3D")
  
 S("Objects at distance less than %1 absolute units "
   "from the center will be displayed with high "
@@ -6951,7 +6945,6 @@ S("level to load:", "карты для загрузки:")
 
 #undef Orb
 
- 
 // === 10.3j extra texts ===
 // =========================
  

language-tr.cpp

@@ -369,7 +369,6 @@ S("heptagonal game board", "yedigensel tahta")
 S("triangular game board", "üçgensel tahta")
 S("HyperRogue game board", "HyperRogue tahta")
 S("first page [Space]", "ilk sayfa [Space]")
-S("exit configuration", "ayarlardan çık")
 S("Configuration:", "AYARLAR:")
 S("video resolution", "çözünürlük")
 S("fullscreen mode", "tam ekran modu")
@@ -396,7 +395,6 @@ S("use Shift to decrease and Ctrl to fine tune ", "Shift'le azalt, Ctrl ile ince
 S("(e.g. Shift+Ctrl+Z)", " (Meselâ Shift+Ctrl+Z)")
 S("the second page [Space]", "ikinci sayfa [Space]")
 S("special features [Space]", "özel seçenekler [Space]")
-S("exit configuration", "ayarlardan çık.")
 S("see the help screen", "yardım ekranına bak.")
 S("save the current config", "mevcut ayarları kaydet")
 S("(v) config", "(v) ayarlar")
@@ -1639,6 +1637,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.")
 
@@ -2730,7 +2729,6 @@ S("paper model creator", "kâğıt modeli üreticisi")
 S("synchronize net and map", "haritayı ve ağı eşle")
 S("display the scope", "odağı göster")
 S("create the model", "modeli üret")
-S("back to HyperRogue", "HyperRogue'a geri dön")
 S("design the net", "ağı tasarla")
 
 S("The paper model created as papermodel-*.bmp", "Kâğıt model papermodel-*.bmp şeklinde üretildi")

menus.cpp

@@ -473,14 +473,14 @@ void showChangeMode() {
 
   dialog::addBreak(50);
   
-  dialog::addItem(XLAT("return to the game"), 'v');
+  dialog::addItem(XLAT("go back"), ' ');
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
     dialog::handleNavigation(sym, uni);    
     char xuni = uni;
-    
+
-    if(xuni == 'v' || sym == SDLK_ESCAPE) popScreen();
+    if(xuni == ' ' || sym == SDLK_ESCAPE) popScreen();
     
     #if CAP_DAILY
     else if(uni == 'z')

netgen.cpp

@@ -656,8 +656,9 @@ namespace hr { 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"), 'q');
       dialog::addItem(XLAT("design the net"), 'd');
+      dialog::addBreak(50);
+      dialog::addItem(XLAT("go back"), ' ');
       
       dialog::display();
       }

pattern2.cpp

@@ -1988,7 +1988,7 @@ namespace linepatterns {
       dialog::addColorItem(among(patterns[numpat].id, patVine, patPower) && gp::on ? XLAT("Goldberg") + (patterns[numpat].id == patVine ? " " : ""): XLAT(patterns[numpat].lpname), patterns[numpat].color, 'a'+numpat);
   
     dialog::addBreak(50);
-    dialog::addItem(XLAT("exit menu"), 'v');
+    dialog::addItem(XLAT("go back"), ' ');
     
     dialog::addBreak(50);
     dialog::addInfo("change the alpha parameter to show the lines");

rogueviz.cpp

@@ -1557,7 +1557,7 @@ void showMenu() {
     kohonen::showMenu();
 
   dialog::addBreak(50);
-  dialog::addItem(XLAT("exit menu"), 'v');
+  dialog::addItem(XLAT("go back"), ' ');
 
   dialog::display();
   

rug.cpp

@@ -1703,7 +1703,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"), 'q');
+  dialog::addItem(XLAT("go back"), ' ');
 
   dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u');
   

scores.cpp

@@ -222,7 +222,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("0 - ") + 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') {

shmup.cpp

@@ -305,7 +305,7 @@ void showShmupConfig() {
 
     dialog::addItem(XLAT("help"), 'h');
 
-    dialog::addItem(XLAT("exit configuration"), 'v');
+    dialog::addItem(XLAT("go back"), ' ');
     dialog::display();
     }
   

tour.cpp

@@ -277,7 +277,7 @@ namespace ss {
       }
     dialog::addBreak(50);
     if(size(slideshows) > 1) dialog::addItem(XLAT("change slideshow"), '1');
-    dialog::addItem(XLAT("exit menu"), '0');
+    dialog::addItem(XLAT("go back"), ' ');
     dialog::display();
     keyhandler = [] (int sym, int uni) {
       if(uni >= 'a' && uni < 'a' + sssize) {