From c80705be84e81944cf41a2c1c992c592df6d6d9d Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 1 Nov 2018 19:00:49 +0100 Subject: [PATCH] various text improvements, and translation update --- conformal.cpp | 10 ++++--- expansion.cpp | 26 +++++++++--------- language-cz.cpp | 71 +++++++++++++++++++++++++++++++++++++++++++++++-- language-de.cpp | 2 +- language-pl.cpp | 69 +++++++++++++++++++++++++++++++++++++++++++++-- language-ru.cpp | 2 +- screenshot.cpp | 2 +- 7 files changed, 159 insertions(+), 23 deletions(-) diff --git a/conformal.cpp b/conformal.cpp index d641b03f..20ddc6b2 100644 --- a/conformal.cpp +++ b/conformal.cpp @@ -582,7 +582,7 @@ namespace conformal { "azimuthal equidistant", "azimuthal equi-area", "ball model", "Minkowski hyperboloid", "hemisphere", "band equidistant", "band equi-area", "sinusoidal", "two-point equidistant", - "fisheye", "Joukovsky", "Joukovsky/inversion" + "fisheye", "Joukowsky transform", "Joukowsky+inversion" }; string get_model_name(eModel pm) { @@ -668,7 +668,7 @@ namespace conformal { } if(pmodel == mdHyperboloid) - dialog::addSelItem(XLAT("topz"), fts3(top_z), 'l'); + dialog::addSelItem(XLAT("maximum z coordinate to show"), fts3(top_z), 'l'); if(model_has_transition()) dialog::addSelItem(XLAT("model transition"), fts3(model_transition), 't'); @@ -732,9 +732,11 @@ namespace conformal { else if(uni == 'l' && model_has_orientation()) dialog::editNumber(model_orientation, 0, 360, 90, 0, XLAT("model orientation"), ""); else if(uni == 'l' && pmodel == mdHyperboloid) - dialog::editNumber(top_z, 1, 20, 0.25, 4, XLAT("topz"), ""); + dialog::editNumber(top_z, 1, 20, 0.25, 4, XLAT("maximum z coordinate to show"), ""); else if(uni == 't') - dialog::editNumber(model_transition, 0, 1, 0.1, 1, XLAT("model transition"), ""); + dialog::editNumber(model_transition, 0, 1, 0.1, 1, XLAT("model transition"), + "You can change this parameter for a transition from another model to this one." + ); else if(uni == 'b' && pmodel == mdHalfplane) dialog::editNumber(model_orientation, 0, 2, 0.25, 1, XLAT("halfplane scale"), ""); else if(uni == 's') { diff --git a/expansion.cpp b/expansion.cpp index d8db48b4..e1c9602d 100644 --- a/expansion.cpp +++ b/expansion.cpp @@ -560,19 +560,19 @@ void viewdist_configure_dialog() { cmode |= sm::SIDE | sm::MAYDARK | sm::EXPANSION; gamescreen(0); - dialog::addSelItem("which distance", dfnames[distance_from], 'c'); + dialog::addSelItem(XLAT("which distance"), XLAT(dfnames[distance_from]), 'c'); dialog::add_action([] () { distance_from = mod_allowed() ? eDistanceFrom((distance_from + 1) % 3) : eDistanceFrom(2 - distance_from); }); - dialog::addSelItem("number codes", ncnames[number_coding], 'n'); + dialog::addSelItem(XLAT("number codes"), XLAT(ncnames[number_coding]), 'n'); dialog::add_action([] () { number_coding = eNumberCoding((number_coding + 1) % (mod_allowed() ? 4 : 2)); }); - dialog::addBoolItem("color codes", use_color_codes, 'u'); + dialog::addBoolItem(XLAT("color codes"), use_color_codes, 'u'); dialog::add_action([] () { use_color_codes = !use_color_codes; }); - dialog::addSelItem("display distances from", its(first_distance), 'd'); + dialog::addSelItem(XLAT("display distances from"), its(first_distance), 'd'); dialog::add_action([] () { scrolling_distances = false; - dialog::editNumber(first_distance, 0, 3000, 1, 0, "display distances from", ""); + dialog::editNumber(first_distance, 0, 3000, 1, 0, XLAT("display distances from"), ""); }); int id = 0; @@ -587,20 +587,22 @@ void viewdist_configure_dialog() { } } - if(!mod_allowed()) - dialog::addInfo(XLAT("note: enable the cheat mode for additional options")); + if(!mod_allowed()) { + dialog::addItem(XLAT("enable the cheat mode for additional options"), 'C'); + dialog::add_action(enable_cheat); + } else dialog::addBreak(100); dialog::addBreak(100); - dialog::addItem("disable", 'x'); + dialog::addItem(XLAT("disable"), 'x'); dialog::add_action([] () { viewdists = false; popScreen(); }); - dialog::addItem("move the player", 'm'); + dialog::addItem(XLAT("move the player"), 'm'); dialog::add_action([] () { show_distance_lists = false; popScreenAll(); }); - dialog::addItem(distance_from ? "show number of descendants by distance" : "show number of cells by distance", 'l'); + dialog::addItem(XLAT(distance_from ? "show number of descendants by distance" : "show number of cells by distance"), 'l'); dialog::add_action([] () { show_distance_lists = true; popScreenAll(); }); dialog::display(); @@ -703,8 +705,8 @@ void expansion_analyzer::view_distances_dialog() { } } - dialog::addItem("scroll", 'S'); - dialog::addItem("configure", 'C'); + dialog::addItem(XLAT("scroll"), 'S'); + dialog::addItem(XLAT("configure"), 'C'); dialog::display(); } diff --git a/language-cz.cpp b/language-cz.cpp index 7b7e32d9..84a4619b 100644 --- a/language-cz.cpp +++ b/language-cz.cpp @@ -3642,7 +3642,7 @@ S("render now (length: %1)", "renderovat hned (délka: %1)") 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 -S("see http://www.roguetemple.com/z/hyper/conformal.php", "viz http://www.roguetemple.com/z/hyper/conformal.php (anglicky)") +S("see http://www.roguetemple.com/z/hyper/models.php", "viz http://www.roguetemple.com/z/hyper/models.php (anglicky)") // Yendorian Forest // ---------------- @@ -7212,7 +7212,7 @@ S("When the 'mark heptagons' option (hotkey '7') is on, moves between unmarked c // 10.4p // in the sight range dialog -S("note: enable the cheat mode for additional options", "poznámka: pro další možnosti zapni cheat mód") +S("enable the cheat mode for additional options", "pro další možnosti zapni cheat mód") // steal a baby tortoise with Orb of Space S("No, that would be heartless!", "Ne, to by bylo bezcitné!") @@ -7399,3 +7399,70 @@ S("full symmetry", "úplná symetrie") S("alternate coloring", "alternativní zbarvení") S("display full floors", "zobrazuj úplné podlahy") S("remove complete classification", "odstraň úplnou klasifikaci") + +// 10.4y + +// animations +S("animations/history", "animace/historie") +S("animations", "animace") +S("period", "perioda") +S("game animation period", "perioda herní animace") +S("no movement animation", "bez animace pohybu") +S("translation", "posunutí") +S("parabolic", "parabolická izometrie") +S("circle", "pohyb po kruhu") +S("animate parameter change", "animace změny parametrů") +S("choose parameters to animate", "vyber si parametry pro animaci") +S("frames to record", "snímky pro nahrání") +S("record to a file", "nahraj do souboru") + +// improved worldsize demo dialog +S("which distance", "která vzdálenost") +S("start", "start") +S("land", "kraj") + +S("number codes", "číselné kódy") +S("distance", "vzdálenost") +S("type", "typ") +S("debug", "debug") + +S("color codes", "barevné kódy") +S("display distances from", "zobrazuj vzdálenosti od") +S("disable", "vyřaď") +S("move the player", "pohyb hráčem") +S("show number of cells by distance", "ukaž počet buněk podle vzdálenosti") +S("show number of descendants by distance", "ukaž počet potomků podle vzdálenosti") + +S("triangle grid: tree edges", "trojúhelníková mřížka: stromové hrany") +S("triangle grid: other edges", "trojúhelníková mřížka: jiné hrany") +S("dual grid", "duální síť") +S("horocycles", "horocykly") +S("configure", "konfigurace") +S("scroll", "posouvání") + +// improved sight range dialog +S("minimum visible cell in pixels", "nejmenší viditelné políčko v pixelech") +S("draw range based on distance", "rozsah vykreslování založený na vzdálenosti") +S("draw based on size in the projection (no generation)", + "vykreslování na základě velikosti v projekci (bez generování)") +S("draw based on size in the projection (generation)", + "vykreslování na základě velikosti v projekci (s generováním)") +S("cells drawn", "počet vykreslených políček") +S("limit on cells drawn", "hranice vykreslených políček") +S("This limit exists to protect the engine from freezing when too many cells would be drawn according to the current options.", + "Tato hranice existuje proto, aby hra nezamrzla, když by aktuální možnosti požadovaly vykreslení příliš velkého počtu políček.") +S("generation range bonus", "bonus generačního rozsahu") +S("game range bonus", "bonus herního rozsahu") + +// new options for models + +S("Joukowsky transform", "Žukovského transformace") +S("Joukowsky+inversion", "Žukovský + inverze") + +S("maximum z coordinate to show", "maximální zobrazená souřadnice z") + +S("model transition", "přechod mezi modely") +S("You can change this parameter for a transition from another model to this one.", + "Tento parametr je možné změnit pro přechod z jiného modelu do tohoto.") + +S("model orientation", "orientace modelu") diff --git a/language-de.cpp b/language-de.cpp index 16232dcc..7ae1b554 100644 --- a/language-de.cpp +++ b/language-de.cpp @@ -3408,7 +3408,7 @@ S("spiral on rendering", "Spirale beim Rendering") S("render now (length: %1)", "rendere jetzt (Länge: %1)") 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)") +S("see http://www.roguetemple.com/z/hyper/models.php", "siehe http://www.roguetemple.com/z/hyper/models.php (in Englisch)") // Yendorian Forest diff --git a/language-pl.cpp b/language-pl.cpp index 965bed0c..fbafc7a8 100644 --- a/language-pl.cpp +++ b/language-pl.cpp @@ -3557,7 +3557,7 @@ S("render now (length: %1)", "rysuj teraz (długość: %1)") 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 -S("see http://www.roguetemple.com/z/hyper/conformal.php", "patrz http://www.roguetemple.com/z/hyper/conformal.php (po angielsku)") +S("see http://www.roguetemple.com/z/hyper/models.php", "patrz http://www.roguetemple.com/z/hyper/models.php (po angielsku)") // Yendorian Forest // ---------------- @@ -6968,7 +6968,7 @@ S("When the 'mark heptagons' option (hotkey '7') is on, moves between unmarked c // 10.4p // in the sight range dialog -S("note: enable the cheat mode for additional options", "uwaga: włącz tryb oszusta, by tu były dodatkowe opcje") +S("enable the cheat mode for additional options", "włącz tryb oszusta, by tu były dodatkowe opcje") // steal a baby tortoise with Orb of Space S("No, that would be heartless!", "Nie, to by było bez serca!") @@ -7154,3 +7154,68 @@ S("full symmetry", "pełna symetria") S("alternate coloring", "kolorowanie alternatywne") S("display full floors", "pokazuj pełne podłogi") S("remove complete classification", "usuń pełną klasyfikację") + +// animations +S("animations/history", "animacje/historia") +S("animations", "animacje") +S("period", "okres") +S("game animation period", "okres animacji gry") +S("no movement animation", "brak animacji ruchu") +S("translation", "przesunięcie") +S("parabolic", "izometria paraboliczna") +S("circle", "ruch po kole") +S("animate parameter change", "animacja zmiany parametrów") +S("choose parameters to animate", "wybierz parametry do animacji") +S("frames to record", "liczba kratek do nagrania") +S("record to a file", "nagraj do pliku") + +// improved worldsize demo dialog +S("which distance", "która odległość") +S("start", "start") +S("land", "kraina") + +S("number codes", "liczby") +S("distance", "odległość") +S("type", "typ") +S("debug", "debug") + +S("color codes", "kolory") +S("display distances from", "pokazuj odległości od") +S("disable", "wyłącz") +S("move the player", "ruch gracza") +S("show number of cells by distance", "pokaż liczbę pól w każdej odległości") +S("show number of descendants by distance", "pokaż liczbę potomków w każdej odległości") + +S("triangle grid: tree edges", "siatka trójkątna: krawędzie drzewa") +S("triangle grid: other edges", "siatka trójkątna: inne krawędzie") +S("dual grid", "siatka dualna") +S("horocycles", "horocykle") +S("configure", "konfiguracja") +S("scroll", "przewijanie") + +// improved sight range dialog +S("minimum visible cell in pixels", "najmniejszy rozmiar rysowanego pola w pikselach") +S("draw range based on distance", "zakres rysowania na podstawie odległości") +S("draw based on size in the projection (no generation)", + "rysuj na podstawie rozmiaru w projekcji (bez generacji)") +S("draw based on size in the projection (generation)", + "rysuj na podstawie rozmiaru w projekcji (z generacją)") +S("cells drawn", "liczba narysowanych pól") +S("limit on cells drawn", "ograniczenie na liczbę narysowanych pól") +S("This limit exists to protect the engine from freezing when too many cells would be drawn according to the current options.", + "To ograniczenie istnieje by uchronić silnik przed zawieszeniem się w przypadku, gdyby zgodnie z obecnymi opcjami było za dużo pól do narysowania.") +S("generation range bonus", "bonus do zasięgu generacji") +S("game range bonus", "bonus do zasięgu gry") + +// new options for models + +S("Joukowsky transform", "odwzorowanie Żukowskiego") +S("Joukowsky+inversion", "Żukowski + inwersja") + +S("maximum z coordinate to show", "największa rysowana wartość z") + +S("model transition", "przejście między modelami") +S("You can change this parameter for a transition from another model to this one.", + "Możesz zmienić ten parametr, by obejrzeć przejście z innego modelu do tego.") + +S("model orientation", "orientacja modelu") diff --git a/language-ru.cpp b/language-ru.cpp index cd72c2a8..18f27b7b 100644 --- a/language-ru.cpp +++ b/language-ru.cpp @@ -3697,7 +3697,7 @@ S("render now (length: %1)", "рисуется сейчас (длина: %1)") S("Enable cheat mode or GAME OVER to use this", "Доступно только в конце игры и в режиме обманщика") // remember to note it's in English -S("see http://www.roguetemple.com/z/hyper/conformal.php", "смотри http://www.roguetemple.com/z/hyper/conformal.php (по-английски))") +S("see http://www.roguetemple.com/z/hyper/models.php", "смотри http://www.roguetemple.com/z/hyper/models.php (по-английски))") // Yendorian Forest // ---------------- diff --git a/screenshot.cpp b/screenshot.cpp index 01169c9f..71524394 100644 --- a/screenshot.cpp +++ b/screenshot.cpp @@ -635,7 +635,7 @@ void show() { }; }); } - dialog::addBoolItem(XLAT("no movement"), ma == maNone, '0'); + dialog::addBoolItem(XLAT("no movement animation"), ma == maNone, '0'); dialog::add_action([] () { ma = maNone; }); dialog::addBoolItem(XLAT("translation"), ma == maTranslation, '1'); dialog::add_action([] () { ma = maTranslation; });