Merge pull request #172 from Quuxplusone/trans

Fix some low-hanging translation bugs.

geom-exp.cpp

@@ -20,7 +20,7 @@ string euchelp =
   "You can try many different geometries here. We start by gluing "
   "n-gons in such a way that k of them meet in every vertex. "
   "Depending on n and k, this either folds into a sphere, unfolds into a plane, "
-  "or requires a hyperbolic space. The result may be then 'bitrunc' by "
+  "or requires a hyperbolic space. The result may be then 'bitruncated' by "
   "replacing each vertex by a 2k-gon. Furthermore, you can play "
   "with quotient geometries. For example, the elliptic geometry is "
   "obtained from the sphere by making the antipodes be the same point, "
@@ -28,7 +28,7 @@ string euchelp =
   "Have fun experimenting! "
   "Achievements and leaderboards do not work in geometry experiments, "
   "except some specific ones.\n\n"
-  "In standard geometry (bitrunc or not), you can play the full game, but in other geometries "
+  "In standard geometry (bitruncated or not), you can play the full game, but in other geometries "
   "you select a particular land. Lands are unlocked by visiting them in this "
   "session, or permanently by collecting 25 treasure. Try Crossroads in Euclidean "
   "or chaos mode in non-standard non-quotient hyperbolic to visit many lands. "

help.cpp

