1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00

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".
This commit is contained in:
Arthur O'Dwyer 2017-10-29 12:16:29 -07:00
parent dae6b9e3d3
commit 43cb9c0bf4
17 changed files with 26 additions and 19 deletions

View File

@ -527,7 +527,7 @@ void loadConfig() {
void showAllConfig() { void showAllConfig() {
dialog::addBreak(50); dialog::addBreak(50);
dialog::addItem(XLAT("exit configuration"), ' '); dialog::addItem(XLAT("go back"), ' ');
#if CAP_CONFIG #if CAP_CONFIG
dialog::addItem(XLAT("save the current config"), 's'); dialog::addItem(XLAT("save the current config"), 's');
if(getcstat == '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: pan threshold"), its(vid.joypanthreshold), 'c');
dialog::addSelItem(XLAT("second joystick: panning speed"), fts(vid.joypanspeed * 1000), 'd'); 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(); dialog::display();
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {
@ -1005,7 +1006,7 @@ void show3D() {
else else
dialog::addInfo(XLAT("parameters set correctly")); dialog::addInfo(XLAT("parameters set correctly"));
dialog::addBreak(50); dialog::addBreak(50);
dialog::addItem(XLAT("exit 3D configuration"), ' '); dialog::addItem(XLAT("go back"), ' ');
dialog::display(); dialog::display();
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {
@ -1106,7 +1107,7 @@ void showCustomizeChar() {
if(numplayers() > 1) dialog::addSelItem(XLAT("player"), its(shmup::cpid+1), 'a'); if(numplayers() > 1) dialog::addSelItem(XLAT("player"), its(shmup::cpid+1), 'a');
dialog::addBreak(50); dialog::addBreak(50);
dialog::addItem(XLAT("return to the game"), ' '); dialog::addItem(XLAT("go back"), ' ');
dialog::display(); dialog::display();
int firsty = dialog::items[0].position / 2; int firsty = dialog::items[0].position / 2;
@ -1191,7 +1192,7 @@ void selectLanguageScreen() {
dialog::addBreak(50); dialog::addBreak(50);
vid.language = -1; vid.language = -1;
dialog::addBoolItem(XLAT("default") + ": " + XLAT("EN"), v == -1, '0'); dialog::addBoolItem(XLAT("default") + ": " + XLAT("EN"), v == -1, '0');
dialog::addItem(XLAT("exit configuration"), ' '); dialog::addItem(XLAT("go back"), ' ');
dialog::addBreak(50); dialog::addBreak(50);

View File

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

View File

@ -310,8 +310,6 @@ void debugScreen() {
void showCheatMenu() { void showCheatMenu() {
gamescreen(1); gamescreen(1);
dialog::init("cheat menu"); dialog::init("cheat menu");
dialog::addItem(XLAT("return to the game"), ' ');
dialog::addBreak(50);
dialog::addItem(XLAT("gain orb powers"), 'F'); dialog::addItem(XLAT("gain orb powers"), 'F');
dialog::addItem(XLAT("summon treasure"), 'T'); dialog::addItem(XLAT("summon treasure"), 'T');
dialog::addItem(XLAT("summon dead orbs"), 'D'); 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 ghost timer"), 'G'-64);
dialog::addItem(XLAT("switch web display"), 'W'-64); dialog::addItem(XLAT("switch web display"), 'W'-64);
dialog::addItem(XLAT("peaceful mode"), 'P'-64); dialog::addItem(XLAT("peaceful mode"), 'P'-64);
dialog::addBreak(50);
dialog::addItem(XLAT("go back"), ' ');
dialog::display(); dialog::display();
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {
dialog::handleNavigation(sym, uni); dialog::handleNavigation(sym, uni);

View File

@ -646,7 +646,7 @@ namespace dialog {
addBreak(100); addBreak(100);
#endif #endif
addItem("return", ' '); addItem("go back", ' ');
addSelItem("default value", disp(ne.dft), SDLK_HOME); addSelItem("default value", disp(ne.dft), SDLK_HOME);
addBreak(100); addBreak(100);
@ -769,7 +769,7 @@ namespace dialog {
getcstat = '2'; getcstat = '2';
if(pages) if(displayfrZ(xr*40, i0, 1, vid.fsize, IFM("3 - ") + XLAT("all"), nlpage == 1 ? 0xD8D8C0 : 0xC0C0C0, 8)) if(pages) if(displayfrZ(xr*40, i0, 1, vid.fsize, IFM("3 - ") + XLAT("all"), nlpage == 1 ? 0xD8D8C0 : 0xC0C0C0, 8))
getcstat = '3'; 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'; getcstat = '0';
if(i&2) if(displayfrZ(xr*72, i0, 1, vid.fsize, IFM("F1 - ") + XLAT("help"), 0xC0C0C0, 8)) if(i&2) if(displayfrZ(xr*72, i0, 1, vid.fsize, IFM("F1 - ") + XLAT("help"), 0xC0C0C0, 8))
getcstat = SDLK_F1; getcstat = SDLK_F1;

View File

@ -4351,6 +4351,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
S("0 - return", "0 - návrat") S("0 - return", "0 - návrat")
S("return", "návrat") S("return", "návrat")
S("go back", "návrat")
S("F1 - help", "F1 - nápověda") S("F1 - help", "F1 - nápověda")
// for the conformal polynomial // for the conformal polynomial

View File

@ -898,6 +898,7 @@ S("Shift=random, Ctrl=mix", "Shift=Zufällig, Ctrl=Mischen")
S("Euclidean mode", "Euklidischer Modus") S("Euclidean mode", "Euklidischer Modus")
S("Return to the hyperbolic world", "Zur hyperbolischen Welt zurückkehren") 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("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("Scores and achievements are not", "Im euklidischem Modus werden");
S("saved in the Euclidean mode!", "Punkte und Errungenschaften nicht gespeichert!"); S("saved in the Euclidean mode!", "Punkte und Errungenschaften nicht gespeichert!");

View File

@ -4266,6 +4266,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
S("0 - return", "0 - powrót") S("0 - return", "0 - powrót")
S("return", "powrót") S("return", "powrót")
S("go back", "powrót")
S("F1 - help", "F1 - pomoc") S("F1 - help", "F1 - pomoc")
// for the conformal polynomial // for the conformal polynomial

View File

@ -4418,6 +4418,7 @@ S("Watch the Minkowski hyperboloid or the hypersian rug mode with the "
S("0 - return", "0 - вернуться") S("0 - return", "0 - вернуться")
S("return", "вернуться") S("return", "вернуться")
S("go back", "вернуться")
S("F1 - help", "F1 - помощь") S("F1 - help", "F1 - помощь")
// for the conformal polynomial // for the conformal polynomial
@ -6065,4 +6066,4 @@ S(
#undef Orb #undef Orb

View File

@ -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") 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("(v) menu", "(v) menü")
S("go back", "dön")
S("return to the game", "oyuna 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.") S("or 'v' to see the main menu", "veya ana menüyü görmek için 'v'ye bas.")

View File

@ -2247,7 +2247,7 @@ lessalphaif(col, behindsphere(V), behindsphere(gmatrix[c2]))
dialog::addColorItem(XLAT(patterns[numpat].lpname), patterns[numpat].color, 'a'+numpat); dialog::addColorItem(XLAT(patterns[numpat].lpname), patterns[numpat].color, 'a'+numpat);
dialog::addBreak(50); dialog::addBreak(50);
dialog::addItem(XLAT("exit menu"), ' '); dialog::addItem(XLAT("go back"), ' ');
dialog::addBreak(50); dialog::addBreak(50);
dialog::addInfo("change the alpha parameter to show the lines"); dialog::addInfo("change the alpha parameter to show the lines");

View File

@ -448,7 +448,7 @@ void showChangeMode() {
dialog::addBreak(50); dialog::addBreak(50);
dialog::addItem(XLAT("return to the game"), ' '); dialog::addItem(XLAT("go back"), ' ');
dialog::display(); dialog::display();
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {

View File

@ -656,8 +656,9 @@ namespace netgen {
dialog::addItem(XLAT("synchronize net and map"), 's'); dialog::addItem(XLAT("synchronize net and map"), 's');
dialog::addItem(XLAT("display the scope"), 't'); dialog::addItem(XLAT("display the scope"), 't');
dialog::addItem(XLAT("create the model"), 'c'); dialog::addItem(XLAT("create the model"), 'c');
dialog::addItem(XLAT("back to HyperRogue"), ' ');
dialog::addItem(XLAT("design the net"), 'd'); dialog::addItem(XLAT("design the net"), 'd');
dialog::addBreak(50);
dialog::addItem(XLAT("go back"), ' ');
dialog::display(); dialog::display();
} }

View File

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

View File

@ -661,7 +661,7 @@ void show() {
dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100); dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100);
dialog::addItem(XLAT("what's this?"), 'h'); 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::addItem(XLAT("enable the Hypersian Rug mode"), 'u');
dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o'); dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o');
dialog::addBoolItem(XLAT("render texture without OpenGL"), (rendernogl), 'g'); dialog::addBoolItem(XLAT("render texture without OpenGL"), (rendernogl), 'g');

View File

@ -238,7 +238,7 @@ void show() {
displayButton(xr*10, i0, IFM("s - ") + XLAT("sort"), 's', 8); displayButton(xr*10, i0, IFM("s - ") + XLAT("sort"), 's', 8);
displayButton(xr*30, i0, IFM("t - ") + XLAT("choose"), 't', 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) { keyhandler = [] (int sym, int uni) {
if(sym == SDLK_LEFT || sym == SDLK_KP4 || sym == 'h' || sym == 'a') { if(sym == SDLK_LEFT || sym == SDLK_KP4 || sym == 'h' || sym == 'a') {

View File

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

View File

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