@@ -495,11 +495,13 @@ EX string generateHelpForItem(eItem it) {
     for(auto& oi: orbinfos) {
       if(treasureType(oi.l) == it) {
         if(oi.gchance > 0) {
+          help += "\n\n";
           help += XLAT("\n\nOrb unlocked: %1", oi.orb);
           describeOrb(help, oi);
           }
         else if(oi.l == cwt.at->land || inv::on) {
-          help += XLAT("\n\nSecondary orb: %1", oi.orb);
+          help += "\n\n";
+          help += XLAT("Secondary orb: %1", oi.orb);
           describeOrb(help, oi);
           }
         }

language-cz.cpp

@@ -3440,9 +3440,6 @@ S(  "This Orb makes you stunningly beautiful. "
 
 S(  "A big, beautiful, magical flower.", "Velká, krásná, magická květina.")
 
-S("Don't be fooled by beauty, or you will be stabbed if you come too close!",
-  "Nenech se oklamat krásou -- když se moc přiblížíš, můžeš dostat ránu nožem!")
-
 S("You just cannot stand in place, those roses smell too nicely.",
   "Nemůžeš zůstat na místě, ty růže příliš krásně voní.")
 S("Those roses smell too nicely. You have to come towards them.",
@@ -5758,9 +5755,8 @@ S("see how it ended", "podívej se, jak to skonèilo")
 // other missing/new things
 // ------------------------
 
-S("\n\nOrb unlocked: %1", "\n\nByla odemèena Sféra: %1")
 S("Orb unlocked: %1", "Byla odemèena Sféra: %1")
-S("\n\nSecondary orb: %1", "\n\nSekundární Sféra: %1")
+S("Secondary orb: %1", "Sekundární Sféra: %1")
 S(" to submerge", " do ponoøení")
 S(" to surface", " do vynoøení")
 S("%The1 says, \"not this place, it looks even worse...\"", 
@@ -7488,15 +7484,11 @@ S("animate parameters", "animace parametrù")
 S(
   "Most parameters can be animated simply by using '..' in their editing dialog. "
   "For example, the value of a parameter set to 0..1 will grow linearly from 0 to 1. "
-  "You can also use functions (e.g. cos(0..2*pi)) and refer to other parameters; "
+  "You can also use functions (e.g. cos(0..2*pi)) and refer to other parameters.",
-  "parameters 'a' and 'b' exist for this purpose. "
-  "See the list below for parameters which are currently animated (or changed).",
   
   "Vìtšinu parametrù lze animovat jen tím, že v jejich editaèním dialogu napíšeš '..'. "
   "Tak napøíklad hodnota parametru nastaveného na 0..1 poroste lineárnì od 0 do 1. "
-  "Lze také použít funkce (napø. cos(0..2*pi) a odkazovat na jiné parametry; "
+  "Lze také použít funkce (napø. cos(0..2*pi) a odkazovat na jiné parametry.")
-  "za tímto úèelem existují parametry 'a' a 'b'. "
-  "Viz níže uvedený seznam parametrù, které jsou v souèasné dobì animovány (nebo zmìnìny).")
 
 // color edit dialog
 
@@ -8160,7 +8152,6 @@ S(
 S("use the full 3D models", "používej úplné 3D modely")
 
 S("Z shift", "Z-posuv")
-S("Eye level", "úroveň očí")
 S("fixed Y/Z rotation", "stálá Y/Z rotace")
 
 S("configure FPP automatically", "automatická konfigurace FPP")
@@ -8948,7 +8939,7 @@ S(
   "If the pointer length is 0.5m, the object pointed to is 0.5 meter from the controller. "
   "This is used in situations where the controller is used as a 3D mouse, e.g., "
   "the drawing tool in three-dimensional geometries. When pointing at two-dimensional surfaces, "
-  "this is not relevant (the pointer is as long as needed to hit the surface.)",
+  "this is not relevant (the pointer is as long as needed to hit the surface).",
   
   "Pokud je délka ukazatele 0,5 m, je objekt, na který ukazuje, 0,5 metru od ovladače. "
   "To se používá v situacích, kdy se ovladač používá jako 3D myš, např. "
@@ -9050,11 +9041,7 @@ S(
           "x, y, z (hyperboloid/sphere/plane coordinates in non-crystal geometries)\n"
           "ex, ey, ez (in Euclidean geometries)\n"
           "x0, x1, x2... (crystal geometry only)\n"
-          "0 is black, 1 is white, rgb(1,0,0) is red, ifp(p-2,1,0) is blue (p=1 for red, 2 for green, 3 for blue)."
+          "0 is black, 1 is white, rgb(1,0,0) is red, ifp(p-2,1,0) is blue (p=1 for red, 2 for green, 3 for blue).",
-
-          "w (fourth coordinate)\n"
-          "wallif(condition, color)\n"
-          , 
 
           "Zde můžeš specifikovat barevný vzor jako funkci políčka. "
           "Dostupné parametry:\n\n"
@@ -9062,6 +9049,12 @@ S(
           "ex, ey, ez (v eukleidovských geometriích)\n"
           "x0, x1, x2... (pouze v krystalové geometrii)\n"
           "0 je černá, 1 bílá, rbg(1,0,0) červená, ifp(p-2,1,0) modrá (p=1 pro červenou, 2 pro zelenou, 3 pro modrou)."
+          )
+
+S(
+          "w (fourth coordinate)\n"
+          "wallif(condition, color)\n",
+
           "w (čtvrtá souřadnice)\n"
           "wallif(podmínka, barva)\n"
           )

language-de.cpp

@@ -2407,7 +2407,7 @@ S("Variants of %the1 are available in the Random Pattern Mode after "
 S(" kills: %1", " Kills: %1")
 S(" $$$: %1", " $$$: %1")
 S(" Hyperstone: %1/%2", " Hypersteine: %1/%2")
-S(" Hell: %1/9", " Hölle: %1/9")
+S(" Hell: %1/%2", " Hölle: %1/%2")
 
 // improved editor
 // ---------------
@@ -3228,9 +3228,6 @@ S("This Orb makes you stunningly beautiful. "
 
 S("A big, beautiful, magical flower.", "Eine große, schöne, magische Blume.")
 
-S("Don't be fooled by beauty, or you will be stabbed if you come too close!",
-  "Lass dich von Schönheit nicht täuschen - oder du wirst erstochen, wenn du zu nah kommst!")
-
 S("Each eight turns, each rosebush at distance at most 5 from you will "
   "release a wave of alluring scent. Creatures on the frontwave "
   "will move towards where the scent came from. Even if it causes them "

language-pl.cpp

@@ -340,7 +340,7 @@ S("Your score: %1", "Twój wynik: %1")
 S("Enemies killed: %1", "Potwory pokonane: %1")
 S("Orbs of Yendor found: %1", "Znalezione Sfery Yendoru: %1")
 S("Collect %1 $$$ to access more worlds", "Znajdź %1 $$$, by iść do nowych krain")
-S("Collect at least %1 treasures in each of 9 types to access Hell", "Znajdź po %1 skarbów w %2 typach, by się dostać do Piekła")
+S("Collect at least %1 treasures in each of %2 types to access Hell", "Znajdź po %1 skarbów w %2 typach, by się dostać do Piekła")
 S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "Znajdź %1 Czarciego Ziela, by znaleźć Sfery Yendoru")
 S("Hyperstone Quest: collect at least %3 %1 in %the2", "Misja alternatywna: znajdź co najmniej %3 skarbów %abl2")
 S("Hyperstone Quest completed!", "Misja alternatywna zakończona!")
@@ -1693,7 +1693,7 @@ S("Hell has these lakes everywhere... They are shaped like evil stars, and fille
 
 S("hardcore mode", "tryb hardcore")
 
-S("One wrong move, and it is game over!", "Jeden fałszywy ruch i koniec gry!")
+S("One wrong move and it is game over!", "Jeden fałszywy ruch i koniec gry!")
 S("Not so hardcore?", "Hardkor to nie to?")
 
 // Shoot'em up Mode
@@ -3376,10 +3376,6 @@ S(  "This Orb makes you stunningly beautiful. "
 
 S(  "A big, beautiful, magical flower.", "Duży, piękny, magiczny kwiat.")
 
-S("Don't be fooled by beauty, or you will be stabbed if you come too close!",
-  "Nie daj się zwieść urodzie, bo jak się za bardzo zbliżysz, możesz zostać ugodzon%y0 nożem!")
-
-
 S(
   "Each eight turns, each rosebush at distance at most 5 from you will "
   "release a wave of alluring scent. Creatures on the frontwave "
@@ -5694,9 +5690,8 @@ S(" (%1 more digits)", " (jeszcze cyfr: %1)")
 S("see how it ended", "jak się skończyło")
 
 // other missing/new things
-S("\n\nOrb unlocked: %1", "\n\nOdblokowana Sfera: %1")
 S("Orb unlocked: %1", "Odblokowana Sfera: %1")
-S("\n\nSecondary orb: %1", "\n\nDodatkowa Sfera: %1")
+S("Secondary orb: %1", "Dodatkowa Sfera: %1")
 S(" to submerge", " do zanurzenia")
 S(" to surface", " do wynurzenia")
 S("%The1 says, \"not this place, it looks even worse...\"", 
@@ -7237,15 +7232,11 @@ S("animate parameters", "animacja parametrów")
 S(
   "Most parameters can be animated simply by using '..' in their editing dialog. "
   "For example, the value of a parameter set to 0..1 will grow linearly from 0 to 1. "
-  "You can also use functions (e.g. cos(0..2*pi)) and refer to other parameters; "
+  "You can also use functions (e.g. cos(0..2*pi)) and refer to other parameters.",
-  "parameters 'a' and 'b' exist for this purpose. "
-  "See the list below for parameters which are currently animated (or changed).",
   
   "Większość parametrów może być animowana w prosty sposób, przez wpisanie '..' w ich pole edycji. "
   "Przykładowo, wartość parametru ustawiona na 0..1 będzie rosła liniowa od 0 do 1. "
-  "Możesz też używać funkcji (np. cos(0..2*pi)) lub odnosić się do innych parametrów; "
+  "Możesz też używać funkcji (np. cos(0..2*pi)) lub odnosić się do innych parametrów.")
-  "parametry 'a' i 'b' istnieją w tym celu. Poniżej lista parametrów obecnie "
-  "animowanych (lub zmienionych).")
 
 // color edit dialog
 
@@ -7878,7 +7869,6 @@ S(
 S("use the full 3D models", "użyj pełnych modeli 3D")
 
 S("Z shift", "przesunięcie Z")
-S("Eye level", "poziom oka")
 S("fixed Y/Z rotation", "ustalona rotacja Y/Z")
 
 S("configure FPP automatically", "automatycznie skonfiguruj FPP")
@@ -8667,7 +8657,7 @@ S(
   "If the pointer length is 0.5m, the object pointed to is 0.5 meter from the controller. "
   "This is used in situations where the controller is used as a 3D mouse, e.g., "
   "the drawing tool in three-dimensional geometries. When pointing at two-dimensional surfaces, "
-  "this is not relevant (the pointer is as long as needed to hit the surface.).",
+  "this is not relevant (the pointer is as long as needed to hit the surface).",
   
   "Jeśli długość wskaźnika to 0.5m, wskazywany punkt jest 0.5 metra od kontrolera. "
   "Ma to znaczenie, gdy kontroler jest używany jako mysz 3D, np. narzędzie do rysowania w "
@@ -8781,8 +8771,7 @@ S(
           
 S(
           "w (fourth coordinate)\n"
-          "wallif(condition, color)\n"
+          "wallif(condition, color)\n", 
-          , 
 
           "w (czwarta współrzędna)\n"
           "wallif(warunek, kolor)\n"

language-ptbr.cpp

@@ -343,8 +343,8 @@ S("Your score: %1", "Sua pontuação: %1")
 S("Enemies killed: %1", "Inimigos mortos: %1")
 S("Orbs of Yendor found: %1", "Orbes de Yendor encontrados: %1")
 S("Collect %1 $$$ to access more worlds", "Colete %1 $$$, para acessar novos mundos")
-S("Collect at least %1 treasures in each of 9 types to access Hell", "Colete pelo menos %1 tesouros de cada um dos 9 tipos para acessar o Inferno")
+S("Collect at least %1 treasures in each of %2 types to access Hell", "Colete pelo menos %1 tesouros de cada um dos %2 tipos para acessar o Inferno")
-S("Collect at least 10 Demon Daisies to find the Orbs of Yendor", "Colete pelo menos 10 Margaridas Demônio para encontrar os Orbes de Yendor")
+S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "Colete pelo menos %1 Margaridas Demônio para encontrar os Orbes de Yendor")
 S("Hyperstone Quest: collect at least %3 %1 in %the2", "Missão da Pedra do Ímpeto: colete pelo menos %3 %1 no-a %abl1")
 S("Hyperstone Quest completed!", "Missão da Pedra do Ímpeto completa!")
 S("Look for the Orbs of Yendor in Hell or in the Crossroads!", "Procure pelos Orbes de Yendor no Inferno e nas Encruzilhadas!")
@@ -483,10 +483,10 @@ S(
  "números mostrados para saber seus significados.\n")
 
 S(
- "Move with mouse, num pad, qweadzxc, or hjklyubn. Wait by pressing 's' or '.'. Spin the world with arrows, PageUp/Down, and Home/Space. "
+ "Move with mouse, num pad, qweadzxc, or hjklyubn. Wait by pressing 's' or '.'. Spin the world with arrows, PageUp/Down, and Space. "
  "To save the game you need an Orb of Safety. Press 'v' for the main menu (configuration, special modes, etc.), ESC for the quest status.\n\n",
  
- "Mova-se com o mouse, teclado numérico, qweadzxc, ou hjklyubn. Espere apertando 's' ou '.'. Gire o mundo com as setas, PageUp/Down, ou Home/Espaço."
+ "Mova-se com o mouse, teclado numérico, qweadzxc, ou hjklyubn. Espere apertando 's' ou '.'. Gire o mundo com as setas, PageUp/Down, ou Espaço."
  "Para salvar o jogo você precisa de um Orbe da Segurança. Pressione 'v' para ir ao menu principal (configurações, modos especiais, etc.), ESC para o estado da missão.\n\n")
 
 S("See more on the website: ", "Veja mais no site: ")
@@ -2610,7 +2610,7 @@ S("Variants of %the1 are available in the Random Pattern Mode after "
 S(" kills: %1", " zabicia: %1")
 S(" $$$: %1", " $$$: %1")
 S(" Hyperstone: %1/%2", " Hiperkamienie: %1/%2")
-S(" Hell: %1/9", " Piekło: %1/9")
+S(" Hell: %1/%2", " Piekło: %1/%2")
 
 // improved editor
 
@@ -3465,10 +3465,6 @@ S(  "This Orb makes you stunningly beautiful. "
 
 S(  "A big, beautiful, magical flower.", "Duży, piękny, magiczny kwiat.")
 
-S("Don't be fooled by beauty, or you will be stabbed if you come too close!",
-  "Nie daj się zwieść urodzie, bo jak się za bardzo zbliżysz, możesz zostać ugodzon%y0 nożem!")
-
-
 S(
   "Each eight turns, each rosebush at distance at most 5 from you will "
   "release a wave of alluring scent. Creatures on the frontwave "
@@ -5779,9 +5775,8 @@ S(" (%1 more digits)", " (jeszcze cyfr: %1)")
 S("see how it ended", "jak się skończyło")
 
 // other missing/new things
-S("\n\nOrb unlocked: %1", "\n\nOdblokowana Sfera: %1")
 S("Orb unlocked: %1", "Odblokowana Sfera: %1")
-S("\n\nSecondary orb: %1", "\n\nDodatkowa Sfera: %1")
+S("Secondary orb: %1", "Dodatkowa Sfera: %1")
 S(" to submerge", " do zanurzenia")
 S(" to surface", " do wynurzenia")
 S("%The1 says, \"not this place, it looks even worse...\"", 

language-ru.cpp

@@ -342,7 +342,7 @@ S("Your score: %1", "Ваш счёт: %1")
 S("Enemies killed: %1", "Врагов убито: %1")
 S("Orbs of Yendor found: %1", "Собрано сфер Йендора: %1")
 S("Collect %1 $$$ to access more worlds", "Соберите %1 $$$, чтобы открыть новые земли")
-S("Collect at least %1 treasures in each of 9 types to access Hell", "Соберите хотя бы по %1 сокровищ %2 разных типов, чтобы попасть в Ад")
+S("Collect at least %1 treasures in each of %2 types to access Hell", "Соберите хотя бы по %1 сокровищ %2 разных типов, чтобы попасть в Ад")
 S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "Соберите %1 адских ромашек, чтобы найти сферу Йендора")
 S("Hyperstone Quest: collect at least %3 %1 in %the2", "Миссия Гиперкамня: соберите %3 драгоценностей в %abl2")
 S("Hyperstone Quest completed!", "Миссия Гиперкамня закончена!")
@@ -3465,10 +3465,6 @@ S(  "This Orb makes you stunningly beautiful. "
  
 S(  "A big, beautiful, magical flower.", "Большой прекрасный магический цветок.")
  
-S("Don't be fooled by beauty, or you will be stabbed if you come too close!",
-  "Не будьте обмануты красотой, если не хотите получить удар в спину!")
- 
- 
 S(
   "Each eight turns, each rosebush at distance at most 5 from you will "
   "release a wave of alluring scent. Creatures on the frontwave "
@@ -5844,9 +5840,8 @@ S(" (%1 more digits)", " (ещё цифр: %1)")
 S("see how it ended", "смотри, как всё закончилось")
  
 // other missing/new things
-S("\n\nOrb unlocked: %1", "\n\nОткрыта сфера: %1")
 S("Orb unlocked: %1", "Открыта сфера: %1")
-S("\n\nSecondary orb: %1", "\n\nДополнительная сфера: %1")
+S("Secondary orb: %1", "Дополнительная сфера: %1")
 S(" to submerge", " на погружение")
 S(" to surface", " на поверхность")
 S("%The1 says, \"not this place, it looks even worse...\"",

language-tr.cpp

@@ -322,7 +322,7 @@ S("Enemies killed: %1", "Öldürülen Düşmanlar: %1")
 S("Orbs of Yendor found: %1", "Bulunan Yendor Küresi sayısı: %1")
 S("Collect %1 $$$ to access more worlds", "%1 $$$ toplayarak başka dünyalara eriş")
 // S("Collect %1 $$$ to access R'Lyeh and Dry Forest", "60 $$$ toplayarak R'Lyeh ve Kara Ormana eriş.")
-S("Collect at least %1 treasures in each of 9 types to access Hell", "%2 hazine çeşidinin hepsinden %1'ar tane toplayarak Cehenneme erişebilirsin.")
+S("Collect at least %1 treasures in each of %2 types to access Hell", "%2 hazine çeşidinin hepsinden %1'ar tane toplayarak Cehenneme erişebilirsin.")
 S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "%1 Şeytan Papatyası toplayarak Yendorun Kürelerini bulabilirsin.")
 S("Hyperstone Quest: collect at least %3 %1 in %the2", "Aşkıntaş Görevi: %2'de en az %3 hazine topla.")
 S("Hyperstone Quest completed!", "Aşkıntaş görevi tamamlandı.")

menus.cpp

@@ -398,7 +398,7 @@ EX void switchHardcore() {
   else if(hardcore && canmove) { hardcore = false; }
   else { hardcore = true; canmove = true; hardcoreAt = turncount; }
   if(hardcore)
-      addMessage(XLAT("One wrong move, and it is game over!"));
+      addMessage(XLAT("One wrong move and it is game over!"));
   else
       addMessage(XLAT("Not so hardcore?"));
   if(pureHardcore()) popScreenAll();

vr.cpp

@@ -1336,7 +1336,7 @@ EX void show_vr_settings() {
         "If the pointer length is 0.5m, the object pointed to is 0.5 meter from the controller. "
         "This is used in situations where the controller is used as a 3D mouse, e.g., "
         "the drawing tool in three-dimensional geometries. When pointing at two-dimensional surfaces, "
-        "this is not relevant (the pointer is as long as needed to hit the surface.)."
+        "this is not relevant (the pointer is as long as needed to hit the surface)."
         ));
       });